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

client_Wu Xijin

2018-08-22 c322d95d20fd83762c4afd0d50a1d9b37deaba1c

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

 Core/GameEngine/Model/TelPartialConfig/tagStoreConfig.cs

@@ -10,7 +10,7 @@
        private static Dictionary<string, List<StoreConfig>> s_canBuyShopDict = new Dictionary<string, List<StoreConfig>>();  //用于存储可以购买的商品

        private static Dictionary<StoreItem, StoreConfig> s_StoreItemDict = new Dictionary<StoreItem, StoreConfig>();

        private static Dictionary<int, List<StoreConfig>> s_TheOnlyShopDict = new Dictionary<int, List<StoreConfig>>();  //key 唯一商品的物品id



        private static Dictionary<int, List<StoreConfig>> storeConfigs = new Dictionary<int, List<StoreConfig>>();

        public void OnConfigParseCompleted()

        {

            if (!s_storeModelDict.ContainsKey(ShopType))

@@ -59,6 +59,14 @@
            {

                s_StoreItemDict.Add(_storeItem, this);

            }



            List<StoreConfig> list = null;

            if(!storeConfigs.TryGetValue(ShopType,out list))

            {

                list = new List<StoreConfig>();

                storeConfigs.Add(ShopType, list);

            }

            list.Add(this);

        }



        private static List<StoreConfig> modellist = new List<StoreConfig>();

@@ -272,6 +280,11 @@
            return null;

        }



        public static bool TryGetStoreConfigs(int shopType, out List<StoreConfig> list)

        {

            return storeConfigs.TryGetValue(shopType, out list);

        }



        public struct StoreItem

        {

            public int item;


 System/OpenServerActivity/OSGiftModel.cs

@@ -103,7 +103,8 @@
            {

                return false;

            }

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift,out _list);

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

            {

                var _limit = storeModel.GetBuyShopLimit((uint)_list[i].ID);


 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -90,7 +90,8 @@


        private void Display()

        {

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift, true);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift, out _list);

            var _index = 0;

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

            {


 System/Vip/OSTimeLimitGiftModel.cs

@@ -46,7 +46,8 @@
        public override void Init()

        {

            var _openDay = 0;

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSTimeLimitGift);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSTimeLimitGift, out _list);

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

            {

                List<StoreConfig> _configs = null;