zhaoyang 2 years ago
parent
commit
4092b0cb59
39 changed files with 783 additions and 300 deletions
  1. 50 0
      FGUIProject/assets/DailyWelfare/DailySignUI.xml
  2. 9 0
      FGUIProject/assets/DailyWelfare/DailySupplyUI.xml
  3. 4 55
      FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml
  4. 13 0
      FGUIProject/assets/DailyWelfare/components/Button1.xml
  5. 8 5
      FGUIProject/assets/DailyWelfare/components/ComProBonus.xml
  6. 11 10
      FGUIProject/assets/DailyWelfare/components/ListSignItem.xml
  7. 9 9
      FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml
  8. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_db.png
  9. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_jdt_db.png
  10. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_jdt_yellow.png
  11. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_kbq.png
  12. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_sz_db.png
  13. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_zz.png
  14. BIN
      FGUIProject/assets/DailyWelfare/images/mrrw_jl_db.png
  15. BIN
      FGUIProject/assets/DailyWelfare/images/qrhd_jd_fgx1.png
  16. BIN
      FGUIProject/assets/DailyWelfare/images/txz_lvl_db.png
  17. BIN
      FGUIProject/assets/DailyWelfare/images/wz_hjksb.png
  18. BIN
      FGUIProject/assets/DailyWelfare/images/wz_jksb.png
  19. BIN
      FGUIProject/assets/DailyWelfare/images/wz_yqd.png
  20. BIN
      FGUIProject/assets/DailyWelfare/images/yqd_mr_db.png
  21. BIN
      FGUIProject/assets/DailyWelfare/images/yz_yhd.png
  22. 17 0
      FGUIProject/assets/DailyWelfare/package.xml
  23. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus.cs
  24. 87 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs
  25. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs.meta
  26. 76 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs.meta
  28. 6 21
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailyWelfareUI.cs
  29. 9 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs
  30. 37 0
      GameClient/Assets/Game/HotUpdate/Utils/NumberUtil.cs
  31. 206 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs
  32. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs.meta
  33. 181 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs
  34. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs.meta
  35. 10 188
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs
  36. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs
  37. 2 2
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  38. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png
  39. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes

+ 50 - 0
FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1865">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="376,324" pivot="0,0.5" anchor="true">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
+    <text id="n2_qik1" name="txtMonth" xy="47,254" pivot="1,1" size="148,94" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
+      <gearFontSize controller="c1" pages="0" values="72" default="50"/>
+    </text>
+    <text id="n4_qik1" name="txtSignCount" xy="346,325" pivot="0.5,0" size="43,54" fontSize="40" color="#643323" text="30"/>
+    <list id="n5_qik1" name="list" xy="60,455" size="967,1276" layout="flow_hz" lineGap="2" colGap="2" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+  </displayList>
+</component>

+ 9 - 0
FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1865">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="244,686" group="n12_qik1"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="556,687" group="n12_qik1"/>
+    <group id="n12_qik1" name="n12" xy="244,686" size="534,354" advanced="true"/>
+  </displayList>
+</component>

+ 4 - 55
FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n27_fqor" 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"/>
@@ -13,61 +12,11 @@
     </component>
     <image id="n2_fqor" name="n2" src="fqor2" fileName="imagesTest/wpbb_xtxt.png" xy="54,312" group="n3_fqor"/>
     <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,229"/>
-    <component id="n4_fqor" name="n4" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="43,347" group="n7_fqor">
-      <Button checked="true" title="每日签到" controller="c1" page="0"/>
+    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+      <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="n5" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="333,347" group="n7_fqor">
-      <Button title="每日补给" controller="c1" page="1"/>
+    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+      <Button title="每日补给"/>
     </component>
-    <component id="n6_fqor" name="n6" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="623,347" group="n7_fqor">
-      <Button title="分享好礼" controller="c1" page="2"/>
-    </component>
-    <group id="n7_fqor" name="n7" xy="43,347" size="870,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n8_fqor" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="115,569" pivot="0,0.5" anchor="true" group="n21_fqor">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <text id="n9_fqor" name="txtSignCount" xy="53,448" pivot="0.5,0" size="20,41" group="n21_fqor" fontSize="30" text="1"/>
-    <list id="n20_fqor" name="list" xy="53,660" size="974,1232" group="n21_fqor" layout="flow_hz" lineGap="30" colGap="60" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n21_fqor" name="n21" xy="53,448" size="974,1444" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <component id="n22_fqor" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="242,827" group="n26_fqor"/>
-    <component id="n25_fqor" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="554,828" group="n26_fqor"/>
-    <group id="n26_fqor" name="n26" xy="242,827" size="534,354" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
   </displayList>
 </component>

+ 13 - 0
FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,328" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,-112" size="1080,1697">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="479,207" size="122,0" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 8 - 5
FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="81,200" pivot="0.5,0.5" anchor="true">
+<component size="80,140" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <text id="n12_fqor" name="txtDay" xy="41,0" pivot="0.5,0" anchor="true" size="40,42" group="n13_fqor" fontSize="30" align="center" text=""/>
-    <loader id="n14_fqor" name="loaIcon" xy="0,114" pivot="0.5,0.5" size="80,80" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
-    <text id="n15_fqor" name="txtCount" xy="26,157" pivot="1,0" size="53,42" group="n13_fqor" fontSize="30" align="right" autoClearText="true" text="000"/>
-    <group id="n13_fqor" name="n13" xy="0,0" size="80,199"/>
+    <image id="n18_qik1" name="n18" src="qik1g" fileName="images/qrhd_jd_fgx1.png" xy="33,76" group="n13_fqor"/>
+    <image id="n16_qik1" name="n16" src="qik1f" fileName="images/mrrw_jl_db.png" xy="0,0" group="n13_fqor"/>
+    <loader id="n14_fqor" name="loaIcon" xy="11,12" pivot="0.5,0.5" size="58,58" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
+    <image id="n17_qik1" name="n17" src="qik1d" fileName="images/mrqd_sz_db.png" xy="34,57" group="n13_fqor"/>
+    <text id="n15_fqor" name="txtCount" xy="35,46" pivot="0.5,0" size="45,39" group="n13_fqor" fontSize="28" color="#ffffff" align="center" autoClearText="true" text="000"/>
+    <text id="n12_fqor" name="txtDay" xy="39,103" pivot="0.5,0" anchor="true" size="35,44" group="n13_fqor" fontSize="32" color="#643323" align="center" text="30"/>
+    <group id="n13_fqor" name="n13" xy="0,0" size="80,147"/>
   </displayList>
 </component>

+ 11 - 10
FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="178,122">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+<component size="155,200">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="35,0" size="117,28" group="n20_fqor" autoSize="true">
-      <gearIcon controller="c1" pages="0,2" values="|ui://t8nwuj7ifqorb" default="ui://t8nwuj7ifqorc"/>
+    <image id="n23_qik1" name="n23" src="qik1j" fileName="images/yqd_mr_db.png" xy="-2,0" group="n20_fqor"/>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" url="ui://t8nwuj7iqik1h" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
-    <loader id="n14_fqor" name="loaIcon" xy="24,29" pivot="0.5,0.5" size="92,92" group="n20_fqor" aspect="true" fill="scale"/>
-    <text id="n17_fqor" name="txtCount" xy="121,77" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <text id="n16_fqor" name="txtDay" xy="121,30" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <image id="n18_fqor" name="imgGot" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,60" size="144,32" group="n20_fqor"/>
-    <image id="n19_fqor" name="imgNotGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,56" size="178,40" group="n20_fqor"/>
-    <group id="n20_fqor" name="n20" xy="0,0" size="178,121"/>
+    <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
+    <text id="n16_fqor" name="txtDay" xy="33,-3" pivot="0.5,0" size="88,39" group="n20_fqor" fontSize="28" color="#8a4e4e" text="三十一"/>
+    <image id="n22_qik1" name="imgMask" src="qik1e" fileName="images/mrqd_zz.png" xy="-2,0" size="159,205" group="n20_fqor"/>
+    <image id="n18_fqor" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="17,64" group="n20_fqor"/>
+    <image id="n19_fqor" name="imgNotGet" src="qik1o" fileName="images/mrqd_kbq.png" xy="-8,45" group="n20_fqor"/>
+    <group id="n20_fqor" name="grpItem" xy="-8,-3" size="205,208" advanced="true"/>
   </displayList>
 </component>

+ 9 - 9
FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="850,139" extention="ProgressBar">
+<component size="620,140" extention="ProgressBar">
   <displayList>
-    <image id="n0_fqor" name="n0" src="fqor6" fileName="images/pro_bk_in.png" xy="-36,0">
+    <image id="n0_fqor" name="n0" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_fqor" name="bar" src="fqor5" fileName="images/pro_activate.png" xy="0,4" fillMethod="hz"/>
-    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="0,25" group="n7_fqor"/>
-    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="121,25" group="n7_fqor"/>
-    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="242,25" group="n7_fqor"/>
-    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="363,25" group="n7_fqor"/>
-    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="484,25" group="n7_fqor"/>
-    <group id="n7_fqor" name="n7" xy="-40,-75" size="565,200" advanced="true"/>
+    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,100" fillMethod="hz"/>
+    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
+    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
+    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
+    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
+    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
   </displayList>
   <ProgressBar/>
 </component>

BIN
FGUIProject/assets/DailyWelfare/images/mrqd_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_jdt_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_jdt_yellow.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_kbq.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_sz_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_zz.png


BIN
FGUIProject/assets/DailyWelfare/images/mrrw_jl_db.png


BIN
FGUIProject/assets/DailyWelfare/images/qrhd_jd_fgx1.png


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


BIN
FGUIProject/assets/DailyWelfare/images/wz_hjksb.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_jksb.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_yqd.png


BIN
FGUIProject/assets/DailyWelfare/images/yqd_mr_db.png


BIN
FGUIProject/assets/DailyWelfare/images/yz_yhd.png


+ 17 - 0
FGUIProject/assets/DailyWelfare/package.xml

@@ -12,6 +12,23 @@
     <component id="fqora" name="ComSupply.xml" path="/components/"/>
     <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
     <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
+    <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
+    <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
+    <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
+    <image id="qik1g" name="qrhd_jd_fgx1.png" path="/images/"/>
+    <image id="qik1h" name="wz_hjksb.png" path="/images/"/>
+    <image id="qik1i" name="wz_yqd.png" path="/images/"/>
+    <image id="qik1j" name="yqd_mr_db.png" path="/images/"/>
+    <image id="qik1k" name="yz_yhd.png" path="/images/"/>
+    <image id="qik1l" name="mrqd_db.png" path="/images/" scale="9grid" scale9grid="270,453,540,1372"/>
+    <image id="qik1m" name="mrqd_jdt_db.png" path="/images/"/>
+    <image id="qik1n" name="mrqd_jdt_yellow.png" path="/images/"/>
+    <image id="qik1o" name="mrqd_kbq.png" path="/images/"/>
+    <component id="qik1q" name="DailySignUI.xml" path="/" exported="true"/>
+    <image id="qik1r" name="txz_lvl_db.png" path="/images/"/>
+    <image id="qik1s" name="wz_jksb.png" path="/images/"/>
+    <component id="qik1t" name="DailySupplyUI.xml" path="/" exported="true"/>
+    <component id="qik1u" name="Button1.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus.cs

@@ -7,9 +7,9 @@ namespace UI.DailyWelfare
     public partial class UI_ComProBonus
     {
         public GComponent target;
-        public GTextField m_txtDay;
         public GLoader m_loaIcon;
         public GTextField m_txtCount;
+        public GTextField m_txtDay;
         public const string URL = "ui://t8nwuj7ifqor8";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComProBonus";
@@ -57,15 +57,15 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_txtDay = (GTextField)comp.GetChild("txtDay");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtDay = null;
             m_loaIcon = null;
             m_txtCount = null;
+            m_txtDay = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 87 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySignUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_ProgressBar1 m_proSign;
+        public GTextField m_txtMonth;
+        public GTextField m_txtSignCount;
+        public GList m_list;
+        public GButton m_btnClose;
+        public const string URL = "ui://t8nwuj7iqik1q";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySignUI";
+        private static UI_DailySignUI _proxy;
+
+        public static UI_DailySignUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySignUI();
+            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_DailySignUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySignUI();
+            }
+            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_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_txtMonth = (GTextField)comp.GetChild("txtMonth");
+            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
+            m_list = (GList)comp.GetChild("list");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_proSign.Dispose();
+            m_proSign = null;
+            m_txtMonth = null;
+            m_txtSignCount = null;
+            m_list = null;
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs.meta

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

