七天签到

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_Component1.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.Activit
+namespace UI.Activity
 {
     public partial class UI_Component1
     {
         public GComponent target;
         public GLoader m_loaIcon;
         public const string URL = "ui://5uawdql9rkrwj";
-        public const string PACKAGE_NAME = "Activit";
+        public const string PACKAGE_NAME = "Activity";
         public const string RES_NAME = "Component1";
         private static UI_Component1 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_Component1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 57d58fcd76122474d879a5aea8fe6418
+guid: 3e17290d4c149c24faa4d524c4ec1c2f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_FirstChargeBonusUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_FirstChargeBonusUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Activit
+namespace UI.Activity
 {
     public partial class UI_FirstChargeBonusUI
     {
@@ -12,7 +12,7 @@ namespace UI.Activit
         public GButton m_btnCharge;
         public GButton m_btnGet;
         public const string URL = "ui://5uawdql9fqor0";
-        public const string PACKAGE_NAME = "Activit";
+        public const string PACKAGE_NAME = "Activity";
         public const string RES_NAME = "FirstChargeBonusUI";
         private static UI_FirstChargeBonusUI _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_FirstChargeBonusUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_FirstChargeBonusUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4247f78793167244caa0191bfc6dd8c7
+guid: 30b9830eef63ec541a0db184ba3d6134
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_ListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_ListItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Activit
+namespace UI.Activity
 {
     public partial class UI_ListItem
     {
@@ -13,7 +13,7 @@ namespace UI.Activit
         public GTextField m_txtName;
         public GImage m_imgGot;
         public const string URL = "ui://5uawdql9jyml7";
-        public const string PACKAGE_NAME = "Activit";
+        public const string PACKAGE_NAME = "Activity";
         public const string RES_NAME = "ListItem";
         private static UI_ListItem _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_ListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_ListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 267f50892cb196a4ea81ff661cdf9d4a
+guid: b43e7a0eac62c634285ce685d5f35b70
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_SevenDayLoginUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_SevenDayLoginUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Activit
+namespace UI.Activity
 {
     public partial class UI_SevenDayLoginUI
     {
@@ -10,7 +10,7 @@ namespace UI.Activit
         public GList m_list;
         public UI_Component1 m_comIcon;
         public const string URL = "ui://5uawdql9lh8v6";
-        public const string PACKAGE_NAME = "Activit";
+        public const string PACKAGE_NAME = "Activity";
         public const string RES_NAME = "SevenDayLoginUI";
         private static UI_SevenDayLoginUI _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_SevenDayLoginUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_SevenDayLoginUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4005c64400415834f84bdbf68a7ab73b
+guid: 97fa79c6f68b0344e847787938057180
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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

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

@@ -11,9 +11,8 @@ namespace UI.DailyWelfare
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnback;
-        public GProgressBar m_proSign;
+        public UI_ProgressBar1 m_proSign;
         public GTextField m_txtSignCount;
-        public UI_ComProBonus m_comItem;
         public GList m_list;
         public UI_ComSupply m_comSupply0;
         public UI_ComSupply m_comSupply1;
@@ -68,9 +67,8 @@ namespace UI.DailyWelfare
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_proSign = (GProgressBar)comp.GetChild("proSign");
+            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
             m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
-            m_comItem = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comItem"));
             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"));
@@ -81,10 +79,9 @@ namespace UI.DailyWelfare
             m_loaBg = null;
             m_comValueBar = null;
             m_btnback = null;
+            m_proSign.Dispose();
             m_proSign = null;
             m_txtSignCount = null;
-            m_comItem.Dispose();
-            m_comItem = null;
             m_list = null;
             m_comSupply0.Dispose();
             m_comSupply0 = null;

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

@@ -0,0 +1,88 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ProgressBar1
+    {
+        public GProgressBar target;
+        public UI_ComProBonus m_comProBonus0;
+        public UI_ComProBonus m_comProBonus1;
+        public UI_ComProBonus m_comProBonus2;
+        public UI_ComProBonus m_comProBonus3;
+        public UI_ComProBonus m_comProBonus4;
+        public const string URL = "ui://t8nwuj7ifqor7";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ProgressBar1";
+        private static UI_ProgressBar1 _proxy;
+
+        public static UI_ProgressBar1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar1();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comProBonus0 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus0"));
+            m_comProBonus1 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus1"));
+            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"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProBonus0.Dispose();
+            m_comProBonus0 = null;
+            m_comProBonus1.Dispose();
+            m_comProBonus1 = null;
+            m_comProBonus2.Dispose();
+            m_comProBonus2 = null;
+            m_comProBonus3.Dispose();
+            m_comProBonus3 = null;
+            m_comProBonus4.Dispose();
+            m_comProBonus4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/Activity/FirstChargeBonusView.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.Activit;
+using UI.Activity;
 using UI.CommonGame;
 using UnityEngine;
 

GameClient/Assets/Game/HotUpdate/Views/Activity/SevenDayLoginView.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.Activit;
+using UI.Activity;
 using UnityEngine;
 
 namespace GFGGame
@@ -53,7 +53,7 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Item);
             _cfg = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Suit)[0];
             UpdateView();
-            _ui.m_comIcon.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_5";
+            _ui.m_comIcon.m_loaIcon.url = "ui://Activity/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
         }
         private void UpdateView()
@@ -72,7 +72,7 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = _cfgs[index];
             UI_ListItem item = UI_ListItem.Proxy(obj);
-            item.m_loaBg.url = string.Format("ui://DailyLogin/yzhd_dyt_{0}", cfg.id);
+            item.m_loaBg.url = string.Format("ui://Activity/yzhd_dyt_{0}", cfg.id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;

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

@@ -1,4 +1,5 @@
 
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -12,8 +13,8 @@ namespace GFGGame
         private UI_DailyWelfareUI _ui;
         private ValueBarController _valueBarController;
 
-        private List<DailyTaskCfg> _cfgs;
-        private List<DailyActiveRewardCfg> _rewardCfgs;
+        private int _month;
+        private int _day;
 
         public override void Dispose()
         {
@@ -52,7 +53,8 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
 
             _valueBarController.OnShown();
-            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
+            _month = DateTime.Now.Month;
+            _day = DateTime.Now.Day;
             UpdateList();
             UpdateReward();
             _ui.m_list.ScrollToView(0);
@@ -68,9 +70,28 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
+        private void UpdateSgignView()
+        {
+            _ui.m_txtSignCount.text = DailyWelfareManager.Instance.DailySignDatas.Count.ToString();
+            _ui.m_proSign.target.max = DailySignCfgArray.Instance.GetCfgsBymonth(_month).Count;
+            _ui.m_proSign.target.value = DailyWelfareManager.Instance.DailySignDatas.Count;
+            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 = (signCfgs[i].day / (float)_ui.m_proSign.target.max) * _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
+                UI_ComProBonus.ProxyEnd();
+            }
+        }
+        private void UpdateSupplyView()
+        {
+
+        }
         private void UpdateList()
         {
-            _ui.m_list.numItems = _cfgs.Count;
         }
         private void UpdateReward()
         {

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0!a.png.meta → GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c16d7c3f9c76a7d4a8d7c340099b6bf5
+guid: 2bd9a0f4485bffc49b9c57c256d4c08d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0.png.meta → GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a8211e10d9bc3b4d8d4866ca44ce0a1
+guid: 2a9656f0914538847980b774702b008c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0_1!a.png.meta → GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a762d564b75aef94b8024359a2e80666
+guid: 8fbb33de14f3ab2439ddd884ea6a7d02
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0_1.png.meta → GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5bafc39d9c9203747b07bf0033c17796
+guid: 896fb7937882f404fb57bc311346bfcc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Activity/Activit_fui.bytes.meta → GameClient/Assets/ResIn/UI/Activity/Activity_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 694da0a5b68e5524e9720d6219fe21ec
+guid: 5c700def84ef1384d996ef349a0791ca
 TextScriptImporter:
   externalObjects: {}
   userData: