snxxz_scripts.git

parent: 7a5e4598 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-06-27 32e308d475745d7ab9e4c0d80e87ee1188c80c45

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

5个文件已修改

	Core/NetworkPackage/ServerPack/HA3_Function/HA349_tagMCRecoverNum.cs	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/ResourcesBackBoxBack.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/ResourcesBackModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/ResourcesBackWin.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemOperateUtility.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/ServerPack/HA3_Function/HA349_tagMCRecoverNum.cs

@@ -1,35 +1,42 @@
using UnityEngine;

using System.Collections;



// A3 49 资源找回次数 #tagMCRecoverNum



public class HA349_tagMCRecoverNum : GameNetPackBasic {

    public byte Num;    // 找回信息数

    public  tagMCRecoverNumInfo[] NumInfo;    // 找回信息列表



    public HA349_tagMCRecoverNum () {

        _cmd = (ushort)0xA349;

    }



    public override void ReadFromBytes (byte[] vBytes) {

        TransBytes (out Num, vBytes, NetDataType.BYTE);

        NumInfo = new tagMCRecoverNumInfo[Num];

        for (int i = 0; i < Num; i ++) {

            NumInfo[i] = new tagMCRecoverNumInfo();

            TransBytes (out NumInfo[i].Index, vBytes, NetDataType.BYTE);

            TransBytes (out NumInfo[i].RecoverCnt, vBytes, NetDataType.BYTE);

            TransBytes (out NumInfo[i].ExtraCnt, vBytes, NetDataType.BYTE);

            TransBytes (out NumInfo[i].ExtraData, vBytes, NetDataType.BYTE);

            TransBytes (out NumInfo[i].ExtraData2, vBytes, NetDataType.BYTE);

        }

    }



    public struct tagMCRecoverNumInfo {

        public byte Index;        // 找回项索引

        public byte RecoverCnt;        // 可找回次数

        public byte ExtraCnt;        // VIP额外次数

        public byte ExtraData;        // 额外参数1

        public byte ExtraData2;        // 额外参数2

    }



}

// A3 49 资源找回次数 #tagMCRecoverNum



public class HA349_tagMCRecoverNum : GameNetPackBasic

{

    public byte Num;    // 找回信息数

    public tagMCRecoverNumInfo[] NumInfo;    // 找回信息列表



    public HA349_tagMCRecoverNum()

    {

        _cmd = (ushort)0xA349;

    }



    public override void ReadFromBytes(byte[] vBytes)

    {

        TransBytes(out Num, vBytes, NetDataType.BYTE);

        NumInfo = new tagMCRecoverNumInfo[Num];

        for (int i = 0; i < Num; i++)

        {

            NumInfo[i] = new tagMCRecoverNumInfo();

            TransBytes(out NumInfo[i].Index, vBytes, NetDataType.BYTE);

            TransBytes(out NumInfo[i].RecoverCnt, vBytes, NetDataType.BYTE);

            TransBytes(out NumInfo[i].ExtraCnt, vBytes, NetDataType.BYTE);

            TransBytes(out NumInfo[i].ExtraData, vBytes, NetDataType.BYTE);

            TransBytes(out NumInfo[i].ExtraData2, vBytes, NetDataType.BYTE);

            TransBytes(out NumInfo[i].HaveRecover, vBytes, NetDataType.BYTE);

        }

    }



    public struct tagMCRecoverNumInfo

    {

        public byte Index;        // 找回项索引

        public byte RecoverCnt;        // 可找回次数

        public byte ExtraCnt;        // VIP额外次数

        public byte ExtraData;        // 额外参数1

        public byte ExtraData2;        // 额外参数2

        public byte HaveRecover;        // 已找回 1-全部已找回 2-非VIP已找回

    }



}

 System/DailyQuest/ResourcesBackBoxBack.cs

@@ -224,12 +224,14 @@
            {

                m_ButtonObj.SetActive(true);

                m_HasBeenrecovered.SetActive(false);

                m_FindNumberText.gameObject.SetActive(true);

            }

            else

            {

                m_HasBeenrecovered.SetActive(true);

                m_GJText.gameObject.SetActive(false);

                m_ButtonObj.SetActive(false);

                m_FindNumberText.gameObject.SetActive(false);

            }



        }

@@ -351,12 +353,14 @@
            {

                m_ButtonObj.SetActive(true);

                m_HasBeenrecovered.SetActive(false);

                m_FindNumberText.gameObject.SetActive(true);

            }

            else

            {

                m_HasBeenrecovered.SetActive(true);

                m_GJText.gameObject.SetActive(false);

                m_ButtonObj.SetActive(false);

                m_FindNumberText.gameObject.SetActive(false);

            }

        }




 System/DailyQuest/ResourcesBackModel.cs

@@ -31,6 +31,7 @@
        public int Times;//可找回时间

        public string DeadTime;//死亡时间

        public List<int> ReplaceItemID;//替换的物品ID

        public byte HaveRecover;        // 已找回 1-全部已找回 2-非VIP已找回

    }

    public class RewardRecovery

    {

@@ -241,7 +242,7 @@
                    resourcesBackDic.ExtraCnt = vNetData.NumInfo[i].ExtraCnt;

                    resourcesBackDic.ExtraData = vNetData.NumInfo[i].ExtraData;

                    resourcesBackDic.ExtraData2 = vNetData.NumInfo[i].ExtraData2;



                    resourcesBackDic.HaveRecover = vNetData.NumInfo[i].HaveRecover;

                }

                else

                {

@@ -264,6 +265,7 @@
                    resourcesBackClass.CopperReward = LitJson.JsonMapper.ToObject<RewardRecovery>(configRB.CopperReward);

                    resourcesBackClass.RewardList = ConfigParse.GetMultipleStr(configRB.RewardList);

                    resourcesBackClass.ReplaceItemID = ReplaceItemID(configRB.JobItem);

                    resourcesBackClass.HaveRecover = vNetData.NumInfo[i].HaveRecover;

                    ResourcesBackDic.Add(id, resourcesBackClass);

                }

            }


 System/DailyQuest/ResourcesBackWin.cs

