Jae 2 жил өмнө
parent
commit
dab4ffbf5a
70 өөрчлөгдсөн 1047 нэмэгдсэн , 35 устгасан
  1. 40 0
      FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml
  2. BIN
      FGUIProject/assets/ActivityDay7/Designs/七日活动.png
  3. 11 0
      FGUIProject/assets/ActivityDay7/components/ButtonDay.xml
  4. 10 0
      FGUIProject/assets/ActivityDay7/components/ExpProcess.xml
  5. 11 0
      FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml
  6. BIN
      FGUIProject/assets/ActivityDay7/images/choose_cardtab_1.png
  7. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_db.png
  8. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_jd_fgx.png
  9. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_jdt.png
  10. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_jdt_db.png
  11. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_jdt_sz_db.png
  12. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_jf_db.png
  13. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_sz_db.png
  14. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_wp_db.png
  15. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_wp_db_1.png
  16. BIN
      FGUIProject/assets/ActivityDay7/images/qrhd_zd.png
  17. BIN
      FGUIProject/assets/ActivityDay7/images/sj_db.png
  18. 23 0
      FGUIProject/assets/ActivityDay7/package.xml
  19. 10 0
      FGUIProject/assets/CommonGame/components/ButtonRed.xml
  20. 0 0
      FGUIProject/assets/CommonGame/components/ComeBt.xml
  21. 3 3
      FGUIProject/assets/CommonGame/components/RewardIconYellow.xml
  22. 14 9
      FGUIProject/assets/CommonGame/components/TaskListItem.xml
  23. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue_1.png
  24. 0 0
      FGUIProject/assets/CommonGame/imagesNew/mrrw_bq_qb.png
  25. 0 0
      FGUIProject/assets/CommonGame/imagesNew/mrrw_db.png
  26. BIN
      FGUIProject/assets/CommonGame/imagesNew/qrhd_ylq_db.png
  27. 0 0
      FGUIProject/assets/CommonGame/imagesNew/txz_lvl_db.png
  28. 0 0
      FGUIProject/assets/CommonGame/imagesNew/txz_tb_ylq.png
  29. 11 0
      FGUIProject/assets/CommonGame/package.xml
  30. 1 1
      FGUIProject/assets/Task/BuyBattlePassLevelUI.xml
  31. 1 1
      FGUIProject/assets/Task/OpenBattlePassUI.xml
  32. 2 2
      FGUIProject/assets/Task/components/BattlePassReward.xml
  33. 3 3
      FGUIProject/assets/Task/components/BattlePassRewardItem.xml
  34. 1 1
      FGUIProject/assets/Task/components/ExpProcess.xml
  35. 1 1
      FGUIProject/assets/Task/components/ExpProcess2.xml
  36. 1 1
      FGUIProject/assets/Task/components/RewardIconBlue.xml
  37. BIN
      FGUIProject/assets/Task/images/wpk_db_1.png
  38. BIN
      FGUIProject/assets/Task/images/wpk_sz_db.png
  39. 0 10
      FGUIProject/assets/Task/package.xml
  40. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7.meta
  41. 95 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs
  42. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs.meta
  43. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs
  44. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs.meta
  45. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs
  46. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs.meta
  47. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs
  48. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs.meta
  49. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta
  50. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta
  51. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs
  52. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs.meta
  53. 92 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs
  54. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs.meta
  55. 3 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7.meta
  56. 130 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs
  57. 3 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs.meta
  58. 2 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  59. 8 0
      GameClient/Assets/ResIn/UI/ActivityDay7.meta
  60. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png
  61. 96 0
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta
  62. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png
  63. 96 0
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta
  64. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_fui.bytes
  65. 7 0
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_fui.bytes.meta
  66. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  67. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  68. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  69. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  70. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 40 - 0
FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" designImage="ui://kupdwln7nyhm0">
+  <displayList>
+    <loader id="n24_jttb" 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>
+    <component id="n0_nyhm" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,78"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108"/>
+    <text id="n2_nyhm" name="TimeStr" xy="461,107" size="156,44" fontSize="32" color="#fffaec" autoSize="none" text=""/>
+    <component id="n4_nyhm" name="n4" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
+    <component id="n6_rle1" name="ExpProcess" src="nyhmf" fileName="components/ExpProcess.xml" xy="74,190">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n9_rle1" name="n9" src="nyhmd" fileName="images/qrhd_jf_db.png" xy="29,267"/>
+    <image id="n7_rle1" name="n7" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-2,195" size="96,96"/>
+    <text id="n8_rle1" name="Score" xy="12,224" size="69,39" fontSize="28" color="#574326" align="center" vAlign="middle" autoSize="none" text="9999"/>
+    <text id="n10_rle1" name="n10" xy="29,274" size="40,161" fontSize="32" color="#574326" align="center" leading="-5" autoSize="none" text="当前积分"/>
+    <list id="n11_rle1" name="DayList" xy="43,909" size="994,61" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://kupdwln7rle1h" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n12_jttb" name="TaskList" xy="12,983" size="1064,937" overflow="scroll" defaultItem="ui://eg2y0ldplh8v5">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <loader id="n14_jttb" name="StartIndex" xy="96,810" size="166,93" url="ui://kupdwln7nyhmc"/>
+    <loader id="n22_jttb" name="EndIndex" xy="79,152" size="159,98" url="ui://kupdwln7nyhmc"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/ActivityDay7/Designs/七日活动.png


+ 11 - 0
FGUIProject/assets/ActivityDay7/components/ButtonDay.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="174,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_rle1" name="n0" src="nyhma" fileName="images/choose_cardtab_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_rle1" name="text" xy="39,8" size="108,44" fontSize="32" color="#954848" autoSize="none" text="第一天"/>
+  </displayList>
+  <Button/>
+</component>

+ 10 - 0
FGUIProject/assets/ActivityDay7/components/ExpProcess.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="44,676" extention="ProgressBar">
+  <displayList>
+    <image id="n0_nyhm" name="n0" src="nyhmb" fileName="images/qrhd_jdt_db.png" xy="0,0" size="38,676">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+  </displayList>
+  <ProgressBar reverse="true"/>
+</component>

+ 11 - 0
FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="159,98">
+  <displayList>
+    <image id="n5_jttb" name="n5" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="53,0"/>
+    <loader id="n6_jttb" name="loaIcon" xy="74,19" size="58,61" url="ui://eg2y0ldply9g8n"/>
+    <image id="n9_jttb" name="n9" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="0,42"/>
+    <image id="n7_jttb" name="n7" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="112,64"/>
+    <text id="n8_jttb" name="Num" xy="112,56" size="47,42" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n10_jttb" name="Score" xy="6,41" size="55,42" fontSize="30" color="#fffbeb" autoSize="none" text="100"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/ActivityDay7/images/choose_cardtab_1.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_jd_fgx.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_jdt.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_jdt_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_jdt_sz_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_jf_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_sz_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_wp_db.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_wp_db_1.png


BIN
FGUIProject/assets/ActivityDay7/images/qrhd_zd.png


BIN
FGUIProject/assets/ActivityDay7/images/sj_db.png


+ 23 - 0
FGUIProject/assets/ActivityDay7/package.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="kupdwln7">
+  <resources>
+    <image id="nyhm0" name="七日活动.png" path="/Designs/"/>
+    <component id="nyhm1" name="ActivityDay7UI.xml" path="/" exported="true"/>
+    <image id="nyhm2" name="qrhd_jd_fgx.png" path="/images/"/>
+    <image id="nyhm3" name="qrhd_zd.png" path="/images/"/>
+    <image id="nyhm4" name="qrhd_wp_db_1.png" path="/images/"/>
+    <image id="nyhm5" name="sj_db.png" path="/images/"/>
+    <image id="nyhm7" name="qrhd_jdt.png" path="/images/"/>
+    <image id="nyhm8" name="qrhd_db.png" path="/images/"/>
+    <image id="nyhm9" name="qrhd_sz_db.png" path="/images/"/>
+    <image id="nyhma" name="choose_cardtab_1.png" path="/images/"/>
+    <image id="nyhmb" name="qrhd_jdt_db.png" path="/images/"/>
+    <image id="nyhmc" name="qrhd_wp_db.png" path="/images/"/>
+    <image id="nyhmd" name="qrhd_jf_db.png" path="/images/"/>
+    <image id="nyhme" name="qrhd_jdt_sz_db.png" path="/images/"/>
+    <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
+    <component id="nyhmg" name="ExpProcessItem.xml" path="/components/" exported="true"/>
+    <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
+</packageDescription>

