Browse Source

界面锁

zhaoyang 2 năm trước cách đây
mục cha
commit
286ba5030e
25 tập tin đã thay đổi với 17 bổ sung9 xóa
  1. 5 4
      FGUIProject/assets/Main/MainUI.xml
  2. BIN
      FGUIProject/assets/Main/images/zjm_mbmbmb.png
  3. 1 0
      FGUIProject/assets/Main/package.xml
  4. 4 4
      FGUIProject/assets/XiuFang/components/Component.xml
  5. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzd_an.png
  6. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzfj_an.png
  7. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzsj_an.png
  8. BIN
      FGUIProject/assets/XiuFang/images/tzhc_tzhc_an.png
  9. 4 0
      FGUIProject/assets/XiuFang/package.xml
  10. 3 1
      GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs
  11. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  12. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png
  23. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png
  25. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes

+ 5 - 4
FGUIProject/assets/Main/MainUI.xml

@@ -19,6 +19,7 @@
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
     <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
+    <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1002" group="n52_qqat"/>
     <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
     <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"/>
@@ -48,7 +49,7 @@
       <Button icon="ui://mfvz4q8kv482fq"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhw"/>
     </component>
-    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1006,1701" group="n59_oju1" advanced="true"/>
+    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1080,1760" 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"/>
@@ -72,11 +73,11 @@
     <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
     <image id="n62_v95q" name="n62" src="v95qhy" fileName="images/zjm_gsmh.png" xy="956,-240" group="n64_v95q"/>
     <image id="n63_v95q" name="n63" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1037,960" pivot="0.5,0.5" anchor="true" group="n64_v95q"/>
-    <image id="n65_v95q" name="n65" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1151,960" pivot="0.5,0.5" anchor="true" group="n64_v95q" scale="-1,1"/>
-    <group id="n64_v95q" name="n64" xy="937,-240" size="314,2400" group="n59_oju1" advanced="true">
+    <image id="n65_v95q" name="n65" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1140,960" pivot="0.5,0.5" anchor="true" group="n64_v95q" scale="-1,1"/>
+    <group id="n64_v95q" name="n64" xy="937,-240" size="303,2400" group="n59_oju1" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
-    <group id="n59_oju1" name="grpMove" xy="24,-240" size="2068,2400" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,-240" size="2092,2400" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
   </displayList>
   <transition name="t1">

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


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

@@ -428,6 +428,7 @@
     <image id="v95qhx" name="zjm_qhqh.png" path="/images/"/>
     <image id="v95qhy" name="zjm_gsmh.png" path="/images/" atlas="alone_npot"/>
     <image id="v95qhz" name="zjm_ej_suo.png" path="/images/"/>
+    <image id="v95qi0" name="zjm_mbmbmb.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -5,9 +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" 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"/>
+    <loader id="n9_v95q" name="loaLockIcon0" xy="160,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qb" autoSize="true"/>
+    <loader id="n15_v95q" name="loaLockIcon1" xy="480,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qa" autoSize="true"/>
+    <loader id="n12_v95q" name="loaLockIcon2" xy="800,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qd" autoSize="true"/>
+    <loader id="n18_v95q" name="loaLockIcon3" xy="1120,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qc" autoSize="true"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/XiuFang/images/tzhc_fzd_an.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_fzfj_an.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_fzsj_an.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_tzhc_an.png


+ 4 - 0
FGUIProject/assets/XiuFang/package.xml

@@ -10,6 +10,10 @@
     <image id="9xlo7" name="tzhc_ziti.png" path="/images/"/>
     <component id="wlc28" name="Component.xml" path="/components/"/>
     <image id="qyr69" name="tzhc_fzfj.png" path="/images/"/>
+    <image id="v95qa" name="tzhc_tzhc_an.png" path="/images/"/>
+    <image id="v95qb" name="tzhc_fzd_an.png" path="/images/"/>
+    <image id="v95qc" name="tzhc_fzfj_an.png" path="/images/"/>
+    <image id="v95qd" name="tzhc_fzsj_an.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -85,7 +85,9 @@ namespace GFGGame
 
             }
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
-            if (guideId == cfg.id && guideIndex == 2)
+            GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);
+            GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);
+            if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1)
             {
                 _ui.m_loaMask.visible = false;
                 MainDataManager.Instance.CanSwipe = true;

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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_5!a.png


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


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


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


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


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png


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