@@ -152,7 +152,7 @@
                ResourcesBackBoxBack resourcesBackBoxBack = cell.transform.GetChild(childCode).GetComponent<ResourcesBackBoxBack>();
                resourcesBackBoxBack.gameObject.SetActive(false);
                int cellCount = (cell.transform.childCount) * gridlineIndex + (childCode + 1);
                if (cellCount - 1 < resourcesBackModel.ResourcesBackDic.Count)
                if (cellCount - 1 < resourcesBackModel.ResourcesBackDic.Count && cellCount - 1 < _list.Count)
                {
                    resourcesBackBoxBack.gameObject.SetActive(true);
                    ResourcesBackClass resourcesBackClass = _list[cellCount - 1];
@@ -355,7 +355,15 @@
            }
            foreach (int key in resourcesBackModel.ResourcesBackDic.Keys)
            {
                _list.Add(resourcesBackModel.ResourcesBackDic[key]);
                var value = resourcesBackModel.ResourcesBackDic[key];
                if(!IsBool)

                {

                    if(value.RecoverCnt == 0 && (value.HaveRecover == 0 || value.HaveRecover == 2))

                    {

                        continue;

                    }

                }
                _list.Add(value);
            }
            if (IsBool)
            {

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -646,8 +646,16 @@
                }
                else
                {
                    BatchUseModel.Instance.SetOfflineUseModel(itemModel.guid);
                    WindowCenter.Instance.Open<OfflineHangUpUseWin>();
                    if (!CheckIsMaxOfflineTime(maxUseCnt, itemModel))
                    {
                        UseItem(itemModel.guid);
                    }
                    else
                    {
                        return false;
                    }
                    //BatchUseModel.Instance.SetOfflineUseModel(itemModel.guid);
                    //WindowCenter.Instance.Open<OfflineHangUpUseWin>();
                }
                return true;
            }

			@@ -1,35 +1,42 @@
			using UnityEngine;
			using System.Collections;

			// A3 49 资源找回次数 #tagMCRecoverNum

			public class HA349_tagMCRecoverNum : GameNetPackBasic {
			public byte Num; // 找回信息数
			public tagMCRecoverNumInfo[] NumInfo; // 找回信息列表

			public HA349_tagMCRecoverNum () {
			_cmd = (ushort)0xA349;
			}

			public override void ReadFromBytes (byte[] vBytes) {
			TransBytes (out Num, vBytes, NetDataType.BYTE);
			NumInfo = new tagMCRecoverNumInfo[Num];
			for (int i = 0; i < Num; i ++) {
			NumInfo[i] = new tagMCRecoverNumInfo();
			TransBytes (out NumInfo[i].Index, vBytes, NetDataType.BYTE);
			TransBytes (out NumInfo[i].RecoverCnt, vBytes, NetDataType.BYTE);
			TransBytes (out NumInfo[i].ExtraCnt, vBytes, NetDataType.BYTE);
			TransBytes (out NumInfo[i].ExtraData, vBytes, NetDataType.BYTE);
			TransBytes (out NumInfo[i].ExtraData2, vBytes, NetDataType.BYTE);
			}
			}

			public struct tagMCRecoverNumInfo {
			public byte Index; // 找回项索引
			public byte RecoverCnt; // 可找回次数
			public byte ExtraCnt; // VIP额外次数
			public byte ExtraData; // 额外参数1
			public byte ExtraData2; // 额外参数2
			}

			}
			// A3 49 资源找回次数 #tagMCRecoverNum

			public class HA349_tagMCRecoverNum : GameNetPackBasic
			{
			public byte Num; // 找回信息数
			public tagMCRecoverNumInfo[] NumInfo; // 找回信息列表

			public HA349_tagMCRecoverNum()
			{
			_cmd = (ushort)0xA349;
			}

			public override void ReadFromBytes(byte[] vBytes)
			{
			TransBytes(out Num, vBytes, NetDataType.BYTE);
			NumInfo = new tagMCRecoverNumInfo[Num];
			for (int i = 0; i < Num; i++)
			{
			NumInfo[i] = new tagMCRecoverNumInfo();
			TransBytes(out NumInfo[i].Index, vBytes, NetDataType.BYTE);
			TransBytes(out NumInfo[i].RecoverCnt, vBytes, NetDataType.BYTE);
			TransBytes(out NumInfo[i].ExtraCnt, vBytes, NetDataType.BYTE);
			TransBytes(out NumInfo[i].ExtraData, vBytes, NetDataType.BYTE);
			TransBytes(out NumInfo[i].ExtraData2, vBytes, NetDataType.BYTE);
			TransBytes(out NumInfo[i].HaveRecover, vBytes, NetDataType.BYTE);
			}
			}

			public struct tagMCRecoverNumInfo
			{
			public byte Index; // 找回项索引
			public byte RecoverCnt; // 可找回次数
			public byte ExtraCnt; // VIP额外次数
			public byte ExtraData; // 额外参数1
			public byte ExtraData2; // 额外参数2
			public byte HaveRecover; // 已找回 1-全部已找回 2-非VIP已找回
			}

			}

			@@ -224,12 +224,14 @@
			{
			m_ButtonObj.SetActive(true);
			m_HasBeenrecovered.SetActive(false);
			m_FindNumberText.gameObject.SetActive(true);
			}
			else
			{
			m_HasBeenrecovered.SetActive(true);
			m_GJText.gameObject.SetActive(false);
			m_ButtonObj.SetActive(false);
			m_FindNumberText.gameObject.SetActive(false);
			}

			}
			@@ -351,12 +353,14 @@
			{
			m_ButtonObj.SetActive(true);
			m_HasBeenrecovered.SetActive(false);
			m_FindNumberText.gameObject.SetActive(true);
			}
			else
			{
			m_HasBeenrecovered.SetActive(true);
			m_GJText.gameObject.SetActive(false);
			m_ButtonObj.SetActive(false);
			m_FindNumberText.gameObject.SetActive(false);
			}
			}

			@@ -31,6 +31,7 @@
			public int Times;//可找回时间
			public string DeadTime;//死亡时间
			public List<int> ReplaceItemID;//替换的物品ID
			public byte HaveRecover; // 已找回 1-全部已找回 2-非VIP已找回
			}
			public class RewardRecovery
			{
			@@ -241,7 +242,7 @@
			resourcesBackDic.ExtraCnt = vNetData.NumInfo[i].ExtraCnt;
			resourcesBackDic.ExtraData = vNetData.NumInfo[i].ExtraData;
			resourcesBackDic.ExtraData2 = vNetData.NumInfo[i].ExtraData2;

			resourcesBackDic.HaveRecover = vNetData.NumInfo[i].HaveRecover;
			}
			else
			{
			@@ -264,6 +265,7 @@
			resourcesBackClass.CopperReward = LitJson.JsonMapper.ToObject<RewardRecovery>(configRB.CopperReward);
			resourcesBackClass.RewardList = ConfigParse.GetMultipleStr(configRB.RewardList);
			resourcesBackClass.ReplaceItemID = ReplaceItemID(configRB.JobItem);
			resourcesBackClass.HaveRecover = vNetData.NumInfo[i].HaveRecover;
			ResourcesBackDic.Add(id, resourcesBackClass);
			}
			}

			@@ -152,7 +152,7 @@
			ResourcesBackBoxBack resourcesBackBoxBack = cell.transform.GetChild(childCode).GetComponent<ResourcesBackBoxBack>();
			resourcesBackBoxBack.gameObject.SetActive(false);
			int cellCount = (cell.transform.childCount) * gridlineIndex + (childCode + 1);
			if (cellCount - 1 < resourcesBackModel.ResourcesBackDic.Count)
			if (cellCount - 1 < resourcesBackModel.ResourcesBackDic.Count && cellCount - 1 < _list.Count)
			{
			resourcesBackBoxBack.gameObject.SetActive(true);
			ResourcesBackClass resourcesBackClass = _list[cellCount - 1];
			@@ -355,7 +355,15 @@
			}
			foreach (int key in resourcesBackModel.ResourcesBackDic.Keys)
			{
			_list.Add(resourcesBackModel.ResourcesBackDic[key]);
			var value = resourcesBackModel.ResourcesBackDic[key];
			if(!IsBool)
			{
			if(value.RecoverCnt == 0 && (value.HaveRecover == 0 \|\| value.HaveRecover == 2))
			{
			continue;
			}
			}
			_list.Add(value);
			}
			if (IsBool)
			{

			@@ -646,8 +646,16 @@
			}
			else
			{
			BatchUseModel.Instance.SetOfflineUseModel(itemModel.guid);
			WindowCenter.Instance.Open<OfflineHangUpUseWin>();
			if (!CheckIsMaxOfflineTime(maxUseCnt, itemModel))
			{
			UseItem(itemModel.guid);
			}
			else
			{
			return false;
			}
			//BatchUseModel.Instance.SetOfflineUseModel(itemModel.guid);
			//WindowCenter.Instance.Open<OfflineHangUpUseWin>();
			}
			return true;
			}