+ 10 - 0
FGUIProject/assets/CommonGame/components/ButtonRed.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="61,61" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nyhm" name="n0" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" xy="0,0" size="59,62">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

+ 0 - 0
FGUIProject/assets/Task/components/ComeBt.xml → FGUIProject/assets/CommonGame/components/ComeBt.xml


+ 3 - 3
FGUIProject/assets/Task/components/RewardIconYellow.xml → FGUIProject/assets/CommonGame/components/RewardIconYellow.xml

@@ -2,11 +2,11 @@
 <component size="123,123">
   <controller name="c1" pages="0,NotGet,1,Get" selected="0"/>
   <displayList>
-    <image id="n0_nd17" name="n0" src="uxxstmb" fileName="images/wpk_db_1.png" xy="0,0"/>
+    <image id="n0_nd17" name="n0" src="l500tlv" fileName="imagesNew/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="uxxstmy" fileName="images/wpk_sz_db.png" xy="5,85"/>
+    <image id="n1_nd17" name="n1" src="l500tlw" fileName="imagesNew/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"/>
-    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="72,-8">
+    <image id="n4_itts" name="n4" src="uxxstn3" fileName="imagesNew/txz_tb_ylq.png" xy="72,-8">
       <gearDisplay controller="c1" pages="1"/>
     </image>
   </displayList>

+ 14 - 9
FGUIProject/assets/Task/components/TaskListItem.xml → FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1037,224">
-  <controller name="c1" pages="1,,2,,3," selected="0">
+  <controller name="c1" pages="1,,2,,3," selected="2">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <controller name="c2" pages="0,CanGo,1,NotGo" selected="0"/>
+  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="1"/>
   <displayList>
-    <image id="n13_ids4" name="n13" src="uxxstmj" fileName="images/mrrw_db.png" xy="-4,8"/>
-    <image id="n12_ids4" name="n12" src="uxxstmq" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
+    <image id="n13_ids4" name="n13" src="uxxstmj" fileName="imagesNew/mrrw_db.png" xy="-4,8"/>
+    <image id="n12_ids4" name="n12" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
     <text id="n14_ids4" name="txtCount" xy="390,20" size="80,44" fontSize="32" color="#915e15" text="1/100"/>
-    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,82" size="189,58">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
     <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/ComeBt.xml" xy="804,81" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="前往" icon="ui://5mpsibzznd17tlv"/>
+      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
     </component>
-    <component id="n18_ids4" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
+    <text id="n19_jttb" name="n19" xy="883,22" size="126,43" fontSize="28" color="#8e4b2a" autoSize="none" text="积分+20">
+      <gearDisplay controller="c3" pages="1"/>
+    </text>
+    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
+    <text id="n21_jttb" name="n21" xy="870,91" size="88,39" group="n22_jttb" fontSize="28" color="#683c28" text="已领取"/>
+    <group id="n22_jttb" name="n22" xy="788,86" size="233,51" advanced="true">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="领取" icon="ui://eg2y0ldpo9gh4l"/>
-    </component>
+    </group>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/Task/images/lm_an_jujue_1.png → FGUIProject/assets/CommonGame/imagesNew/lm_an_jujue_1.png


+ 0 - 0
FGUIProject/assets/Task/images/mrrw_bq_qb.png → FGUIProject/assets/CommonGame/imagesNew/mrrw_bq_qb.png


+ 0 - 0
FGUIProject/assets/Task/images/mrrw_db.png → FGUIProject/assets/CommonGame/imagesNew/mrrw_db.png


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


+ 0 - 0
FGUIProject/assets/Task/images/txz_lvl_db.png → FGUIProject/assets/CommonGame/imagesNew/txz_lvl_db.png


+ 0 - 0
FGUIProject/assets/Task/images/txz_tb_ylq.png → FGUIProject/assets/CommonGame/imagesNew/txz_tb_ylq.png


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

@@ -306,6 +306,17 @@
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
+    <component id="nyhmtly" name="ButtonRed.xml" path="/components/" exported="true"/>
+    <image id="uxxstm7" name="txz_lvl_db.png" path="/imagesNew/" exported="true"/>
+    <component id="lh8v5" name="TaskListItem.xml" path="/components/" exported="true"/>
+    <component id="9qpb4h" name="ComeBt.xml" path="/components/" exported="true"/>
+    <component id="nd1743" name="RewardIconYellow.xml" path="/components/" exported="true"/>
+    <image id="uxxstmq" name="mrrw_bq_qb.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstmj" name="mrrw_db.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
+    <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm6" name="qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
+    <image id="jttbtn5" name="db_jiajian_1.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstms" fileName="images/lm_biaotizi_13.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="立即获得以下奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
       <item/>

