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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Store/StoreModel.cs

@@ -40,13 +40,13 @@
    public int[] StoreRedIdlist { get; private set;}

    public override void Init()

    {

        FuncConfigConfig buyItemHinit = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BuyItemHinit");

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

        normalBuyCoinsTypes = ConfigParse.GetMultipleStr<int>(buyItemHinit.Numerical1);

        FuncConfigConfig restTimeConfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RefreshText");

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

        resetTimeDict = ConfigParse.GetDic<int, string>(restTimeConfig.Numerical1);

        FuncConfigConfig mallCurrency = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MallCurrency");

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

        showCoinsUIDict = ConfigParse.GetDic<int, int>(mallCurrency.Numerical1);

        FuncConfigConfig mallPush = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MallPush");

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

        StoreRedIdlist = ConfigParse.GetMultipleStr<int>(mallPush.Numerical2);

    }



@@ -153,7 +153,7 @@
    public void SetJobReplaceIDDict()

    {

        JobReplaceIdDict.Clear();

        List<StoreConfig> storeConfigs = ConfigManager.Instance.GetAllValues<StoreConfig>();

        List<StoreConfig> storeConfigs = Config.Instance.GetAllValues<StoreConfig>();

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

        {

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

@@ -279,10 +279,10 @@


    public RuneTowerFloorConfig SetRuneSource(int itemId)

    {

        _tagRuneModel = ConfigManager.Instance.GetTemplate<RuneConfig>(itemId);

        _tagRuneModel = Config.Instance.Get<RuneConfig>(itemId);

        if (_tagRuneModel == null)

            return null;

        var _tagRuneTowerModel = ConfigManager.Instance.GetTemplate<RuneTowerFloorConfig>(_tagRuneModel.TowerID);

        var _tagRuneTowerModel = Config.Instance.Get<RuneTowerFloorConfig>(_tagRuneModel.TowerID);

        return _tagRuneTowerModel;

    }



@@ -374,7 +374,7 @@
    {

        if ((StoreFunc)model.ShopType == StoreFunc.RuneStore)

        {

            _tagRuneModel = ConfigManager.Instance.GetTemplate<RuneConfig>(model.ItemID);

            _tagRuneModel = Config.Instance.Get<RuneConfig>(model.ItemID);

            if (_tagRuneModel != null)

            {

                if (!IsCanBuyItem(_tagRuneModel.TowerID))

@@ -423,10 +423,10 @@
    public void GetBuyResult(HA811_tagMCShoppingResult result)

    {

        DebugEx.Log("GetBuyResult");

        StoreConfig tagStore = ConfigManager.Instance.GetTemplate<StoreConfig>((int)result.ItemIndex);

        StoreConfig tagStore = Config.Instance.Get<StoreConfig>((int)result.ItemIndex);

        if (tagStore != null)

        {

            ItemConfig chinModel = ConfigManager.Instance.GetTemplate<ItemConfig>(ReplaceItemIdByJob(tagStore.ID, tagStore.ItemID));

            ItemConfig chinModel = Config.Instance.Get<ItemConfig>(ReplaceItemIdByJob(tagStore.ID, tagStore.ItemID));

            if (!normalBuyCoinsTypes.Contains(tagStore.MoneyType))

            {

                if (tagStore.RemindSuccess == 0)

@@ -692,7 +692,7 @@
    /// <returns></returns>

    public bool CheckTheOnlyShopSellOut(int shopIndex,out bool isTheOnlyShop)

    {

        StoreConfig storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(shopIndex);

        StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(shopIndex);

        isTheOnlyShop = false;

        if (storeConfig == null) return false;



@@ -772,7 +772,7 @@
   

        foreach(var key in shopRedDict.Keys)

        {

            StoreConfig storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(key);

            StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(key);

            if (storeConfig.MoneyNumber == 0)

            {

                if(CheckShopIsCanBuy(storeConfig))