田野调查ui调整

FGUIProject/assets/Field/components/Button1.xml

@@ -7,8 +7,17 @@
   </controller>
   <displayList>
     <loader id="n7_ohun" name="icon" xy="0,0" size="428,429" url="ui://5oh3t798mzf812" autoSize="true"/>
-    <loader id="n10_mzf8" name="loaConsume" xy="184,310" size="60,60" url="ui://eg2y0ldpq08x4"/>
-    <text id="n11_mzf8" name="txtConsume" xy="223,326" size="71,54" fontSize="40" color="#fcfaf4" strokeColor="#886d2f" strokeSize="2" text="x66"/>
+    <loader id="n10_mzf8" name="loaConsume" xy="184,310" size="60,60" url="ui://eg2y0ldpq08x4">
+      <gearDisplay controller="c1" pages="1"/>
+    </loader>
+    <text id="n11_mzf8" name="txtConsume" xy="223,326" size="71,54" fontSize="40" color="#fcfaf4" strokeColor="#886d2f" strokeSize="2" text="x66">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
+    <image id="n12_nasr" name="n12" src="nasr1a" fileName="images/tydc_djdj_4.png" xy="26,26" group="n14_nasr"/>
+    <image id="n13_nasr" name="n13" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="178,255" group="n14_nasr"/>
+    <group id="n14_nasr" name="grpLock" xy="26,26" size="376,376" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Field/package.xml

@@ -42,6 +42,7 @@
     <image id="mzf817" name="tydc_zizi_2.png" path="/images/" exported="true"/>
     <image id="mzf818" name="tydc_zizi_3.png" path="/images/" exported="true"/>
     <image id="mzf819" name="tydc_zizi_4.png" path="/images/" exported="true"/>
+    <image id="nasr1a" name="tydc_djdj_4.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button1.cs

@@ -10,6 +10,7 @@ namespace UI.Field
         public Controller m_c1;
         public GLoader m_loaConsume;
         public GTextField m_txtConsume;
+        public GGroup m_grpLock;
         public const string URL = "ui://5oh3t798s20j4";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "Button1";
@@ -60,12 +61,14 @@ namespace UI.Field
             m_c1 = comp.GetController("c1");
             m_loaConsume = (GLoader)comp.GetChild("loaConsume");
             m_txtConsume = (GTextField)comp.GetChild("txtConsume");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaConsume = null;
             m_txtConsume = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -113,7 +113,7 @@ namespace GFGGame
 
             _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("jingzhongh_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fzsj_bg");
 
             UpdateView();
 

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -134,9 +134,21 @@ namespace GFGGame
             _ui.m_loaIcon.url = string.Format("ui://Field/tydc_zizi_{0}", _dataManager.fieldInfos.theme);
             // _ui.m_txtScore.text = ConstDressUpScoreType.scoreTypeList()[_dataManager.fieldInfos.theme].ToString();
             // _ui.m_txtMaxLv.text = string.Format("最高记录:{0}/{1}", _dataManager.GetHighestLvByChapterId(_dataManager.chapterId), _curCfg.num);
-            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[0].needPower);
-            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[1].needPower);
-            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[2].needPower);
+            FieldCfg selectCfg0 = FieldCfgArray.Instance.dataArray[0];
+            FieldCfg selectCfg1 = FieldCfgArray.Instance.dataArray[1];
+            FieldCfg selectCfg2 = FieldCfgArray.Instance.dataArray[2];
+
+            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", selectCfg0.needPower);
+            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", selectCfg1.needPower);
+            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", selectCfg2.needPower);
+
+            bool isPass0 = selectCfg0.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg0.storyLvId);
+            bool isPass1 = selectCfg1.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.storyLvId);
+            bool isPass2 = selectCfg2.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg2.storyLvId);
+            _ui.m_btn0.m_c1.selectedIndex = isPass0 ? 1 : 0;
+            _ui.m_btn1.m_c1.selectedIndex = isPass1 ? 1 : 0;
+            _ui.m_btn2.m_c1.selectedIndex = isPass2 ? 1 : 0;
+
             _ui.m_proTaskReward.max = _dataManager.fieldInfos.bonusMaxLimit;
             _ui.m_proTaskReward.value = _dataManager.fieldInfos.bonusWeekly;
             _ui.m_loaTaskReward.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED));