From 406e6d485ce67acb8667c5e72eb858644d8efdbf Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 09:47:35 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/Dogz/DogzActiveWin.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/System/Dogz/DogzActiveWin.cs b/System/Dogz/DogzActiveWin.cs
index 9e91c85..ef3e9f6 100644
--- a/System/Dogz/DogzActiveWin.cs
+++ b/System/Dogz/DogzActiveWin.cs
@@ -34,6 +34,9 @@
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzModel>());
}
}
+
+ PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
+
#region Built-in
protected override void BindController()
{
@@ -63,6 +66,9 @@
UpdateDogzAssistCnt();
model.UpdateSelectDogzEvent += UpdateSelectDogzEvent;
model.UpdateAssistDogzEvent += UpdateDogzAssistCnt;
+ model.RefreshDogzEquipAct += RefreshDogzEquipEvent;
+
+
}
protected override void OnAfterOpen()
@@ -71,6 +77,9 @@
protected override void OnPreClose()
{
+ model.UpdateSelectDogzEvent -= UpdateSelectDogzEvent;
+ model.UpdateAssistDogzEvent -= UpdateDogzAssistCnt;
+ model.RefreshDogzEquipAct -= RefreshDogzEquipEvent;
}
protected override void OnAfterClose()
@@ -126,10 +135,28 @@
var _skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(_dogzCfg.HelpBattleSkills[i]);
m_DogzSkills[i].Icon.SetSprite(_skillCfg.IconName);
m_DogzSkills[i].Lv.text = Language.Get("Z1024", _skillCfg.SkillLV);
+ m_DogzSkills[i].SkillBtn.RemoveAllListeners();
+ m_DogzSkills[i].SkillBtn.AddListener(()=>
+ {
+ int fightPower = 0;
+ if (_skillCfg.FightPower > 0)
+ {
+ fightPower = _skillCfg.FightPower;
+ }
+ SkillDetails.ShowSkillDetails(_skillCfg.SkillID, SkillDetails.SkillSourceType.DogzSkill, fightPower);
+ });
}
}
}
}
+
+
+ private void RefreshDogzEquipEvent(int dogzId)
+ {
+ if (dogzId != model.presentSelectDogz) return;
+ UpdateDogzEquip();
+ }
+
private void UpdateDogzEquip()
{
var _dogzCfg = ConfigManager.Instance.GetTemplate<DogzConfig>(model.presentSelectDogz);
@@ -143,7 +170,7 @@
m_DogzEquips[i].gameObject.SetActive(_equiped);
if (_equiped)
{
- m_DogzEquips[i].Display(_data.itemId);
+ m_DogzEquips[i].Display(_data);
}
}
}
@@ -209,6 +236,8 @@
public Image Icon { get { return m_SkillIcon; } }
[SerializeField] Text m_SkillLv;
public Text Lv { get { return m_SkillLv; } }
+ [SerializeField] Button m_SkillBtn;
+ public Button SkillBtn { get { return m_SkillBtn; } }
}
}
}
--
Gitblit v1.8.0