+ 1 - 1
FGUIProject/assets/Task/OpenBattlePassUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstmv" fileName="images/lm_biaotizi_12.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="解锁特别制造奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
       <item/>

+ 2 - 2
FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -8,10 +8,10 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
     <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,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://5mpsibzznd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

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

@@ -8,12 +8,12 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="前往" icon="ui://5mpsibzzittstn4"/>
+      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
     </component>
     <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
       <gearDisplay controller="c1" pages="1"/>
@@ -28,7 +28,7 @@
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </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,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://5mpsibzznd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

+ 1 - 1
FGUIProject/assets/Task/components/ExpProcess.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
-    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54"/>
+    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54" pkg="eg2y0ldp"/>
     <text id="n4_e3m1" name="n4" xy="-55,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-54,-15" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>

+ 1 - 1
FGUIProject/assets/Task/components/ExpProcess2.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_nd17" name="ExpBar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,1" size="346,19"/>
-    <image id="n2_nd17" name="n2" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-99,-50"/>
+    <image id="n2_nd17" name="n2" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-99,-50" pkg="eg2y0ldp"/>
     <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}"/>

+ 1 - 1
FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -6,7 +6,7 @@
     <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="uxxstm5" 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"/>
-    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1">
+    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="1"/>
     </image>
   </displayList>

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


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


+ 0 - 10
FGUIProject/assets/Task/package.xml

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5mpsibzz">
   <resources>
-    <component id="lh8v5" name="TaskListItem.xml" path="/components/"/>
     <component id="fqor2n" name="TaskUI.xml" path="/" exported="true"/>
     <component id="fqor2p" name="CombTaskUI.xml" path="/" exported="true"/>
     <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
     <component id="nd173t" name="ExpProcess2.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/"/>
     <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
     <component id="ids44e" name="TabButton.xml" path="/components/"/>
-    <component id="9qpb4h" name="ComeBt.xml" path="/components/"/>
     <component id="9qpb4j" name="LinessRewardProcessItemBt.xml" path="/components/"/>
     <component id="or80tlw" name="BattlePassReward.xml" path="/components/"/>
     <component id="or80tlx" name="OpenBattlePassUI.xml" path="/" exported="true"/>
@@ -21,11 +18,9 @@
     <image id="uxxstm4" name="wz_kqjlzz.png" path="/images/"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/images/"/>
     <image id="uxxstm6" name="an_jia.png" path="/images/"/>
-    <image id="uxxstm7" name="txz_lvl_db.png" path="/images/"/>
     <image id="uxxstm8" name="yeqian_db.png" path="/images/"/>
     <image id="uxxstm9" name="db_jiajian.png" path="/images/"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/images/"/>
-    <image id="uxxstmb" name="wpk_db_1.png" path="/images/"/>
     <image id="uxxstmc" name="txz_jlzz_db_jlzz.png" path="/images/"/>
     <image id="uxxstmd" name="jyt_pink.png" path="/images/"/>
     <image id="uxxstme" name="txz_nr_db.png" path="/images/"/>
@@ -33,14 +28,12 @@
     <image id="uxxstmg" name="jyt_liang.png" path="/images/"/>
     <image id="uxxstmh" name="jdt_bg.png" path="/images/"/>
     <image id="uxxstmi" name="jyt_yellow.png" path="/images/"/>
-    <image id="uxxstmj" name="mrrw_db.png" path="/images/"/>
     <image id="uxxstmk" name="yeqian_xz.png" path="/images/"/>
     <image id="uxxstml" name="bt_db_jlzz.png" path="/images/"/>
     <image id="uxxstmm" name="wpk_zz.png" path="/images/"/>
     <image id="uxxstmn" name="txz_jlzz_tbdj_db.png" path="/images/"/>
     <image id="uxxstmo" name="jdt_bk.png" path="/images/"/>
     <image id="uxxstmp" name="txz_jlzz_db_pt.png" path="/images/"/>
