snxxz_scripts.git

parent: b8208072 | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-01-11 dd88a67c721c8a03745136262d9d633a0e6d0e86

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

13个文件已修改

	System/FairyAu/FairyGrabBossBehaviour.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/BoxInfoWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemInfoWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemTipsModel.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/PlayerPackModels.cs	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/ImpactBillRankCell.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/ImpactRankWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Rank/RankHeadCell.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmPreviewWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/RoleParticulars/RoleParticularsWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyBoxInfoWin.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyItemInfoWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Tip/ChestDetailBehaviour.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/FairyAu/FairyGrabBossBehaviour.cs

@@ -95,6 +95,7 @@
            if (realmConfig != null)

            {

                m_RealmIcon.SetSprite(realmConfig.Img);

                m_RealmIcon.SetNativeSize();

            }

        }




 System/KnapSack/Logic/BoxInfoWin.cs

@@ -175,6 +175,11 @@
                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            if(infoDes.Contains("{ShareNum}"))

            {

                string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);

                infoDes = infoDes.Replace("{ShareNum}",shareNumDes);

            }



            itemDesText.text = infoDes;

            operateBtn.SetActive(false);


 System/KnapSack/Logic/ItemInfoWin.cs

@@ -157,6 +157,11 @@
                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            if (infoDes.Contains("{ShareNum}"))

            {

                string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);

                infoDes = infoDes.Replace("{ShareNum}", shareNumDes);

            }



            itemDesText.text = infoDes;

            operateBtn.SetActive(false);


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -2268,6 +2268,36 @@
            return 0;

        }

        #endregion



        #region 共享开启次数

        public string GetShareNumItemDes(int itemId)

        {

            string shareNumDes = string.Empty;

            List<int> idlist = null;

            bool isShare = playerPack.TryGetShareNumItem(itemId,out idlist);

           if(isShare)

            {

                foreach (var id in idlist)

                {

                    if (itemId != id)

                    {

                        ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id);

                        TextColType colType = itemConfig.ItemColor < 2 ? TextColType.White : (TextColType)itemConfig.ItemColor;

                        string des = UIHelper.AppendStringColor(colType, itemConfig.ItemName);

                        if (shareNumDes.Length > 0)

                        {

                            shareNumDes = StringUtility.Contact(shareNumDes, "</r>", des);

                        }

                        else

                        {

                            shareNumDes = des;

                        }

                    }

                }

            }

            return shareNumDes;

        }

        #endregion

    }



    public class ItemAttrData


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -25,6 +25,8 @@
        public int InitDepotGridCnt { get; private set; }

        BlastFurnaceModel FurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }

        public List<int> LocalSavePlaceArray { get; private set; }

        public Dictionary<int, List<int>> ShareUseCntItemDict { get; private set;}



        public override void Init()

        {

            ParseConfig();

@@ -78,6 +80,23 @@
            FuncConfigConfig equipDecompose = Config.Instance.Get<FuncConfigConfig>("EquipDevourCount");

            minDecomposeNum = int.Parse(equipDecompose.Numerical1);

            defaultUnSelectlist = ConfigParse.GetMultipleStr<int>(equipDecompose.Numerical2);



            FuncConfigConfig ShareUseCntItem = Config.Instance.Get<FuncConfigConfig>("ShareUseCntItem");

            ShareUseCntItemDict = new Dictionary<int, List<int>>();

            JsonData shareUseJson = JsonMapper.ToObject(ShareUseCntItem.Numerical1);

            if(shareUseJson.IsArray)

            {

                for(int i = 0; i < shareUseJson.Count;i++)

                {

                    var idListJson = shareUseJson[i];

                    var idlist = new List<int>();

                    ShareUseCntItemDict.Add(i,idlist);

                    foreach(var id in idListJson)

                    {

                        idlist.Add(int.Parse(id.ToString()));

                    }

                }

            }



            InitDepotGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("InitDepotCellCount").Numerical1);

            InitBagGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("InitBagCellCount").Numerical1);

@@ -889,6 +908,20 @@
            return count;

        }



        public bool TryGetShareNumItem(int itemId,out List<int> idlist)

        {

            idlist = new List<int>();

            foreach(var list in ShareUseCntItemDict.Values)

            {

                if(list.Contains(itemId))

                {

                    idlist = list;

                    return true;

                }

            }

            return false;

        }



        /// <summary>

        /// 得到物品今日使用次数

        /// </summary>

