فهرست منبع

feat 任务修改提交

Jae 2 سال پیش
والد
کامیت
c7797277b7
100فایلهای تغییر یافته به همراه848 افزوده شده و 124 حذف شده
  1. 0 0
      FGUIProject/assets/CommonGame/components/Button11.xml
  2. 0 0
      FGUIProject/assets/CommonGame/imagesExport/lm_an__xuanzhong_qifu.png
  3. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an__3xuanzhong2.png
  4. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an__weixuan_qifu.png
  5. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue.png
  6. BIN
      FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue_1.png
  7. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an_yellow.png
  8. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_dt_zsx1.png
  9. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_tb.png
  10. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_tb_tishi.png
  11. 11 1
      FGUIProject/assets/CommonGame/package.xml
  12. 2 2
      FGUIProject/assets/League/LeagueAnsweringUI.xml
  13. 1 1
      FGUIProject/assets/League/LeagueApplyUI.xml
  14. 2 2
      FGUIProject/assets/League/LeagueConstructUI.xml
  15. 2 2
      FGUIProject/assets/League/LeagueGiftUI.xml
  16. 1 1
      FGUIProject/assets/League/LeagueMemberAppointUI.xml
  17. 1 1
      FGUIProject/assets/League/LeagueMemberUI.xml
  18. 1 1
      FGUIProject/assets/League/LeagueUI.xml
  19. 2 2
      FGUIProject/assets/League/components/Button20.xml
  20. 1 1
      FGUIProject/assets/League/components/Button3.xml
  21. 1 1
      FGUIProject/assets/League/components/Button4.xml
  22. 1 1
      FGUIProject/assets/League/components/ListApplyItem.xml
  23. 1 1
      FGUIProject/assets/League/components/ListGiftButItem.xml
  24. 1 10
      FGUIProject/assets/League/package.xml
  25. 10 19
      FGUIProject/assets/RechargeStore/package.xml
  26. 50 0
      FGUIProject/assets/Task/BattlePassRewardUI.xml
  27. 0 7
      FGUIProject/assets/Task/ComBattle.xml
  28. 4 4
      FGUIProject/assets/Task/TaskUI.xml
  29. 34 0
      FGUIProject/assets/Task/components/BattlePassRewardItem.xml
  30. 11 0
      FGUIProject/assets/Task/components/ButtonOpenBattlePass.xml
  31. 15 0
      FGUIProject/assets/Task/components/ExpProcess.xml
  32. 3 3
      FGUIProject/assets/Task/components/ListItem.xml
  33. 9 0
      FGUIProject/assets/Task/components/RewardIconBlue.xml
  34. 9 0
      FGUIProject/assets/Task/components/RewardIconYellow.xml
  35. BIN
      FGUIProject/assets/Task/images/an_jia.png
  36. BIN
      FGUIProject/assets/Task/images/an_jian.png
  37. BIN
      FGUIProject/assets/Task/images/bt_db_dj.png
  38. BIN
      FGUIProject/assets/Task/images/bt_db_jlzz.png
  39. BIN
      FGUIProject/assets/Task/images/bt_db_ptzz.png
  40. BIN
      FGUIProject/assets/Task/images/cz_an_pink.png
  41. BIN
      FGUIProject/assets/Task/images/db_jiajian.png
  42. BIN
      FGUIProject/assets/Task/images/jdt_bg.png
  43. BIN
      FGUIProject/assets/Task/images/jdt_bk.png
  44. BIN
      FGUIProject/assets/Task/images/jdt_pink_2.png
  45. BIN
      FGUIProject/assets/Task/images/jlzz_djbg.png
  46. BIN
      FGUIProject/assets/Task/images/jyt_dk.png
  47. BIN
      FGUIProject/assets/Task/images/jyt_dk_2.png
  48. BIN
      FGUIProject/assets/Task/images/jyt_fgx.png
  49. BIN
      FGUIProject/assets/Task/images/jyt_liang.png
  50. BIN
      FGUIProject/assets/Task/images/jyt_pink.png
  51. BIN
      FGUIProject/assets/Task/images/jyt_yellow.png
  52. BIN
      FGUIProject/assets/Task/images/lm_biaotizi_12.png
  53. BIN
      FGUIProject/assets/Task/images/lm_biaotizi_13.png
  54. BIN
      FGUIProject/assets/Task/images/mrrw_bq_qb.png
  55. BIN
      FGUIProject/assets/Task/images/mrrw_db.png
  56. BIN
      FGUIProject/assets/Task/images/sj_dk.png
  57. BIN
      FGUIProject/assets/Task/images/txz_jlzz_db_jlzz.png
  58. BIN
      FGUIProject/assets/Task/images/txz_jlzz_db_pt.png
  59. BIN
      FGUIProject/assets/Task/images/txz_jlzz_tbdj_db.png
  60. BIN
      FGUIProject/assets/Task/images/txz_lvl_db.png
  61. BIN
      FGUIProject/assets/Task/images/txz_nr_db.png
  62. BIN
      FGUIProject/assets/Task/images/wpk_db_1.png
  63. BIN
      FGUIProject/assets/Task/images/wpk_db_2.png
  64. BIN
      FGUIProject/assets/Task/images/wpk_sz_db.png
  65. BIN
      FGUIProject/assets/Task/images/wpk_sz_db2.png
  66. BIN
      FGUIProject/assets/Task/images/wpk_zz.png
  67. BIN
      FGUIProject/assets/Task/images/wz_kqjlzz.png
  68. BIN
      FGUIProject/assets/Task/images/yeqian_db.png
  69. BIN
      FGUIProject/assets/Task/images/yeqian_xz.png
  70. BIN
      FGUIProject/assets/Task/images/zsx_flower.png
  71. 43 1
      FGUIProject/assets/Task/package.xml
  72. 41 12
      GameClient/Assets/Editor/Excel/ExcelReader.cs
  73. 3 3
      GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs
  74. 93 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs
  75. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs.meta
  76. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs
  77. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs.meta
  78. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs
  79. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs.meta
  80. 11 21
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs
  81. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs.meta
  82. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs
  83. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs.meta
  84. 3 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs
  85. 0 4
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs
  86. 3 3
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  87. 3 0
      GameClient/Assets/Game/HotUpdate/Views/Task.meta
  88. 173 0
      GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs
  89. 3 0
      GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs.meta
  90. 20 12
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs
  91. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs.meta
  92. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  93. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  94. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  95. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  96. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  97. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  98. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  99. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  100. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png

+ 0 - 0
FGUIProject/assets/League/components/Button11.xml → FGUIProject/assets/CommonGame/components/Button11.xml


+ 0 - 0
FGUIProject/assets/League/images/lm_an__xuanzhong_qifu.png → FGUIProject/assets/CommonGame/imagesExport/lm_an__xuanzhong_qifu.png


+ 0 - 0
FGUIProject/assets/League/images/lm_an__3xuanzhong2.png → FGUIProject/assets/CommonGame/imagesNew/lm_an__3xuanzhong2.png


+ 0 - 0
FGUIProject/assets/League/images/lm_an__weixuan_qifu.png → FGUIProject/assets/CommonGame/imagesNew/lm_an__weixuan_qifu.png


+ 0 - 0
FGUIProject/assets/League/images/lm_an_jujue.png → FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue.png


BIN
FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue_1.png


+ 0 - 0
FGUIProject/assets/League/images/lm_an_yellow.png → FGUIProject/assets/CommonGame/imagesNew/lm_an_yellow.png


+ 0 - 0
FGUIProject/assets/League/images/lm_dt_zsx1.png → FGUIProject/assets/CommonGame/imagesNew/lm_dt_zsx1.png


+ 0 - 0
FGUIProject/assets/League/images/lm_tb.png → FGUIProject/assets/CommonGame/imagesNew/lm_tb.png


+ 0 - 0
FGUIProject/assets/League/images/lm_tb_tishi.png → FGUIProject/assets/CommonGame/imagesNew/lm_tb_tishi.png


+ 11 - 1
FGUIProject/assets/CommonGame/package.xml

@@ -285,6 +285,16 @@
     <image id="wm603g" name="lm_an__3weixuan.png" path="/imagesNew/" exported="true"/>
     <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
+    <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
+    <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
+    <image id="nd17tlv" name="lm_an_jujue_1.png" path="/imagesNew/"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
+    <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -36,7 +36,7 @@
     </component>
     <text id="n7_pvb4" name="txtTime" xy="706,713" size="275,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ceb188" text="活动剩余时间 00:00"/>
     <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="663,718" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
@@ -122,7 +122,7 @@
     <image id="n47_9jv6" name="n47" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665" group="n56_miy3"/>
     <image id="n48_9jv6" name="n48" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779" group="n56_miy3"/>
     <text id="n35_pvb4" name="txtChat" xy="110,1784" size="653,44" group="n56_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
-    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3">
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3" pkg="eg2y0ldp">
       <Button title="发送"/>
     </component>
     <group id="n56_miy3" name="n56" xy="0,1665" size="1080,255" advanced="true">

+ 1 - 1
FGUIProject/assets/League/LeagueApplyUI.xml

@@ -7,7 +7,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="642,86" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <list id="n4_rv09" name="list" xy="140,165" size="820,531" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
       <item/>

+ 2 - 2
FGUIProject/assets/League/LeagueConstructUI.xml

@@ -46,7 +46,7 @@
     <group id="n56_o9gh" name="n56" xy="424,487" size="259,140" group="n17_rv09" advanced="true" layout="vt" excludeInvisibles="true"/>
     <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="454,792" group="n17_rv09"/>
     <component id="n68_o9gh" name="btnTips" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="631,235" size="36,37" group="n17_rv09">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
@@ -65,7 +65,7 @@
     <group id="n28_rv09" name="n28" xy="706,187" size="295,736" group="n67_o9gh"/>
     <group id="n67_o9gh" name="n67" xy="118,187" size="883,736" advanced="true"/>
     <component id="n69_o9gh" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="344,968" size="36,37" group="n72_o9gh">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n70_o9gh" name="n70" xy="389,966" size="202,35" group="n72_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#8d817a" text="雅集每日维护资金"/>
     <component id="n71_o9gh" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="607,960" group="n72_o9gh" controller="c1,1"/>

+ 2 - 2
FGUIProject/assets/League/LeagueGiftUI.xml

@@ -22,9 +22,9 @@
     </component>
     <group id="n6_pvb4" name="n6" xy="613,88" size="304,63"/>
     <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="920,101" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
-    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697">
+    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="一键领取"/>

+ 1 - 1
FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -10,7 +10,7 @@
     <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
     <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="911,26"/>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <image id="n11_o9gh" name="n11" src="o9gh4h" fileName="images/lm_kuang_3.png" xy="60,149" group="n16_o9gh"/>
     <text id="n12_o9gh" name="n12" xy="270,151" size="60,39" group="n16_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" text="职位"/>

+ 1 - 1
FGUIProject/assets/League/LeagueMemberUI.xml

@@ -43,7 +43,7 @@
     <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
       <Button title="联盟信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09" pkg="eg2y0ldp">
       <Button title="退出联盟"/>
     </component>
     <group id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">

+ 1 - 1
FGUIProject/assets/League/LeagueUI.xml

@@ -9,7 +9,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37" visible="false">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
       <Button title="雅集成员"/>

+ 2 - 2
FGUIProject/assets/League/components/Button20.xml

@@ -2,10 +2,10 @@
 <component size="189,58" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="3"/>
   <displayList>
-    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
+    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0" pkg="eg2y0ldp">
       <gearDisplay controller="button" pages="4"/>
     </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://tw70qm9do9gh4k" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://eg2y0ldpo9gh4k" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="64,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#683c28" align="center" vars="true" text="升级">

+ 1 - 1
FGUIProject/assets/League/components/Button3.xml

@@ -7,7 +7,7 @@
       <gearSize controller="c1" pages="1" values="146,47,1,1" default="280,47,1,1"/>
     </image>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="168,61" aspect="true" url="ui://tw70qm9da0cf2v" fill="scale" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://tw70qm9da0cf2o|ui://tw70qm9da0cf2v"/>
+      <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpa0cf2o|ui://tw70qm9da0cf2v"/>
     </loader>
     <text id="n7_a0cf" name="txtCount" xy="173,10" pivot="0.5,0" size="78,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=30}/{maxValue=30}">
       <gearXY controller="c1" pages="0,1" values="264,10|173,10"/>

+ 1 - 1
FGUIProject/assets/League/components/Button4.xml

@@ -2,7 +2,7 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://eg2y0ldpa0cf2o" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="67,11" pivot="0.5,0" size="116,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="搜索雅集">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

+ 1 - 1
FGUIProject/assets/League/components/ListApplyItem.xml

@@ -7,7 +7,7 @@
       <Button title="同意"/>
     </component>
     <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39" pkg="eg2y0ldp">
-      <Button title="拒绝" icon="ui://tw70qm9do9gh4o"/>
+      <Button title="拒绝" icon="ui://eg2y0ldpo9gh4o"/>
     </component>
     <image id="n5_o9gh" name="n5" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="0,108" size="816,12"/>
   </displayList>

+ 1 - 1
FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -5,7 +5,7 @@
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余:1/1"/>
     <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
+      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
     <list id="n13_pvb4" name="listGift" xy="-438,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">

+ 1 - 10
FGUIProject/assets/League/package.xml

@@ -32,7 +32,6 @@
     <component id="rv091l" name="Button10.xml" path="/components/"/>
     <component id="rv091m" name="ComLeader.xml" path="/components/"/>
     <component id="rv091n" name="ListMemberItem.xml" path="/components/"/>
-    <component id="rv091o" name="Button11.xml" path="/components/"/>
     <component id="rv091r" name="Button14.xml" path="/components/"/>
     <component id="rv091s" name="Button15.xml" path="/components/"/>
     <component id="rv091z" name="ListApplyItem.xml" path="/components/"/>
@@ -46,10 +45,8 @@
     <image id="a0cf2e" name="lm_db.png" path="/images/"/>
     <image id="a0cf2f" name="lm_db2.png" path="/images/"/>
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
-    <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
     <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
     <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
-    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
     <image id="a0cf2q" name="lm_db_chang.png" path="/images/" scale="9grid" scale9grid="0,486,1080,275"/>
     <image id="a0cf2r" name="lm_kuang_1.png" path="/images/"/>
@@ -96,7 +93,6 @@
     <image id="o9gh48" name="lm_zjm_gnkuang.png" path="/images/"/>
     <image id="o9gh49" name="lm_zjm_djs.png" path="/images/"/>
     <image id="o9gh4a" name="lm_zjm_chkuang.png" path="/images/"/>
-    <image id="o9gh4b" name="lm_tb_tishi.png" path="/images/"/>
     <image id="o9gh4c" name="lm_tb_db_weixuan.png" path="/images/"/>
     <image id="o9gh4d" name="lm_tb_db.png" path="/images/"/>
     <image id="o9gh4e" name="tb_gou.png" path="/images/"/>
@@ -105,9 +101,6 @@
     <image id="o9gh4h" name="lm_kuang_3.png" path="/images/"/>
     <image id="o9gh4i" name="lm_db_2.png" path="/images/"/>
     <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
-    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/images/"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/images/"/>
-    <image id="o9gh4o" name="lm_an_jujue.png" path="/images/"/>
     <image id="o9gh4p" name="biaotizi_9.png" path="/images/"/>
     <image id="o9gh4q" name="biaotizi_8.png" path="/images/"/>
     <image id="o9gh4r" name="biaotizi_7.png" path="/images/"/>
@@ -136,7 +129,6 @@
     <image id="9jv65j" name="biaotizi12.png" path="/images/"/>
     <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
     <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
-    <image id="9jv65m" name="lm_dt_zsx1.png" path="/images/"/>
     <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
     <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
     <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
@@ -160,7 +152,6 @@
     <image id="9jv669" name="biaotizi_11.png" path="/images/"/>
     <image id="9jv66a" name="fannao.png" path="/images/"/>
     <image id="9jv66b" name="liuhan.png" path="/images/"/>
-    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/images/"/>
     <image id="9jv66g" name="lm_biaoqian_ylq.png" path="/images/"/>
     <image id="9jv66i" name="lm_biaotizi_13.png" path="/images/"/>
     <image id="9jv66j" name="lm_zsx0.png" path="/images/"/>
@@ -212,5 +203,5 @@
     <component id="miy37v" name="ListSkillScore.xml" path="/"/>
     <component id="miy37w" name="Button124.xml" path="/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 10 - 19
FGUIProject/assets/RechargeStore/package.xml

@@ -4,6 +4,13 @@
     <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
     <image id="d4iwd" name="sc_yj_xiantiao.png" path="/images/" scale="9grid" scale9grid="14,0,28,0"/>
     <image id="d4iwg" name="sc_kuangjiazi_1.png" path="/images/"/>
+    <image id="d4iwh" name="sc_kuangjiazi_2.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwl" name="sc_zizhuan_1.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwm" name="sc_zizhuan_2.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwn" name="sc_zizhuan_3.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwo" name="sc_zizhuan_4.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwp" name="sc_zizhuan_5.png" path="/imagesExport/" exported="true"/>
+    <image id="d4iwq" name="sc_zizhuan_6.png" path="/imagesExport/" exported="true"/>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
     <component id="nz0t14" name="Button1.xml" path="/components/"/>
     <image id="dmsi15" name="scsc_anniuej_2.png" path="/images/"/>
@@ -32,32 +39,16 @@
     <image id="10not1u" name="sc_kuangand.png" path="/images/"/>
     <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
+    <image id="10not1w" name="jinbi_1.png" path="/imagesExport/"/>
     <image id="10not1x" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="19,2,38,4"/>
     <image id="iftftaa" name="sc_cwcw_1.png" path="/images/"/>
     <image id="iftftab" name="sc_cwcw_2.png" path="/images/"/>
     <image id="iftftac" name="sc_cwcw_3.png" path="/images/"/>
+    <image id="iftftad" name="jinbi_1(1).png" path="/imagesExport/"/>
     <image id="iftftae" name="sc_xtxtxt(1).png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <image id="t8xrtag" name="sc_kuangdikjia_3.png" path="/images/"/>
     <image id="qqattah" name="scsc_fuhao.png" path="/images/"/>
-    <component id="fqor7x" name="StoreUI.xml" path="/"/>
-    <image id="fqortai" name="sc_zhuangshishan.png" path="/imagesNew/"/>
-    <image id="fqortaj" name="sc_tab_yueka_xuanzhong.png" path="/imagesNew/"/>
-    <image id="fqortak" name="sc_tab_yueka.png" path="/imagesNew/"/>
-    <image id="fqortal" name="sc_tab_libao_xuanzhong.png" path="/imagesNew/"/>
-    <image id="fqortam" name="sc_tab_libao.png" path="/imagesNew/"/>
-    <image id="fqortan" name="sc_tab_chognzhi_xuanzhong.png" path="/imagesNew/"/>
-    <image id="fqortao" name="sc_tab_chognzhi.png" path="/imagesNew/"/>
-    <image id="fqortap" name="sc_zhuangshihua.png" path="/imagesNew/"/>
-    <image id="fqortaq" name="sc_tab_xuanzhong.png" path="/imagesNew/"/>
-    <image id="fqortar" name="sc_xiangqing.png" path="/imagesNew/"/>
-    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/"/>
-    <image id="fqortat" name="sc_jiazi.png" path="/imagesNew/"/>
-    <image id="fqortau" name="sc_xian.png" path="/imagesNew/"/>
-    <image id="fqortav" name="sc_subTab_xz.png" path="/imagesNew/"/>
-    <image id="fqortaw" name="sc_subtab.png" path="/imagesNew/"/>
-    <image id="fqortax" name="sc_tab.png" path="/imagesNew/"/>
-    <image id="fqortay" name="sc_zhuangshihua1.png" path="/imagesNew/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 50 - 0
FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <image id="n33_nd17" name="n33" src="nd172z" fileName="images/txz_nr_db.png" xy="0,691"/>
+    <image id="n15_nd17" name="n15" src="nd172t" fileName="images/sj_dk.png" xy="0,310">
+      <relation target="" sidePair="left-right"/>
+    </image>
+    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,303" size="61,61"/>
+    <component id="n18_nd17" name="n18" src="nd173t" fileName="components/ExpProcess.xml" xy="107,601">
+      <relation target="" sidePair="left-left"/>
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <text id="n19_nd17" name="LeftTime" xy="59,311" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <image id="n20_nd17" name="n20" src="nd173b" fileName="images/bt_db_dj.png" xy="15,691"/>
+    <text id="n21_nd17" name="n21" xy="40,697" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" text="等级"/>
+    <image id="n35_nd17" name="n35" src="nd173g" fileName="images/jdt_bg.png" xy="47,733"/>
+    <image id="n22_nd17" name="n22" src="nd173i" fileName="images/jdt_pink_2.png" xy="59,746" size="22,996"/>
+    <image id="n25_nd17" name="n25" src="nd172u" fileName="images/txz_jlzz_db_jlzz.png" xy="391,681"/>
+    <image id="n31_nd17" name="n31" src="nd172v" fileName="images/txz_jlzz_db_pt.png" xy="136,711"/>
+    <image id="n26_nd17" name="n26" src="nd172w" fileName="images/txz_jlzz_tbdj_db.png" xy="0,1558"/>
+    <image id="n27_nd17" name="n27" src="nd173c" fileName="images/bt_db_jlzz.png" xy="407,691"/>
+    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="819,706" flip="hz"/>
+    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="514,707"/>
+    <text id="n30_nd17" name="n30" xy="668,697" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" text="锦罗织造"/>
+    <image id="n32_nd17" name="n32" src="nd173d" fileName="images/bt_db_ptzz.png" xy="138,691"/>
+    <list id="n48_nd17" name="RewardList" xy="2,746" size="1080,806" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n36_nd17" name="n36" src="nd173q" fileName="images/zsx_flower.png" xy="742,746"/>
+    <text id="n37_nd17" name="n37" xy="201,697" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" text="普通织造"/>
+    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <component id="n50_nd17" name="n50" src="nd173u" fileName="components/BattlePassRewardItem.xml" xy="0,1577"/>
+    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="430,1803">
+      <Button title="一键领取"/>
+    </component>
+  </displayList>
+</component>

+ 0 - 7
FGUIProject/assets/Task/ComBattle.xml

@@ -5,13 +5,6 @@
     <remark page="1" value="特别织造"/>
   </controller>
   <displayList>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="普通织造" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="特别织造" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
     <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
     <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
     <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>

+ 4 - 4
FGUIProject/assets/Task/TaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="2">
+  <controller name="c1" pages="2,,0,,1," selected="0">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
@@ -11,20 +11,20 @@
     <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,170">
+    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,170">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="167,187" group="n17_fqor">
       <Button title="今日任务" controller="c1" page="0"/>
     </component>
     <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="457,187" group="n17_fqor">
-      <Button checked="true" title="锦罗织造" controller="c1" page="1"/>
+      <Button title="锦罗织造" controller="c1" page="1"/>
     </component>
     <group id="n17_fqor" name="n17" xy="167,187" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n1_lh8v" name="comTask" src="fqor2p" fileName="ComTask.xml" xy="66,290" size="947,1558">
       <gearDisplay controller="c1" pages="0"/>
     </component>
-    <component id="n18_fqor" name="comBattle" src="fqor2q" fileName="ComBattle.xml" xy="66,290">
+    <component id="n22_nd17" name="n22" src="nd173r" fileName="BattlePassRewardUI.xml" xy="0,0">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

+ 34 - 0
FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,153">
+  <controller name="c1" pages="0,GetReward,1,HadGet,2,Continue,3,Come" selected="0">
+    <remark page="0" value="领取奖励"/>
+    <remark page="1" value="已领取"/>
+    <remark page="2" value="继续领取"/>
+    <remark page="3" value="前往"/>
+  </controller>
+  <displayList>
+    <image id="n6_nd17" name="n6" src="nd172x" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,10"/>
+    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
+    </component>
+    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
+    </component>
+    <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="3"/>
+      <Button title="前往" icon="ui://eg2y0ldpnd17tlv"/>
+    </component>
+    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
+    </component>
+    <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
+    <list id="n18_vixc" name="RewardList" xy="450,18" size="270,111" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
+      <item url="ui://5mpsibzznd1743"/>
+      <item url="ui://5mpsibzznd1743"/>
+    </list>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/Task/components/ButtonOpenBattlePass.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="288,83" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nd17" name="n0" src="nd173e" fileName="images/cz_an_pink.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_nd17" name="n1" xy="52,18" size="184,44" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="center" autoSize="none" strokeColor="#e89999" shadowColor="#b36f6e" shadowOffset="3,1" text="开启锦罗织造"/>
+  </displayList>
+  <Button/>
+</component>

+ 15 - 0
FGUIProject/assets/Task/components/ExpProcess.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="346,22" extention="ProgressBar">
+  <displayList>
+    <image id="n0_nd17" name="n0" src="nd173k" fileName="images/jyt_dk_2.png" xy="0,0" size="346,22">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_nd17" name="ExpBar" src="nd1739" fileName="images/jyt_yellow.png" xy="0,1" size="346,19"/>
+    <image id="n2_nd17" name="n2" src="nd172x" fileName="images/txz_lvl_db.png" xy="-99,-50"/>
+    <text id="n3_nd17" name="n3" xy="-51,-23" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
+    <text id="n4_nd17" name="Level" xy="-50,-11" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
+    <text id="n5_nd17" name="NumProcess" xy="49,-43" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
+    <image id="n6_nd17" name="n6" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="6,-36"/>
+  </displayList>
+  <ProgressBar titleType="valueAndmax"/>
+</component>

+ 3 - 3
FGUIProject/assets/Task/components/ListItem.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="940,160">
-  <controller name="c1" pages="1,,2,,3," selected="2">
+  <controller name="c1" pages="1,,2,,3," selected="0">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <controller name="c2" alias="是否跳转" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n1_lh8v" name="txtDesc" xy="29,2" size="305,51" fontSize="38" color="#f4e2a9" text="任务描述任务描述"/>
+    <text id="n1_lh8v" name="txtDesc" xy="29,2" size="308,52" fontSize="38" color="#f4e2a9" text="任务描述任务描述"/>
     <component id="n3_lh8v" name="btnGet" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://5mpsibzzwet22c"/>
@@ -21,7 +21,7 @@
       <gearDisplay controller="c1" pages="3"/>
       <Button icon="ui://5mpsibzzwet22e"/>
     </component>
-    <text id="n5_lh8v" name="txtCount" xy="760,0" pivot="0.5,0" size="58,41" fontSize="30" color="#f4e2a9" align="center" text="0/5"/>
+    <text id="n5_lh8v" name="txtCount" xy="766,0" pivot="0.5,0" size="46,42" fontSize="30" color="#f4e2a9" align="center" text="0/5"/>
     <list id="n7_wet2" name="listTaskReward" xy="52,80" size="361,53" layout="row" colGap="50" defaultItem="ui://5mpsibzzwet22j" autoClearItems="true">
       <item/>
       <item/>

+ 9 - 0
FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="123,123">
+  <displayList>
+    <image id="n0_nd17" name="n0" src="nd1730" fileName="images/wpk_db_2.png" xy="0,0"/>
+    <loader id="n3_vixc" name="loaIcon" xy="64,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
+    <image id="n1_nd17" name="n1" src="nd1732" fileName="images/wpk_sz_db2.png" xy="5,85"/>
+    <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
+  </displayList>
+</component>

