From ff5a952767a0c98fff6cf53733df93db5aa80b2f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 07 九月 2018 19:27:33 +0800
Subject: [PATCH] Merge branch 'master' into 3243Activity
---
System/Strengthening/GodBeastAttributes.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/Strengthening/GodBeastAttributes.cs b/System/Strengthening/GodBeastAttributes.cs
index 3069ff8..b575370 100644
--- a/System/Strengthening/GodBeastAttributes.cs
+++ b/System/Strengthening/GodBeastAttributes.cs
@@ -42,6 +42,7 @@
PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
ItemTipsModel _itemTipsModel;
ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
+ GodBeastModel godBeastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }
private int GodBeastNumber = 0;//绁炲吔缂栧彿
private int GodBeastPart = 0;//绁炲吔瑁呭ID
@@ -64,12 +65,12 @@
m_DoubleToggle.isOn = false;
}
GodBeastReinforcementWin.ChooseToModify += ChooseToModify;
- GodBeastSlidingList.AbsorbEvent += AbsorbEvent;
+ godBeastModel.AbsorbEvent += AbsorbEvent;
}
private void OnDisable()
{
GodBeastReinforcementWin.ChooseToModify -= ChooseToModify;
- GodBeastSlidingList.AbsorbEvent -= AbsorbEvent;
+ godBeastModel.AbsorbEvent -= AbsorbEvent;
}
public void Init()
@@ -92,7 +93,7 @@
}
private void OnClickStrengthBtn()
{
- Dictionary<int, int> DicAb = m_GodBeastSlidingList.Absorption_Dic;
+ Dictionary<int, int> DicAb = godBeastModel.Absorption_Dic;
List<int> List = new List<int>();
foreach (var key in DicAb.Keys)
{
@@ -111,7 +112,7 @@
{
GetGodBeastLocationMarker(locationMarker);
}
- private void AbsorbEvent(Dictionary<int, int> absorb)
+ private void AbsorbEvent()//閫変腑鍙栨秷鐨勬暟鎹埛鏂�
{
GetDogZLevelAndExp();
AttributeAssignment();
@@ -212,7 +213,7 @@
SingleProficiency = 0;
DoubleProficiency = 0;
NeedFairyJade = 0;
- Dictionary<int, int> DicAb = m_GodBeastSlidingList.Absorption_Dic;
+ Dictionary<int, int> DicAb = godBeastModel.Absorption_Dic;
foreach (var key in DicAb.Keys)
{
ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptDogzItem, key);
--
Gitblit v1.8.0