Merge remote-tracking branch 'remotes/origin/zhaoyang' into guodong

# Conflicts:
#	GameClient/Assets/Game/CSShare
#	GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs

FGUIProject/assets/Main/components/ComBtn.xml

@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="500,400" overflow="scroll">
   <displayList>
-    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,0" size="332,46">
+    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,63" size="332,46">
       <Button title="获取所有换装部件" titleFontSize="30"/>
     </component>
-    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,66" size="330,46">
+    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,129" size="330,46">
       <Button title="获取所有卡牌" titleFontSize="30"/>
     </component>
-    <component id="n14_lqp0" name="btnSetLv" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,132" size="330,46">
+    <component id="n14_lqp0" name="btnSetLv" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,195" size="330,46">
       <Button title="设置玩家等级" titleFontSize="30"/>
     </component>
-    <text id="n17_lqp0" name="txtRoleLv" xy="332,134" size="119,42" fontSize="30" autoSize="none" text="99" input="true" prompt="[color=#B6A688]99[/color]" maxLength="3"/>
-    <component id="n15_lqp0" name="btnSetChapter" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,198" size="330,46">
+    <text id="n17_lqp0" name="txtRoleLv" xy="332,197" size="119,42" fontSize="30" autoSize="none" text="99" input="true" prompt="[color=#B6A688]99[/color]" maxLength="3"/>
+    <component id="n15_lqp0" name="btnSetChapter" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,261" size="330,46">
       <Button title="设置玩家章节" titleFontSize="30"/>
     </component>
-    <text id="n18_lqp0" name="txtChapter" xy="333,199" size="44,42" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
-    <text id="n19_lqp0" name="txtChapterLv" xy="411,199" size="42,42" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
-    <component id="n20_lqp0" name="btnAll" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,267" size="330,46">
+    <text id="n18_lqp0" name="txtChapter" xy="333,262" size="44,42" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
+    <text id="n19_lqp0" name="txtChapterLv" xy="411,262" size="42,42" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
+    <component id="n20_lqp0" name="btnAll" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,0" size="330,46">
       <Button title="666账号" titleFontSize="30"/>
     </component>
-    <text id="n21_lqp0" name="n21" xy="377,199" size="34,42" fontSize="30" text="章"/>
-    <text id="n24_lqp0" name="n24" xy="454,200" size="34,42" fontSize="30" text="关"/>
+    <text id="n21_lqp0" name="n21" xy="377,262" size="34,41" fontSize="30" text="章"/>
+    <text id="n24_lqp0" name="n24" xy="454,263" size="34,41" fontSize="30" text="关"/>
+    <component id="n25_irk8" name="btnSkipCheckOpen" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,325" size="330,46">
+      <Button title="跳过功能开启检测" titleFontSize="30"/>
+    </component>
   </displayList>
 </component>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit a90360e91bf1e3252c98bb400444dcc4c680cfa6
+Subproject commit de965c0b7b29ba1382c6ef238abc68e4ccba019a

GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs

@@ -7,7 +7,8 @@ namespace GFGGame
         public const int STORAGE_SKIP_GUIDE = 20000;//跳过引导，0不跳过,1跳过
         public const int STORAGE_AUTO_PLAY = 20001;//自动战斗，0不自动战斗，1自动战斗
         public const int STORAGE_AUTO_PLAY_SPEED = 20002;//战斗速度
-        public const int STORAGE_CUSTOME_SUIT_INDEX = 20003;//自定义套装当前使用索引
+        public const int SKIP_CHECK_OPEN = 20003;//跳过检查功能开启0不跳过，1跳过
+        public const int STORAGE_CUSTOME_SUIT_INDEX = 20004;//自定义套装当前使用索引
 
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -191,6 +191,7 @@ namespace GFGGame
 
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
+            GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
 
         }
 

GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -160,16 +160,22 @@ namespace GFGGame
             CardLvlCfg tCurCfg = CardLvlCfgArray.Instance.GetCfg(showLv, rarity);
             while (showExp >= tCurCfg.needExp && showLv <= maxLv)
             {
-                showLv++;
-                if (showLv == maxLv)
+
+                showExp -= tCurCfg.needExp;
+                if (showLv + 1 > maxLv)
                 {
                     //满级
-                    showLv = maxLv - 1;
+                    // showLv = showLv - 1;
                     showExp = tCurCfg.needExp;
                     break;
                 }
+                showLv++;
                 tCurCfg = CardLvlCfgArray.Instance.GetCfg(showLv, rarity);
-                showExp -= tCurCfg.needExp;
+                // if (showExp < tCurCfg.needExp)
+                // {
+                //     showLv = showLv - 1;
+                //     break;
+                // }
             }
         }
 

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/SuitCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a34da0d86583b94c904ccedfb532b01
+guid: 8ea0b0316b4f96c44956f6555a1604e4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtn.cs

@@ -15,6 +15,7 @@ namespace UI.Main
         public GTextInput m_txtChapter;
         public GTextInput m_txtChapterLv;
         public GButton m_btnAll;
+        public GButton m_btnSkipCheckOpen;
         public const string URL = "ui://mfvz4q8klqp0dm";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComBtn";
@@ -70,6 +71,7 @@ namespace UI.Main
             m_txtChapter = (GTextInput)comp.GetChild("txtChapter");
             m_txtChapterLv = (GTextInput)comp.GetChild("txtChapterLv");
             m_btnAll = (GButton)comp.GetChild("btnAll");
+            m_btnSkipCheckOpen = (GButton)comp.GetChild("btnSkipCheckOpen");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,7 @@ namespace UI.Main
             m_txtChapter = null;
             m_txtChapterLv = null;
             m_btnAll = null;
+            m_btnSkipCheckOpen = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -18,6 +18,8 @@ namespace GFGGame
 
         public static bool skipGuide;
 
+        public static bool skipCheckOpen;//跳过功能开启检查
+
         public static string loginApiUrl;
         public static string gameApiUrl;
         public static string gameApiUrlTest;

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -51,6 +51,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            CardSProxy.GetCardInfos().Coroutine();
+
             _ui.m_listRole.selectedIndex = this._selectType;
             _ui.m_listRole.numItems = listRoleCount;
             this.UpdateCardList(_ui.m_listRole.selectedIndex);

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -7,6 +7,7 @@ using UnityEngine;
 using System.Timers;
 using System.Collections;
 using System.Linq;
+using VEngine;
 
 namespace GFGGame
 {
@@ -24,7 +25,8 @@ namespace GFGGame
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
 
-        private List<int> itemsNum = new List<int>();
+        private List<int> itemsCount;
+        private int[] upgradeCardItemsArr = GlobalCfgArray.globalCfg.upgradeCardItemsArr;
         //private Timer _timer;
         private const float _delay = 300;
         private double _selectTimeCount = 0;//长按时间
@@ -104,14 +106,25 @@ namespace GFGGame
 
             _cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
             Input.multiTouchEnabled = false;
-
+            this.ClearItemsCountList();
             this.UpdateCommon();
             this.UpdateNormal();
             this.UpdateCardRes();
             this.UpdateUpLvView();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
         }
-
+        private void ClearItemsCountList()
+        {
+            if (itemsCount == null)
+            {
+                itemsCount = new List<int>();
+            }
+            itemsCount.Clear();
+            for (int i = 0; i < upgradeCardItemsArr.Length; i++)
+            {
+                itemsCount.Add(0);
+            }
+        }
         private void UpdateNormal()
         {
             _comFosterBottom.m_txtName.text = _cardData.itemCfg.name;
@@ -137,7 +150,10 @@ namespace GFGGame
                 _cardObj = null;
             }
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
-            _cardObj = DressUpUtil.AddAnimationObj(resPath);
+            if (Versions.Contains(resPath))
+            {
+                _cardObj = DressUpUtil.AddAnimationObj(resPath);
+            }
 
             if (_cardObj != null)
             {
@@ -201,7 +217,7 @@ namespace GFGGame
             {
                 return;
             }
-            _comFosterBottom.m_listLvConsume.numItems = GlobalCfgArray.globalCfg.upgradeCardItemsArr.Length;
+            _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
 
         }
 
@@ -209,11 +225,11 @@ namespace GFGGame
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
             CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfg(_cardData.lv, _cardData.itemCfg.rarity);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.upgradeCardItemsArr[index]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[index]);
             listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
             listItem.m_txtNum.text = ItemDataManager.GetItemNum(itemCfg.id).ToString();
             listItem.m_txtUseCount.text = "0";
-            listItem.target.data = itemCfg;
+            listItem.target.data = index;
 
             if (listItem.m_btnMinus.data == null)
             {
@@ -230,16 +246,18 @@ namespace GFGGame
             listItem.m_loaItem.data = index;
             UI_ComConsume.ProxyEnd();
         }
-        private void OnClickItemConsumsBegin(GObject obj, int index)
+        private void OnClickItemConsumsBegin(GObject obj, int type)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
+            int index = (int)listItem.target.data;
+            int itemId = upgradeCardItemsArr[index];
             _consumeSelectItem = obj;
-            _consumeSelectIndex = index;
-            if (index == 1)
+            _consumeSelectIndex = type;
+            if (type == 1)
             {
-                if (ItemDataManager.GetItemNum((listItem.target.data as ItemCfg).id) == 0)
+                if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
-                    ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { (listItem.target.data as ItemCfg).id, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
+                    ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
                 }
             }
             //_timer.Start();
@@ -290,17 +308,19 @@ namespace GFGGame
         private bool OnClickBtnPlusLvConsume(GObject obj, bool showTips = true)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
-            ItemCfg itemCfg = (listItem.target.data as ItemCfg);
+            // ItemCfg itemCfg = (listItem.target.data as ItemCfg);
+            int index = (int)listItem.target.data;
+            int itemId = upgradeCardItemsArr[index];
 
-            string count = listItem.m_txtUseCount.text;
-
-            if (int.Parse(count) == ItemDataManager.GetItemNum(itemCfg.id))
+            if (itemsCount[index] == ItemDataManager.GetItemNum(itemId))
             {
                 Timers.inst.Remove(OnTimedEvent);
 
                 return false;
             }
-            if (_showLv == CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl && _comFosterBottom.m_barLv.max == _comFosterBottom.m_barLv.value)
+            int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
+            int needExp = CardLvlCfgArray.Instance.GetCfg(_showLv, _cardData.itemCfg.rarity).needExp;
+            if (_showLv == maxLv && _comFosterBottom.m_barLv.value >= needExp)
             {
                 Timers.inst.Remove(OnTimedEvent);
 
@@ -310,7 +330,8 @@ namespace GFGGame
                 }
                 return false;
             }
-            listItem.m_txtUseCount.text = (int.Parse(count) + 1).ToString();
+            itemsCount[index] = itemsCount[index] + 1;
+            listItem.m_txtUseCount.text = itemsCount[index].ToString();
             this.UpdatePreView();
             return true;
         }
@@ -319,16 +340,19 @@ namespace GFGGame
         private void OnClickBtnMinus(GObject obj)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
+            int index = (int)listItem.target.data;
+            // int itemId = upgradeCardItemsArr[index];
 
-            string count = listItem.m_txtUseCount.text;
+            // string count = listItem.m_txtUseCount.text;
 
-            if (int.Parse(count) == 0)
+            if (itemsCount[index] == 0)
             {
                 Timers.inst.Remove(OnTimedEvent);
 
                 return;
             }
-            listItem.m_txtUseCount.text = (int.Parse(count) - 1).ToString();
+            itemsCount[index] = itemsCount[index] - 1;
+            listItem.m_txtUseCount.text = itemsCount[index].ToString();
             this.UpdatePreView();
         }
         private void UpdatePreView()
@@ -336,15 +360,15 @@ namespace GFGGame
             int count = 0;//消耗金币数量
             int hasExp = 0;//消耗材料提升的总经验
 
-            for (int i = 0; i < _comFosterBottom.m_listLvConsume.numItems; i++)
+            for (int i = 0; i < itemsCount.Count; i++)
             {
-                UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
+                // UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
 
-                if (int.Parse(listItem.m_txtUseCount.text) == 0) { continue; }
-
-                ItemCfg itemCfg = (listItem.target.data as ItemCfg);
-                count += itemCfg.cardUpLvGoldArr[1] * int.Parse(listItem.m_txtUseCount.text);
-                hasExp += itemCfg.cardUpLvExp * int.Parse(listItem.m_txtUseCount.text);
+                // if (int.Parse(listItem.m_txtUseCount.text) == 0) { continue; }
+                if (itemsCount[i] == 0) continue;
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]);
+                count += itemCfg.cardUpLvGoldArr[1] * itemsCount[i];
+                hasExp += itemCfg.cardUpLvExp * itemsCount[i];
 
             }
             _comFosterBottom.m_ComLvConsumeGold.m_txtCount.text = count.ToString();
@@ -356,11 +380,36 @@ namespace GFGGame
         }
         private void OnClcikBtnAll()
         {
-
-            for (int i = 0; i < _comFosterBottom.m_listLvConsume.numItems; i++)
-            {
-                UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
-                int itemNum = int.Parse(listItem.m_txtNum.text);
+            // bool isFullLv = false;
+            // int exp = 0;
+            // for (int i = 0; i < itemsCount.Count; i++)
+            // {
+            //     UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
+            //     int itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
+            //     int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
+            //     int needExp = CardLvlCfgArray.Instance.GetCfg(maxLv, _cardData.itemCfg.rarity).needExp;
+            //     for (int j = 1; j <= itemNum; j++)
+            //     {
+            //         exp += ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]).cardUpLvExp;
+            //         CardDataManager.GetPreViewLvAndExp(_cardData.itemCfg.rarity, _cardData.lv, _cardData.exp, exp, out int previewLv, out int previewExp);
+            //         itemsCount[i] = j;
+            //         listItem.m_txtUseCount.text = j.ToString();
+            //         Debug.Log("previewLv:" + previewLv + "  maxLv:" + maxLv + "   previewExp:" + previewExp + "   needExp:" + needExp);
+            //         if (previewLv >= maxLv && previewExp >= needExp)
+            //         {
+            //             isFullLv = true;
+            //             break;
+            //         }
+            //     }
+            //     if (isFullLv) break;
+            // }
+            // //  listItem.m_txtUseCount.text = itemsCount[index].ToString();
+            // this.UpdatePreView();
+
+            for (int i = 0; i < itemsCount.Count; i++)
+            {
+                // UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
+                int itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
                 for (int j = 0; j < itemNum; j++)
                 {
                     if (this.OnClickBtnPlusLvConsume(_comFosterBottom.m_listLvConsume.GetChildAt(i), false) == false)
@@ -373,7 +422,7 @@ namespace GFGGame
 
         private void OnClickBtnUpLv()
         {
-            int itemMoneyId = (UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(0)).target.data as ItemCfg).cardUpLvGoldArr[0];
+            int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldArr[0];
             int itemMoneyNum = int.Parse(_comFosterBottom.m_ComLvConsumeGold.m_txtCount.text);
             if (itemMoneyNum > ItemDataManager.GetItemNum(itemMoneyId))
             {
@@ -388,15 +437,11 @@ namespace GFGGame
         private async void UpLv()
         {
 
-            itemsNum.Clear();
+            // itemsCount.Clear();
             int allConsume = 0;
-            for (int i = 0; i < _comFosterBottom.m_listLvConsume.numItems; i++)
+            for (int i = 0; i < itemsCount.Count; i++)
             {
-                UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
-                int itemId = (listItem.target.data as ItemCfg).id;
-                int itemNum = int.Parse(listItem.m_txtUseCount.text);
-                allConsume += itemNum;
-                itemsNum.Add(itemNum);
+                allConsume += itemsCount[i];
             }
             if (allConsume == 0)
             {
@@ -407,7 +452,7 @@ namespace GFGGame
             if (CardDataManager.isFullLv(_cardData.id, _cardData.lv) == false)
             {
                 int lv = _cardData.lv;
-                bool result = await CardSProxy.UpgradeCardLvl(_cardData.id, itemsNum);
+                bool result = await CardSProxy.UpgradeCardLvl(_cardData.id, itemsCount);
                 if (result)
                 {
                     if (_showLv - lv >= 1)
@@ -417,7 +462,7 @@ namespace GFGGame
                     }
                     this.UpdateCommon();
                     this.UpdateUpLvView();
-
+                    this.ClearItemsCountList();
                 }
             }
         }
@@ -652,6 +697,7 @@ namespace GFGGame
             this.UpdateCommon();
             if (_comFosterBottom.m_ctrlTab.selectedIndex == 0)
             {
+                this.ClearItemsCountList();
                 this.UpdateUpLvView();
             }
             else if (_comFosterBottom.m_ctrlTab.selectedIndex == 1)
@@ -668,7 +714,7 @@ namespace GFGGame
             if (!CardDataManager.isFullLv(_cardData.id, _cardData.lv, false))
             {
                 CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfg(_showLv, _cardData.itemCfg.rarity);
-                _comFosterBottom.m_listLvConsume.numItems = GlobalCfgArray.globalCfg.upgradeCardItemsArr.Length;
+                _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
             }
             if (!CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/GMPanelView.cs

@@ -34,6 +34,7 @@ namespace GFGGame
             _ui.m_ComBtn.m_btnAll.onClick.Add(OnClickBtnAll);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
+            _ui.m_ComBtn.m_btnSkipCheckOpen.onClick.Add(OnClickBtnSkipCheckOpen);
         }
 
         protected override void OnShown()
@@ -104,7 +105,19 @@ namespace GFGGame
             string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text, _ui.m_ComBtn.m_txtChapterLv.text);
             GMController.SendGMCommand("chapter " + content, messageSuc).Coroutine();
         }
+        private async void OnClickBtnSkipCheckOpen()
+        {
+            int isSkip = GameGlobal.skipCheckOpen == false ? 1 : 0;
+            bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.SKIP_CHECK_OPEN, isSkip);
+            if (result)
+            {
+                GameGlobal.skipCheckOpen = !GameGlobal.skipCheckOpen;
+                PromptController.Instance.ShowFloatTextPrompt("已开启跳过功能开启检测");
+
+            }
+
 
+        }
         private void OnClickBtnAll()
         {
             OnClickBtnGetAllDressUpItem();
@@ -114,6 +127,7 @@ namespace GFGGame
             _ui.m_ComBtn.m_txtChapter.text = "5";
             _ui.m_ComBtn.m_txtChapterLv.text = "1";
             OnClickBtnSetChapter();
+            OnClickBtnSkipCheckOpen();
         }
 
         private void OnClickBtnGM(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -52,10 +52,10 @@ namespace GFGGame
         public static void Show(string viewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
         {
             string name = GetName(viewName);
-            // if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
-            // {
-            //     return;
-            // }
+            if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
+            {
+                return;
+            }
             if (hideOthers)
             {
                 HideAllView(name);
@@ -122,10 +122,10 @@ namespace GFGGame
             // string viewName = names[names.Length - 1];
             string name = GetName(typeof(T).FullName);
 
-            // if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
-            // {
-            //     return false;
-            // }
+            if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
+            {
+                return false;
+            }
             if (hideOthers)
             {
                 HideAllView(name);