Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,837" opaque="false">
   <displayList>
-    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
-    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
-    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
-    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <component id="n0_qik1" name="comBg" src="ofwu23" fileName="components/ComSupplyBg.xml" xy="0,194" size="1080,644"/>
+    <component id="n10_qik1" name="comSupply" src="ofwu24" fileName="components/ComSupply.xml" xy="36,69"/>
     <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
-    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
-    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
-    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
-    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <graph id="n19_ofwu" name="holder" xy="590,720" size="10,10"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_qik1" tween="true" startValue="0" endValue="1" duration="8" ease="Linear"/>
+    <item time="0" type="Alpha" target="n10_qik1" tween="true" startValue="0" endValue="1" duration="11" ease="Expo.In"/>
+    <item time="0" type="Alpha" target="n14_qik1" tween="true" startValue="0" endValue="1" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n0_qik1" tween="true" startValue="0,644" endValue="1080,644" duration="8" ease="Linear"/>
+    <item time="0" type="Visible" target="n19_ofwu" value="true"/>
+    <item time="0" type="XY" target="n10_qik1" tween="true" startValue="36,0" endValue="36,69" duration="8" ease="Linear"/>
+    <item time="8" type="Visible" target="n19_ofwu" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="378,643">
-  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+<component size="919,674">
   <displayList>
-    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
-    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
-    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
-    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
-      <Button title="补领"/>
-    </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
-    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
-    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
-    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
-    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
-    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupplyItem.xml" xy="171,0"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupplyItem.xml" xy="541,31" controller="c1,1"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="0,99"/>
+    <graph id="n14_ofwu" name="holder" xy="15,148" size="10,10"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupplyBg.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,644" pivot="0.5,0" overflow="hidden">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,0">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,612" pivot="0.5,0.5" group="n18_ofwu"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,598" pivot="0.5,0" size="239,46" group="n18_ofwu" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,612" pivot="0.5,0.5" group="n18_ofwu" scale="-1,1"/>
+    <group id="n18_ofwu" name="n18" xy="271,598" size="537,46" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ComSupplyItem.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="378,643">
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
+      <Button title="补领"/>
+    </component>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <graph id="n36_ofwu" name="holder" xy="147,232" size="10,10" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -5,7 +5,7 @@
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
-    <component id="fqora" name="ComSupply.xml" path="/components/"/>
+    <component id="fqora" name="ComSupplyItem.xml" path="/components/"/>
     <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/"/>
@@ -75,7 +75,9 @@
     <image id="vols1z" name="hdbn_qtdl.png" path="/images/"/>
     <image id="vols20" name="hdbn_qtdl_kqdnf.png" path="/images/"/>
     <image id="vols21" name="hdbn_wz_mrbj.png" path="/images/"/>
-    <component id="vols22" name="ComList.xml" path="/"/>
+    <component id="vols22" name="ComList.xml" path="/components/"/>
+    <component id="ofwu23" name="ComSupplyBg.xml" path="/components/"/>
+    <component id="ofwu24" name="ComSupply.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 4;
+        public int maxFightSpeed = 2;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupply.cs

@@ -7,12 +7,10 @@ namespace UI.DailyWelfare
     public partial class UI_ComSupply
     {
         public GComponent target;
-        public Controller m_c1;
-        public GTextField m_txtTime;
-        public GButton m_btnGet;
-        public GComponent m_comCost;
-        public GTextField m_txtCount;
-        public const string URL = "ui://t8nwuj7ifqora";
+        public UI_ComSupplyItem m_comSupply0;
+        public UI_ComSupplyItem m_comSupply1;
+        public GGraph m_holder;
+        public const string URL = "ui://t8nwuj7iofwu24";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComSupply";
         private static UI_ComSupply _proxy;
@@ -59,19 +57,17 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_comCost = (GComponent)comp.GetChild("comCost");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comSupply0 = (UI_ComSupplyItem)UI_ComSupplyItem.Create(comp.GetChild("comSupply0"));
+            m_comSupply1 = (UI_ComSupplyItem)UI_ComSupplyItem.Create(comp.GetChild("comSupply1"));
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_txtTime = null;
-            m_btnGet = null;
-            m_comCost = null;
-            m_txtCount = null;
+            m_comSupply0.Dispose();
+            m_comSupply0 = null;
+            m_comSupply1.Dispose();
+            m_comSupply1 = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyBg.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComSupplyBg
+    {
+        public GComponent target;
+        public GTextField m_txtGiftBag;
+        public const string URL = "ui://t8nwuj7iofwu23";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComSupplyBg";
+        private static UI_ComSupplyBg _proxy;
+
+        public static UI_ComSupplyBg Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSupplyBg();
+            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_ComSupplyBg Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSupplyBg();
+            }
+            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_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyBg.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComSupplyItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtTime;
+        public GButton m_btnGet;
+        public GComponent m_comCost;
+        public GTextField m_txtCount;
+        public GGraph m_holder;
+        public const string URL = "ui://t8nwuj7ifqora";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComSupplyItem";
+        private static UI_ComSupplyItem _proxy;
+
+        public static UI_ComSupplyItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSupplyItem();
+            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_ComSupplyItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSupplyItem();
+            }
+            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_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtTime = null;
+            m_btnGet = null;
+            m_comCost = null;
+            m_txtCount = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs

@@ -7,9 +7,10 @@ namespace UI.DailyWelfare
     public partial class UI_DailySupplyUI
     {
         public GComponent target;
-        public UI_ComSupply m_comSupply0;
-        public UI_ComSupply m_comSupply1;
-        public GTextField m_txtGiftBag;
+        public UI_ComSupplyBg m_comBg;
+        public UI_ComSupply m_comSupply;
+        public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://t8nwuj7iqik1t";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailySupplyUI";
@@ -57,17 +58,19 @@ namespace UI.DailyWelfare
 
         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"));
-            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_comBg = (UI_ComSupplyBg)UI_ComSupplyBg.Create(comp.GetChild("comBg"));
+            m_comSupply = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSupply0.Dispose();
-            m_comSupply0 = null;
-            m_comSupply1.Dispose();
-            m_comSupply1 = null;
-            m_txtGiftBag = null;
+            m_comBg.Dispose();
+            m_comBg = null;
+            m_comSupply.Dispose();
+            m_comSupply = null;
+            m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -13,7 +13,14 @@ namespace GFGGame
     {
         private UI_DailySupplyUI _ui;
         // private ValueBarController _valueBarController;
-
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
         private int _signCount;
         private int _month;
         private int _day;
@@ -26,6 +33,10 @@ namespace GFGGame
             //     _valueBarController.Dispose();
             //     _valueBarController = null;
             // }
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,11 +53,22 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            viewAnimationType = EnumViewAnimationType.None;
             // _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             // _ui.m_btnback.onClick.Add(OnBtnBackClick);
-
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+            string resPath = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_book");
+            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_hudie");
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_holder, resPath1, out _gameObject1, out _wrapper1);
+
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_zhuti");
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_comSupply0.m_holder, resPath2, out _gameObject2, out _wrapper2);
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_comSupply1.m_holder, resPath2, out _gameObject3, out _wrapper3);
         }
         protected override void AddEventListener()
         {
@@ -60,12 +82,14 @@ namespace GFGGame
             _month = TimeUtil.GetCurMonth();
             _day = TimeUtil.GetCurDay();
             UpdateSupplyView();
+            _ui.m_t0.Play();
         }
 
         protected override void OnHide()
         {
             // _valueBarController.OnHide();
             base.OnHide();
+            _ui.m_t0.Stop();
         }
         protected override void RemoveEventListener()
         {
@@ -84,8 +108,8 @@ namespace GFGGame
 
         private void UpdateSupplyView()
         {
-            UpdateReward(_ui.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
-            UpdateReward(_ui.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
+            UpdateReward(_ui.m_comSupply.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
+            UpdateReward(_ui.m_comSupply.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
         }
 
 
@@ -93,7 +117,7 @@ namespace GFGGame
         {
             DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
 
-            UI_ComSupply item = UI_ComSupply.Proxy(obj);
+            UI_ComSupplyItem item = UI_ComSupplyItem.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"));
@@ -132,7 +156,7 @@ namespace GFGGame
                 item.m_btnGet.onClick.Add(OnBtnGetSupplyClick);
             }
             item.m_btnGet.data = supplyCfg;
-            UI_ComSupply.ProxyEnd();
+            UI_ComSupplyItem.ProxyEnd();
         }
         private void OnBtnGetSupplyClick(EventContext context)
         {

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9ed9e3b2f9307444ea5c0d05985bbf34
+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: