ソースを参照

每日签到动画

zhaoyang 2 年 前
コミット
c0319abd18
23 ファイル変更181 行追加117 行削除
  1. 59 10
      FGUIProject/assets/DailyWelfare/DailySignUI.xml
  2. 1 1
      FGUIProject/assets/DailyWelfare/components/ComProBonus.xml
  3. 6 0
      FGUIProject/assets/DailyWelfare/components/ComSignBg.xml
  4. 6 0
      FGUIProject/assets/DailyWelfare/components/ComSignTop.xml
  5. 3 2
      FGUIProject/assets/DailyWelfare/components/ListSignItem.xml
  6. 10 7
      FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml
  7. 0 1
      FGUIProject/assets/DailyWelfare/components/comPro.xml
  8. BIN
      FGUIProject/assets/DailyWelfare/images/bg.png
  9. BIN
      FGUIProject/assets/DailyWelfare/images/flower.png
  10. BIN
      FGUIProject/assets/DailyWelfare/images/kuang.png
  11. BIN
      FGUIProject/assets/DailyWelfare/images/top_line.png
  12. 5 0
      FGUIProject/assets/DailyWelfare/package.xml
  13. 18 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs
  14. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs
  15. 9 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar1.cs
  16. 0 74
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs
  17. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs.meta
  18. 61 5
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs
  19. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png
  20. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png
  21. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png
  22. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png
  23. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes

+ 59 - 10
FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1865">
+<component size="1080,1865" opaque="false">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_qik1" name="n0" src="idkd1f" fileName="images/bg.png" xy="0,38"/>
-    <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="686,254" pivot="0.5,0" 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="时期">
+    <component id="n13_idkd" name="comBg" src="idkd1k" fileName="components/ComSignBg.xml" xy="0,95" size="1080,1735"/>
+    <image id="n10_idkd" name="n10" src="idkd1j" fileName="images/top_line.png" xy="544,0"/>
+    <component id="n12_idkd" name="comTop" src="idkd1l" fileName="components/ComSignTop.xml" xy="54,229" size="971,213"/>
+    <image id="n11_idkd" name="n11" src="idkd1h" fileName="images/flower.png" xy="0,54"/>
+    <image id="n1_qik1" name="n1" src="idkd19" fileName="images/t_k2.png" xy="115,257" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n14_idkd" name="n14" src="idkd18" fileName="images/t_k1.png" xy="85,232" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n15_idkd" name="n15" src="idkd1a" fileName="images/t_kuai.png" xy="108,254" pivot="0.5,0.5" size="163,163" group="n20_idkd"/>
+    <image id="n16_idkd" name="n16" src="idkd1b" fileName="images/t_moon.png" xy="110,274" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n17_idkd" name="n17" src="idkd1e" fileName="images/t3.png" xy="132,354" group="n20_idkd"/>
+    <image id="n18_idkd" name="n18" src="idkd17" fileName="images/t4.png" xy="193,352" group="n20_idkd"/>
+    <image id="n19_idkd" name="n19" src="idkd1d" fileName="images/t2.png" xy="196,292" group="n20_idkd"/>
+    <text id="n2_qik1" name="txtMonth" xy="195,348" pivot="1,1" anchor="true" size="148,94" group="n20_idkd" 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"/>
+    <group id="n20_idkd" name="n20" xy="47,232" size="244,206"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="693,271" pivot="0.5,0" anchor="true" size="622,161">
+      <ProgressBar value="1" max="100"/>
+    </component>
+    <graph id="n21_idkd" name="holderRole" xy="884,1500" size="10,10" touchable="false"/>
     <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/>
@@ -46,6 +55,46 @@
       <item/>
     </list>
     <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+    <graph id="n22_idkd" name="holderFlower" xy="535,484" size="10,10" touchable="false"/>
+    <graph id="n24_idkd" name="holderLizi" xy="522,670" size="10,10" touchable="false"/>
   </displayList>