@@ -897,7 +930,21 @@
        public int GetDayUseCntByID(int itemId)

        {

            int useCnt = 0;

            itemDayUseCntDict.TryGetValue(itemId, out useCnt);

            List<int> shareIdlist = null;

            bool isShare = TryGetShareNumItem(itemId,out shareIdlist);

            if(isShare)

            {

               foreach(var id in shareIdlist)

                {

                    int singleUseCnt = 0;

                    itemDayUseCntDict.TryGetValue(id, out singleUseCnt);

                    useCnt += singleUseCnt;

                }

            }

            else

            {

                itemDayUseCntDict.TryGetValue(itemId, out useCnt);

            }

            return useCnt;

        }



@@ -909,7 +956,21 @@
        public int GetSumUseCntByID(int itemId)

        {

            int useCnt = 0;

            itemSumUseCntDict.TryGetValue(itemId, out useCnt);

            List<int> shareIdlist = null;

            bool isShare = TryGetShareNumItem(itemId, out shareIdlist);

            if (isShare)

            {

                foreach (var id in shareIdlist)

                {

                    int singleUseCnt = 0;

                    itemDayUseCntDict.TryGetValue(id, out singleUseCnt);

                    useCnt += singleUseCnt;

                }

            }

            else

            {

                itemSumUseCntDict.TryGetValue(itemId, out useCnt);

            }

            return useCnt;

        }




 System/OpenServerActivity/ImpactBillRankCell.cs

@@ -68,6 +68,7 @@
                        if (_realmCfg != null)
                        {
                            m_CompareImg.SetSprite(_realmCfg.Img);
                            m_CompareImg.SetNativeSize();
                        }
                        break;

                    case PlayerRankData.RankType.OpenServerRecharge:

 System/OpenServerActivity/ImpactRankWin.cs

@@ -252,6 +252,7 @@
                    {

                        var _realmConfig = Config.Instance.Get<RealmConfig>(_playerData.value);

                        m_TargetImg.SetSprite(_realmConfig == null ? string.Empty : _realmConfig.Img);

                        m_TargetImg.SetNativeSize();

                    }

                    else

                    {


 System/Rank/RankHeadCell.cs

@@ -121,7 +121,9 @@
                    realmImg.gameObject.SetActive(data.type != (int)PlayerRankData.RankType.Realm);

                    m_CompareImg.gameObject.SetActive(data.type == (int)PlayerRankData.RankType.Realm);

                    realmImg.SetSprite(presentCfg.Img);

                    realmImg.SetNativeSize();

                    m_CompareImg.SetSprite(presentCfg.Img);

                    m_CompareImg.SetNativeSize();

                }



                bool isSelf = data.ID == PlayerDatas.Instance.PlayerId;


 System/Realm/RealmPreviewWin.cs

@@ -84,6 +84,7 @@
            m_SelectRealmProperty.Display(m_SelectRealm, false);

            var _realmCfg = Config.Instance.Get<RealmConfig>(m_SelectRealm);

            m_SelectRealmIcon.SetSprite(_realmCfg.Img);

            m_SelectRealmIcon.SetNativeSize();

        }



        private void OnRefreshCell(ScrollerDataType type, CellView cell)


 System/RoleParticulars/RoleParticularsWin.cs

@@ -207,7 +207,9 @@
                {

                    RealmConfig _tagRealmModel = Config.Instance.Get<RealmConfig>(realmLv);

                    if (_tagRealmModel != null)

                    {

                        realmImg.SetSprite(_tagRealmModel.Img);

                    }

                }

                playerTxt.text = StringUtility.Contact(viewPlayerData.rolePropData.Name, "Lv. ", viewPlayerData.rolePropData.LV);

                fightPowerTxt.text = StringUtility.Contact(Language.Get("RoleParticularWin_2"), viewPlayerData.rolePropData.FightPower);


 System/Store/Logic/BuyBoxInfoWin.cs

@@ -178,8 +178,25 @@
            {

                CheckUselimit();

            }

           
            itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description;

            string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();

            if (infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

            if (infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            if (infoDes.Contains("{ShareNum}"))

            {

                string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);

                infoDes = infoDes.Replace("{ShareNum}", shareNumDes);

            }



            itemDesText.text = infoDes;



            if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)

            {


 System/Store/Logic/BuyItemInfoWin.cs

@@ -168,6 +168,11 @@
                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            if (infoDes.Contains("{ShareNum}"))

            {

                string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);

                infoDes = infoDes.Replace("{ShareNum}", shareNumDes);

            }

            itemDesText.text = infoDes;



            if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)


 System/Tip/ChestDetailBehaviour.cs

@@ -1,8 +1,8 @@
using System;

using System.Collections;
using System.Collections.Generic;
using System.Collections;

using System.Collections.Generic;

using TableConfig;

using UnityEngine;
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

@@ -109,6 +109,11 @@
                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            if (infoDes.Contains("{ShareNum}"))

            {

                string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);

                infoDes = infoDes.Replace("{ShareNum}", shareNumDes);

            }



            m_Description.text = infoDes;



@@ -166,6 +171,7 @@
                            if (realmConfig != null)

                            {

                                m_ConditionValue1.SetSprite(realmConfig.Img);

                                m_ConditionValue1.SetNativeSize();

                            }

                        }



@@ -188,5 +194,5 @@
            KnapSackEventMgr.Instance.HideItemPopWin();

        }

    }

}

}

			@@ -95,6 +95,7 @@
			if (realmConfig != null)
			{
			m_RealmIcon.SetSprite(realmConfig.Img);
			m_RealmIcon.SetNativeSize();
			}
			}

			@@ -175,6 +175,11 @@
			itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
			infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
			}
			if(infoDes.Contains("{ShareNum}"))
			{
			string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);
			infoDes = infoDes.Replace("{ShareNum}",shareNumDes);
			}

			itemDesText.text = infoDes;
			operateBtn.SetActive(false);

			@@ -157,6 +157,11 @@
			itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
			infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
			}
			if (infoDes.Contains("{ShareNum}"))
			{
			string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);
			infoDes = infoDes.Replace("{ShareNum}", shareNumDes);
			}

			itemDesText.text = infoDes;
			operateBtn.SetActive(false);

			@@ -2268,6 +2268,36 @@
			return 0;
			}
			#endregion

			#region 共享开启次数
			public string GetShareNumItemDes(int itemId)
			{
			string shareNumDes = string.Empty;
			List<int> idlist = null;
			bool isShare = playerPack.TryGetShareNumItem(itemId,out idlist);
			if(isShare)
			{
			foreach (var id in idlist)
			{
			if (itemId != id)
			{
			ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id);
			TextColType colType = itemConfig.ItemColor < 2 ? TextColType.White : (TextColType)itemConfig.ItemColor;
			string des = UIHelper.AppendStringColor(colType, itemConfig.ItemName);
			if (shareNumDes.Length > 0)
			{
			shareNumDes = StringUtility.Contact(shareNumDes, "</r>", des);
			}
			else
			{
			shareNumDes = des;
			}
			}
			}
			}
			return shareNumDes;
			}
			#endregion
			}

			public class ItemAttrData

			@@ -25,6 +25,8 @@
			public int InitDepotGridCnt { get; private set; }
			BlastFurnaceModel FurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }
			public List<int> LocalSavePlaceArray { get; private set; }
			public Dictionary<int, List<int>> ShareUseCntItemDict { get; private set;}

			public override void Init()
			{
			ParseConfig();
			@@ -78,6 +80,23 @@
			FuncConfigConfig equipDecompose = Config.Instance.Get<FuncConfigConfig>("EquipDevourCount");
			minDecomposeNum = int.Parse(equipDecompose.Numerical1);
			defaultUnSelectlist = ConfigParse.GetMultipleStr<int>(equipDecompose.Numerical2);

			FuncConfigConfig ShareUseCntItem = Config.Instance.Get<FuncConfigConfig>("ShareUseCntItem");
			ShareUseCntItemDict = new Dictionary<int, List<int>>();
			JsonData shareUseJson = JsonMapper.ToObject(ShareUseCntItem.Numerical1);
			if(shareUseJson.IsArray)
			{
			for(int i = 0; i < shareUseJson.Count;i++)
			{
			var idListJson = shareUseJson[i];
			var idlist = new List<int>();
			ShareUseCntItemDict.Add(i,idlist);
			foreach(var id in idListJson)
			{
			idlist.Add(int.Parse(id.ToString()));
			}
			}
			}

			InitDepotGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("InitDepotCellCount").Numerical1);
			InitBagGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("InitBagCellCount").Numerical1);
			@@ -889,6 +908,20 @@
			return count;
			}

			public bool TryGetShareNumItem(int itemId,out List<int> idlist)
			{
			idlist = new List<int>();
			foreach(var list in ShareUseCntItemDict.Values)
			{
			if(list.Contains(itemId))
			{
			idlist = list;
			return true;
			}
			}
			return false;
			}

			/// <summary>
			/// 得到物品今日使用次数
			/// </summary>
			@@ -897,7 +930,21 @@
			public int GetDayUseCntByID(int itemId)
			{
			int useCnt = 0;
			itemDayUseCntDict.TryGetValue(itemId, out useCnt);
			List<int> shareIdlist = null;
			bool isShare = TryGetShareNumItem(itemId,out shareIdlist);
			if(isShare)
			{
			foreach(var id in shareIdlist)
			{
			int singleUseCnt = 0;
			itemDayUseCntDict.TryGetValue(id, out singleUseCnt);
			useCnt += singleUseCnt;
			}
			}
			else
			{
			itemDayUseCntDict.TryGetValue(itemId, out useCnt);
			}
			return useCnt;
			}

			@@ -909,7 +956,21 @@
			public int GetSumUseCntByID(int itemId)
			{
			int useCnt = 0;
			itemSumUseCntDict.TryGetValue(itemId, out useCnt);
			List<int> shareIdlist = null;
			bool isShare = TryGetShareNumItem(itemId, out shareIdlist);
			if (isShare)
			{
			foreach (var id in shareIdlist)
			{
			int singleUseCnt = 0;
			itemDayUseCntDict.TryGetValue(id, out singleUseCnt);
			useCnt += singleUseCnt;
			}
			}
			else
			{
			itemSumUseCntDict.TryGetValue(itemId, out useCnt);
			}
			return useCnt;
			}

			@@ -68,6 +68,7 @@
			if (_realmCfg != null)
			{
			m_CompareImg.SetSprite(_realmCfg.Img);
			m_CompareImg.SetNativeSize();
			}
			break;
			case PlayerRankData.RankType.OpenServerRecharge:

			@@ -252,6 +252,7 @@
			{
			var _realmConfig = Config.Instance.Get<RealmConfig>(_playerData.value);
			m_TargetImg.SetSprite(_realmConfig == null ? string.Empty : _realmConfig.Img);
			m_TargetImg.SetNativeSize();
			}
			else
			{

			@@ -121,7 +121,9 @@
			realmImg.gameObject.SetActive(data.type != (int)PlayerRankData.RankType.Realm);
			m_CompareImg.gameObject.SetActive(data.type == (int)PlayerRankData.RankType.Realm);
			realmImg.SetSprite(presentCfg.Img);
			realmImg.SetNativeSize();
			m_CompareImg.SetSprite(presentCfg.Img);
			m_CompareImg.SetNativeSize();
			}

			bool isSelf = data.ID == PlayerDatas.Instance.PlayerId;

			@@ -84,6 +84,7 @@
			m_SelectRealmProperty.Display(m_SelectRealm, false);
			var _realmCfg = Config.Instance.Get<RealmConfig>(m_SelectRealm);
			m_SelectRealmIcon.SetSprite(_realmCfg.Img);
			m_SelectRealmIcon.SetNativeSize();
			}

			private void OnRefreshCell(ScrollerDataType type, CellView cell)

			@@ -207,7 +207,9 @@
			{
			RealmConfig _tagRealmModel = Config.Instance.Get<RealmConfig>(realmLv);
			if (_tagRealmModel != null)
			{
			realmImg.SetSprite(_tagRealmModel.Img);
			}
			}
			playerTxt.text = StringUtility.Contact(viewPlayerData.rolePropData.Name, "Lv. ", viewPlayerData.rolePropData.LV);
			fightPowerTxt.text = StringUtility.Contact(Language.Get("RoleParticularWin_2"), viewPlayerData.rolePropData.FightPower);

			@@ -178,8 +178,25 @@
			{
			CheckUselimit();
			}

			itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description;
			string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();
			if (infoDes.Contains("{Exp}"))
			{
			ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);
			infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));
			}
			if (infoDes.Contains("{FightPower}"))
			{
			int fightPower = 0;
			itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
			infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
			}
			if (infoDes.Contains("{ShareNum}"))
			{
			string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);
			infoDes = infoDes.Replace("{ShareNum}", shareNumDes);
			}

			itemDesText.text = infoDes;

			if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)
			{

			@@ -168,6 +168,11 @@
			itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
			infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
			}
			if (infoDes.Contains("{ShareNum}"))
			{
			string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);
			infoDes = infoDes.Replace("{ShareNum}", shareNumDes);
			}
			itemDesText.text = infoDes;

			if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)

			@@ -1,8 +1,8 @@
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.Collections;
			using System.Collections.Generic;
			using TableConfig;
			using UnityEngine;
			using UnityEngine;
			using UnityEngine.UI;

			namespace Snxxz.UI
			@@ -109,6 +109,11 @@
			itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
			infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
			}
			if (infoDes.Contains("{ShareNum}"))
			{
			string shareNumDes = itemTipsModel.GetShareNumItemDes(itemTipsModel.curAttrData.itemId);
			infoDes = infoDes.Replace("{ShareNum}", shareNumDes);
			}

			m_Description.text = infoDes;

			@@ -166,6 +171,7 @@
			if (realmConfig != null)
			{
			m_ConditionValue1.SetSprite(realmConfig.Img);
			m_ConditionValue1.SetNativeSize();
			}
			}

			@@ -188,5 +194,5 @@
			KnapSackEventMgr.Instance.HideItemPopWin();
			}
			}
			}

			}