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

client_Wu Xijin

2018-09-17 1be0e26fa7c1b82e95b1bdb00638ce9907b5e8ee

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

 Core/NetworkPackage/DTCFile/ServerPack/HB9_Team/DTCB912_tagGCTeamMemFuncDataList.cs

@@ -27,7 +27,7 @@
                    {

                        if (int.Parse(vNetData.MemFuncDataList[i].MemFuncData) - main.WaHuangHighestFloor >= 0)

                        {

                            main.LayerNumber = int.Parse(vNetData.MemFuncDataList[i].MemFuncData);

                            main.LayerNumber = int.Parse(vNetData.MemFuncDataList[i].MemFuncData) - main.WaHuangHighestFloor;

                        }

                        else

                        {


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -55,7 +55,6 @@
                    makeDruglist.Add(fruitlist[i]);

                }

            }

            makeDruglist.Sort(CompareMakeDrug);

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;



            SetDevourEquipPlace();

@@ -1585,15 +1584,35 @@
            {

                return configS.LV.CompareTo(configE.LV);

            }



            int x = makeDruglist.IndexOf(start);

            int y = makeDruglist.IndexOf(end);

            if (x.CompareTo(y) != 0) x.CompareTo(y);



            return 0;

        }



        List<AttrFruitConfig> drugOrderlist = new List<AttrFruitConfig>();

        List<AttrFruitConfig> haveDruglist = new List<AttrFruitConfig>();

        public List<AttrFruitConfig> GetDrugOrderByCnt()

        {

            drugOrderlist.Clear();

            haveDruglist.Clear();

            drugOrderlist.AddRange(makeDruglist);

            drugOrderlist.Sort(CompareByIsHave);

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

            {

                if(IsHaveDrugUse(drugOrderlist[i]))

                {

                    haveDruglist.Add(drugOrderlist[i]);

                }

            }

            haveDruglist.Sort(CompareMakeDrug);

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

            {

                drugOrderlist[i] = haveDruglist[i];

            }

          
            return drugOrderlist;

        }