-  <transition name="t0"/>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n11_idkd" tween="true" startValue="0" endValue="1" duration="24" ease="Linear"/>
+    <item time="0" type="Alpha" target="n12_idkd" tween="true" startValue="0" endValue="1" duration="24" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n14_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n15_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n16_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n17_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n18_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n19_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n1_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n2_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n3_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n5_qik1" value="0"/>
+    <item time="0" type="Size" target="n12_idkd" tween="true" startValue="0,213" endValue="971,213" duration="12" ease="Linear"/>
+    <item time="0" type="Size" target="n13_idkd" tween="true" startValue="1080,0" endValue="1080,1735" duration="12" ease="Linear"/>
+    <item time="0" type="Visible" target="n21_idkd" value="false"/>
+    <item time="0" type="Visible" target="n9_qik1" value="false"/>
+    <item time="0" type="XY" target="n16_idkd" value="140,285"/>
+    <item time="6" type="Alpha" target="n2_qik1" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="6" type="XY" target="n2_qik1" tween="true" startValue="222,375" endValue="195,348" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n14_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n15_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n16_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n17_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n18_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n19_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n1_qik1" tween="true" startValue="0" endValue="0" duration="6" ease="Linear"/>
+    <item time="9" type="Rotation" target="n14_idkd" tween="true" startValue="-10" endValue="0" duration="6" ease="Linear"/>
+    <item time="9" type="Rotation" target="n1_qik1" tween="true" startValue="10" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n16_idkd" tween="true" startValue="140,285" endValue="110,274" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n17_idkd" tween="true" startValue="145,339" endValue="131,354" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n18_idkd" tween="true" startValue="203,338" endValue="193,352" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n19_idkd" tween="true" startValue="182,306" endValue="196,292" duration="6" ease="Linear"/>
+    <item time="12" type="Alpha" target="n3_qik1" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="12" type="Alpha" target="n5_qik1" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="18" type="Visible" target="n21_idkd" value="true"/>
+    <item time="24" type="Visible" target="n9_qik1" value="true"/>
+  </transition>
 </component>

+ 1 - 1
FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -3,7 +3,7 @@
   <displayList>
     <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"/>
+    <loader id="n14_fqor" name="loaIcon" xy="5,6" pivot="0.5,0.5" size="70,70" 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"/>

+ 6 - 0
FGUIProject/assets/DailyWelfare/components/ComSignBg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1735" overflow="hidden">
+  <displayList>
+    <loader id="n13_idkd" name="n13" xy="0,0" size="1080,1735" url="ui://t8nwuj7iidkd1f" fill="scaleFree"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/DailyWelfare/components/ComSignTop.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="971,213" overflow="hidden">
+  <displayList>
+    <image id="n12_idkd" name="n12" src="idkd1i" fileName="images/kuang.png" xy="0,0"/>
+  </displayList>
+</component>

+ 3 - 2
FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="155,200">
-  <controller name="c1" pages="0,,1,,2," selected="2">
+  <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
     <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">
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" autoSize="true">
       <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
     <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
@@ -15,5 +15,6 @@
     <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"/>
+    <graph id="n24_idkd" name="holderSign" xy="80,103" size="10,10" touchable="false"/>
   </displayList>
 </component>

+ 10 - 7
FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="620,140" overflow="hidden" extention="ProgressBar">
+<component size="622,161" extention="ProgressBar">
   <displayList>
-    <image id="n8_idkd" name="n8" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <component id="n0_fqor" name="n0" src="idkd1g" fileName="components/comPro.xml" xy="0,95"/>
+    <image id="n8_idkd" name="n8" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" group="n13_idkd"/>
+    <image id="n14_idkd" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,99" group="n13_idkd" 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"/>
-    <graph id="n9_idkd" name="ani" xy="608,56" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" group="n13_idkd" advanced="true"/>
+    <graph id="n9_idkd" name="holder" xy="536,106" pivot="0.5,0.5" anchor="true" size="10,10" group="n13_idkd" touchable="false" lineSize="0"/>
+    <graph id="n15_idkd" name="holderReward" xy="425,34" size="10,10" group="n13_idkd" touchable="false"/>
+    <group id="n13_idkd" name="n13" xy="0,0" size="620,140"/>
+    <image id="n10_idkd" name="n10" src="qik1r" fileName="images/txz_lvl_db.png" xy="-90,38" group="n12_idkd"/>
+    <text id="n11_idkd" name="txtSignCount" xy="-49,73" pivot="0.5,0" size="43,54" group="n12_idkd" fontSize="40" color="#643323" text="30"/>
+    <group id="n12_idkd" name="n12" xy="-90,38" size="123,123"/>
   </displayList>
   <ProgressBar/>
 </component>

