Browse Source

快速挑战消耗

zhaoyang 2 years ago
parent
commit
583092c87a

+ 0 - 1
FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -9,6 +9,5 @@
     <group id="n17_ohbx" name="grpTips" xy="0,15" size="962,1086" advanced="true" layout="vt" excludeInvisibles="true">
     <group id="n17_ohbx" name="grpTips" xy="0,15" size="962,1086" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
       <relation target="" sidePair="middle-middle"/>
     </group>
     </group>
-    <image id="n22_r9ri" name="n22" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="108,107" size="707,977"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 7 - 7
FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1071,1336">
 <component size="1071,1336">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
   <displayList>
     <image id="n0_s2cc" name="n0" src="r9rihi" fileName="images/zd_tzhddi_1.png" xy="0,0" group="n19_mueb"/>
     <image id="n0_s2cc" name="n0" src="r9rihi" fileName="images/zd_tzhddi_1.png" xy="0,0" group="n19_mueb"/>
     <image id="n27_qe01" name="n27" src="r9rihk" fileName="images/zd_tzhdkua_1.png" xy="274,89" group="n29_qe01"/>
     <image id="n27_qe01" name="n27" src="r9rihk" fileName="images/zd_tzhdkua_1.png" xy="274,89" group="n29_qe01"/>
@@ -12,21 +12,21 @@
     <group id="n35_qe01" name="grpNeeditem" xy="114,200" size="843,49" group="n19_mueb" advanced="true">
     <group id="n35_qe01" name="grpNeeditem" xy="114,200" size="843,49" group="n19_mueb" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay controller="c1" pages="1"/>
     </group>
     </group>
-    <list id="n13_s2cc" name="list" xy="88,277" size="895,773" group="n19_mueb" overflow="scroll" lineGap="20">
+    <list id="n13_s2cc" name="list" xy="88,200" size="895,870" group="n19_mueb" overflow="scroll" lineGap="20">
       <gearXY controller="c1" pages="0,1" values="88,200|88,277"/>
       <gearXY controller="c1" pages="0,1" values="88,200|88,277"/>
-      <gearSize controller="c1" pages="0,1" values="895,850,1,1|895,773,1,1"/>
+      <gearSize controller="c1" pages="0,1" values="895,870,1,1|895,793,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="bottomext-bottom"/>
     </list>
     </list>
-    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="148,1160" group="n16_nzmy">
+    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="148,1110" size="342,96" group="n16_nzmy">
       <Button title="结束挑战" icon="ui://eg2y0ldpr9ritji"/>
       <Button title="结束挑战" icon="ui://eg2y0ldpr9ritji"/>
     </component>
     </component>
-    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="580,1160" group="n16_nzmy">
+    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="580,1110" group="n16_nzmy">
       <Button title="挑战十次"/>
       <Button title="挑战十次"/>
     </component>
     </component>
-    <group id="n16_nzmy" name="n16" xy="148,1160" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">
+    <group id="n16_nzmy" name="n16" xy="148,1110" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </group>
     </group>
-    <component id="n37_r9ri" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="414,1090" group="n19_mueb"/>
+    <component id="n37_r9ri" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="653,1214" group="n19_mueb"/>
     <group id="n19_mueb" name="n19" xy="0,0" size="1071,1336" advanced="true"/>
     <group id="n19_mueb" name="n19" xy="0,0" size="1071,1336" advanced="true"/>
     <text id="n25_mueb" name="n25" xy="392,597" size="287,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
     <text id="n25_mueb" name="n25" xy="392,597" size="287,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
     <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="167,706" group="n24_mueb">
     <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="167,706" group="n24_mueb">

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -124,7 +124,6 @@ namespace GFGGame
             }
             }
 
 
             this.clickBlankToClose = false;
             this.clickBlankToClose = false;
-            _ui.m_comCostCurrent.visible = false;
             // _ui.m_t0.Play(() =>
             // _ui.m_t0.Play(() =>
             // {
             // {
             _fightTimes = _fightType == 1 ? 1 : _fightTimes;
             _fightTimes = _fightType == 1 ? 1 : _fightTimes;
@@ -194,9 +193,7 @@ namespace GFGGame
             UpdateBtnFightTimes();
             UpdateBtnFightTimes();
             updateNeedItem();
             updateNeedItem();
 
 
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
-            int power = _index * levelCfg.power;
-            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, power);
+
             _ui.m_comCostCurrent.visible = true;
             _ui.m_comCostCurrent.visible = true;
 
 
             _index = 0;
             _index = 0;
@@ -227,8 +224,11 @@ namespace GFGGame
                 InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out _fightTimes, out string title);
                 InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out _fightTimes, out string title);
                 _ui.m_btnFightTimes.title = _fightType == 1 ? "挑战一次" : title;
                 _ui.m_btnFightTimes.title = _fightType == 1 ? "挑战一次" : title;
                 _ui.m_btnFightTimes.visible = _fightTimes > 0;
                 _ui.m_btnFightTimes.visible = _fightTimes > 0;
+                _ui.m_comCostCurrent.visible = _fightTimes > 0;
 
 
                 _fightTimes = _fightType == 1 ? 1 : _fightTimes;
                 _fightTimes = _fightType == 1 ? 1 : _fightTimes;
+                int power = _fightTimes * levelCfg.power;
+                ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, power);
             }
             }
         }
         }
 
 

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


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