Browse Source

快速挑战替换资源

zhaoyang 2 years ago
parent
commit
126f370bc9
56 changed files with 303 additions and 72 deletions
  1. 1 1
      FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml
  2. 1 1
      FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml
  3. 12 0
      FGUIProject/assets/CommonGame/components/Button17.xml
  4. 12 0
      FGUIProject/assets/CommonGame/components/Button18.xml
  5. 5 2
      FGUIProject/assets/CommonGame/components/ComItem.xml
  6. 2 5
      FGUIProject/assets/CommonGame/components/ComItemIcon.xml
  7. BIN
      FGUIProject/assets/CommonGame/images/anniuty.png
  8. BIN
      FGUIProject/assets/CommonGame/images/anniuty2.png
  9. BIN
      FGUIProject/assets/CommonGame/images/anniuty3.png
  10. BIN
      FGUIProject/assets/CommonGame/images/anniuty_1.png
  11. 6 0
      FGUIProject/assets/CommonGame/package.xml
  12. 1 1
      FGUIProject/assets/Field/FieldFightEndUI.xml
  13. 1 1
      FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml
  14. 1 1
      FGUIProject/assets/Mail/MailContentUI.xml
  15. 24 26
      FGUIProject/assets/Main/StoryFightQuicklyUI.xml
  16. 8 10
      FGUIProject/assets/Main/components/StoryFightQuicklyBonusListItem.xml
  17. 2 2
      FGUIProject/assets/Main/components/StoryFightQuicklyComplete.xml
  18. BIN
      FGUIProject/assets/Main/images/zd_tzhdbj.png
  19. BIN
      FGUIProject/assets/Main/images/zd_tzhddi_1.png
  20. BIN
      FGUIProject/assets/Main/images/zd_tzhddi_2.png
  21. BIN
      FGUIProject/assets/Main/images/zd_tzhdkua_1.png
  22. BIN
      FGUIProject/assets/Main/images/zd_wctsxs.png
  23. BIN
      FGUIProject/assets/Main/imagesFight/zd_wctsxs.png
  24. 6 2
      FGUIProject/assets/Main/package.xml
  25. 1 1
      FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml
  26. 1 1
      FGUIProject/assets/Studio/components/ListRewardItem.xml
  27. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs
  28. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs
  29. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightQuicklyUI.cs
  30. 6 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs
  31. 15 11
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  33. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  34. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  35. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  36. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  37. BIN
      GameClient/Assets/ResIn/UI/Field/Field_fui.bytes
  38. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  39. BIN
      GameClient/Assets/ResIn/UI/Mail/Mail_fui.bytes
  40. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  42. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  43. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  44. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  45. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  46. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  47. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  48. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  49. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  50. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  51. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta
  52. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  53. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta
  54. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  55. BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes
  56. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes

+ 1 - 1
FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml

@@ -6,7 +6,7 @@
     </loader>
     <text id="n2_pjip" name="txtTitle" xy="105,56" size="726,66" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>
     <image id="n5_qr4e" name="n5" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" xy="44,128"/>
-    <list id="n3_pjip" name="listBonus" xy="44,195" size="841,340" layout="flow_hz" overflow="scroll" lineGap="20" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n3_pjip" name="listBonus" xy="44,195" size="841,340" layout="flow_hz" overflow="scroll" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

+ 1 - 1
FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml

@@ -6,7 +6,7 @@
     </loader>
     <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="230,32"/>
     <text id="n2_pjip" name="txtTitle" xy="104,36" size="726,72" fontSize="54" color="#8f6e30" align="center" autoSize="none" text="套装详情"/>
-    <list id="n3_pjip" name="listParts" xy="24,179" size="887,540" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <list id="n3_pjip" name="listParts" xy="24,179" size="887,540" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>

+ 12 - 0
FGUIProject/assets/CommonGame/components/Button17.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="342,96" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritjd" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,-2" size="342,96" font="ui://eg2y0ldpwonotja" fontSize="52" color="#fdf7e8" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_r9ri" sidePair="width-width,height-height"/>
+</component>

+ 12 - 0
FGUIProject/assets/CommonGame/components/Button18.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="344,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n2_r9ri" name="icon" xy="-1,0" pivot="0.5,0.5" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,-2" size="344,97" font="ui://eg2y0ldpwonotja" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" singleLine="true" text="挑战十次">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_r9ri" sidePair="width-width,height-height"/>
+</component>

+ 5 - 2
FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="221,222" overflow="hidden" opaque="false">
+<component size="222,254" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="ng0itiz" fileName="components/ComItemIcon.xml" xy="0,0" pivot="0.5,0.5" size="222,222" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="50,36" fontSize="26" color="#fbf6eb" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=20}">
+    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="76,42" fontSize="30" color="#fbf6eb" align="right" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=200}">
       <relation target="n25_pu55" sidePair="right-right,top-top"/>
     </text>
+    <text id="n26_r9ri" name="txtName" xy="111,215" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
   </displayList>
 </component>

+ 2 - 5
FGUIProject/assets/CommonGame/components/ComItemIcon.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,222">
+<component size="222,254">
   <displayList>
-    <image id="n25_pu55" name="n25" src="orsttit" fileName="images/wpbb_di.png" xy="0,0" size="222,222">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n25_pu55" name="n25" src="orsttit" fileName="images/wpbb_di.png" xy="0,0" size="222,222"/>
     <loader id="n12_ehs9" name="loaIcon" xy="110,111" pivot="0.5,0.5" anchor="true" size="140,140" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
-    <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" visible="false" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="21,91" size="178,40" group="n29_pu55"/>

BIN
FGUIProject/assets/CommonGame/images/anniuty.png


BIN
FGUIProject/assets/CommonGame/images/anniuty2.png


BIN
FGUIProject/assets/CommonGame/images/anniuty3.png


BIN
FGUIProject/assets/CommonGame/images/anniuty_1.png


+ 6 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -236,6 +236,12 @@
     <font id="wonotja" name="NANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
     <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="r9ritjd" name="anniuty2.png" path="/images/" exported="true"/>
+    <image id="r9ritje" name="anniuty_1.png" path="/images/" exported="true"/>
+    <image id="r9ritjf" name="anniuty.png" path="/images/" exported="true"/>
+    <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
+    <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
+    <image id="r9ritji" name="anniuty3.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -2,7 +2,7 @@
 <component size="936,700">
   <displayList>
     <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,700"/>
-    <list id="n2_ohun" name="list" xy="116,203" size="717,240" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <list id="n2_ohun" name="list" xy="116,203" size="717,223" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
     </list>
     <text id="n3_ohun" name="txtTitle" xy="370,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>

+ 1 - 1
FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n12_qr4e" name="n12" src="qr4e28" fileName="images/wpzs_bji.png" xy="21,2"/>
     <text id="n9_ga16" name="txtName" xy="72,2" size="349,60" fontSize="40" color="#998570" autoSize="none" text="示例"/>
-    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="20" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>

+ 1 - 1
FGUIProject/assets/Mail/MailContentUI.xml

@@ -10,7 +10,7 @@
     <component id="n10_ehs9" name="ComContent" src="ehs9g" fileName="components/ComContent.xml" xy="60,280" size="815,418">
       <gearSize controller="c1" pages="0,1" values="815,795,1,1|815,418,1,1"/>
     </component>
-    <list id="n15_ehs9" name="listReward" xy="54,791" size="822,244" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="4" colGap="68" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <list id="n15_ehs9" name="listReward" xy="54,791" size="822,224" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="4" colGap="68" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>

+ 24 - 26
FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,44 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1130">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="1071,1336">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130" group="n19_mueb"/>
-    <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93" group="n19_mueb"/>
-    <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120" group="n19_mueb"/>
-    <image id="n27_qe01" name="n27" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="239,32" group="n29_qe01"/>
-    <text id="n28_qe01" name="txtName" xy="335,32" pivot="0.5,0" size="284,74" group="n29_qe01" fontSize="56" color="#8f6e30" text="活跃度奖励"/>
-    <group id="n29_qe01" name="n29" xy="239,32" size="475,85" group="n19_mueb"/>
-    <graph id="n32_qe01" name="n32" xy="43,140" size="850,58" group="n35_qe01" alpha="0.2" type="rect" lineSize="0" lineColor="#ff666666" fillColor="#ff666666" corner="10"/>
-    <text id="n33_qe01" name="txtItemName" xy="54,145" size="324,44" group="n35_qe01" fontSize="32" color="#cb9d57" text="目标道具:孔雀东南飞"/>
-    <text id="n34_qe01" name="txtItemNeedNum" xy="725,146" pivot="1,0" size="152,44" group="n35_qe01" fontSize="32" color="#cb9d57" align="right" text="还需:8个"/>
-    <group id="n35_qe01" name="grpNeeditem" xy="43,140" size="850,58" group="n19_mueb" advanced="true">
+    <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"/>
+    <text id="n28_qe01" name="txtName" xy="429,93" pivot="0.5,0" size="212,56" group="n29_qe01" font="ui://eg2y0ldpwonotj9" fontSize="42" color="#8f6e30" text="活跃度奖励"/>
+    <group id="n29_qe01" name="n29" xy="274,89" size="522,68" group="n19_mueb"/>
+    <image id="n36_r9ri" name="n36" src="r9rihh" fileName="images/zd_tzhdbj.png" xy="114,215" group="n35_qe01"/>
+    <text id="n33_qe01" name="txtItemName" xy="170,200" size="364,49" group="n35_qe01" fontSize="36" color="#b97d6d" text="目标道具:孔雀东南飞"/>
+    <text id="n34_qe01" name="txtItemNeedNum" xy="787,200" pivot="1,0" size="170,49" group="n35_qe01" fontSize="36" color="#b97d6d" align="right" text="还需:8个"/>
+    <group id="n35_qe01" name="grpNeeditem" xy="114,200" size="843,49" group="n19_mueb" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <list id="n13_s2cc" name="list" xy="20,153" size="895,760" group="n19_mueb" overflow="scroll" lineGap="10" align="center">
-      <gearXY controller="c1" pages="0,1" values="20,153|20,232"/>
-      <gearSize controller="c1" pages="0,1" values="895,760,1,1|895,681,1,1"/>
+    <list id="n13_s2cc" name="list" xy="88,277" size="895,773" group="n19_mueb" overflow="scroll" lineGap="20">
+      <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"/>
       <relation target="" sidePair="bottomext-bottom"/>
     </list>
-    <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" group="n19_mueb" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
-    <component id="n6_s2cc" name="btnExit" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="57,958" group="n16_nzmy">
-      <Button title="结束挑战"/>
+    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="148,1160" group="n16_nzmy">
+      <Button title="结束挑战" icon="ui://eg2y0ldpr9ritji"/>
     </component>
-    <component id="n5_s2cc" name="btnFightTimes" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="499,960" group="n16_nzmy">
+    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="580,1160" group="n16_nzmy">
       <Button title="挑战十次"/>
     </component>
-    <group id="n16_nzmy" name="n16" xy="57,958" size="822,113" group="n19_mueb" advanced="true" layout="hz" colGap="62" excludeInvisibles="true">
+    <group id="n16_nzmy" name="n16" xy="148,1160" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <group id="n19_mueb" name="n19" xy="0,-120" size="936,1250" advanced="true"/>
-    <text id="n25_mueb" name="n25" xy="324,380" 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="99,489" group="n24_mueb">
+    <component id="n37_r9ri" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="414,1090" group="n19_mueb"/>
+    <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="速刷中......"/>
+    <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="167,706" group="n24_mueb">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n22_mueb" name="bar" src="muebef" fileName="components/Component4.xml" xy="99,491" size="705,28" group="n24_mueb"/>
-    <image id="n23_mueb" name="n23" src="muebeb" fileName="images/sjsd_ss_3.png" xy="729,491" group="n24_mueb">
+    <component id="n22_mueb" name="bar" src="muebef" fileName="components/Component4.xml" xy="167,708" size="705,28" group="n24_mueb"/>
+    <image id="n23_mueb" name="n23" src="muebeb" fileName="images/sjsd_ss_3.png" xy="797,708" group="n24_mueb">
       <relation target="n22_mueb" sidePair="right-right"/>
     </image>
-    <group id="n24_mueb" name="n24" xy="99,380" size="737,141" visible="false" advanced="true"/>
+    <group id="n24_mueb" name="n24" xy="167,597" size="737,141" visible="false" advanced="true"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Size" target="n22_mueb" tween="true" startValue="0,28" endValue="705,28" duration="48" ease="Linear"/>

+ 8 - 10
FGUIProject/assets/Main/components/StoryFightQuicklyBonusListItem.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="864,400">
+<component size="882,324">
   <displayList>
-    <text id="n7_s2cc" name="txtTimes" xy="19,3" size="103,51" fontSize="38" color="#9b7853" vars="true" text="第{n=1}次"/>
-    <image id="n8_s2cc" name="n8" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="8,65" size="848,12"/>
-    <text id="n9_s2cc" name="txtExp" xy="760,14" size="77,41" fontSize="30" color="#ba9a78" vars="true" text="+{n=300}"/>
-    <image id="n10_s2cc" name="n10" src="8xpg4y" fileName="imagesFight/zd_jsjm_jyz.png" xy="629,13"/>
-    <list id="n11_s2cc" name="list" xy="-1,97" size="865,276" layout="flow_hz" lineGap="20" colGap="60" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
+    <image id="n12_r9ri" name="n12" src="r9rihj" fileName="images/zd_tzhddi_2.png" xy="0,0">
+      <relation target="n11_s2cc" sidePair="height-height"/>
+    </image>
+    <text id="n7_s2cc" name="txtTimes" xy="50,11" size="109,54" font="ui://eg2y0ldpwonotjc" fontSize="40" color="#a07c49" vars="true" text="第{n=1}次"/>
+    <text id="n9_s2cc" name="txtExp" xy="642,17" size="195,41" fontSize="30" color="#bb9b6c" vars="true" text="经验值:+{n=300}"/>
+    <list id="n11_s2cc" name="list" xy="23,72" pivot="0.5,0" size="835,252" layout="flow_hz" lineGap="-10" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>
     </list>
   </displayList>
+  <relation target="n11_s2cc" sidePair="height-height"/>
 </component>

+ 2 - 2
FGUIProject/assets/Main/components/StoryFightQuicklyComplete.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="924,78">
+<component size="944,70">
   <displayList>
-    <image id="n0_s2cc" name="bg" src="s2cc54" fileName="imagesFight/zd_wctsxs.png" xy="0,0"/>
+    <image id="n0_s2cc" name="bg" src="r9rihl" fileName="images/zd_wctsxs.png" xy="0,0"/>
   </displayList>
 </component>

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


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


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


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


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


BIN
FGUIProject/assets/Main/imagesFight/zd_wctsxs.png


+ 6 - 2
FGUIProject/assets/Main/package.xml

@@ -117,7 +117,6 @@
     <component id="8xpg50" name="ProgressBarExp.xml" path="/components/"/>
     <component id="8xpg52" name="CompFightExpBar.xml" path="/components/"/>
     <component id="s2cc53" name="StoryFightQuicklyUI.xml" path="/" exported="true"/>
-    <image id="s2cc54" name="zd_wctsxs.png" path="/imagesFight/"/>
     <image id="s2cc56" name="zd_jsjm_sbsz_0.png" path="/Font3/"/>
     <image id="s2cc57" name="zd_jsjm_sbsz_1.png" path="/Font3/"/>
     <image id="s2cc58" name="zd_jsjm_sbsz_2.png" path="/Font3/"/>
@@ -355,7 +354,7 @@
     <image id="k1khe9" name="zdsz_10.png" path="/Font5/"/>
     <image id="k1khea" name="zdsz_11.png" path="/Font5/"/>
     <image id="muebeb" name="sjsd_ss_3.png" path="/images/"/>
-    <image id="muebec" name="sjsd_ss_1.png" path="/images/"/>
+    <image id="muebec" name="sjsd_ss_1.png" path="/images/" scale="9grid" scale9grid="177,8,354,16"/>
     <image id="muebed" name="sjsd_ss_2.png" path="/images/"/>
     <component id="muebef" name="Component4.xml" path="/components/"/>
     <component id="c2umeg" name="comMineCircle.xml" path="/components/"/>
@@ -433,6 +432,11 @@
     <component id="wonohe" name="ComRoleResult3.xml" path="/components/"/>
     <component id="wonohf" name="ComRoleResult4.xml" path="/components/"/>
     <image id="wonohg" name="zjm_e_5.png" path="/images/"/>
+    <image id="r9rihh" name="zd_tzhdbj.png" path="/images/"/>
+    <image id="r9rihi" name="zd_tzhddi_1.png" path="/images/"/>
+    <image id="r9rihj" name="zd_tzhddi_2.png" path="/images/" scale="9grid" scale9grid="219,154,440,119"/>
+    <image id="r9rihk" name="zd_tzhdkua_1.png" path="/images/"/>
+    <image id="r9rihl" name="zd_wctsxs.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -7,7 +7,7 @@
     <text id="n1_10not" name="txtName" xy="354,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
     <loader id="n2_10not" name="loaIcon" xy="44,159" pivot="0.5,0.5" size="250,250" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
     <text id="n3_10not" name="txtLimit" xy="100,420" pivot="0.5,0" size="132,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="永久限购"/>
-    <list id="n4_10not" name="list" xy="299,215" size="690,228" scale="0.9,0.9" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <list id="n4_10not" name="list" xy="299,215" size="690,221" scale="0.9,0.9" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
       <item/>
       <item/>

+ 1 - 1
FGUIProject/assets/Studio/components/ListRewardItem.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n4_orst" name="n4" src="orst23" fileName="images/pfjl_xiaodik.png" xy="0,0"/>
     <text id="n2_rqo4" name="txtDesc" xy="67,49" size="296,49" fontSize="36" color="#7d6446" text="总评分达到99999"/>
-    <list id="n3_rqo4" name="listReward" xy="343,-39" pivot="1,0.5" size="523,229" layout="row" colGap="-60" defaultItem="ui://eg2y0ldpj48o98" align="right">
+    <list id="n3_rqo4" name="listReward" xy="343,-37" pivot="1,0.5" size="523,225" layout="row" colGap="-60" defaultItem="ui://eg2y0ldpj48o98" align="right">
       <item/>
       <item/>
     </list>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -9,6 +9,7 @@ namespace UI.CommonGame
         public GComponent target;
         public UI_ComItemIcon m_comItemIcon;
         public GTextField m_txtCount;
+        public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         {
             m_comItemIcon = (UI_ComItemIcon)UI_ComItemIcon.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comItemIcon.Dispose();
             m_comItemIcon = null;
             m_txtCount = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs

@@ -8,7 +8,6 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GTextField m_txtName;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
         public GImage m_imgHas;
@@ -63,7 +62,6 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_imgHas = (GImage)comp.GetChild("imgHas");
@@ -74,7 +72,6 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_txtName = null;
             m_txtHasCount = null;
             m_loaRarity = null;
             m_imgHas = null;

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightQuicklyUI.cs

@@ -13,9 +13,9 @@ namespace UI.Main
         public GTextField m_txtItemNeedNum;
         public GGroup m_grpNeeditem;
         public GList m_list;
-        public GTextField m_txtPowerDesc;
         public GButton m_btnExit;
         public GButton m_btnFightTimes;
+        public GComponent m_comCostCurrent;
         public UI_Component4 m_bar;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8ks2cc53";
@@ -71,9 +71,9 @@ namespace UI.Main
             m_txtItemNeedNum = (GTextField)comp.GetChild("txtItemNeedNum");
             m_grpNeeditem = (GGroup)comp.GetChild("grpNeeditem");
             m_list = (GList)comp.GetChild("list");
-            m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnFightTimes = (GButton)comp.GetChild("btnFightTimes");
+            m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_bar = (UI_Component4)UI_Component4.Create(comp.GetChild("bar"));
             m_t0 = comp.GetTransition("t0");
         }
@@ -85,9 +85,9 @@ namespace UI.Main
             m_txtItemNeedNum = null;
             m_grpNeeditem = null;
             m_list = null;
-            m_txtPowerDesc = null;
             m_btnExit = null;
             m_btnFightTimes = null;
+            m_comCostCurrent = null;
             m_bar.Dispose();
             m_bar = null;
             m_t0 = null;

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -27,7 +27,7 @@ namespace GFGGame
             _item = obj.GetChild("comItemIcon").asCom;
             _loaIcon = _item.GetChild("loaIcon") as GLoader;
             _loaRarity = _item.GetChild("loaRarity") as GLoader;
-            _txtName = _item.GetChild("txtName") as GTextField;
+            _txtName = obj.GetChild("txtName") as GTextField;
             _txtCount = obj.GetChild("txtCount") as GTextField;
             _txtHasCount = _item.GetChild("txtHasCount") as GTextField;
             // _imgGot = obj.GetChild("imgGot") as GImage;
@@ -62,6 +62,7 @@ namespace GFGGame
             _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             // _imgGot.visible = false;
+            _txtName.visible = false;
             _grpGot.visible = false;
             _imgNotHas.visible = false;
             _imgHas.visible = false;
@@ -220,5 +221,9 @@ namespace GFGGame
         {
             _txtCount.SetPosition(x, y, 0);
         }
+        public void SetTxtNamePos(int x, int y)
+        {
+            _txtName.SetPosition(x, y, 0);
+        }
     }
 }

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

@@ -39,6 +39,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            this.clickBlankToClose = false;
 
             _ui.m_btnExit.onClick.Add(Hide);
             _ui.m_btnFightTimes.onClick.Add(StartFight);
@@ -123,20 +124,19 @@ namespace GFGGame
             }
 
             this.clickBlankToClose = false;
-
+            _ui.m_comCostCurrent.visible = false;
             // _ui.m_t0.Play(() =>
             // {
             _fightTimes = _fightType == 1 ? 1 : _fightTimes;
             _ui.m_btnExit.visible = false;
             _ui.m_btnFightTimes.visible = false;
-            _ui.m_txtPowerDesc.visible = false;
+            _ui.m_comCostCurrent.visible = false;
             _ui.m_list.RemoveChildren();
             InstanceZonesDataManager.isQuicklyFighting = true;
             // InstanceZonesSProxy.FinishStoryFightQuickly(_levelID, _fightType == 1 ? 1 : times).Coroutine();
             _index = 0;
 
             ReqFightQuickly(null);
-            this.clickBlankToClose = true;
             // });
         }
         private async void ReqFightQuickly(object param)
@@ -193,8 +193,14 @@ namespace GFGGame
             _ui.m_list.ScrollToView(_index, true);
             UpdateBtnFightTimes();
             updateNeedItem();
-            _index = 0;
 
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+            int power = _index * levelCfg.power;
+            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, power);
+            _ui.m_comCostCurrent.visible = true;
+
+            _index = 0;
+            this.clickBlankToClose = true;
         }
 
         private void ListItemRender(int index, GObject item)
@@ -205,7 +211,11 @@ namespace GFGGame
                 item.data = new ItemView(item as GComponent);
             }
             (item.data as ItemView).SetData(itemData);
-            (item.data as ItemView).ShowHasCount = false;
+            (item.data as ItemView).ShowName = true;
+            (item.data as ItemView).SetComItemScale = 0.8f;
+            (item.data as ItemView).SetTxtCountPos(210, 160);
+            (item.data as ItemView).SetTxtNamePos(110, 200);
+            // (item.data as ItemView).ShowHasCount = false;
         }
 
         private void UpdateBtnFightTimes()
@@ -218,12 +228,6 @@ namespace GFGGame
                 _ui.m_btnFightTimes.title = _fightType == 1 ? "挑战一次" : title;
                 _ui.m_btnFightTimes.visible = _fightTimes > 0;
 
-                _ui.m_txtPowerDesc.visible = _ui.m_btnFightTimes.visible;
-                if (_ui.m_txtPowerDesc.visible)
-                {
-                    int power = _fightTimes * levelCfg.power;
-                    _ui.m_txtPowerDesc.SetVar("v1", "" + power).FlushVars();
-                }
                 _fightTimes = _fightType == 1 ? 1 : _fightTimes;
             }
         }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


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


BIN
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Mail/Mail_fui.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_2!a.png


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


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.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_7!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8f48749c8e06de94d94e995d02d708a2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


+ 96 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: a8df243afd809c1418cb63a8cd519327
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes