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

client_Wu Xijin

2018-12-04 3cdc18c2e82cd9f9d5a22cd0772436fb695dae04

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

 Core/GameEngine/Model/Config/AttrFruitConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, October 15, 2018
//    [  Date ]:           Tuesday, December 04, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -15,6 +15,7 @@
        public int FuncID { get ; private set ; }

        public int MaxUseCnt { get ; private set ; }

        public int RecycleExp { get ; private set ; }

        public int FightPowerEx { get ; private set ; }

        public int Sort { get ; private set ; }

        public int[] RecipeLv;

@@ -34,9 +35,11 @@
            

                RecycleExp=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 

            

                Sort=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
                FightPowerEx=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
            

                string[] RecipeLvStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                Sort=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
			
                string[] RecipeLvStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                RecipeLv = new int[RecipeLvStringArray.Length];
                for (int i=0;i<RecipeLvStringArray.Length;i++)
                {

 Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1954bcb26cf3ca94786dfcd7948b49df
timeCreated: 1539610229
timeCreated: 1543922145
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/KnapSack/Logic/ItemInfoWin.cs

@@ -146,7 +146,23 @@
            CheckUselimit();

            if(itemTipsModel.curAttrData.itemConfig.Effect1 != 215)

            {

                itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes();

                int type = 0;

                bool isContain = itemTipsModel.TryGetContainsParamsType(itemTipsModel.curAttrData.itemId,out type);

                if(isContain)

                {

                    switch(type)

                    {

                        case 1:

                            int fightPower = 0;

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

                            itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes().Replace("{0}",fightPower.ToString());

                            break;

                    }

                }

                else

                {

                    itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes();

                }

            }

            else

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -34,6 +34,7 @@
        private Dictionary<int, Dictionary<int, int>> petSkillDict = new Dictionary<int, Dictionary<int, int>>(); // 编号 解锁阶级 技能

        private Dictionary<int, Dictionary<int, List<int>>> mountSkillDict = new Dictionary<int, Dictionary<int, List<int>>>(); // 编号 解锁阶级 技能 

        public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>();

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

        public string expValueFormula = "";



        public int[] guardAutoDrops;

@@ -88,6 +89,24 @@
            FuncConfigConfig renewalFunc = Config.Instance.Get<FuncConfigConfig>("ItemRepayButton");

            ItemRenewalIds = ConfigParse.GetMultipleStr<int>(renewalFunc.Numerical1);

            tryPutOnEquipIds = ConfigParse.GetMultipleStr<int>(renewalFunc.Numerical2);



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

            JsonData itemParamsData = JsonMapper.ToObject(ItemTipsNum.Numerical1);

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

            foreach (var type in itemParamsData.Keys)

            {

                List<int> list = new List<int>();

                itemParamsDict.Add(int.Parse(type),list);

                if(itemParamsData[type].IsArray)

                {

                    for (int i = 0; i < itemParamsData[type].Count; i++)

                    {

                        int num = 0;

                        int.TryParse(itemParamsData[type][i].ToString(),out num);

                        list.Add(num);

                    }

                }

            }



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

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

@@ -623,6 +642,20 @@
        private StringBuilder attrSB = new StringBuilder();

        private PlayerPropertyConfig playerProModel;



        public bool TryGetContainsParamsType(int param,out int _type)

        {

            _type = 0;

            foreach(var type in itemParamsDict.Keys)

            {

                var list = itemParamsDict[type];

                if(list.Contains(param))

                {

                    _type = type;

                    return true;

                }

            }

            return false;

        }



        #region 设置装备基础信息

        /// <summary>

@@ -1898,6 +1931,8 @@
            if (itemConfig == null) return false;



            var attrIdlist = Config.Instance.GetAllKeys<PlayerPropertyConfig>();

            var fruitlist = Config.Instance.GetAllKeys<AttrFruitConfig>();



            Dictionary<int, int> attrDict = new Dictionary<int, int>();

            Dictionary<int, int> itemEffectDict = SetItemEffectDict(itemConfig);

            int atk = 0;

@@ -1994,6 +2029,11 @@
            }



            fightPower = UIHelper.GetFightPower(attrDict);

            if(fruitlist.Contains(itemId.ToString()))

            {

                var fruitConfig = Config.Instance.Get<AttrFruitConfig>(itemId);

                fightPower += fruitConfig.FightPowerEx;

            }

            return fightPower > 0;

        }

   


 System/Store/Logic/BuyItemInfoWin.cs

@@ -158,7 +158,24 @@


            if (itemTipsModel.curAttrData.itemConfig.Effect1 != 215)

            {

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

                int type = 0;

                bool isContain = itemTipsModel.TryGetContainsParamsType(itemTipsModel.curAttrData.itemId, out type);

                if (isContain)

                {

                    switch (type)

                    {

                        case 1:

                            int fightPower = 0;

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

                            itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description.Replace("{0}",fightPower.ToString());

                            break;

                    }

                }

                else

                {

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

                }

              
            }

            else

            {