snxxz_scripts.git

parent: 4bae2638 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-05-06 93695b2c3f99a195e0348be92f1a9c782d826820

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

4个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC04_tagGCXMZZFightInfo.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_PlayerXMZZ.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GActorPlayerBase.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulTipWin.cs	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC04_tagGCXMZZFightInfo.cs

@@ -113,21 +113,20 @@
        }

        else

        {

            if (vNetData.ItemDataSize > 2)

            if (_propData["EquipShowID"].Count > 0)

            {

                RoleParticularModel.ItemData[] _itemDatas = JsonMapper.ToObject<RoleParticularModel.ItemData[]>(vNetData.ItemData);

                _target.itemDatas = new GA_PlayerXMZZ.XmzzItemInfo[_itemDatas.Length];

                for (int i = 0; i < _itemDatas.Length; ++i)

                _target.itemDatas = new GA_PlayerXMZZ.XmzzItemInfo[_propData["EquipShowID"].Count];

                ItemConfig _itemConfig;

                for (int i = 0; i < _propData["EquipShowID"].Count; ++i)

                {

                    _target.itemDatas[i] = new GA_PlayerXMZZ.XmzzItemInfo();

                    _target.itemDatas[i].id = _itemDatas[i].ItemID;

                    _target.itemDatas[i].isSuit = _itemDatas[i].IsSuit;

                    _target.itemDatas[i].place = _itemDatas[i].ItemIndex;

                    _itemDatas[i].AnalysisUserData();

                    if (_itemDatas[i].useDataDict.ContainsKey(30))

                    _target.itemDatas[i].id = (int)_propData["EquipShowID"][i];

                    _itemConfig = ItemConfig.Get(_target.itemDatas[i].id);

                    if (_itemConfig == null)

                    {

                        _target.itemDatas[i].suitLevel = _itemDatas[i].useDataDict[30][0];

                        continue;

                    }

                    _target.itemDatas[i].place = _itemConfig.EquipPlace;

                }

            }

        }


 Fight/GameActor/GA_PlayerXMZZ.cs

@@ -9,8 +9,6 @@
    {

        public int id;

        public int place;

        public int isSuit;

        public int suitLevel;

    }



    public class XmzzTargetInfo


 Fight/GameActor/GActorPlayerBase.cs

@@ -1349,6 +1349,18 @@
                    HandResID = _resID;

                }

            }



            if (m_HandModel)

            {

                if (this is GA_Hero)

                {

                    m_HandModel.layer = LayerUtility.Hero;

                }

                else

                {

                    m_HandModel.layer = LayerUtility.Player;

                }

            }

        }

        else

        {


 System/GatheringSoul/GatherSoulTipWin.cs

@@ -126,40 +126,39 @@


        void DisplayFuncs()

        {

            var list = tipData.operates;

            var operates = tipData.operates;

            var index = 0;

            foreach (var type in list)

            if (operates != null)

            {

                var callBackType = type;

                if (index < m_Funcs.Length)

                foreach (var type in operates)

                {

                    m_Funcs[index].gameObject.SetActive(true);

                    m_Funcs[index].RemoveAllListeners();

                    m_Funcs[index].AddListener(() =>

                    var callBackType = type;

                    if (index < m_Funcs.Length)

                    {

                        ItemTipUtility.GatherSoulOperate(callBackType);

                        //if (list[callBackType] != null)

                        //{

                        //    list[callBackType](callBackType, string.Empty);

                        //}

                    });

                    m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));

                    m_Redpoints[index].gameObject.SetActive(false);

                        m_Funcs[index].gameObject.SetActive(true);

                        m_Funcs[index].RemoveAllListeners();

                        m_Funcs[index].AddListener(() =>

                        {

                            ItemTipUtility.GatherSoulOperate(callBackType);

                        });

                        m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));

                        m_Redpoints[index].gameObject.SetActive(false);



                    if (callBackType == ItemOperateType.LevelUp)

                    {

                        m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple

                          && tipData.gatherSoul.packType == PackType.InterimPack

                          && model.levelUpRedpointHole == tipData.gatherSoul.index);

                        if (callBackType == ItemOperateType.LevelUp)

                        {

                            m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple

                              && tipData.gatherSoul.packType == PackType.InterimPack

                              && model.levelUpRedpointHole == tipData.gatherSoul.index);

                        }

                        else if (callBackType == ItemOperateType.Replace)

                        {

                            m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple

                                && tipData.gatherSoul.packType == PackType.GatherSoul

                                && tipData.gatherSoul.index == model.replaceRedpointIndex);

                        }

                    }

                    else if (callBackType == ItemOperateType.Replace)

                    {

                        m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple

                            && tipData.gatherSoul.packType == PackType.GatherSoul

                            && tipData.gatherSoul.index == model.replaceRedpointIndex);

                    }

                    index++;

                }

                index++;

            }

            for (int i = index; i < m_Funcs.Length; i++)

            {

			@@ -113,21 +113,20 @@
			}
			else
			{
			if (vNetData.ItemDataSize > 2)
			if (_propData["EquipShowID"].Count > 0)
			{
			RoleParticularModel.ItemData[] _itemDatas = JsonMapper.ToObject<RoleParticularModel.ItemData[]>(vNetData.ItemData);
			_target.itemDatas = new GA_PlayerXMZZ.XmzzItemInfo[_itemDatas.Length];
			for (int i = 0; i < _itemDatas.Length; ++i)
			_target.itemDatas = new GA_PlayerXMZZ.XmzzItemInfo[_propData["EquipShowID"].Count];
			ItemConfig _itemConfig;
			for (int i = 0; i < _propData["EquipShowID"].Count; ++i)
			{
			_target.itemDatas[i] = new GA_PlayerXMZZ.XmzzItemInfo();
			_target.itemDatas[i].id = _itemDatas[i].ItemID;
			_target.itemDatas[i].isSuit = _itemDatas[i].IsSuit;
			_target.itemDatas[i].place = _itemDatas[i].ItemIndex;
			_itemDatas[i].AnalysisUserData();
			if (_itemDatas[i].useDataDict.ContainsKey(30))
			_target.itemDatas[i].id = (int)_propData["EquipShowID"][i];
			_itemConfig = ItemConfig.Get(_target.itemDatas[i].id);
			if (_itemConfig == null)
			{
			_target.itemDatas[i].suitLevel = _itemDatas[i].useDataDict[30][0];
			continue;
			}
			_target.itemDatas[i].place = _itemConfig.EquipPlace;
			}
			}
			}

			@@ -9,8 +9,6 @@
			{
			public int id;
			public int place;
			public int isSuit;
			public int suitLevel;
			}

			public class XmzzTargetInfo

			@@ -1349,6 +1349,18 @@
			HandResID = _resID;
			}
			}

			if (m_HandModel)
			{
			if (this is GA_Hero)
			{
			m_HandModel.layer = LayerUtility.Hero;
			}
			else
			{
			m_HandModel.layer = LayerUtility.Player;
			}
			}
			}
			else
			{

			@@ -126,40 +126,39 @@

			void DisplayFuncs()
			{
			var list = tipData.operates;
			var operates = tipData.operates;
			var index = 0;
			foreach (var type in list)
			if (operates != null)
			{
			var callBackType = type;
			if (index < m_Funcs.Length)
			foreach (var type in operates)
			{
			m_Funcs[index].gameObject.SetActive(true);
			m_Funcs[index].RemoveAllListeners();
			m_Funcs[index].AddListener(() =>
			var callBackType = type;
			if (index < m_Funcs.Length)
			{
			ItemTipUtility.GatherSoulOperate(callBackType);
			//if (list[callBackType] != null)
			//{
			// list[callBackType](callBackType, string.Empty);
			//}
			});
			m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));
			m_Redpoints[index].gameObject.SetActive(false);
			m_Funcs[index].gameObject.SetActive(true);
			m_Funcs[index].RemoveAllListeners();
			m_Funcs[index].AddListener(() =>
			{
			ItemTipUtility.GatherSoulOperate(callBackType);
			});
			m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));
			m_Redpoints[index].gameObject.SetActive(false);

			if (callBackType == ItemOperateType.LevelUp)
			{
			m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple
			&& tipData.gatherSoul.packType == PackType.InterimPack
			&& model.levelUpRedpointHole == tipData.gatherSoul.index);
			if (callBackType == ItemOperateType.LevelUp)
			{
			m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple
			&& tipData.gatherSoul.packType == PackType.InterimPack
			&& model.levelUpRedpointHole == tipData.gatherSoul.index);
			}
			else if (callBackType == ItemOperateType.Replace)
			{
			m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple
			&& tipData.gatherSoul.packType == PackType.GatherSoul
			&& tipData.gatherSoul.index == model.replaceRedpointIndex);
			}
			}
			else if (callBackType == ItemOperateType.Replace)
			{
			m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple
			&& tipData.gatherSoul.packType == PackType.GatherSoul
			&& tipData.gatherSoul.index == model.replaceRedpointIndex);
			}
			index++;
			}
			index++;
			}
			for (int i = index; i < m_Funcs.Length; i++)
			{