-    <image id="uxxstmq" name="mrrw_bq_qb.png" path="/images/"/>
     <image id="uxxstmr" name="jlzz_djbg.png" path="/images/"/>
     <image id="uxxstms" name="lm_biaotizi_13.png" path="/images/"/>
     <image id="uxxstmt" name="jyt_fgx.png" path="/images/"/>
@@ -48,13 +41,10 @@
     <image id="uxxstmv" name="lm_biaotizi_12.png" path="/images/"/>
     <image id="uxxstmw" name="jyt_dk_2.png" path="/images/"/>
     <image id="uxxstmx" name="jdt_pink_2.png" path="/images/"/>
-    <image id="uxxstmy" name="wpk_sz_db.png" path="/images/"/>
     <image id="uxxstmz" name="an_jian.png" path="/images/"/>
     <image id="uxxstn0" name="cz_an_pink.png" path="/images/"/>
     <image id="uxxstn1" name="bt_db_dj.png" path="/images/"/>
     <image id="uxxstn2" name="jyt_dk.png" path="/images/"/>
-    <image id="uxxstn3" name="txz_tb_ylq.png" path="/images/"/>
-    <image id="ittstn4" name="lm_an_jujue_1.png" path="/images/"/>
     <image id="ittstn5" name="mrqd_3.png" path="/images/"/>
     <image id="ittstn6" name="mrqd_anniu_4.png" path="/images/"/>
     <image id="ittstn7" name="mrqd_anniu_5.png" path="/images/"/>

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 467019021bce641ea87b60c3e4733592
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 95 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ActivityDay7UI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_TimeStr;
+        public GProgressBar m_ExpProcess;
+        public GTextField m_Score;
+        public GList m_DayList;
+        public GList m_TaskList;
+        public GLoader m_StartIndex;
+        public GLoader m_EndIndex;
+        public const string URL = "ui://kupdwln7nyhm1";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ActivityDay7UI";
+        private static UI_ActivityDay7UI _proxy;
+
+        public static UI_ActivityDay7UI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityDay7UI();
+            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_ActivityDay7UI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityDay7UI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_TimeStr = (GTextField)comp.GetChild("TimeStr");
+            m_ExpProcess = (GProgressBar)comp.GetChild("ExpProcess");
+            m_Score = (GTextField)comp.GetChild("Score");
+            m_DayList = (GList)comp.GetChild("DayList");
+            m_TaskList = (GList)comp.GetChild("TaskList");
+            m_StartIndex = (GLoader)comp.GetChild("StartIndex");
+            m_EndIndex = (GLoader)comp.GetChild("EndIndex");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_TimeStr = null;
+            m_ExpProcess = null;
+            m_Score = null;
+            m_DayList = null;
+            m_TaskList = null;
+            m_StartIndex = null;
+            m_EndIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ButtonDay
+    {
+        public GButton target;
+        public GTextField m_text;
+        public const string URL = "ui://kupdwln7rle1h";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ButtonDay";
+        private static UI_ButtonDay _proxy;
+
+        public static UI_ButtonDay Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonDay();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonDay Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonDay();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_text = (GTextField)comp.GetChild("text");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_text = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ExpProcessItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_Num;
+        public GTextField m_Score;
+        public const string URL = "ui://kupdwln7nyhmg";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ExpProcessItem";
+        private static UI_ExpProcessItem _proxy;
+
+        public static UI_ExpProcessItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ExpProcessItem();
+            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_ExpProcessItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ExpProcessItem();
+            }
+            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");
+            m_Score = (GTextField)comp.GetChild("Score");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_Num = null;
+            m_Score = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_BtnStyle000
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://eg2y0ldpqik1tm1";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "BtnStyle000";
+        private static UI_BtnStyle000 _proxy;
+
+        public static UI_BtnStyle000 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnStyle000();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnStyle000 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnStyle000();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs.meta

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 16d2b13e4f388e443a4aa699fa6fea84
+guid: 82763b2a154d64a6e9f64adfccfeca3f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d83de497ce18a7e4c940f6dbfe1f2955
+guid: 45c34602b5cd145d6986388695fc4c4d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_RewardIconYellow
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_num;
+        public const string URL = "ui://eg2y0ldpnd1743";
+        public const string PACKAGE_NAME = "CommonGame";
+        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_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 92 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_TaskListItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public Controller m_c3;
+        public GTextField m_txtDesc;
+        public GTextField m_txtCount;
+        public GList m_listTaskReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ComeBt;
+        public const string URL = "ui://eg2y0ldplh8v5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "TaskListItem";
+        private static UI_TaskListItem _proxy;
+
+        public static UI_TaskListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskListItem();
+            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_TaskListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskListItem();
+            }
+            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_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_c3 = null;
+            m_txtDesc = null;
+            m_txtCount = null;
+            m_listTaskReward = null;
+            m_GetRewardBt = null;
+            m_ComeBt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs.meta

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

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6bc1202d53eb457497223983617655ba
+timeCreated: 1684997625

