zhaoyang 2 лет назад
Родитель
Сommit
a5c54ee6d0
26 измененных файлов с 39 добавлено и 140 удалено
  1. 13 8
      FGUIProject/assets/Main/MainUI.xml
  2. 2 5
      FGUIProject/assets/Main/components/ButtonModle1.xml
  3. BIN
      FGUIProject/assets/Main/images/zjm_an_1.png
  4. BIN
      FGUIProject/assets/Main/images/zjm_an_2.png
  5. BIN
      FGUIProject/assets/Main/images/zjm_an_3.png
  6. BIN
      FGUIProject/assets/Main/images/zjm_an_4.png
  7. BIN
      FGUIProject/assets/Main/images/zjm_an_5.png
  8. 5 0
      FGUIProject/assets/Main/package.xml
  9. 4 20
      FGUIProject/assets/XiuFang/components/Component.xml
  10. 0 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs
  11. 0 24
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component.cs
  12. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs
  13. 10 57
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  14. 4 20
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  26. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes

+ 13 - 8
FGUIProject/assets/Main/MainUI.xml

@@ -23,45 +23,50 @@
     <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1587" size="360,274" group="n52_qqat">
+    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1587" size="310,274" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
     </component>
     <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="25,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fn"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qht"/>
     </component>
     <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="208,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fo"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhu"/>
     </component>
     <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="391,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fp"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhv"/>
     </component>
     <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="574,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fq"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhw"/>
     </component>
-    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1056,1700" group="n59_oju1" advanced="true"/>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,640" size="77,255" group="n58_oju1">
+    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1006,1701" group="n59_oju1" advanced="true"/>
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,621" size="87,293" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482ft"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1571" size="77,256" group="n58_oju1">
+    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1552" size="87,294" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fv"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1450" size="77,256" group="n58_oju1">
+    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1431" size="87,294" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fr"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,859" size="77,255" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,840" size="87,293" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kwonohg"/>
     </component>
-    <group id="n58_oju1" name="grpRight" xy="1576,640" size="506,1187" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="24,160" size="2058,1700" advanced="true"/>
+    <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="24,160" size="2068,1701" advanced="true"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>

+ 2 - 5
FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -11,14 +11,11 @@
     <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">
+    <loader id="n8_v95q" name="loaLockIcon" xy="79,107" pivot="0.5,0.5" anchor="true" size="84,395" url="ui://eg2y0ldpv95qtk0" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
+    </loader>
   </displayList>
   <Button/>
   <relation target="n1_wg7t" sidePair="width-width,height-height"/>
   <customProperty target="loaLockIcon" propertyId="1"/>
-  <customProperty target="txtLock" propertyId="0"/>
 </component>

BIN
FGUIProject/assets/Main/images/zjm_an_1.png


BIN
FGUIProject/assets/Main/images/zjm_an_2.png


BIN
FGUIProject/assets/Main/images/zjm_an_3.png


BIN
FGUIProject/assets/Main/images/zjm_an_4.png


BIN
FGUIProject/assets/Main/images/zjm_an_5.png


+ 5 - 0
FGUIProject/assets/Main/package.xml

@@ -420,6 +420,11 @@
     <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/"/>
+    <image id="v95qhs" name="zjm_an_5.png" path="/images/"/>
+    <image id="v95qht" name="zjm_an_1.png" path="/images/"/>
+    <image id="v95qhu" name="zjm_an_2.png" path="/images/"/>
+    <image id="v95qhv" name="zjm_an_3.png" path="/images/"/>
+    <image id="v95qhw" name="zjm_an_4.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 4 - 20
FGUIProject/assets/XiuFang/components/Component.xml

@@ -5,25 +5,9 @@
     <loader id="n6_9xlo" name="btnSuitSynthetic" xy="320,0" size="320,1246" url="ui://kv0ad4wy9xlo6" 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>
+    <loader id="n9_v95q" name="loaLockIcon0" xy="165,622" pivot="0.5,0.5" anchor="true" size="84,395" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <loader id="n15_v95q" name="loaLockIcon1" xy="483,622" pivot="0.5,0.5" anchor="true" size="84,395" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <loader id="n12_v95q" name="loaLockIcon2" xy="801,622" pivot="0.5,0.5" anchor="true" size="84,395" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
+    <loader id="n18_v95q" name="loaLockIcon3" xy="1119,622" pivot="0.5,0.5" anchor="true" size="84,395" touchable="false" url="ui://eg2y0ldpv95qtk0" autoSize="true"/>
   </displayList>
 </component>

+ 0 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs

@@ -10,8 +10,6 @@ namespace UI.Main
         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";
@@ -62,16 +60,12 @@ 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();

+ 0 - 24
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component.cs

@@ -12,17 +12,9 @@ namespace UI.XiuFang
         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";
@@ -75,17 +67,9 @@ namespace UI.XiuFang
             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)
         {
@@ -94,17 +78,9 @@ namespace UI.XiuFang
             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();

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs

@@ -20,6 +20,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_NoticeUI.PACKAGE_NAME;
             _ui = UI_NoticeUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();

+ 10 - 57
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -542,72 +542,25 @@ namespace GFGGame
 
         private void CheckFunOpen()
         {
-            _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_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            _ui.m_btnHuanZhuang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            _ui.m_btnCiPai.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            _ui.m_btnZhaiXing.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            _ui.m_btnMain.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).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_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_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);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
-            // _btnStudio.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            // _btnField.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
-            // _btnTianGong.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            // _btnPengYouQuan.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            // _btnJInShu.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+
 
 
         }

+ 4 - 20
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -41,26 +41,10 @@ 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);
-            }
+            _ui.m_component.m_loaLockIcon0.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingShopView).Name, false);
+            _ui.m_component.m_loaLockIcon1.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SuitSyntheticView).Name, false);
+            _ui.m_component.m_loaLockIcon2.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
+            _ui.m_component.m_loaLockIcon3.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingDecomposeView).Name, false);
 
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_DECOMPOSE);

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes