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

client_Zxw

2019-01-04 ff1063ff14582b652c91b931a2c0d2855dccc1f2

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

 Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, December 18, 2018
//    [  Date ]:           Friday, January 04, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -17,7 +17,7 @@
        public string AttrInfo3 { get ; private set; } 

        public string AttrInfo4 { get ; private set; } 

        public string AttrInfo5 { get ; private set; } 

        public int sort { get ; private set ; }
        public string sort { get ; private set; } 

        public override string getKey()
        {
@@ -39,7 +39,7 @@
            

                AttrInfo5 = rawContents[5].Trim();

            

                sort=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
                sort = rawContents[6].Trim();
            }
            catch (Exception ex)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 94d416140f232244a8491a1281aa4af3
timeCreated: 1545099843
timeCreated: 1546568196
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Compose/New/ComposeFirstTypeCell.cs

@@ -27,7 +27,8 @@
            unlockTypeName.text = itemCompound.secondTypeName;

            arrowImg.gameObject.SetActive(thirdType != 0);

            UpdateBtnImg(selectSecondType);

            if (composeModel.secondTypeRedDict.ContainsKey(secondType))

            if (firstType == (int)ComposeFuncType.Item

                 && composeModel.secondTypeRedDict.ContainsKey(secondType))

            {

                redpoint.gameObject.SetActive(true);

                redpoint.redpointId = composeModel.secondTypeRedDict[secondType].id;


 System/Compose/New/ComposeSecondTypeCell.cs

@@ -34,7 +34,8 @@
            lockTypeName.text = itemCompound.thirdTypeName;

            lockLevel.text =  StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041"));

            string key = StringUtility.Contact(secondType, 10,thirdType);

            if (composeModel.thirdTypeRedDict.ContainsKey(key))

            if (firstType == (int)ComposeFuncType.Item

                && composeModel.thirdTypeRedDict.ContainsKey(key))

            {

                redpoint.gameObject.SetActive(true);

                redpoint.redpointId = composeModel.thirdTypeRedDict[key].id;


 System/Compose/New/ComposeToolsWin.cs

@@ -162,6 +162,8 @@
            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, curThirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                preSecondType = curSecondType;

                preThirdType = curThirdType;

                RefreshUI(thirdTypeData.itemCompound);

                if (isJumpTo)

                {


 System/Compose/New/ComposeWinModel.cs

@@ -52,12 +52,12 @@


    public void OnPlayerLoginOk()

    {

        RefreshComposeRed();

        playerPack.RefreshItemCountAct -= OnItemCntRefresh;

        playerPack.RefreshItemCountAct += OnItemCntRefresh;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerLvUpdate;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerLvUpdate;

        UpdateComposeDataByLevel();

        RefreshComposeRed();

    }



    public void ResetModel()


 System/GatheringSoul/GatherSoulTotalPropertyWin.cs

@@ -130,11 +130,10 @@


        int Compare(int lhs, int rhs)

        {

            var lhsConfig = Config.Instance.Get<GatherSoulPropertyConfig>(lhs);

            var rhsConfig = Config.Instance.Get<GatherSoulPropertyConfig>(rhs);

            if (lhsConfig.sort != rhsConfig.sort)

            var dict = model.propertySorts;

            if (dict != null && dict.ContainsKey(lhs) && dict.ContainsKey(rhs))

            {

                return lhsConfig.sort.CompareTo(rhsConfig.sort);

                return dict[lhs].CompareTo(dict[rhs]);

            }

            return 0;

        }


 System/GatheringSoul/GatheringSoulModel.cs

@@ -15,7 +15,7 @@
        Dictionary<int, GatherSoulHoleCondition> holeConditions = new Dictionary<int, GatherSoulHoleCondition>();

        Dictionary<int, int> holeItemTypeDict;

        Dictionary<int, int> qualityMaxLevelDict;

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

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

        Dictionary<int, float> qualityResolveCostDict;

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



@@ -51,6 +51,19 @@
        public int autoResolveRemainCount { get; private set; }



        public bool serverInited { get; private set; }



        public Dictionary<int, int> propertySorts

        {

            get

            {

                var job = PlayerDatas.Instance.baseData.Job;

                if (propertySortDict.ContainsKey(job))

                {

                    return propertySortDict[job];

                }

                return null;

            }

        }



        public event Action<PackType, int> prepareResolveEvent;



@@ -199,7 +212,17 @@
            {

                var config = gatherSoulPropertyConfigs[i];

                propertyComputeDict.Add(config.AttrType, new PropertyCompute(config));

                propertySortDict.Add(config.AttrType, config.sort);

                var dict = ConfigParse.GetDic<int, int>(config.sort);

                foreach (var job in dict.Keys)

                {

                    Dictionary<int, int> sortDict;

                    if (!propertySortDict.TryGetValue(job, out sortDict))

                    {

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

                        propertySortDict.Add(job, sortDict);

                    }

                    sortDict.Add(config.AttrType, dict[job]);

                }

            }



            var gatherSoulConfigs = Config.Instance.GetAllValues<GatherSoulConfig>();

@@ -221,12 +244,16 @@
        public int GetPropertyHighestSort(List<int> list)

        {

            var sort = -1;

            var dict = propertySorts;

            if (dict == null)

            {

                return sort;

            }

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

            {

                if (propertySortDict.ContainsKey(list[i]) &&

                    propertySortDict[list[i]] > sort)

                if (dict.ContainsKey(list[i]) && dict[list[i]] > sort)

                {

                    sort = propertySortDict[list[i]];

                    sort = dict[list[i]];

                }

            }

            return sort;