+ 130 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -0,0 +1,130 @@
+using FairyGUI;
+using UI.ActivityDay7;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class ActivityDay7View : BaseWindow
+    {
+        private UI_ActivityDay7UI _ui;
+
+        //7日活动配置
+        private Activity7DaysCfg[] cfgDataArray;
+
+        //7日活动积分配置
+        private Activity7DaysCfg[] activity7DaysCfgs;
+
+        //选中的天数index 天数=index+1
+        private int onClickIndex = 0;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityDay7UI.PACKAGE_NAME;
+            _ui = UI_ActivityDay7UI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            bringToFontOnClick = false;
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_DayList.itemRenderer = DayListRenderer;
+            _ui.m_TaskList.itemRenderer = TaskListRenderer;
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityDay7View).FullName);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            SetScoreList();
+            SetDayList();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        //DayListRenderer
+        private void DayListRenderer(int index, GObject obj)
+        {
+            var item = UI_ButtonDay.Proxy(obj);
+            if (item.target.data == null)
+            {
+                var cfg = cfgDataArray[index];
+                item.m_text.text = $"第{cfg.id}天";
+                item.target.data = index;
+                item.target.onClick.Add(OnClickDay);
+            }
+            //设置按钮状态
+            item.target.selected = index == onClickIndex;
+            UI_ButtonDay.ProxyEnd();
+        }
+
+        //选中天数
+        private void OnClickDay(EventContext context)
+        {
+            onClickIndex = (int)context.data;
+            _ui.m_TaskList.numItems = cfgDataArray.Length;
+            //TODO 刷新天数任务列表
+        }
+
+        //TaskListRenderer
+        private void TaskListRenderer(int index, GObject obj)
+        {
+            var item = UI_TaskListItem.Proxy(obj);
+
+            UI_TaskListItem.ProxyEnd();
+        }
+
+        //设置积分列表
+        private void SetScoreList()
+        {
+            //7日活动配置
+            activity7DaysCfgs = Activity7DaysCfgArray.Instance.dataArray;
+            var maxCfg = activity7DaysCfgs[activity7DaysCfgs.Length - 1];
+            var maxScore = maxCfg.score;
+            var pos = _ui.m_StartIndex.position;
+            var endY = _ui.m_EndIndex.position.y;
+            //循环设置UI
+            foreach (var cfg in activity7DaysCfgs)
+            {
+                var cfgScore = cfg.score;
+                var item = UI_ExpProcessItem.Create();
+                var target = item.target;
+                _ui.target.AddChild(target);
+                // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x,z不变,y根据比例设置 
+                var y = pos.y - (pos.y - endY) * cfgScore / maxScore;
+                target.SetPosition(pos.x, y, pos.z);
+                item.m_Score.text = cfgScore.ToString();
+                var cfgBonusArr = cfg.bonusArr;
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
+                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_Num.text = cfgBonusArr[0][1].ToString();
+                UI_ExpProcess.ProxyEnd();
+            }
+        }
+
+
+        //设置天数列表
+        private void SetDayList()
+        {
+            //7日活动配置
+            cfgDataArray = Activity7DaysCfgArray.Instance.dataArray;
+            _ui.m_DayList.numItems = cfgDataArray.Length;
+        }
+    }
+}

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2622fcb4feac49f885978c8db5a6ea3f
+timeCreated: 1684997636

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

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

+ 8 - 0
GameClient/Assets/ResIn/UI/ActivityDay7.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dba4b17e28b32449eb0bb80017d0275d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 1d19a171fa1c345889ee033d2cb86f34
+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/ActivityDay7/ActivityDay7_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dd4354c8a423e4af4abb677e3fb58cd5
+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/ActivityDay7/ActivityDay7_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1aae36720eaf0459c8885cf877551a22
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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