+ 76 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs

@@ -0,0 +1,76 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySupplyUI
+    {
+        public GComponent target;
+        public UI_ComSupply m_comSupply0;
+        public UI_ComSupply m_comSupply1;
+        public const string URL = "ui://t8nwuj7iqik1t";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySupplyUI";
+        private static UI_DailySupplyUI _proxy;
+
+        public static UI_DailySupplyUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySupplyUI();
+            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_DailySupplyUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySupplyUI();
+            }
+            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_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
+            m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comSupply0.Dispose();
+            m_comSupply0 = null;
+            m_comSupply1.Dispose();
+            m_comSupply1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs.meta

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

+ 6 - 21
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailyWelfareUI.cs

@@ -7,15 +7,11 @@ namespace UI.DailyWelfare
     public partial class UI_DailyWelfareUI
     {
         public GComponent target;
-        public Controller m_c1;
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnback;
-        public UI_ProgressBar1 m_proSign;
-        public GTextField m_txtSignCount;
-        public GList m_list;
-        public UI_ComSupply m_comSupply0;
-        public UI_ComSupply m_comSupply1;
+        public GButton m_btnSign;
+        public GButton m_btnSupply;
         public const string URL = "ui://t8nwuj7ifqor0";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailyWelfareUI";
@@ -63,30 +59,19 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
-            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
-            m_list = (GList)comp.GetChild("list");
-            m_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
-            m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
+            m_btnSign = (GButton)comp.GetChild("btnSign");
+            m_btnSupply = (GButton)comp.GetChild("btnSupply");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_loaBg = null;
             m_comValueBar = null;
             m_btnback = null;
-            m_proSign.Dispose();
-            m_proSign = null;
-            m_txtSignCount = null;
-            m_list = null;
-            m_comSupply0.Dispose();
-            m_comSupply0 = null;
-            m_comSupply1.Dispose();
-            m_comSupply1 = null;
+            m_btnSign = null;
+            m_btnSupply = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs

@@ -9,11 +9,12 @@ namespace UI.DailyWelfare
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaDoubleTag;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
+        public GComponent m_comItem;
         public GTextField m_txtDay;
+        public GImage m_imgMask;
         public GImage m_imgGot;
         public GImage m_imgNotGet;
+        public GGroup m_grpItem;
         public const string URL = "ui://t8nwuj7ifqor9";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ListSignItem";
@@ -63,21 +64,23 @@ namespace UI.DailyWelfare
         {
             m_c1 = comp.GetController("c1");
             m_loaDoubleTag = (GLoader)comp.GetChild("loaDoubleTag");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comItem = (GComponent)comp.GetChild("comItem");
             m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_imgMask = (GImage)comp.GetChild("imgMask");
             m_imgGot = (GImage)comp.GetChild("imgGot");
             m_imgNotGet = (GImage)comp.GetChild("imgNotGet");
+            m_grpItem = (GGroup)comp.GetChild("grpItem");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaDoubleTag = null;
-            m_loaIcon = null;
-            m_txtCount = null;
+            m_comItem = null;
             m_txtDay = null;
+            m_imgMask = null;
             m_imgGot = null;
             m_imgNotGet = null;
+            m_grpItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 37 - 0
GameClient/Assets/Game/HotUpdate/Utils/NumberUtil.cs

@@ -42,6 +42,43 @@ namespace GFGGame
             }
             return "未知";
         }
