Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/KnapSack/Logic/PlayerPackModels.cs

@@ -17,6 +17,11 @@
        public Dictionary<int, Dictionary<int, int>> decomposeAttrDict = new Dictionary<int, Dictionary<int, int>>();

        public static string StrengthAttrShift_RecordKey = "StrengthAttrShift";

        public const string RecordKnapsackTitle = "RecordKnapsackTitle";

        public int MaxBagGridCnt { get; private set; }

        public int InitBagGridCnt { get; private set; }

        public int MaxDepotGridCnt { get; private set; }

        public int InitDepotGridCnt { get; private set; }



        public override void Init()

        {

            List<DungeonOpenTimeConfig> dungeonlist = ConfigManager.Instance.GetAllValues<DungeonOpenTimeConfig>();

@@ -71,6 +76,11 @@
            minDecomposeNum = int.Parse(equipDecompose.Numerical1);

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



            InitDepotGridCnt = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("InitDepotCellCount").Numerical1);

            InitBagGridCnt = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("InitBagCellCount").Numerical1);

            MaxBagGridCnt = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MaxBagCellCount").Numerical1);

            MaxDepotGridCnt = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MaxDepotCellCount").Numerical1);



        }

        

        public void OnBeforePlayerDataInitialize()