From 0bb7ef62509e01721117f7beaf63a937a68050b2 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 14:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzActiveWin.cs | 18 ++
System/Dogz/DogzEquip.cs | 73 ++-------
System/Dogz/DogzPackWin.cs | 2
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs.meta | 4
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C1_tagMCDogzHelpbattleState.cs | 26 ++-
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs | 45 ++++++
System/Dogz/DogzDetailsWin.cs | 6
System/Dogz/DogzDetailBehaviour.cs | 92 ++++++------
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs.meta | 4
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs.meta | 2
System/Dogz/DogzModel.cs | 14 +
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs | 63 ++++++---
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C0_tagMCDogzInfo.cs | 26 ++-
Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs | 4
14 files changed, 228 insertions(+), 151 deletions(-)
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs
similarity index 80%
rename from Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs
rename to Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs
index 8974650..2b46b64 100644
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs
@@ -3,11 +3,11 @@
// A5 C0 神兽穿戴装备 #tagCMDogzEquipItem
-public class CA5C0_tagCMRuneCompound : GameNetPackBasic {
+public class CA5C0_tagCMDogzEquipItem : GameNetPackBasic {
public byte DogzID; // 神兽ID
public byte EquipIndex; //神兽装备所在神兽背包索引
- public CA5C0_tagCMRuneCompound () {
+ public CA5C0_tagCMDogzEquipItem () {
combineCmd = (ushort)0x03FE;
_cmd = (ushort)0xA5C0;
}
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs.meta
similarity index 75%
copy from Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta
copy to Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs.meta
index f85a78d..4c6f273 100644
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: b00a5364802efe042ab660ccf8ad18c6
-timeCreated: 1534495463
+guid: 23a1593c938d2a54aaf891bee0cc83a6
+timeCreated: 1534573006
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs
index 9f84731..dc7800c 100644
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs
@@ -1,24 +1,45 @@
using UnityEngine;
using System.Collections;
-// A5 C4 神兽装备强化 #tagCMDogzEquipPlus
-
-public class CA5C4_tagCMDogzBattleStateChange : GameNetPackBasic {
- public byte EquipIndex; //神兽装备背包中索引
- public byte IndexCount; //材料所在神兽物品背包索引的数量
- public byte[] IndexList; //材料所在神兽物品背包索引列表
- public byte IsDouble; //是否双倍强化
-
- public CA5C4_tagCMDogzBattleStateChange () {
- combineCmd = (ushort)0x03FE;
- _cmd = (ushort)0xA5C4;
- }
-
- public override void WriteToBytes () {
- WriteBytes (EquipIndex, NetDataType.BYTE);
- WriteBytes (IndexCount, NetDataType.BYTE);
- WriteBytes (IndexList, NetDataType.BYTE, IndexCount);
- WriteBytes (IsDouble, NetDataType.BYTE);
- }
-
-}
+// A5 C4 神兽装备强化 #tagCMDogzEquipPlus
+
+
+
+public class CA5C4_tagCMDogzBattleStateChange : GameNetPackBasic {
+
+ public byte EquipIndex; //神兽装备背包中索引
+
+ public byte IndexCount; //材料所在神兽物品背包索引的数量
+
+ public byte[] IndexList; //材料所在神兽物品背包索引列表
+
+ public byte IsDouble; //是否双倍强化
+
+
+
+ public CA5C4_tagCMDogzBattleStateChange () {
+
+ combineCmd = (ushort)0x03FE;
+
+ _cmd = (ushort)0xA5C4;
+
+ }
+
+
+
+ public override void WriteToBytes () {
+
+ WriteBytes (EquipIndex, NetDataType.BYTE);
+
+ WriteBytes (IndexCount, NetDataType.BYTE);
+
+ WriteBytes (IndexList, NetDataType.BYTE, IndexCount);
+
+ WriteBytes (IsDouble, NetDataType.BYTE);
+
+ }
+
+
+
+}
+
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs.meta
index a4f4d6c..01337f6 100644
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs.meta
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzBattleStateChange.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 06d0a968835825d4682ef91adddf7aca
-timeCreated: 1534495572
+timeCreated: 1534573684
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs
new file mode 100644
index 0000000..b872a37
--- /dev/null
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs
@@ -0,0 +1,45 @@
+using UnityEngine;
+using System.Collections;
+
+// A5 C4 神兽装备强化 #tagCMDogzEquipPlus
+
+
+
+public class CA5C4_tagCMDogzEquipPlus : GameNetPackBasic {
+
+ public byte EquipIndex; //神兽装备背包中索引
+
+ public byte IndexCount; //材料所在神兽物品背包索引的数量
+
+ public byte[] IndexList; //材料所在神兽物品背包索引列表
+
+ public byte IsDouble; //是否双倍强化
+
+
+
+ public CA5C4_tagCMDogzEquipPlus () {
+
+ combineCmd = (ushort)0x03FE;
+
+ _cmd = (ushort)0xA5C4;
+
+ }
+
+
+
+ public override void WriteToBytes () {
+
+ WriteBytes (EquipIndex, NetDataType.BYTE);
+
+ WriteBytes (IndexCount, NetDataType.BYTE);
+
+ WriteBytes (IndexList, NetDataType.BYTE, IndexCount);
+
+ WriteBytes (IsDouble, NetDataType.BYTE);
+
+ }
+
+
+
+}
+
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs.meta
similarity index 75%
rename from Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta
rename to Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs.meta
index f85a78d..436c1cc 100644
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMRuneCompound.cs.meta
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: b00a5364802efe042ab660ccf8ad18c6
-timeCreated: 1534495463
+guid: 492661260e65b124d9ae25fc29018a94
+timeCreated: 1534573007
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C0_tagMCDogzInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C0_tagMCDogzInfo.cs
index 45c2a04..052329b 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C0_tagMCDogzInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C0_tagMCDogzInfo.cs
@@ -1,11 +1,21 @@
using UnityEngine;
using System.Collections;
+using Snxxz.UI;
-// A3 C0 神兽信息 #tagMCDogzInfo
-
-public class DTCA3C0_tagMCDogzInfo : DtcBasic {
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA3C0_tagMCDogzInfo vNetData = vNetPack as HA3C0_tagMCDogzInfo;
- }
-}
+// A3 C0 神兽信息 #tagMCDogzInfo
+
+
+
+public class DTCA3C0_tagMCDogzInfo : DtcBasic {
+
+ DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
+ public override void Done(GameNetPackBasic vNetPack) {
+
+ base.Done(vNetPack);
+
+ HA3C0_tagMCDogzInfo vNetData = vNetPack as HA3C0_tagMCDogzInfo;
+ dogzModel.SetServerAddAssistDogzCnt(vNetData);
+ }
+
+}
+
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C1_tagMCDogzHelpbattleState.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C1_tagMCDogzHelpbattleState.cs
index d5b366b..7ea5352 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C1_tagMCDogzHelpbattleState.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3C1_tagMCDogzHelpbattleState.cs
@@ -1,11 +1,21 @@
using UnityEngine;
using System.Collections;
+using Snxxz.UI;
-// A3 C1 神兽助战状态刷新 #tagMCDogzHelpbattleState
-
-public class DTCA3C1_tagMCDogzHelpbattleState : DtcBasic {
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA3C1_tagMCDogzHelpbattleState vNetData = vNetPack as HA3C1_tagMCDogzHelpbattleState;
- }
-}
+// A3 C1 神兽助战状态刷新 #tagMCDogzHelpbattleState
+
+
+
+public class DTCA3C1_tagMCDogzHelpbattleState : DtcBasic {
+
+ DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
+ public override void Done(GameNetPackBasic vNetPack) {
+
+ base.Done(vNetPack);
+
+ HA3C1_tagMCDogzHelpbattleState vNetData = vNetPack as HA3C1_tagMCDogzHelpbattleState;
+ dogzModel.SetServerAssistDogzState(vNetData);
+ }
+
+}
+
diff --git a/System/Dogz/DogzActiveWin.cs b/System/Dogz/DogzActiveWin.cs
index 6ba7d96..744ea5b 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,8 @@
UpdateDogzAssistCnt();
model.UpdateSelectDogzEvent += UpdateSelectDogzEvent;
model.UpdateAssistDogzEvent += UpdateDogzAssistCnt;
+ model.RefreshDogzEquipAct += RefreshDogzEquipEvent;
+
}
@@ -72,6 +77,9 @@
protected override void OnPreClose()
{
+ model.UpdateSelectDogzEvent -= UpdateSelectDogzEvent;
+ model.UpdateAssistDogzEvent -= UpdateDogzAssistCnt;
+ model.RefreshDogzEquipAct -= RefreshDogzEquipEvent;
}
protected override void OnAfterClose()
@@ -131,6 +139,14 @@
}
}
}
+
+
+ private void RefreshDogzEquipEvent(int dogzId)
+ {
+ if (dogzId != model.presentSelectDogz) return;
+ UpdateDogzEquip();
+ }
+
private void UpdateDogzEquip()
{
var _dogzCfg = ConfigManager.Instance.GetTemplate<DogzConfig>(model.presentSelectDogz);
@@ -144,7 +160,7 @@
m_DogzEquips[i].gameObject.SetActive(_equiped);
if (_equiped)
{
- m_DogzEquips[i].Display(_data.itemId);
+ m_DogzEquips[i].Display(_data);
}
}
}
diff --git a/System/Dogz/DogzDetailBehaviour.cs b/System/Dogz/DogzDetailBehaviour.cs
index ef1a8f2..ae63781 100644
--- a/System/Dogz/DogzDetailBehaviour.cs
+++ b/System/Dogz/DogzDetailBehaviour.cs
@@ -43,53 +43,53 @@
});
}
- public void Display(DogzEquipData data)
+ public void Display(ItemModel data)
{
- m_DogzEquip.Display(data.ItemId);
- var config = ConfigManager.Instance.GetTemplate<ItemConfig>(data.ItemId);
- if (config != null)
- {
- m_ItemNameTxt.text = config.ItemName;
- m_ItemNameTxt.color = UIHelper.GetUIColor(config.ItemColor);
- }
- m_ContainerBaseProp.gameObject.SetActive(data.basePropertyDict != null);
- if (data.basePropertyDict != null)
- {
- var index = 0;
- foreach (var _key in data.basePropertyDict.Keys)
- {
- if (index < m_BasePropertys.Length)
- {
- var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key);
- m_BasePropertys[index].gameObject.SetActive(true);
- m_BasePropertys[index].Display(_key, data.basePropertyDict[_key]);
- }
- index++;
- }
- for (int i = index; i < m_BasePropertys.Length; i++)
- {
- m_BasePropertys[i].gameObject.SetActive(false);
- }
- }
- m_ContainerSpecialProp.gameObject.SetActive(data.specialPropertyDict != null);
- if (data.specialPropertyDict != null)
- {
- var index = 0;
- foreach (var _key in data.specialPropertyDict.Keys)
- {
- if (index < m_SpecialPropertys.Length)
- {
- var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key);
- m_SpecialPropertys[index].gameObject.SetActive(true);
- m_SpecialPropertys[index].Display(_key, data.specialPropertyDict[_key]);
- }
- index++;
- }
- for (int i = index; i < m_SpecialPropertys.Length; i++)
- {
- m_SpecialPropertys[i].gameObject.SetActive(false);
- }
- }
+ //m_DogzEquip.Display(data);
+ //var config = ConfigManager.Instance.GetTemplate<ItemConfig>(data.itemId);
+ //if (config != null)
+ //{
+ // m_ItemNameTxt.text = config.ItemName;
+ // m_ItemNameTxt.color = UIHelper.GetUIColor(config.ItemColor);
+ //}
+ //m_ContainerBaseProp.gameObject.SetActive(data.basePropertyDict != null);
+ //if (data.basePropertyDict != null)
+ //{
+ // var index = 0;
+ // foreach (var _key in data.basePropertyDict.Keys)
+ // {
+ // if (index < m_BasePropertys.Length)
+ // {
+ // var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key);
+ // m_BasePropertys[index].gameObject.SetActive(true);
+ // m_BasePropertys[index].Display(_key, data.basePropertyDict[_key]);
+ // }
+ // index++;
+ // }
+ // for (int i = index; i < m_BasePropertys.Length; i++)
+ // {
+ // m_BasePropertys[i].gameObject.SetActive(false);
+ // }
+ //}
+ //m_ContainerSpecialProp.gameObject.SetActive(data.specialPropertyDict != null);
+ //if (data.specialPropertyDict != null)
+ //{
+ // var index = 0;
+ // foreach (var _key in data.specialPropertyDict.Keys)
+ // {
+ // if (index < m_SpecialPropertys.Length)
+ // {
+ // var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key);
+ // m_SpecialPropertys[index].gameObject.SetActive(true);
+ // m_SpecialPropertys[index].Display(_key, data.specialPropertyDict[_key]);
+ // }
+ // index++;
+ // }
+ // for (int i = index; i < m_SpecialPropertys.Length; i++)
+ // {
+ // m_SpecialPropertys[i].gameObject.SetActive(false);
+ // }
+ //}
}
private void OnEnable()
diff --git a/System/Dogz/DogzDetailsWin.cs b/System/Dogz/DogzDetailsWin.cs
index 1f5ee5f..79e1dc0 100644
--- a/System/Dogz/DogzDetailsWin.cs
+++ b/System/Dogz/DogzDetailsWin.cs
@@ -49,9 +49,9 @@
private void Display()
{
- m_Compare.gameObject.SetActive(model.viewDetailCompare);
- m_Single.Display(model.viewDetailData);
- m_Single.gameObject.SetActive(true);
+ //m_Compare.gameObject.SetActive(model.viewDetailCompare);
+ //m_Single.Display(model.viewDetailData);
+ //m_Single.gameObject.SetActive(true);
}
private void OnClose()
diff --git a/System/Dogz/DogzEquip.cs b/System/Dogz/DogzEquip.cs
index d4ae845..f35fcb0 100644
--- a/System/Dogz/DogzEquip.cs
+++ b/System/Dogz/DogzEquip.cs
@@ -9,68 +9,33 @@
{
public class DogzEquip : MonoBehaviour
{
- [SerializeField] Image m_EquipBG;
- [SerializeField] Image m_EquipIcon;
- [SerializeField] List<Image> m_EquipStars;
-
- [SerializeField] Button m_ViewDetial;
-
- DogzModel model { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
-
- public int ItemId { get; private set; }
- public DogzEquipData equipData { get; private set; }
-
- private void Awake()
+ [SerializeField] CommonItemBaisc itemBaisc;
+ [SerializeField] Text strengLvTxt;
+ ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+ public void Display(ItemModel model)
{
- if (m_ViewDetial != null)
+ itemBaisc.Init(model);
+ int strenLv = 0;
+ if(model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
{
- m_ViewDetial.onClick.AddListener(ViewDetail);
+ strenLv = model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];
}
- }
-
- public void Display(int _itemId)
- {
- this.ItemId = _itemId;
- var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);
- if (_itemCfg != null)
+ if (strenLv > 0)
{
- DisplayEquipBG(_itemCfg.ItemColor);
- DisplayIcon(_itemId);
- DisplayStar(_itemCfg.StarLevel);
+ strengLvTxt.gameObject.SetActive(true);
+ strengLvTxt.text = StringUtility.Contact("+", strenLv);
}
- }
-
- void DisplayEquipBG(int _itemColor)
- {
- if (m_EquipBG != null)
+ else
{
- m_EquipBG.SetItemBackGround(_itemColor);
+ strengLvTxt.gameObject.SetActive(false);
}
- }
-
- void DisplayIcon(int _itemId)
- {
- var config = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);
- if (config != null && m_EquipIcon != null)
+ itemBaisc.cellBtn.RemoveAllListeners();
+ itemBaisc.cellBtn.AddListener(()=>
{
- m_EquipIcon.SetSprite(config.IconKey);
- }
- }
-
- void DisplayStar(int _star)
- {
- if (m_EquipStars != null)
- {
- for (int i = 0; i < m_EquipStars.Count; i++)
- {
- m_EquipStars[i].gameObject.SetActive(i < _star);
- }
- }
- }
-
- private void ViewDetail()
- {
- model.ViewDetail(ItemId);
+ ItemAttrData attrData = new ItemAttrData(model.itemId,false,(ulong)model.itemInfo.ItemCount,model.itemInfo.ItemPlace,
+ model.itemInfo.IsBind,false,PackType.rptDogzEquip,model.itemInfo.ItemGUID);
+ tipsModel.SetItemTipsModel(attrData);
+ });
}
}
}
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index 66b5a63..96f835f 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -153,6 +153,10 @@
{
addAssistCnt = info.BuyHelpbattleCount;
DogzAssistDefaultCnt += addAssistCnt;
+ if (UpdateAssistDogzEvent != null)
+ {
+ UpdateAssistDogzEvent();
+ }
}
public event Action UpdateAssistDogzEvent;
@@ -219,6 +223,7 @@
}
}
+ public Action<int> RefreshDogzEquipAct;
private void RefreshDogzEquipInfo(PackType type, int index, int id)
{
if (type != PackType.rptDogzEquip) return;
@@ -246,6 +251,11 @@
return;
}
}
+ }
+
+ if(RefreshDogzEquipAct != null)
+ {
+ RefreshDogzEquipAct(dogzId);
}
}
@@ -301,7 +311,7 @@
public void SendPutOnEquip(int dogzId,int index)
{
- CA5C0_tagCMRuneCompound dogzPutOn = new CA5C0_tagCMRuneCompound();
+ CA5C0_tagCMDogzEquipItem dogzPutOn = new CA5C0_tagCMDogzEquipItem();
dogzPutOn.DogzID = (byte)dogzId;
dogzPutOn.EquipIndex = (byte)index;
GameNetSystem.Instance.SendInfo(dogzPutOn);
@@ -331,7 +341,7 @@
public void SendDogzEquipStrength(int index,List<int>indexlist,int isDouble)
{
- CA5C4_tagCMDogzBattleStateChange dogzStren = new CA5C4_tagCMDogzBattleStateChange();
+ CA5C4_tagCMDogzEquipPlus dogzStren = new CA5C4_tagCMDogzEquipPlus();
dogzStren.EquipIndex = (byte)index;
dogzStren.IndexCount = (byte)indexlist.Count;
byte[] indexByte = new byte[indexlist.Count];
diff --git a/System/Dogz/DogzPackWin.cs b/System/Dogz/DogzPackWin.cs
index a397d10..7199366 100644
--- a/System/Dogz/DogzPackWin.cs
+++ b/System/Dogz/DogzPackWin.cs
@@ -90,7 +90,7 @@
m_DogzEquips[i].gameObject.SetActive(_equiped);
if (_equiped)
{
- m_DogzEquips[i].Display(_data.itemId);
+ m_DogzEquips[i].Display(_data);
}
else
{
--
Gitblit v1.8.0