+        public static string GetOldChiniseNumberText(int num)
+        {
+            int numInUnit = 0;
+            int numInTen = 0;
+            string strInUnit = "";
+            string strInTen = "";
+            if (num == 0)
+            {
+                return "零";
+            }
+            if (num <= 10)
+            {
+                return GameConst.CHINESE_NUMBER_OLD[num - 1];
+            }
+            else if (num < 20)
+            {
+                numInUnit = num - 10;
+                strInUnit = GameConst.CHINESE_NUMBER_OLD[numInUnit - 1];
+                return "拾" + strInUnit;
+            }
+            else if (num < 100)
+            {
+                numInTen = Mathf.FloorToInt(num / 10);
+                strInTen = GameConst.CHINESE_NUMBER_OLD[numInTen - 1];
+                numInUnit = num % 10;
+                if (numInUnit == 0)
+                {
+                    return strInTen + "拾";
+                }
+                else
+                {
+                    strInUnit = GameConst.CHINESE_NUMBER_OLD[numInUnit - 1];
+                    return strInTen + "拾" + strInUnit;
+                }
+            }
+            return "未知";
+        }
         public static string GetChiniseNumberWeekText(int num)
         {
             if (num >= 0 && num < GameConst.CHINESE_NUMBER.Length)

+ 206 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -0,0 +1,206 @@
+
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailySignView : BaseWindow
+    {
+        private UI_DailySignUI _ui;
+
+        private int _signCount;
+        private int _month;
+        private int _day;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_DailySignUI.PACKAGE_NAME;
+            _ui = UI_DailySignUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_list.itemRenderer = ListItemRender;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSignView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
+            {
+                if (DateTime.Now.Day == 1)
+                {
+                    if (DateTime.Now.Month == 1)
+                    {
+                        _month = 12;
+                    }
+                    else
+                    {
+                        _month = DateTime.Now.Month - 1;
+                    }
+                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
+                    _day = cfgs[cfgs.Count - 1].day;
+                }
+                else
+                {
+                    _day = DateTime.Now.Day - 1;
+                }
+            }
+            else
+            {
+                _month = DateTime.Now.Month;
+                _day = DateTime.Now.Day;
+            }
+            _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
+            UpdateSignView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSignView);
+        }
+
+        private void UpdateSignView()
+        {
+            _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
+            _ui.m_txtSignCount.text = _signCount.ToString();
+            List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.target.max = signBonusCfgs.Count;
+            _ui.m_proSign.target.value = _signCount;
+            List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            for (int i = 0; i < signCfgs.Count; i++)
+            {
+                GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
+                comProBonus.x = ((float)signCfgs[i].day / (float)signBonusCfgs.Count) * _ui.m_proSign.target.width;
+                UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
+                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
+                item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
+                item.m_txtDay.text = signCfgs[i].day.ToString();
+                if (item.target.data == null)
+                {
+                    item.target.onClick.Add(OnBtnGetProBonus);
+                }
+                item.target.data = signCfgs[i];
+                bool canGet = _signCount >= signCfgs[i].day && !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfgs[i].day);
+                RedDotController.Instance.SetComRedDot(item.target, canGet);
+                UI_ComProBonus.ProxyEnd();
+            }
+            _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+        }
+        private async void OnBtnGetProBonus(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            DailySignCfg signCfg = obj.data as DailySignCfg;
+            if (_signCount < signCfg.day || MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfg.day))
+            {
+                GoodsItemTipsController.ShowItemTips(signCfg.bonusArr[0][0]);
+            }
+            else
+            {
+                bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.day);
+                if (result)
+                {
+                    UpdateSignView();
+                }
+            }
+        }
+
+        private void ListItemRender(int index, GObject obj)
+        {
+
+            UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
+            if (index == 29)
+            {
+                item.target.touchable = false;
+                item.target.visible = false;
+                return;
+            }
+            int _index = index >= 29 ? index - 1 : index;
+            DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
+            bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), bonusCfg.day);
+
+            item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
+            item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day);//  bonusCfg.day.ToString();
+            if (item.m_comItem.data == null)
+            {
+                item.m_comItem.data = new ItemView(item.m_comItem);
+            }
+            ItemData itemData = ItemUtil.createItemData(bonusCfg.bonusArr[0]);
+            (item.m_comItem.data as ItemView).SetData(itemData);
+            (item.m_comItem.data as ItemView).ShowTips = false;
+            (item.m_comItem.data as ItemView).ChangeTxtCountStyle();
+
+            item.m_imgMask.visible = isGot || bonusCfg.day < _day && !isGot;
+            item.m_imgGot.visible = isGot;
+            item.m_imgNotGet.visible = bonusCfg.day < _day && !isGot;
+            RedDotController.Instance.SetComRedDot(item.target, bonusCfg.day == _day && !isGot);
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnGetSignBonus);
+            }
+            item.target.data = bonusCfg.day;
+            UI_ListSignItem.ProxyEnd();
+        }
+        private async void OnGetSignBonus(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int day = (int)obj.data;
+            bool result = false;
+            if (day > _day) return;
+            if (day < _day)
+            {
+                int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];
+                AlertUI.Show(string.Format("是否确定花费{0}{1}补签?", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name)).
+               SetLeftButton(true, "否").
+                SetRightButton(true, "是", async (object param) =>
+                {
+                    if (ItemDataManager.GetItemNum(cost[0]) < cost[1])
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                        return;
+                    }
+                    result = await DailyWelfareSProxy.ReqReSign(day);
+                });
+            }
+            else
+            {
+                result = await DailyWelfareSProxy.ReqSign(day);
+            }
+            if (result)
+            {
+                _ui.m_list.numItems = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month).Count;
+            }
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs.meta

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

+ 181 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -0,0 +1,181 @@
+
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailySupplyView : BaseWindow
+    {
+        private UI_DailySupplyUI _ui;
+        // private ValueBarController _valueBarController;
+
+        private int _signCount;
+        private int _month;
+        private int _day;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            // if (_valueBarController != null)
+            // {
+            //     _valueBarController.Dispose();
+            //     _valueBarController = null;
+            // }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_DailySupplyUI.PACKAGE_NAME;
+            _ui = UI_DailySupplyUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            // _valueBarController = new ValueBarController(_ui.m_comValueBar);
+
+            // _ui.m_btnback.onClick.Add(OnBtnBackClick);
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
+
+            // _valueBarController.OnShown();
+
+            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
+            {
+                if (DateTime.Now.Day == 1)
+                {
+                    if (DateTime.Now.Month == 1)
+                    {
+                        _month = 12;
+                    }
+                    else
+                    {
+                        _month = DateTime.Now.Month - 1;
+                    }
+                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
+                    _day = cfgs[cfgs.Count - 1].day;
+                }
+                else
+                {
+                    _day = DateTime.Now.Day - 1;
+                }
+            }
+            else
+            {
+                _month = DateTime.Now.Month;
+                _day = DateTime.Now.Day;
+            }
+            // _ui.m_list.ScrollToView(0);
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            // _valueBarController.OnHide();
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
+        }
+        private void UpdateView()
+        {
+            UpdateSupplyView();
+        }
+
+        private void UpdateSupplyView()
+        {
+            UpdateReward(_ui.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
+            UpdateReward(_ui.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
+        }
+
+
+        private void UpdateReward(GObject obj, int id)
+        {
+            DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
+
+            UI_ComSupply item = UI_ComSupply.Proxy(obj);
+
+            long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
+            long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
+            item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
+            if (item.m_comItem.data == null)
+            {
+                item.m_comItem.data = new ItemView(item.m_comItem);
+            }
+            ItemData itemData = ItemUtil.createItemData(supplyCfg.bonusArr[0]);
+            (item.m_comItem.data as ItemView).SetData(itemData);
+            (item.m_comItem.data as ItemView).ShowTips = false;
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0]);
+            item.m_comCost.visible = false;
+
+            if (MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id))
+            {
+                item.m_btnGet.title = "已领取";
+                item.m_btnGet.enabled = false;
+                return;
+            }
+
+            long curTime = TimeHelper.ServerNow();
+            if (curTime < openTime)
+            {
+                item.m_btnGet.title = "领取";
+                item.m_btnGet.enabled = false;
+            }
+            else if (curTime > openTime && curTime < endTime)
+            {
+                item.m_btnGet.title = "领取";
+                item.m_btnGet.enabled = true;
+            }
+            else
+            {
+                item.m_comCost.visible = true;
+                item.m_btnGet.title = "补领";
+                item.m_btnGet.enabled = true;
+            }
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetSupplyClick);
+            }
+            item.m_btnGet.data = supplyCfg;
+            UI_ComSupply.ProxyEnd();
+        }
+        private async void OnBtnGetSupplyClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            DailySupplyCfg supplyCfg = obj.data as DailySupplyCfg;
+            long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
+            long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
+            bool result = await DailyWelfareSProxy.ReqGetSupplyReward(supplyCfg.id);
+            if (result)
+            {
+                UpdateSupplyView();
+            }
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs.meta

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