+ 0 - 1
FGUIProject/assets/DailyWelfare/components/comPro.xml

@@ -3,6 +3,5 @@
   <displayList>
     <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
     <image id="n3_idkd" name="n3" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
-    <graph id="n2_idkd" name="ani" xy="614,12" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
   </displayList>
 </component>

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


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


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


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


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

@@ -55,6 +55,11 @@
     <image id="idkd1e" name="t3.png" path="/images/"/>
     <image id="idkd1f" name="bg.png" path="/images/"/>
     <component id="idkd1g" name="comPro.xml" path="/components/"/>
+    <image id="idkd1h" name="flower.png" path="/images/"/>
+    <image id="idkd1i" name="kuang.png" path="/images/"/>
+    <image id="idkd1j" name="top_line.png" path="/images/"/>
+    <component id="idkd1k" name="ComSignBg.xml" path="/components/"/>
+    <component id="idkd1l" name="ComSignTop.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

+ 18 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs

@@ -8,11 +8,15 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public Controller m_c1;
-        public UI_ProgressBar1 m_proSign;
+        public GComponent m_comBg;
+        public GComponent m_comTop;
         public GTextField m_txtMonth;
-        public GTextField m_txtSignCount;
+        public UI_ProgressBar1 m_proSign;
+        public GGraph m_holderRole;
         public GList m_list;
         public GButton m_btnClose;
+        public GGraph m_holderFlower;
+        public GGraph m_holderLizi;
         public Transition m_t0;
         public const string URL = "ui://t8nwuj7iqik1q";
         public const string PACKAGE_NAME = "DailyWelfare";
@@ -62,22 +66,30 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_comTop = (GComponent)comp.GetChild("comTop");
             m_txtMonth = (GTextField)comp.GetChild("txtMonth");
-            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
+            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_holderRole = (GGraph)comp.GetChild("holderRole");
             m_list = (GList)comp.GetChild("list");
             m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_holderFlower = (GGraph)comp.GetChild("holderFlower");
+            m_holderLizi = (GGraph)comp.GetChild("holderLizi");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_comBg = null;
+            m_comTop = null;
+            m_txtMonth = null;
             m_proSign.Dispose();
             m_proSign = null;
-            m_txtMonth = null;
-            m_txtSignCount = null;
+            m_holderRole = null;
             m_list = null;
             m_btnClose = null;
+            m_holderFlower = null;
+            m_holderLizi = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -15,6 +15,7 @@ namespace UI.DailyWelfare
         public GImage m_imgGot;
         public GImage m_imgNotGet;
         public GGroup m_grpItem;
+        public GGraph m_holderSign;
         public const string URL = "ui://t8nwuj7ifqor9";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ListSignItem";
@@ -70,6 +71,7 @@ namespace UI.DailyWelfare
             m_imgGot = (GImage)comp.GetChild("imgGot");
             m_imgNotGet = (GImage)comp.GetChild("imgNotGet");
             m_grpItem = (GGroup)comp.GetChild("grpItem");
+            m_holderSign = (GGraph)comp.GetChild("holderSign");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,7 @@ namespace UI.DailyWelfare
             m_imgGot = null;
             m_imgNotGet = null;
             m_grpItem = null;
+            m_holderSign = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar1.cs

@@ -12,6 +12,9 @@ namespace UI.DailyWelfare
         public UI_ComProBonus m_comProBonus2;
         public UI_ComProBonus m_comProBonus3;
         public UI_ComProBonus m_comProBonus4;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public GTextField m_txtSignCount;
         public const string URL = "ui://t8nwuj7ifqor7";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ProgressBar1";
@@ -64,6 +67,9 @@ namespace UI.DailyWelfare
             m_comProBonus2 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus2"));
             m_comProBonus3 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus3"));
             m_comProBonus4 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus4"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -77,6 +83,9 @@ namespace UI.DailyWelfare
             m_comProBonus3 = null;
             m_comProBonus4.Dispose();
             m_comProBonus4 = null;
+            m_holder = null;
+            m_holderReward = null;
+            m_txtSignCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 74
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_comPro
-    {
-        public GComponent target;
-        public GImage m_bar;
-        public GGraph m_ani;
-        public const string URL = "ui://t8nwuj7iidkd1g";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "comPro";
-        private static UI_comPro _proxy;
-
-        public static UI_comPro Create(GObject gObject = null)
-        {
-            var ui = new UI_comPro();
-            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_comPro Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_comPro();
-            }
-            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_bar = (GImage)comp.GetChild("bar");
-            m_ani = (GGraph)comp.GetChild("ani");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bar = null;
-            m_ani = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

+ 61 - 5
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -11,15 +11,32 @@ namespace GFGGame
     public class DailySignView : BaseWindow
     {
         private UI_DailySignUI _ui;
-
-        private int _signCount;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GameObject _gameObject4;
+        private GameObject _gameObject5;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
+        private GoWrapper _wrapper4;
+        private GoWrapper _wrapper5;
+        private GGraph m_holderSign;
+        private float _signCount;
         private int _month;
         private int _day;
 
         public override void Dispose()
         {
             base.Dispose();
-
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -40,6 +57,17 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_list.itemRenderer = ListItemRender;
 
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_league", "Answer_bgtx");
+            SceneController.AddObjectToView(null, null, _ui.m_holderFlower, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everyday_2lizi");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLizi, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everydayy_people");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRole, resPath2, out _gameObject2, out _wrapper2);
+
+            string resPath4 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Progress_head");
+            SceneController.AddObjectToView(null, null, _ui.m_proSign.m_holder, resPath4, out _gameObject4, out _wrapper4, 90);
+
         }
         protected override void AddEventListener()
         {
@@ -50,15 +78,25 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_t0.Play(() =>
+            {
+                if (m_holderSign != null)
+                {
+                    m_holderSign.visible = true;
+                }
+            });
             _month = TimeUtil.GetCurMonth();
             _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
+
             UpdateSignView();
+
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_t0.Stop();
         }
         protected override void RemoveEventListener()
         {
@@ -69,11 +107,13 @@ namespace GFGGame
         private void UpdateSignView()
         {
             _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
-            _ui.m_txtSignCount.text = _signCount.ToString();
+            _ui.m_proSign.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;
+            _ui.m_proSign.m_holder.x = _signCount / signBonusCfgs.Count * _ui.m_proSign.target.width - 68;
             List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.m_holderReward.visible = false;
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
@@ -90,6 +130,16 @@ namespace GFGGame
                 bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfgs[i].day);
                 item.m_imgGot.visible = isGot;
                 bool canGet = _signCount >= signCfgs[i].day && !isGot;
+                if (canGet)
+                {
+                    if (_gameObject5 == null)
+                    {
+                        string resPath5 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everyday_enable");
+                        SceneController.AddObjectToView(null, null, _ui.m_proSign.m_holderReward, resPath5, out _gameObject5, out _wrapper5);
+                    }
+                    _ui.m_proSign.m_holderReward.visible = canGet;
+                    _ui.m_proSign.m_holderReward.position = new Vector2(item.target.x, 35);
+                }
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
@@ -127,7 +177,13 @@ namespace GFGGame
             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 (bonusCfg.day == _day && !isGot && _gameObject3 == null)
+            {
+                string resPath3 = ResPathUtil.GetViewEffectPath("ui_Activity", "everyday_kuang");
+                SceneController.AddObjectToView(null, null, item.m_holderSign, resPath3, out _gameObject3, out _wrapper3);
+                m_holderSign = item.m_holderSign;
+            }
+            item.m_holderSign.visible = false;
             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)

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


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


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


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


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