+ 9 - 0
FGUIProject/assets/Task/components/RewardIconYellow.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="123,123">
+  <displayList>
+    <image id="n0_nd17" name="n0" src="nd1736" fileName="images/wpk_db_1.png" xy="0,0"/>
+    <loader id="n3_vixc" name="loaIcon" xy="61,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
+    <image id="n1_nd17" name="n1" src="nd1731" fileName="images/wpk_sz_db.png" xy="5,85"/>
+    <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/Task/images/an_jia.png


BIN
FGUIProject/assets/Task/images/an_jian.png


BIN
FGUIProject/assets/Task/images/bt_db_dj.png


BIN
FGUIProject/assets/Task/images/bt_db_jlzz.png


BIN
FGUIProject/assets/Task/images/bt_db_ptzz.png


BIN
FGUIProject/assets/Task/images/cz_an_pink.png


BIN
FGUIProject/assets/Task/images/db_jiajian.png


BIN
FGUIProject/assets/Task/images/jdt_bg.png


BIN
FGUIProject/assets/Task/images/jdt_bk.png


BIN
FGUIProject/assets/Task/images/jdt_pink_2.png


BIN
FGUIProject/assets/Task/images/jlzz_djbg.png


BIN
FGUIProject/assets/Task/images/jyt_dk.png


BIN
FGUIProject/assets/Task/images/jyt_dk_2.png


BIN
FGUIProject/assets/Task/images/jyt_fgx.png


BIN
FGUIProject/assets/Task/images/jyt_liang.png


BIN
FGUIProject/assets/Task/images/jyt_pink.png


BIN
FGUIProject/assets/Task/images/jyt_yellow.png


BIN
FGUIProject/assets/Task/images/lm_biaotizi_12.png


BIN
FGUIProject/assets/Task/images/lm_biaotizi_13.png


BIN
FGUIProject/assets/Task/images/mrrw_bq_qb.png


BIN
FGUIProject/assets/Task/images/mrrw_db.png


BIN
FGUIProject/assets/Task/images/sj_dk.png


BIN
FGUIProject/assets/Task/images/txz_jlzz_db_jlzz.png


BIN
FGUIProject/assets/Task/images/txz_jlzz_db_pt.png


BIN
FGUIProject/assets/Task/images/txz_jlzz_tbdj_db.png


BIN
FGUIProject/assets/Task/images/txz_lvl_db.png


BIN
FGUIProject/assets/Task/images/txz_nr_db.png


BIN
FGUIProject/assets/Task/images/wpk_db_1.png


BIN
FGUIProject/assets/Task/images/wpk_db_2.png


BIN
FGUIProject/assets/Task/images/wpk_sz_db.png


BIN
FGUIProject/assets/Task/images/wpk_sz_db2.png


BIN
FGUIProject/assets/Task/images/wpk_zz.png


BIN
FGUIProject/assets/Task/images/wz_kqjlzz.png


BIN
FGUIProject/assets/Task/images/yeqian_db.png


BIN
FGUIProject/assets/Task/images/yeqian_xz.png


BIN
FGUIProject/assets/Task/images/zsx_flower.png


+ 43 - 1
FGUIProject/assets/Task/package.xml

@@ -23,6 +23,48 @@
     <component id="fqor2n" name="TaskUI.xml" path="/" exported="true"/>
     <component id="fqor2p" name="ComTask.xml" path="/"/>
     <component id="fqor2q" name="ComBattle.xml" path="/"/>
+    <image id="nd172r" name="an_jia.png" path="/images/"/>
+    <image id="nd172s" name="mrrw_db.png" path="/images/"/>
+    <image id="nd172t" name="sj_dk.png" path="/images/"/>
+    <image id="nd172u" name="txz_jlzz_db_jlzz.png" path="/images/"/>
+    <image id="nd172v" name="txz_jlzz_db_pt.png" path="/images/"/>
+    <image id="nd172w" name="txz_jlzz_tbdj_db.png" path="/images/"/>
+    <image id="nd172x" name="txz_lvl_db.png" path="/images/"/>
+    <image id="nd172y" name="mrrw_bq_qb.png" path="/images/"/>
+    <image id="nd172z" name="txz_nr_db.png" path="/images/"/>
+    <image id="nd1730" name="wpk_db_2.png" path="/images/"/>
+    <image id="nd1731" name="wpk_sz_db.png" path="/images/"/>
+    <image id="nd1732" name="wpk_sz_db2.png" path="/images/"/>
+    <image id="nd1733" name="wpk_zz.png" path="/images/"/>
+    <image id="nd1734" name="wz_kqjlzz.png" path="/images/"/>
+    <image id="nd1735" name="yeqian_db.png" path="/images/"/>
+    <image id="nd1736" name="wpk_db_1.png" path="/images/"/>
+    <image id="nd1737" name="lm_biaotizi_13.png" path="/images/"/>
+    <image id="nd1738" name="lm_biaotizi_12.png" path="/images/"/>
+    <image id="nd1739" name="jyt_yellow.png" path="/images/"/>
+    <image id="nd173a" name="an_jian.png" path="/images/"/>
+    <image id="nd173b" name="bt_db_dj.png" path="/images/"/>
+    <image id="nd173c" name="bt_db_jlzz.png" path="/images/"/>
+    <image id="nd173d" name="bt_db_ptzz.png" path="/images/"/>
+    <image id="nd173e" name="cz_an_pink.png" path="/images/"/>
+    <image id="nd173f" name="db_jiajian.png" path="/images/"/>
+    <image id="nd173g" name="jdt_bg.png" path="/images/"/>
+    <image id="nd173h" name="jdt_bk.png" path="/images/"/>
+    <image id="nd173i" name="jdt_pink_2.png" path="/images/"/>
+    <image id="nd173j" name="jlzz_djbg.png" path="/images/"/>
+    <image id="nd173k" name="jyt_dk_2.png" path="/images/"/>
+    <image id="nd173l" name="jyt_dk.png" path="/images/"/>
+    <image id="nd173m" name="jyt_fgx.png" path="/images/"/>
+    <image id="nd173n" name="jyt_liang.png" path="/images/"/>
+    <image id="nd173o" name="jyt_pink.png" path="/images/"/>
+    <image id="nd173p" name="yeqian_xz.png" path="/images/" exported="true"/>
+    <image id="nd173q" name="zsx_flower.png" path="/images/"/>
+    <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
+    <component id="nd173t" name="ExpProcess.xml" path="/components/"/>
+    <component id="nd173u" name="BattlePassRewardItem.xml" path="/components/"/>
+    <component id="nd1742" name="RewardIconBlue.xml" path="/components/"/>
+    <component id="nd1743" name="RewardIconYellow.xml" path="/components/"/>
+    <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Task" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 41 - 12
GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -11,7 +11,8 @@ namespace GFGEditor
 {
     public class ExcelReader
     {
-        public delegate void RowCollectionHandler(ExcelWorksheet rowCollection, string configName, string configArrayName);
+        public delegate void RowCollectionHandler(ExcelWorksheet rowCollection, string configName,
+            string configArrayName);
 
         public static void ReadExcel(RowCollectionHandler rowCollectionHandler)
         {
@@ -23,19 +24,24 @@ namespace GFGEditor
             {
                 string filePath = files[i];
                 string fileName = Path.GetFileNameWithoutExtension(filePath);
-                if (!fileName.Contains("~"))
+                if (!fileName.Contains("~") && !fileName.StartsWith(".") && fileName != "")
                 {
+                    EditorUtility.DisplayProgressBar("进度", $"fileNmae{fileName}", 1);
                     ET.Log.Debug($"fileName {fileName}");
                     Stream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
                     ExcelPackage excelPackage = new ExcelPackage(stream);
                     //IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
                     //DataSet result = excelReader.AsDataSet();
 
-                    HandleTableCollection(excelPackage.Workbook.Worksheets, rowCollectionHandler, out string dispose, out string init);
+                    HandleTableCollection(excelPackage.Workbook.Worksheets, rowCollectionHandler, out string dispose,
+                        out string init);
                     strCfgArrayDispose = strCfgArrayDispose + dispose;
                     strCfgArrayInit = strCfgArrayInit + init;
+                    // stream.Dispose();
+                    // excelPackage.Dispose();
                 }
             }
+
             string functionDispose = CodeTemplateFactory.FunctionDisposeTemplate;
             functionDispose = functionDispose.Replace("{StrCfgArrayDispose}", strCfgArrayDispose);
             string disposeAllCfgsCache = CodeTemplateFactory.DisposeAllCfgsCacheTemplate;
@@ -55,7 +61,8 @@ namespace GFGEditor
             }
         }
 
-        private static void HandleTableCollection(ExcelWorksheets Worksheets, RowCollectionHandler rowCollectionHandler, out string strDispose, out string strInit)
+        private static void HandleTableCollection(ExcelWorksheets Worksheets, RowCollectionHandler rowCollectionHandler,
+            out string strDispose, out string strInit)
         {
             strDispose = "";
             strInit = "";
@@ -64,7 +71,8 @@ namespace GFGEditor
                 ExcelWorksheet worksheet = Worksheets[i];
                 string configArrayName = HandleTable(worksheet, rowCollectionHandler);
                 if (string.IsNullOrEmpty(configArrayName)) continue;
-                string dispose = CodeTemplateFactory.StrCfgArrayDisposeTemplate.Replace("{configArrayName}", configArrayName);
+                string dispose =
+                    CodeTemplateFactory.StrCfgArrayDisposeTemplate.Replace("{configArrayName}", configArrayName);
                 strDispose = strDispose + "\n" + dispose;
                 string init = CodeTemplateFactory.StrCfgArrayInitTemplate.Replace("{configArrayName}", configArrayName);
                 strInit = strInit + "\n" + init;
@@ -79,17 +87,20 @@ namespace GFGEditor
                 //未正确命名的表格
                 return "";
             }
+
             if (worksheet.Name.Contains("#"))
             {
                 //被注释的表格
                 return "";
             }
+
             string configItemName = names[1];
             string managerTag = "";
             if (names.Length > 2)
             {
                 managerTag = names[2];
             }
+
             //文件名及管理器名
             string configManagerName = string.Format(ExcelConfig.CONFIG_ARRAY_TEMPLATE, configItemName, managerTag);
 
@@ -108,10 +119,13 @@ namespace GFGEditor
             {
                 string filePath = files[i];
                 string fileName = Path.GetFileNameWithoutExtension(filePath);
-                if (!fileName.Contains("~") && !fileName.Contains("0000自动生表工具") && !fileName.Contains("zzzzGFG数值"))
+                if (!fileName.Contains("~") && !fileName.Contains("0000自动生表工具") && !fileName.Contains("zzzzGFG数值")
+                    && fileName != "" && !fileName.StartsWith("."))
                 {
+                    Debug.Log(fileName + "开始导入");
                     string newPath = ExcelConfig.excelsCacheFolderPath + fileName + ".xlsx";
-                    Stream newStream = new FileStream(newPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
+                    Stream newStream = new FileStream(newPath, FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                        FileShare.ReadWrite);
                     ExcelPackage newExcelPackage = new ExcelPackage(newStream);
                     ExcelWorksheets newWorksheets = newExcelPackage.Workbook.Worksheets;
 
@@ -143,14 +157,17 @@ namespace GFGEditor
                                 }
                             }
                         }
+
                         if (newWorksheet == null)
                         {
                             newWorksheets.Add(worksheet.Name);
                             newWorksheet = newWorksheets[newWorksheets.Count];
                         }
+
                         WriteTitle(newWorksheet, worksheet);
                         // Debug.Log(worksheet.Name + "写入完成");
                     }
+
                     newExcelPackage.Save();
                     excelPackage.Save();
                     newStream.Close();
@@ -175,6 +192,7 @@ namespace GFGEditor
                 {
                     continue;
                 }
+
                 bool needWriteColumn = true;
                 for (int j = 1; j <= newColumnNum; j++)
                 {
@@ -185,6 +203,7 @@ namespace GFGEditor
                         needWriteColumn = false;
                     }
                 }
+
                 if (needWriteColumn)
                 {
                     newColumnNum = newWorksheet.Dimension == null ? 0 : newWorksheet.Dimension.End.Column;
@@ -196,8 +215,10 @@ namespace GFGEditor
                     }
                 }
             }
+
             WriteCell(newWorksheet, worksheet);
         }
+
         private static void WriteCell(ExcelWorksheet newWorksheet, ExcelWorksheet worksheet)
         {
             int newRowNum = newWorksheet.Dimension == null ? 0 : newWorksheet.Dimension.End.Row;
@@ -210,6 +231,7 @@ namespace GFGEditor
             {
                 Debug.Log("");
             }
+
             for (int i = 5; i <= rowNum; i++)
             {
                 newRowNum = newWorksheet.Dimension == null ? 0 : newWorksheet.Dimension.End.Row;
@@ -226,8 +248,10 @@ namespace GFGEditor
                         {
                             dicArray[title] = 0;
                         }
+
                         dicArray[title] = dicArray[title] + 1;
                     }
+
                     if (string.IsNullOrEmpty(title)) continue;
 
                     Dictionary<string, int> newDicArray = new Dictionary<string, int>();
@@ -241,10 +265,14 @@ namespace GFGEditor
                             {
                                 newDicArray[newTitle] = 0;
                             }
+
                             newDicArray[newTitle] = newDicArray[newTitle] + 1;
                         }
+
                         bool isSame = newTitle == title && newType == type;
-                        if (isSame && (dicArray.ContainsKey(title) && newDicArray.ContainsKey(newTitle) && dicArray[title] == newDicArray[newTitle] || !dicArray.ContainsKey(title) && !newDicArray.ContainsKey(newTitle)))
+                        if (isSame && (dicArray.ContainsKey(title) && newDicArray.ContainsKey(newTitle) &&
+                                dicArray[title] == newDicArray[newTitle] || !dicArray.ContainsKey(title) &&
+                                !newDicArray.ContainsKey(newTitle)))
                         {
                             column = k;
                             break;
@@ -254,9 +282,11 @@ namespace GFGEditor
                     newWorksheet.Cells[newRowNum + 1, column].Value = worksheet.Cells[i, j].Value;
                 }
             }
+
             newRowNum = newWorksheet.Dimension == null ? 0 : newWorksheet.Dimension.End.Row;
             newWorksheet.InsertRow(newRowNum + 1, 2);
         }
+
         private static void DeleteExcle()
         {
             string path = ExcelConfig.excelsCacheFolderPath;
@@ -264,6 +294,7 @@ namespace GFGEditor
             {
                 Directory.CreateDirectory(path);
             }
+
             DirectoryInfo dir = new DirectoryInfo(path);
             // FileInfo[] files = dir.GetFiles();
             string[] files = Directory.GetFiles(path);
@@ -273,16 +304,14 @@ namespace GFGEditor
                 {
                     File.Delete(item);
                 }
+
                 return;
             }
             catch (Exception)
             {
                 ET.Log.Debug("Delete Failed!");
                 return;
-
             }
-
         }
-
     }
-}
+}

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs

@@ -142,9 +142,9 @@ namespace GFGGame
         {
             DailyTaskCfg taskCfg = DailyTaskCfgArray.Instance.GetCfg(taskId);
             DailyTaskTypeCfg activeRewardCfg = DailyTaskTypeCfgArray.Instance.GetCfg(taskCfg.type);
-            switch ((ConstDailyTaskType)activeRewardCfg.id)
+            switch ((ConstTaskType)activeRewardCfg.id)
             {
-                case ConstDailyTaskType.CompleteInstanceZones:
+                case ConstTaskType.CompleteInstanceZones:
                     string name = "";
                     name = EctypeCfgArray.Instance.GetCfgsBytype(taskCfg.paramsArr[0])[0].typeName;
                     if (taskCfg.paramsArr.Length > 1)
@@ -153,7 +153,7 @@ namespace GFGGame
                     }
                     return string.Format(activeRewardCfg.desc, taskCfg.count, name);
 
-                case ConstDailyTaskType.UseItem:
+                case ConstTaskType.UseItem:
                     ItemCfg cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
                     return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
 

+ 93 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_BattlePassRewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_RewardIconBlue m_NormalReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ContinueBt;
+        public GButton m_ComeBt;
+        public GButton m_HadGet;
+        public GTextField m_Level;
+        public GList m_RewardList;
+        public const string URL = "ui://5mpsibzznd173u";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "BattlePassRewardItem";
+        private static UI_BattlePassRewardItem _proxy;
+
+        public static UI_BattlePassRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_BattlePassRewardItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BattlePassRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BattlePassRewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_HadGet = (GButton)comp.GetChild("HadGet");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_NormalReward.Dispose();
+            m_NormalReward = null;
+            m_GetRewardBt = null;
+            m_ContinueBt = null;
+            m_ComeBt = null;
+            m_HadGet = null;
+            m_Level = null;
+            m_RewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ComBattle.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 92386e0b40a336b4a94fb6e1fb9c980a
+guid: a4e7c69601c174215b1880fa5910756f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_BattlePassRewardUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GTextField m_LeftTime;
+        public GList m_RewardList;
+        public GButton m_btnOpen;
+        public GButton m_btnGetAll;
+        public const string URL = "ui://5mpsibzznd173r";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "BattlePassRewardUI";
+        private static UI_BattlePassRewardUI _proxy;
+
+        public static UI_BattlePassRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_BattlePassRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BattlePassRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BattlePassRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_btnGetAll = (GButton)comp.GetChild("btnGetAll");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_LeftTime = null;
+            m_RewardList = null;
+            m_btnOpen = null;
+            m_btnGetAll = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: afb486d6da9514e379b9c054d4a042c7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_ExpProcess
+    {
+        public GProgressBar target;
+        public GImage m_ExpBar;
+        public GTextField m_Level;
+        public GTextField m_NumProcess;
+        public const string URL = "ui://5mpsibzznd173t";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "ExpProcess";
+        private static UI_ExpProcess _proxy;
+
+        public static UI_ExpProcess Create(GObject gObject = null)
+        {
+            var ui = new UI_ExpProcess();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ExpProcess Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ExpProcess();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_ExpBar = (GImage)comp.GetChild("ExpBar");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_NumProcess = (GTextField)comp.GetChild("NumProcess");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ExpBar = null;
+            m_Level = null;
+            m_NumProcess = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90240e395a4134a478e3966e1c83f6b5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 21
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ComBattle.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs

@@ -4,22 +4,19 @@ using FairyGUI;
 
 namespace UI.Task
 {
-    public partial class UI_ComBattle
+    public partial class UI_RewardIconBlue
     {
         public GComponent target;
-        public Controller m_c1;
-        public GTextField m_txtDesc0;
         public GLoader m_loaIcon;
-        public GTextField m_txtDesc1;
-        public UI_Button3 m_btnGetAll;
-        public const string URL = "ui://5mpsibzzfqor2q";
+        public GTextField m_num;
+        public const string URL = "ui://5mpsibzznd1742";
         public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "ComBattle";
-        private static UI_ComBattle _proxy;
+        public const string RES_NAME = "RewardIconBlue";
+        private static UI_RewardIconBlue _proxy;
 
-        public static UI_ComBattle Create(GObject gObject = null)
+        public static UI_RewardIconBlue Create(GObject gObject = null)
         {
-            var ui = new UI_ComBattle();
+            var ui = new UI_RewardIconBlue();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +25,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_ComBattle Proxy(GObject gObject = null)
+        public static UI_RewardIconBlue Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComBattle();
+                _proxy = new UI_RewardIconBlue();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,20 +56,13 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_txtDesc0 = (GTextField)comp.GetChild("txtDesc0");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc1 = (GTextField)comp.GetChild("txtDesc1");
-            m_btnGetAll = (UI_Button3)UI_Button3.Create(comp.GetChild("btnGetAll"));
+            m_num = (GTextField)comp.GetChild("num");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_txtDesc0 = null;
             m_loaIcon = null;
-            m_txtDesc1 = null;
-            m_btnGetAll.Dispose();
-            m_btnGetAll = null;
+            m_num = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cc2c40ade55094709b2e9bf36d0e73f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_RewardIconYellow
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_num;
+        public const string URL = "ui://5mpsibzznd1743";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "RewardIconYellow";
+        private static UI_RewardIconYellow _proxy;
+
+        public static UI_RewardIconYellow Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardIconYellow();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_RewardIconYellow Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardIconYellow();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 72132a2f53f5a427d9997b4e92566a14
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs

@@ -10,9 +10,8 @@ namespace UI.Task
         public Controller m_c1;
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
-        public GButton m_btnback;
+        public GButton m_btnBack;
         public UI_ComTask m_comTask;
-        public UI_ComBattle m_comBattle;
         public const string URL = "ui://5mpsibzzfqor2n";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskUI";
@@ -63,20 +62,17 @@ namespace UI.Task
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comTask = (UI_ComTask)UI_ComTask.Create(comp.GetChild("comTask"));
-            m_comBattle = (UI_ComBattle)UI_ComBattle.Create(comp.GetChild("comBattle"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
             m_comValueBar = null;
-            m_btnback = null;
+            m_btnBack = null;
             m_comTask.Dispose();
             m_comTask = null;
-            m_comBattle.Dispose();
-            m_comBattle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 4
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -34,10 +34,6 @@ namespace GFGGame
             _ui.m_listUpDanReward.itemRenderer = RenderListUpDanReward;
             _ui.m_comMyDanReward.m_listReward.itemRenderer = RenderListRewardItem;
         }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-        }
         protected override void OnShown()
         {
             base.OnShown();

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

@@ -572,9 +572,9 @@ namespace GFGGame
         }
         private void OnClickBtnRenWu()
         {
-            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
-
-            ViewManager.Show<DailyTaskView>();
+            ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
+            // ViewManager.Show<DailyTaskView>();
         }
         private void OnClickHeadBar()
         {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Views/Task.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6853d8b8fe5249978d07b1027fe0e174
+timeCreated: 1684393937

+ 173 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class BattlePassTaskView : BaseView
+    {
+        private UI_BattlePassRewardUI _ui;
+
+        private List<BattlePassCfg> _rewardCfgs;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_BattlePassRewardUI.PACKAGE_NAME;
+            _ui = UI_BattlePassRewardUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnOpen.onClick.Add(OnBtnOpenClick);
+            // _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            // _ui.m_btnContinue.onClick.Add(OnBtnContinueClick);
+            // _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
+            // _ui.m_btnGo.onClick.Add(OnBtnGoClick);
+            _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
+            _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("scsc_bjbj");
+            //获取通行证奖励配置
+            //TODO 获取赛季id
+            var SeaseonId = 1;
+            _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(SeaseonId));
+            _ui.m_RewardList.numItems = _rewardCfgs.Count;
+            _ui.m_RewardList.ScrollToView(0);
+        }
+
+        //开启通行证
+        private void OnBtnOpenClick()
+        {
+            //TODO
+            Log.Debug("开启通行证");
+        }
+
+        //领取奖励
+        private void OnBtnGetClick()
+        {
+            //TODO
+            Log.Debug("领取奖励");
+        }
+
+        //继续领取
+        private void OnBtnContinueClick()
+        {
+            //TODO
+            Log.Debug("继续领取");
+        }
+
+        //领取全部奖励
+        private void OnBtnGetAllClick()
+        {
+            //TODO
+            Log.Debug("领取全部奖励");
+        }
+
+        //前往
+        private void OnBtnGoClick()
+        {
+            //TODO
+            Log.Debug("前往");
+        }
+
+        private void ListBoxRewardItemRender(int index, GObject obj)
+        {
+            var item = UI_BattlePassRewardItem.Proxy(obj);
+            var battlePassCfg = _rewardCfgs[index];
+            //设置等级
+            item.m_Level.text = battlePassCfg.level.ToString();
+            //设置奖励
+            var bonusNormalArr = battlePassCfg.bonusNormalArr;
+            if (bonusNormalArr != null && bonusNormalArr.Length > 0)
+            {
+                var itemCfg = ItemCfgArray.Instance.GetCfg(bonusNormalArr[0][0]);
+                if (itemCfg != null)
+                {
+                    item.m_NormalReward.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                    item.m_NormalReward.m_num.text = bonusNormalArr[0][1].ToString();
+                }
+            }
+
+            if (item.m_RewardList.data == null)
+            {
+                item.m_RewardList.itemRenderer = SpecialRewardRender;
+            }
+
+            item.m_RewardList.data = battlePassCfg.bonusSpecialArr;
+            item.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
+            //TODO 设置按钮状态
+            var state = 1;
+            //设置按钮状态
+            SetBtnState(item, battlePassCfg.id, state);
+            item.target.data = battlePassCfg;
+            UI_BattlePassRewardItem.ProxyEnd();
+        }
+
+        //SpecialRewardRender
+        private static void SpecialRewardRender(int index, GObject obj)
+        {
+            var item = UI_RewardIconYellow.Proxy(obj);
+            var parentData = (int[][])obj.parent.data;
+            // if (!(obj.parent.data is int[][] parentData))
+            // {
+            //     UI_RewardIconYellow.ClearProxy();
+            //     return;
+            // }
+            var itemInfo = parentData[index];
+            var itemId = itemInfo[0];
+            var num = itemInfo[1];
+            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg != null)
+            {
+                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_num.text = num.ToString();
+            }
+
+            UI_RewardIconYellow.ProxyEnd();
+        }
+
+        //根据状态设置按钮
+        private void SetBtnState(UI_BattlePassRewardItem item, int id, int state)
+        {
+            item.m_c1.selectedIndex = state;
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
+
+            item.m_GetRewardBt.data = id;
+
+            //继续领取
+            if (item.m_ContinueBt.data == null)
+            {
+                item.m_ContinueBt.onClick.Add(OnBtnContinueClick);
+            }
+
+            //前往
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            }
+
+            item.m_GetRewardBt.data = id;
+
+            item.m_GetRewardBt.data = id;
+        }
+    }
+}

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 48d197a8f1c1489299465bd355b7487d
+timeCreated: 1684394270

+ 20 - 12
GameClient/Assets/Game/HotUpdate/Views/DailyTask/TaskView.cs → GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -1,7 +1,4 @@
-using ET;
-using FairyGUI;
 using UI.Task;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -18,11 +15,13 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -34,22 +33,29 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
             _ui.m_c1.onChanged.Add(OnCtrlChange);
-
         }
+        
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(TaskView).FullName);
+        }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
-            _ui.m_c1.selectedIndex = this.viewData == null ? 1 : (int)(this.viewData as object[])[0];
+            _ui.m_c1.selectedIndex = 2;
+            // _ui.m_c1.selectedIndex = viewData == null ? 1 : (int)(viewData as object[])?[0];
         }
 
         protected override void OnHide()
@@ -62,18 +68,20 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
+
         private void OnCtrlChange()
         {
-            if (_ui.m_c1.selectedIndex == 1)
+            switch (_ui.m_c1.selectedIndex)
             {
-                ViewManager.Show<DailyTaskView>();
+                case 1:
+                    ViewManager.Show<DailyTaskView>();
+                    break;
+                case 2:
+                    ViewManager.Show<BattlePassTaskView>();
+                    break;
             }
-            else if (_ui.m_c1.selectedIndex == 2)
-            {
 
-            }
             this.viewData = null;
         }
     }

+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyTask/TaskView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs.meta


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


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_fui.bytes


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است