+ 10 - 188
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -44,13 +44,15 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
-            _ui.m_list.itemRenderer = ListItemRender;
+            // _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_btnSign.onClick.Add(OnBtnSignClick);
+            _ui.m_btnSupply.onClick.Add(OnBtnSupplyClick);
 
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            // EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
 
         protected override void OnShown()
@@ -60,33 +62,7 @@ namespace GFGGame
 
             _valueBarController.OnShown();
 
-            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
-            {
-                if (DateTime.Now.Day == 1)
-                {
-                    if (DateTime.Now.Month == 1)
-                    {
-                        _month = 12;
-                    }
-                    else
-                    {
-                        _month = DateTime.Now.Month - 1;
-                    }
-                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-                    _day = cfgs[cfgs.Count - 1].day;
-                }
-                else
-                {
-                    _day = DateTime.Now.Day - 1;
-                }
-            }
-            else
-            {
-                _month = DateTime.Now.Month;
-                _day = DateTime.Now.Day;
-            }
-            // _ui.m_list.ScrollToView(0);
-            UpdateView();
+
         }
 
         protected override void OnHide()
@@ -97,174 +73,20 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            // EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
 
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
-        private void UpdateView()
-        {
-            UpdateSgignView();
-            UpdateSupplyView();
-        }
-        private void UpdateSgignView()
-        {
-            _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
-            _ui.m_txtSignCount.text = _signCount.ToString();// DailyWelfareManager.Instance.DailySignDatas.Count.ToString();
-            List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-            _ui.m_proSign.target.max = signBonusCfgs.Count;
-            _ui.m_proSign.target.value = _signCount;
-            List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
-            for (int i = 0; i < signCfgs.Count; i++)
-            {
-                GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
-                comProBonus.x = ((float)signCfgs[i].day / (float)signBonusCfgs.Count) * _ui.m_proSign.target.width;
-                UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
-                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
-                item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
-                item.m_txtDay.text = signCfgs[i].day.ToString();
-                if (item.target.data == null)
-                {
-                    item.target.onClick.Add(OnBtnGetProBonus);
-                }
-                item.target.data = signCfgs[i];
-                UI_ComProBonus.ProxyEnd();
-            }
-            _ui.m_list.numItems = signBonusCfgs.Count;
-        }
-        private async void OnBtnGetProBonus(EventContext context)
-        {
-            GObject obj = context.sender as GObject;
-            DailySignCfg signCfg = obj.data as DailySignCfg;
-            if (_signCount < signCfg.day || MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfg.day))
-            {
-                GoodsItemTipsController.ShowItemTips(signCfg.bonusArr[0][1]);
-            }
-            else
-            {
-                bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.day);
-                if (result)
-                {
-                    UpdateSgignView();
-                }
-            }
-        }
-        private void UpdateSupplyView()
+        private void OnBtnSignClick()
         {
-            UpdateReward(_ui.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
-            UpdateReward(_ui.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
+            ViewManager.Show<DailySignView>();
         }
-
-        private void ListItemRender(int index, GObject obj)
+        private void OnBtnSupplyClick()
         {
-            DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[index];
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
-            bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), bonusCfg.day);
-            if (itemCfg == null) return;
-            UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
-
-            item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
-            item.m_txtDay.text = bonusCfg.day.ToString();
-            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_txtCount.text = bonusCfg.bonusArr[0][1].ToString();
-            item.m_imgGot.visible = isGot;// bonusCfg.day <= _day && DailyWelfareManager.Instance.DailySignDatas.IndexOf(bonusCfg.day) >= 0;
-            item.m_imgNotGet.visible = bonusCfg.day < _day && !isGot;
-            RedDotController.Instance.SetComRedDot(item.target, bonusCfg.day == _day && !isGot);
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(OnGetSignBonus);
-            }
-            item.target.data = bonusCfg.day;
-            UI_ListSignItem.ProxyEnd();
-        }
-        private async void OnGetSignBonus(EventContext context)
-        {
-            GObject obj = context.sender as GObject;
-            int day = (int)obj.data;
-            bool result = false;
-            if (day > _day) return;
-            if (day < _day)
-            {
-                int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];
-                AlertUI.Show(string.Format("是否确定花费{0}{1}补签?", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name)).
-               SetLeftButton(true, "否").
-                SetRightButton(true, "是", async (object param) =>
-                {
-                    result = await DailyWelfareSProxy.ReqReSign(day);
-                });
-            }
-            else
-            {
-                result = await DailyWelfareSProxy.ReqSign(day);
-            }
-            if (result)
-            {
-                _ui.m_list.numItems = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month).Count;
-            }
-        }
-        private void UpdateReward(GObject obj, int id)
-        {
-            DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
-
-            UI_ComSupply item = UI_ComSupply.Proxy(obj);
-
-            long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
-            long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
-            item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
-            if (item.m_comItem.data == null)
-            {
-                item.m_comItem.data = new ItemView(item.m_comItem);
-            }
-            ItemData itemData = ItemUtil.createItemData(supplyCfg.bonusArr[0]);
-            (item.m_comItem.data as ItemView).SetData(itemData);
-            (item.m_comItem.data as ItemView).ShowTips = false;
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0]);
-            item.m_comCost.visible = false;
-
-            if (MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id))
-            {
-                item.m_btnGet.title = "已领取";
-                item.m_btnGet.enabled = false;
-                return;
-            }
-
-            long curTime = TimeHelper.ServerNow();
-            if (curTime < openTime)
-            {
-                item.m_btnGet.title = "领取";
-                item.m_btnGet.enabled = false;
-            }
-            else if (curTime > openTime && curTime < endTime)
-            {
-                item.m_btnGet.title = "领取";
-                item.m_btnGet.enabled = true;
-            }
-            else
-            {
-                item.m_comCost.visible = true;
-                item.m_btnGet.title = "补领";
-                item.m_btnGet.enabled = true;
-            }
-            if (item.m_btnGet.data == null)
-            {
-                item.m_btnGet.onClick.Add(OnBtnGetSupplyClick);
-            }
-            item.m_btnGet.data = supplyCfg;
-            UI_ComSupply.ProxyEnd();
-        }
-        private async void OnBtnGetSupplyClick(EventContext context)
-        {
-            GObject obj = context.sender as GObject;
-            DailySupplyCfg supplyCfg = obj.data as DailySupplyCfg;
-            long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
-            long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
-            bool result = await DailyWelfareSProxy.ReqGetSupplyReward(supplyCfg.id);
-            if (result)
-            {
-                UpdateSupplyView();
-            }
+            ViewManager.Show<DailySupplyView>();
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -100,7 +100,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.Hide(_curViewName);
-            ViewManager.GoBackFrom(typeof(StoreView).FullName);
+            ViewManager.GoBackFrom(typeof(StoreView).FullName, false);
         }
 
         private void OnTabChange()

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -269,7 +269,7 @@ namespace GFGGame
             }
         }
 
-        public static void GoBackFrom(string fullViewName)
+        public static void GoBackFrom(string fullViewName, bool hideOther = true)
         {
             string name = GetName(fullViewName);
             ViewManager.Hide(name);
@@ -289,7 +289,7 @@ namespace GFGGame
             }
             else
             {
-                ViewManager.Show(ViewName.MAINUI_VIEW, null, null, true);
+                ViewManager.Show(ViewName.MAINUI_VIEW, null, null, hideOther);
             }
         }
 

BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes