功能图标加锁

FGUIProject/assets/CommonGame/package.xml

@@ -237,6 +237,7 @@
     <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
+    <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -2,7 +2,7 @@
 <component size="158,214" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n1_wg7t" name="icon" xy="79,107" pivot="0.5,0.5" anchor="true" size="158,214" url="ui://mfvz4q8kv482fo" autoSize="true">
+    <loader id="n1_wg7t" name="icon" xy="79,107" pivot="0.5,0.5" anchor="true" size="148,176" url="ui://mfvz4q8kv482fo" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
@@ -11,6 +11,14 @@
     <graph id="n4_lki4" name="holder1" xy="127,130" size="0,0" visible="false" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="79,107" pivot="0.5,0.5" anchor="true" size="84,395" group="n10_v95q" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <text id="n9_v95q" name="txtLock" xy="78,106" pivot="0.5,0.5" anchor="true" size="63,41" group="n10_v95q" fontSize="30" color="#ffcc66" text="解锁"/>
+    <group id="n10_v95q" name="grpLock" xy="37,-90" size="84,395" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
   <Button/>
+  <relation target="n1_wg7t" sidePair="width-width,height-height"/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="txtLock" propertyId="0"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -419,6 +419,7 @@
     <component id="v95qhn" name="ListRewardItem.xml" path="/components/"/>
     <image id="v95qho" name="self.png" path="/imagesDialog/"/>
     <image id="v95qhp" name="jinbixie.png" path="/imagesDialog/"/>
+    <image id="v95qhr" name="ejzjm_gbzt.png" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/XiuFang/components/Component.xml

@@ -2,8 +2,28 @@
 <component size="1000,1246" overflow="scroll" scroll="horizontal">
   <displayList>
     <loader id="n4_9xlo" name="btnClothingShop" xy="0,0" size="320,1246" url="ui://kv0ad4wy9xlo3" autoSize="true"/>
-    <loader id="n5_9xlo" name="btnClothingUpgrade" xy="640,0" size="320,1246" url="ui://kv0ad4wy9xlo4" autoSize="true"/>
     <loader id="n6_9xlo" name="btnSuitSynthetic" xy="320,0" size="320,1246" url="ui://kv0ad4wy9xlo6" autoSize="true"/>
-    <loader id="n8_wlc2" name="btnDecompose" xy="958,0" size="321,1246" url="ui://kv0ad4wyqyr69" autoSize="true"/>
+    <loader id="n5_9xlo" name="btnClothingUpgrade" xy="640,0" size="320,1246" url="ui://kv0ad4wy9xlo4" autoSize="true"/>
+    <loader id="n8_wlc2" name="btnDecompose" xy="958,0" size="320,1246" url="ui://kv0ad4wyqyr69" autoSize="true"/>
+    <loader id="n9_v95q" name="loaLockIcon0" xy="165,622" pivot="0.5,0.5" anchor="true" size="84,395" group="n11_v95q" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <text id="n10_v95q" name="txtLock0" xy="164,621" pivot="0.5,0.5" anchor="true" size="63,41" group="n11_v95q" fontSize="30" color="#ffcc66" text="解锁"/>
+    <group id="n11_v95q" name="grpLockClothingShop" xy="123,425" size="84,395" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <loader id="n15_v95q" name="loaLockIcon1" xy="483,622" pivot="0.5,0.5" anchor="true" size="84,395" group="n17_v95q" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <text id="n16_v95q" name="txtLock1" xy="482,621" pivot="0.5,0.5" anchor="true" size="63,41" group="n17_v95q" fontSize="30" color="#ffcc66" text="解锁"/>
+    <group id="n17_v95q" name="grpLockSuitSynthetic" xy="441,425" size="84,395" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <loader id="n12_v95q" name="loaLockIcon2" xy="801,622" pivot="0.5,0.5" anchor="true" size="84,395" group="n14_v95q" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <text id="n13_v95q" name="txtLock2" xy="800,621" pivot="0.5,0.5" anchor="true" size="63,41" group="n14_v95q" fontSize="30" color="#ffcc66" text="解锁"/>
+    <group id="n14_v95q" name="grpLockClothingUpgrade" xy="759,425" size="84,395" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <loader id="n18_v95q" name="loaLockIcon3" xy="1119,622" pivot="0.5,0.5" anchor="true" size="84,395" group="n20_v95q" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <text id="n19_v95q" name="txtLock3" xy="1118,621" pivot="0.5,0.5" anchor="true" size="63,41" group="n20_v95q" fontSize="30" color="#ffcc66" text="解锁"/>
+    <group id="n20_v95q" name="grpLockDecompose" xy="1077,425" size="84,395" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

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

@@ -3,7 +3,7 @@ namespace GFGGame
     public class ConstGuideId
     {
 
-        public const string START_STORY = "START_STORY";
+        // public const string START_STORY = "START_STORY";
         public const string SINGLE_FIGHT = "SINGLE_FIGHT";
         public const string BUY_CLOTHING = "BUY_CLOTHING";
         public const string TARGET_FIGHT = "TARGET_FIGHT";

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

@@ -29,12 +29,36 @@ namespace GFGGame
                     return false;
                 }
             }
+
             if (!CheckIsChapterFunOpen(cfg, showTips)) return false;
             if (!CheckIsLvFunOpen(cfg, showTips)) return false;
             if (!CheckIsSpecialFunOpen(cfg, showTips)) return false;
             return true;
         }
 
+        public string GetOpenTips(string functionId)
+        {
+            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(functionId);
+            if (cfg == null)
+            {
+                return "";
+            }
+
+            if (!CheckIsChapterFunOpen(cfg, false))
+            {
+                return GetChapterOpenTips(cfg);
+            }
+            if (!CheckIsLvFunOpen(cfg, false))
+            {
+                return GetLvTips(cfg);
+            }
+            if (!CheckIsSpecialFunOpen(cfg, false))
+            {
+                return GetChapterLvTips(cfg);
+            }
+            return "";
+        }
+
         /// <summary>
         /// 根据章节Id检测是否有新功能开启
         /// </summary>
@@ -107,13 +131,6 @@ namespace GFGGame
                 ViewManager.Show<FunctionOpenView>(listCfg);
             }
         }
-        // private void FunctionOpen(object param)
-        // {
-        //     if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name)) return;
-        //     ViewManager.Show<FunctionOpenView>(param);
-        //     Timers.inst.Remove(FunctionOpen);
-
-        // }
 
         //检测配置章节是否开启
         private bool CheckIsChapterFunOpen(FunctionOpenCfg cfg, bool showTips = true)
@@ -133,6 +150,7 @@ namespace GFGGame
             return false;
         }
 
+
         //检测配置角色是否开启
         private bool CheckIsLvFunOpen(FunctionOpenCfg cfg, bool showTips = true)
         {
@@ -145,8 +163,6 @@ namespace GFGGame
             return false;
         }
 
-
-
         private bool CheckIsSpecialFunOpen(FunctionOpenCfg cfg, bool showTips = true)
         {
             if (cfg.special <= 0) return true;
@@ -177,5 +193,37 @@ namespace GFGGame
 
         }
 
+        private string GetChapterOpenTips(FunctionOpenCfg cfg)
+        {
+            string strTips = "";
+            if (cfg.storyLevelId > 0)
+            {
+                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
+                StoryChapterCfg storyChapterCfg = StoryChapterCfgArray.Instance.GetCfg(storyLevelCfg.chapterId);
+                strTips = string.Format("通关主线{0}-{1}解锁", storyChapterCfg.order, storyLevelCfg.order);
+            }
+            return strTips;
+        }
+        private string GetLvTips(FunctionOpenCfg cfg)
+        {
+            string strTips = "";
+            if (cfg.lv > 0)
+            {
+                strTips = string.Format("角色达到{0}级解锁", cfg.lv);
+            }
+            return strTips;
+        }
+        private string GetChapterLvTips(FunctionOpenCfg cfg)
+        {
+            string strTips = "";
+            if (cfg.special > 0)
+            {
+                if (cfg.id == typeof(ClothingListView).Name)//服装升级获取第一套【天衣】套装后开启
+                {
+                    strTips = string.Format("收集一套'天衣'套装后解锁");
+                }
+            }
+            return strTips;
+        }
     }
 }

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

@@ -88,22 +88,7 @@ namespace GFGGame
 
             return (partScore + tagScore + roleScore + cardScore) * ConstScoreSystem.MAIN_SCORE;
         }
-        /// <summary>
-        /// 部件评分
-        /// </summary>
-        /// <param name="partId">评分部位</param>
-        /// <returns></returns>
-        public double GetPartBaseScore(int partId)
-        {
-            double partScore = 0;
-            if (!equipDicWithPartId.ContainsKey(partId)) return partScore;
 
-            for (int i = 0; i < equipDicWithPartId[partId].Count; i++)
-            {
-                partScore += DressUpMenuItemDataManager.GetItemScore(equipDicWithPartId[partId][i]);
-            }
-            return partScore;
-        }
 
         /// <summary>
         /// 部件评分
@@ -126,10 +111,28 @@ namespace GFGGame
             // return (partScore + clickScore + skillScore);
             return (int)Math.Round((partScore + skillScore));
         }
+
         public double GetPartItemScore(int partId)
         {
             return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE;
         }
+        
+        /// <summary>
+        /// 部件基础评分
+        /// </summary>
+        /// <param name="partId">评分部位</param>
+        /// <returns></returns>
+        public double GetPartBaseScore(int partId)
+        {
+            double partScore = 0;
+            if (!equipDicWithPartId.ContainsKey(partId)) return partScore;
+
+            for (int i = 0; i < equipDicWithPartId[partId].Count; i++)
+            {
+                partScore += DressUpMenuItemDataManager.GetItemScore(equipDicWithPartId[partId][i]);
+            }
+            return partScore;
+        }
         public double GetPartItemClickScore(int partId, int clickState)
         {
             //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLock.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComLock
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GTextField m_txtLock;
+        public const string URL = "ui://eg2y0ldpv95qhq";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComLock";
+        private static UI_ComLock _proxy;
+
+        public static UI_ComLock Create(GObject gObject = null)
+        {
+            var ui = new UI_ComLock();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComLock Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComLock();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_txtLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLock.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 07dabc907154a36449e2455c81572377
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -9,6 +9,9 @@ namespace UI.Main
         public GButton target;
         public GGraph m_holder;
         public GGraph m_holder1;
+        public GLoader m_loaLockIcon;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://mfvz4q8kq08xu";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ButtonModle1";
@@ -58,11 +61,17 @@ namespace UI.Main
         {
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
             m_holder1 = null;
+            m_loaLockIcon = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component.cs

@@ -8,9 +8,21 @@ namespace UI.XiuFang
     {
         public GComponent target;
         public GLoader m_btnClothingShop;
-        public GLoader m_btnClothingUpgrade;
         public GLoader m_btnSuitSynthetic;
+        public GLoader m_btnClothingUpgrade;
         public GLoader m_btnDecompose;
+        public GLoader m_loaLockIcon0;
+        public GTextField m_txtLock0;
+        public GGroup m_grpLockClothingShop;
+        public GLoader m_loaLockIcon1;
+        public GTextField m_txtLock1;
+        public GGroup m_grpLockSuitSynthetic;
+        public GLoader m_loaLockIcon2;
+        public GTextField m_txtLock2;
+        public GGroup m_grpLockClothingUpgrade;
+        public GLoader m_loaLockIcon3;
+        public GTextField m_txtLock3;
+        public GGroup m_grpLockDecompose;
         public const string URL = "ui://kv0ad4wywlc28";
         public const string PACKAGE_NAME = "XiuFang";
         public const string RES_NAME = "Component";
@@ -59,16 +71,40 @@ namespace UI.XiuFang
         private void Init(GComponent comp)
         {
             m_btnClothingShop = (GLoader)comp.GetChild("btnClothingShop");
-            m_btnClothingUpgrade = (GLoader)comp.GetChild("btnClothingUpgrade");
             m_btnSuitSynthetic = (GLoader)comp.GetChild("btnSuitSynthetic");
+            m_btnClothingUpgrade = (GLoader)comp.GetChild("btnClothingUpgrade");
             m_btnDecompose = (GLoader)comp.GetChild("btnDecompose");
+            m_loaLockIcon0 = (GLoader)comp.GetChild("loaLockIcon0");
+            m_txtLock0 = (GTextField)comp.GetChild("txtLock0");
+            m_grpLockClothingShop = (GGroup)comp.GetChild("grpLockClothingShop");
+            m_loaLockIcon1 = (GLoader)comp.GetChild("loaLockIcon1");
+            m_txtLock1 = (GTextField)comp.GetChild("txtLock1");
+            m_grpLockSuitSynthetic = (GGroup)comp.GetChild("grpLockSuitSynthetic");
+            m_loaLockIcon2 = (GLoader)comp.GetChild("loaLockIcon2");
+            m_txtLock2 = (GTextField)comp.GetChild("txtLock2");
+            m_grpLockClothingUpgrade = (GGroup)comp.GetChild("grpLockClothingUpgrade");
+            m_loaLockIcon3 = (GLoader)comp.GetChild("loaLockIcon3");
+            m_txtLock3 = (GTextField)comp.GetChild("txtLock3");
+            m_grpLockDecompose = (GGroup)comp.GetChild("grpLockDecompose");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnClothingShop = null;
-            m_btnClothingUpgrade = null;
             m_btnSuitSynthetic = null;
+            m_btnClothingUpgrade = null;
             m_btnDecompose = null;
+            m_loaLockIcon0 = null;
+            m_txtLock0 = null;
+            m_grpLockClothingShop = null;
+            m_loaLockIcon1 = null;
+            m_txtLock1 = null;
+            m_grpLockSuitSynthetic = null;
+            m_loaLockIcon2 = null;
+            m_txtLock2 = null;
+            m_grpLockClothingUpgrade = null;
+            m_loaLockIcon3 = null;
+            m_txtLock3 = null;
+            m_grpLockDecompose = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -266,8 +266,7 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.START_STORY) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
             {
@@ -282,19 +281,13 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_STORY, 1, "点击关卡，开启新历程。");
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了，暂时解释不清，先按请求换上服饰吧。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "");
         }
-        protected override void TryCompleteGuide()
-        {
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.START_STORY);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.START_STORY, 1);
-        }
+
     }
 
 }

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

@@ -4,6 +4,7 @@ using UnityEngine;
 using System.Collections.Generic;
 using ET;
 using System;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -537,17 +538,61 @@ namespace GFGGame
 
         private void CheckFunOpen()
         {
-            _ui.m_btnXiuFang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
-            _ui.m_btnMain.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
-            _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
-            _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            _ui.m_btnXiuFang.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            if (_ui.m_btnXiuFang.m_grpLock.visible)
+            {
+                _ui.m_btnXiuFang.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(XiuFangView).Name);
+            }
+            _ui.m_btnHuanZhuang.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            if (_ui.m_btnHuanZhuang.m_grpLock.visible)
+            {
+                _ui.m_btnHuanZhuang.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(DressUpView).Name);
+            }
+            _ui.m_btnCiPai.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            if (_ui.m_btnCiPai.m_grpLock.visible)
+            {
+                _ui.m_btnCiPai.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(CardDetailView).Name);
+            }
+            _ui.m_btnZhaiXing.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            if (_ui.m_btnZhaiXing.m_grpLock.visible)
+            {
+                _ui.m_btnZhaiXing.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(LuckyBoxView).Name);
+            }
+            _ui.m_btnMain.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            if (_ui.m_btnMain.m_grpLock.visible)
+            {
+                _ui.m_btnMain.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(StoryChapterListView).Name);
+            }
+            _ui.m_btnStudio.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            if (_ui.m_btnStudio.m_grpLock.visible)
+            {
+                _ui.m_btnStudio.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(StudioView).Name);
+            }
+            _ui.m_btnField.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            if (_ui.m_btnField.m_grpLock.visible)
+            {
+                _ui.m_btnField.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(FieldView).Name);
+            }
+            _ui.m_btnPoem.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            if (_ui.m_btnPoem.m_grpLock.visible)
+            {
+                _ui.m_btnPoem.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(PoemView).Name);
+            }
+            _ui.m_btnTravel.m_grpLock.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
+            if (_ui.m_btnTravel.m_grpLock.visible)
+            {
+                _ui.m_btnTravel.m_txtLock.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(TravelView).Name);
+            }
+
+            // _ui.m_btnMain.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            // _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            // _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            // _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            // _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
             || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
-            _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
-            _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
-            _ui.m_btnPoem.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            // _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            // _ui.m_btnPoem.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
@@ -624,8 +669,8 @@ namespace GFGGame
         }
         protected override void TryCompleteGuide()
         {
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+            // GuideController.TryCompleteGuideIndex(cfg.id, 1);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

@@ -42,8 +42,8 @@ namespace GFGGame
         {
             base.OnShown();
 
-            _ui.m_comphoto.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name) ? 1 : 0;
-            _ui.m_comGallery.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name) ? 1 : 0;
+            _ui.m_comphoto.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false) ? 1 : 0;
+            _ui.m_comGallery.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name, false) ? 1 : 0;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -132,9 +132,9 @@ namespace GFGGame
 
         protected override void TryCompleteGuide()
         {
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-            GuideController.TryCompleteGuideIndex(cfg.id, 3);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+            // GuideController.TryCompleteGuideIndex(cfg.id, 3);
+            // GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -41,6 +41,28 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_component.target.scrollPane.SetPosX(0, false);
+            _ui.m_component.m_grpLockClothingShop.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingShopView).Name, false);
+            if (_ui.m_component.m_grpLockClothingShop.visible)
+            {
+                _ui.m_component.m_txtLock0.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(ClothingShopView).Name);
+            }
+            _ui.m_component.m_btnClothingUpgrade.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SuitSyntheticView).Name, false);
+            if (_ui.m_component.m_btnClothingUpgrade.visible)
+            {
+                _ui.m_component.m_txtLock1.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(SuitSyntheticView).Name);
+            }
+            _ui.m_component.m_grpLockClothingUpgrade.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
+            if (_ui.m_component.m_grpLockClothingUpgrade.visible)
+            {
+                _ui.m_component.m_txtLock2.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(ClothingListView).Name);
+            }
+            _ui.m_component.m_grpLockDecompose.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingDecomposeView).Name, false);
+            if (_ui.m_component.m_grpLockDecompose.visible)
+            {
+                _ui.m_component.m_txtLock3.text = FunctionOpenDataManager.Instance.GetOpenTips(typeof(ClothingDecomposeView).Name);
+            }
+
+
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_DECOMPOSE);
             if (GuideDataManager.currentGuideId == cfg.id)
             {
@@ -67,7 +89,7 @@ namespace GFGGame
         {
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
             ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
-            this.Hide();
+            // this.Hide();
 
         }