福利大厅

FGUIProject/assets/CommonGame/components/ComCostColor1.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="93,46">
-  <controller name="c1" exported="true" pages="0,,1," selected="1">
-    <remark page="0" value="免费"/>
-    <remark page="1" value="付费"/>
-  </controller>
-  <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,5" size="35,35" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="35,3" size="58,39" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,3" size="93,39" advanced="true" layout="hz" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <text id="n11_a0cf" name="n11" xy="10,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </text>
-  </displayList>
-  <relation target="n7_si5z" sidePair="width-width"/>
-</component>

FGUIProject/assets/CommonGame/package.xml

@@ -141,7 +141,7 @@
     <image id="qr4etht" name="wpzs_anniu_2.png" path="/imagesExport/" exported="true"/>
     <image id="a97wthv" name="huoyuedu.png" path="/imgItemIcon/" exported="true"/>
     <image id="cs8jthw" name="yx_wilq.png" path="/images/"/>
-    <image id="cs8jthx" name="yx_whd.png" path="/images/"/>
+    <image id="cs8jthx" name="yx_whd.png" path="/images/" exported="true"/>
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
@@ -269,7 +269,6 @@
     <image id="o9ghtlj" name="hz_bq_shuxing_2.png" path="/imagesNew/" exported="true"/>
     <image id="o9ghtlk" name="hz_bq_shuxing_3.png" path="/imagesNew/" exported="true"/>
     <image id="o9ghtll" name="hz_bq_shuxing_4.png" path="/imagesNew/" exported="true"/>
-    <component id="o9ghtln" name="ComCostColor1.xml" path="/components/" exported="true"/>
     <component id="o9ghtlo" name="ComHead1.xml" path="/components/" exported="true"/>
     <image id="o9gh43" name="lm_zjm_sztxk.png" path="/imagesNew/"/>
     <component id="o9ghtlp" name="ComHeadWithLv2.xml" path="/components/" exported="true"/>
@@ -281,8 +280,8 @@
     <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
-    <component id="rv091p" name="BtnYellowBig.xml" path="/components/" exported="true"/>
-    <component id="rv091x" name="BtnYellowSmall.xml" path="/components/" exported="true"/>
+    <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
+    <component id="rv091x" name="BtnStyle1Small.xml" path="/components/" exported="true"/>
     <image id="wm603g" name="lm_an__3weixuan.png" path="/imagesNew/" exported="true"/>
     <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
+  <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"/>
+    </loader>
+    <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
+      <Button icon="ui://t8nwuj7ifqor1"/>
+    </component>
+    <image id="n2_fqor" name="n2" src="fqor2" fileName="images/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 title="每日签到" controller="c1" page="0"/>
+    </component>
+    <component id="n5_fqor" name="n5" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="333,347" group="n7_fqor">
+      <Button checked="true" title="每日补给" controller="c1" page="1"/>
+    </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,470" 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,42" group="n21_fqor" fontSize="30" text="1"/>
+    <component id="n11_fqor" name="comItem" src="fqor8" fileName="components/ComProBonus.xml" xy="115,471" group="n21_fqor"/>
+    <list id="n20_fqor" name="list" xy="53,616" size="974,1130" group="n21_fqor" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://t8nwuj7ifqor9" 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>
+    <group id="n21_fqor" name="n21" xy="53,371" size="974,1375" 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>

FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="81,200" 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=""/>
+    <component id="n11_fqor" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="41,122" pivot="0.5,0" anchor="true" group="n13_fqor" scale="0.3,0.3"/>
+    <group id="n13_fqor" name="n13" xy="-89,0" size="260,382"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="222,353">
+  <displayList>
+    <component id="n22_fqor" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,0" size="222,225"/>
+    <component id="n23_fqor" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="17,230">
+      <Button title="补领"/>
+    </component>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="46,307" pivot="0.5,0" controller="c1,1"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="178,143">
+  <displayList>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="49,0" size="50,50"/>
+    <loader id="n14_fqor" name="loaIcon" xy="24,51" pivot="0.5,0.5" size="92,92" aspect="true" fill="scale"/>
+    <text id="n16_fqor" name="txtDay" xy="121,52" size="40,42" fontSize="30" text=""/>
+    <text id="n17_fqor" name="txtCount" xy="121,99" size="40,42" fontSize="30" text=""/>
+    <image id="n18_fqor" name="n18" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,82"/>
+    <image id="n19_fqor" name="n19" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,78"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="850,33" extention="ProgressBar">
+  <displayList>
+    <image id="n0_fqor" name="n0" src="fqor6" fileName="images/pro_bk_in.png" xy="-36,0">
+      <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"/>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="t8nwuj7i">
+  <resources>
+    <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
+    <image id="fqor1" name="wpbb_zi.png" path="/images/"/>
+    <image id="fqor2" name="wpbb_xtxt.png" path="/images/"/>
+    <image id="fqor5" name="pro_activate.png" path="/images/"/>
+    <image id="fqor6" name="pro_bk_in.png" path="/images/"/>
+    <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/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyWelfare" packageCount="2" genCode="true"/>
+</packageDescription>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -19,7 +19,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckGiftBagApproach, CheckShopExchangeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, GetZhaiXingApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckGiftBagApproach, CheckShopExchangeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, GetZhaiXingApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)
@@ -505,5 +505,54 @@ namespace GFGEditor
 
             return null;
         }
+        private static string GetLeaguePrayApproach(int itemId)
+        {
+            LeaguePrayCfg[] prayCfgs = LeaguePrayCfgArray.Instance.dataArray;
+            for (int i = 0; i < prayCfgs.Length; i++)
+            {
+                for (int j = 0; j < prayCfgs[i].bonusArr.Length; j++)
+                {
+                    if (prayCfgs[i].bonusArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.LEAGUE_PRAY;
+                    }
+                }
+                for (int j = 0; j < prayCfgs[i].bonusOnceArr.Length; j++)
+                {
+                    if (prayCfgs[i].bonusOnceArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.LEAGUE_PRAY;
+                    }
+                }
+            }
+            return null;
+        }
+        private static string GetLeagueAnswerApproach(int itemId)
+        {
+            LeagueQuestionCfg[] questionCfgs = LeagueQuestionCfgArray.Instance.dataArray;
+            for (int i = 0; i < questionCfgs.Length; i++)
+            {
+                for (int j = 0; j < questionCfgs[i].bonusArr.Length; j++)
+                {
+                    if (questionCfgs[i].bonusArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.LEAGUE_ANSWER;
+                    }
+                }
+            }
+
+            LeagueQuestionBonusCfg[] questionBonusCfgs = LeagueQuestionBonusCfgArray.Instance.dataArray;
+            for (int i = 0; i < questionBonusCfgs.Length; i++)
+            {
+                for (int j = 0; j < questionBonusCfgs[i].bonusArr.Length; j++)
+                {
+                    if (questionBonusCfgs[i].bonusArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.LEAGUE_ANSWER;
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -61,6 +61,14 @@ namespace GFGGame
         /// 每日任务
         /// </summary>
         public const string DAILY_TASK = "DAILY_TASK";
+        /// <summary>
+        /// 雅集-祈福
+        /// </summary>
+        public const string LEAGUE_PRAY = "LEAGUE_PRAY";
+        /// <summary>
+        ///雅集-夜宴
+        /// </summary>
+        public const string LEAGUE_ANSWER = "LEAGUE_ANSWER";
 
     }
 }

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

@@ -0,0 +1,22 @@
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using UnityEngine;
+
+namespace GFGGame
+{
+
+    public class DailyWelfareManager : SingletonBase<DailyWelfareManager>
+    {
+        public List<int> DailySignDatas = new List<int>();//记录本月已签到日期
+        public List<int> AccumulatedSignDatas = new List<int>();//记录本月已领奖励的进度日期，5,10,15,20,25
+        public List<int> SupplyRewardDatas = new List<int>();//记录今日已领补给id
+        public static void Clear()
+        {
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/DailyWelfareManager.cs.meta

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

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

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

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

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

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComSupply
+    {
+        public GComponent target;
+        public GComponent m_comItem;
+        public GButton m_btnGet;
+        public GComponent m_comCost;
+        public const string URL = "ui://t8nwuj7ifqora";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComSupply";
+        private static UI_ComSupply _proxy;
+
+        public static UI_ComSupply Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSupply();
+            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_ComSupply Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSupply();
+            }
+            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_comItem = (GComponent)comp.GetChild("comItem");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItem = null;
+            m_btnGet = null;
+            m_comCost = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,101 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+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 GProgressBar 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;
+        public const string URL = "ui://t8nwuj7ifqor0";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailyWelfareUI";
+        private static UI_DailyWelfareUI _proxy;
+
+        public static UI_DailyWelfareUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailyWelfareUI();
+            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_DailyWelfareUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailyWelfareUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+            m_btnback = (GButton)comp.GetChild("btnback");
+            m_proSign = (GProgressBar)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"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_comValueBar = null;
+            m_btnback = null;
+            m_proSign = null;
+            m_txtSignCount = null;
+            m_comItem.Dispose();
+            m_comItem = null;
+            m_list = null;
+            m_comSupply0.Dispose();
+            m_comSupply0 = null;
+            m_comSupply1.Dispose();
+            m_comSupply1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ListSignItem
+    {
+        public GComponent target;
+        public GLoader m_loaDoubleTag;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDay;
+        public GTextField m_txtCount;
+        public const string URL = "ui://t8nwuj7ifqor9";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ListSignItem";
+        private static UI_ListSignItem _proxy;
+
+        public static UI_ListSignItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSignItem();
+            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_ListSignItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSignItem();
+            }
+            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_loaDoubleTag = (GLoader)comp.GetChild("loaDoubleTag");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaDoubleTag = null;
+            m_loaIcon = null;
+            m_txtDay = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/ServerProxy/DailyWelfareSProxy.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+namespace GFGGame
+{
+    public static class DailyWelfareSProxy
+    {
+        public static async ETTask<bool> ReqDailyTaskInfos()
+        {
+            M2C_GetDailyTaskInfos response = null;
+            response = (M2C_GetDailyTaskInfos)await MessageHelper.SendToServer(new C2M_GetDailyTaskInfos());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.TaskList.Count; i++)
+                    {
+                        TaskInfo taskInfo = new TaskInfo();
+                        taskInfo.id = response.TaskList[i].Id;
+                        taskInfo.state = response.TaskList[i].Status;
+                        taskInfo.progress = response.TaskList[i].Progress;
+                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
+                    }
+                    for (int i = 0; i < response.kLivenessBox.Count; i++)
+                    {
+                        DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.kLivenessBox[i], response.vLivenessBox[i]);
+                    }
+
+                    return true;
+                }
+            }
+            return false;
+        }
+        //每日签到
+        public static async ETTask<bool> ReqSign(int taskId)
+        {
+            S2C_Sign response = null;
+            response = (S2C_Sign)await MessageHelper.SendToServer(new C2S_Sign());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    DailyWelfareManager.Instance.DailySignDatas.Add(DateTime.Now.Day);
+                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
+                    BonusController.TryShowBonusList(bonus);
+                    return true;
+                }
+            }
+            return false;
+        }
+        //补签
+        public static async ETTask<bool> ReqReSign(int day)
+        {
+            S2C_ReSign response = null;
+            response = (S2C_ReSign)await MessageHelper.SendToServer(new C2S_ReSign() { Day = day });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    DailyWelfareManager.Instance.DailySignDatas.Add(day);
+                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
+                    BonusController.TryShowBonusList(bonus);
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取签到累计奖励
+        public static async ETTask<bool> ReqGetSignReward(int day)
+        {
+            S2C_GetSignReward response = null;
+            response = (S2C_GetSignReward)await MessageHelper.SendToServer(new C2S_GetSignReward() { Day = day });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    DailyWelfareManager.Instance.AccumulatedSignDatas.Add(day);
+                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
+                    BonusController.TryShowBonusList(bonus);
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取/补领每日补给
+        public static async ETTask<bool> ReqGetSupplyReward(int id)
+        {
+            S2C_GetSupplyReward response = null;
+            response = (S2C_GetSupplyReward)await MessageHelper.SendToServer(new C2S_GetSupplyReward() { Id = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    DailyWelfareManager.Instance.SupplyRewardDatas.Add(id);
+                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
+                    BonusController.TryShowBonusList(bonus);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/DailyWelfareSProxy.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -63,6 +63,11 @@ namespace GFGGame
             {
                 ViewManager.Show<PoemGalleryRuleView>();
             });
+            _valueBar.m_btnLeagueContribuation.onClick.Add(() =>
+            {
+                object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, new object[] { typeof(LeagueSkillUpView).FullName, null } };
+                GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CONTRIBUTION, sourceDatas);
+            });
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -285,25 +285,26 @@ namespace GFGGame
                     isJump = false;
                     if (ViewManager.isViewOpen(ViewName.SUIT_GUIDE_VIEW))
                     {
-
-                        // this.Hide();
                         return;
                     }
-                    // this.Hide();
                     isJump = ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, _fromeViewDatas);
 
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
-                    // this.Hide();
                     isJump = ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
-                    // this.Hide();
                     isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.DAILY_TASK:
                     isJump = ViewManager.Show<DailyTaskView>(null, _fromeViewDatas);
                     break;
+                case ConstFunctionId.LEAGUE_PRAY:
+                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
+                    break;
+                case ConstFunctionId.LEAGUE_ANSWER:
+                    isJump = ViewManager.Show<LeagueAnswerView>(null, _fromeViewDatas);
+                    break;
             }
             if (isJump)
             {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare.meta

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

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

@@ -0,0 +1,88 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailyWelfareView : BaseWindow
+    {
+        private UI_DailyWelfareUI _ui;
+        private ValueBarController _valueBarController;
+
+        private List<DailyTaskCfg> _cfgs;
+        private List<DailyActiveRewardCfg> _rewardCfgs;
+
+        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_DailyWelfareUI.PACKAGE_NAME;
+            _ui = UI_DailyWelfareUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
+
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_list.itemRenderer = ListItemRender;
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
+
+            _valueBarController.OnShown();
+            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
+            UpdateList();
+            UpdateReward();
+            _ui.m_list.ScrollToView(0);
+
+        }
+
+        protected override void OnHide()
+        {
+            _valueBarController.OnHide();
+            base.OnHide();
+        }
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
+        }
+        private void UpdateList()
+        {
+            _ui.m_list.numItems = _cfgs.Count;
+        }
+        private void UpdateReward()
+        {
+
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+        }
+        private void ListBonusItemRender(int index, GObject obj)
+        {
+
+        }
+
+    }
+}

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

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

GameClient/Assets/ResIn/UI/DailyWelfare.meta

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

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

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

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

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