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

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

@@ -222,10 +222,18 @@ namespace GFGGame
         // 更新华容道活动界面数据
         public const string ACTIVITY_HUARONGDAO_UPDATE = "ACTIVITY_HUARONGDAO_UPDATE";
 
+        // 重置接元宵小游戏数据
+        public const string ACTIVITY_GETYUANXIAO_RESET = "ACTIVITY_GETYUANXIAO_RESET";
+        // 开始元宵小游戏
+        public const string ACTIVITY_GETYUANXIAO_START = "ACTIVITY_GETYUANXIAO_START";
+
         //更新2048游戏关卡状态
         public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
 
         //显示系统公告界面
         public const string SHOW_SYSTEM_NOTICE = "SHOW_SYSTEM_NOTICE";
+
+        //新年红包领取加倍按钮
+        public const string NEW_YEAR_RED_ENVELOPE_INFO = "NEW_YEAR_RED_ENVELOPE_INFO";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -232,6 +232,7 @@ namespace GFGGame
             ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
+            NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo().Coroutine();
             TaskSProxy.GetTaskInfos();
             BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();

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

@@ -0,0 +1,10 @@
+namespace GFGGame
+{
+    public class NewYearRedEnvelopeDataManager
+    {
+        public static int Status = RedPacketStatus.None;  //红包领取状态
+        public static int ItemId = 0;  //红包奖励物品
+        public static long ItemNum = 0;  //奖励数量（单倍）
+
+    }
+}

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

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoEntryUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_bgEffect;
+        public GGraph m_leafEffect;
+        public GGraph m_yuanXiaoEffect;
+        public GButton m_btnTask;
+        public GButton m_btnShop;
+        public GGraph m_cloudEffect;
+        public GList m_list;
+        public GGraph m_startBtnEffect;
+        public GGraph m_titleTextEffect;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GGraph m_btnStart;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uqkvg4";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoEntryUI";
+        private static UI_ActivityGetYuanXiaoEntryUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoEntryUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoEntryUI();
+            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_ActivityGetYuanXiaoEntryUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoEntryUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_leafEffect = (GGraph)comp.GetChild("leafEffect");
+            m_yuanXiaoEffect = (GGraph)comp.GetChild("yuanXiaoEffect");
+            m_btnTask = (GButton)comp.GetChild("btnTask");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_cloudEffect = (GGraph)comp.GetChild("cloudEffect");
+            m_list = (GList)comp.GetChild("list");
+            m_startBtnEffect = (GGraph)comp.GetChild("startBtnEffect");
+            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnStart = (GGraph)comp.GetChild("btnStart");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_leafEffect = null;
+            m_yuanXiaoEffect = null;
+            m_btnTask = null;
+            m_btnShop = null;
+            m_cloudEffect = null;
+            m_list = null;
+            m_startBtnEffect = null;
+            m_titleTextEffect = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_btnStart = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoFailUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoFailUI
+    {
+        public GComponent target;
+        public GGraph m_titleEffect;
+        public GGraph m_starEffect;
+        public GButton m_btnExit;
+        public GButton m_btnRetry;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uhmj625";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoFailUI";
+        private static UI_ActivityGetYuanXiaoFailUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoFailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoFailUI();
+            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_ActivityGetYuanXiaoFailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoFailUI();
+            }
+            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_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnRetry = (GButton)comp.GetChild("btnRetry");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_titleEffect = null;
+            m_starEffect = null;
+            m_btnExit = null;
+            m_btnRetry = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoFailUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoSuccessUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoSuccessUI
+    {
+        public GComponent target;
+        public GButton m_btnExit;
+        public GButton m_btnRetry;
+        public GList m_listReward;
+        public GGraph m_starEffect;
+        public GGraph m_titleEffect;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uhmj62c";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoSuccessUI";
+        private static UI_ActivityGetYuanXiaoSuccessUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoSuccessUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoSuccessUI();
+            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_ActivityGetYuanXiaoSuccessUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoSuccessUI();
+            }
+            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_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnRetry = (GButton)comp.GetChild("btnRetry");
+            m_listReward = (GList)comp.GetChild("listReward");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnExit = null;
+            m_btnRetry = null;
+            m_listReward = null;
+            m_starEffect = null;
+            m_titleEffect = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoSuccessUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoTargetUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoTargetUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnCancel;
+        public GButton m_btnConfirm;
+        public GTextField m_score;
+        public GList m_collectList;
+        public const string URL = "ui://tguohf7uhmj61s";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoTargetUI";
+        private static UI_ActivityGetYuanXiaoTargetUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoTargetUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoTargetUI();
+            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_ActivityGetYuanXiaoTargetUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoTargetUI();
+            }
+            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_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_score = (GTextField)comp.GetChild("score");
+            m_collectList = (GList)comp.GetChild("collectList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnCancel = null;
+            m_btnConfirm = null;
+            m_score = null;
+            m_collectList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoTargetUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoTaskUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoTaskUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_score;
+        public GList m_itemList;
+        public const string URL = "ui://tguohf7uhmj62k";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoTaskUI";
+        private static UI_ActivityGetYuanXiaoTaskUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoTaskUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoTaskUI();
+            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_ActivityGetYuanXiaoTaskUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoTaskUI();
+            }
+            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_score = (GTextField)comp.GetChild("score");
+            m_itemList = (GList)comp.GetChild("itemList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_score = null;
+            m_itemList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoTaskUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoUI.cs

@@ -0,0 +1,121 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GGraph m_bgEffect;
+        public UI_catchers m_catcher;
+        public UI_YuanXiaoParent m_YuanXiaoParent;
+        public GGraph m_end0;
+        public GTextField m_time;
+        public GList m_collectList;
+        public GTextField m_score;
+        public GButton m_btnBack;
+        public GGraph m_start0;
+        public GGraph m_start1;
+        public GGraph m_start2;
+        public GGraph m_start3;
+        public GTextField m_progress;
+        public GTextField m_targetScore;
+        public GGraph m_startEffect;
+        public const string URL = "ui://tguohf7ux0ey0";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoUI";
+        private static UI_ActivityGetYuanXiaoUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoUI();
+            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_ActivityGetYuanXiaoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoUI();
+            }
+            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_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_catcher = (UI_catchers)UI_catchers.Create(comp.GetChild("catcher"));
+            m_YuanXiaoParent = (UI_YuanXiaoParent)UI_YuanXiaoParent.Create(comp.GetChild("YuanXiaoParent"));
+            m_end0 = (GGraph)comp.GetChild("end0");
+            m_time = (GTextField)comp.GetChild("time");
+            m_collectList = (GList)comp.GetChild("collectList");
+            m_score = (GTextField)comp.GetChild("score");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_start0 = (GGraph)comp.GetChild("start0");
+            m_start1 = (GGraph)comp.GetChild("start1");
+            m_start2 = (GGraph)comp.GetChild("start2");
+            m_start3 = (GGraph)comp.GetChild("start3");
+            m_progress = (GTextField)comp.GetChild("progress");
+            m_targetScore = (GTextField)comp.GetChild("targetScore");
+            m_startEffect = (GGraph)comp.GetChild("startEffect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_catcher.Dispose();
+            m_catcher = null;
+            m_YuanXiaoParent.Dispose();
+            m_YuanXiaoParent = null;
+            m_end0 = null;
+            m_time = null;
+            m_collectList = null;
+            m_score = null;
+            m_btnBack = null;
+            m_start0 = null;
+            m_start1 = null;
+            m_start2 = null;
+            m_start3 = null;
+            m_progress = null;
+            m_targetScore = null;
+            m_startEffect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_YuanXiaoItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_YuanXiaoItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_YuanXiao;
+        public const string URL = "ui://tguohf7uaev23";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "YuanXiaoItem";
+        private static UI_YuanXiaoItem _proxy;
+
+        public static UI_YuanXiaoItem Create(GObject gObject = null)
+        {
+            var ui = new UI_YuanXiaoItem();
+            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_YuanXiaoItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_YuanXiaoItem();
+            }
+            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_YuanXiao = (GLoader)comp.GetChild("YuanXiao");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_YuanXiao = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_YuanXiaoItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_YuanXiaoParent.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_YuanXiaoParent.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_catchers.cs

@@ -0,0 +1,90 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_catchers
+    {
+        public GComponent target;
+        public Controller m_c2;
+        public GGraph m_catcher;
+        public GLoader m_catcherImg;
+        public GLoader m_catcherImg2;
+        public GGraph m_getEffect;
+        public UI_flyScore m_flyscore;
+        public GGroup m_catchers;
+        public const string URL = "ui://tguohf7uqkvg1a";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "catchers";
+        private static UI_catchers _proxy;
+
+        public static UI_catchers Create(GObject gObject = null)
+        {
+            var ui = new UI_catchers();
+            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_catchers Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_catchers();
+            }
+            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_c2 = comp.GetController("c2");
+            m_catcher = (GGraph)comp.GetChild("catcher");
+            m_catcherImg = (GLoader)comp.GetChild("catcherImg");
+            m_catcherImg2 = (GLoader)comp.GetChild("catcherImg2");
+            m_getEffect = (GGraph)comp.GetChild("getEffect");
+            m_flyscore = (UI_flyScore)UI_flyScore.Create(comp.GetChild("flyscore"));
+            m_catchers = (GGroup)comp.GetChild("catchers");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c2 = null;
+            m_catcher = null;
+            m_catcherImg = null;
+            m_catcherImg2 = null;
+            m_getEffect = null;
+            m_flyscore.Dispose();
+            m_flyscore = null;
+            m_catchers = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_catchers.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_flyScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_flyScore
+    {
+        public GComponent target;
+        public GTextField m_score;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7umgu71p";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "flyScore";
+        private static UI_flyScore _proxy;
+
+        public static UI_flyScore Create(GObject gObject = null)
+        {
+            var ui = new UI_flyScore();
+            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_flyScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_flyScore();
+            }
+            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_score = (GTextField)comp.GetChild("score");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_score = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_flyScore.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_gameTarget.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_gameTarget
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_iconType;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uhmj62j";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "gameTarget";
+        private static UI_gameTarget _proxy;
+
+        public static UI_gameTarget Create(GObject gObject = null)
+        {
+            var ui = new UI_gameTarget();
+            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_gameTarget Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_gameTarget();
+            }
+            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_iconType = (GLoader)comp.GetChild("iconType");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconType = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_gameTarget.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_level.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_level
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_iconLevel;
+        public GLoader m_spendIcon;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uqkvg14";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "level";
+        private static UI_level _proxy;
+
+        public static UI_level Create(GObject gObject = null)
+        {
+            var ui = new UI_level();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_level Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_level();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_iconLevel = (GLoader)comp.GetChild("iconLevel");
+            m_spendIcon = (GLoader)comp.GetChild("spendIcon");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconLevel = null;
+            m_spendIcon = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_level.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_targetItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_targetItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_iconType;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uqkvgu";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "targetItem";
+        private static UI_targetItem _proxy;
+
+        public static UI_targetItem Create(GObject gObject = null)
+        {
+            var ui = new UI_targetItem();
+            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_targetItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_targetItem();
+            }
+            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_iconType = (GLoader)comp.GetChild("iconType");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconType = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_targetItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_taskItem.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_taskItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnGet;
+        public GTextField m_desc;
+        public GButton m_btnLock;
+        public GList m_rewardList;
+        public const string URL = "ui://tguohf7uhmj62r";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "taskItem";
+        private static UI_taskItem _proxy;
+
+        public static UI_taskItem Create(GObject gObject = null)
+        {
+            var ui = new UI_taskItem();
+            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_taskItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_taskItem();
+            }
+            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_btnGet = (GButton)comp.GetChild("btnGet");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_btnLock = (GButton)comp.GetChild("btnLock");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnGet = null;
+            m_desc = null;
+            m_btnLock = null;
+            m_rewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_taskItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertMiniGameUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Common
+{
+    public partial class UI_AlertMiniGameUI
+    {
+        public GComponent target;
+        public Controller m_checkType;
+        public GTextField m_txtContent;
+        public GTextField m_txtTips;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
+        public GButton m_btnCheck;
+        public const string URL = "ui://mk0fwx0xhmj6tk3";
+        public const string PACKAGE_NAME = "Common";
+        public const string RES_NAME = "AlertMiniGameUI";
+        private static UI_AlertMiniGameUI _proxy;
+
+        public static UI_AlertMiniGameUI Create(GObject gObject = null)
+        {
+            var ui = new UI_AlertMiniGameUI();
+            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_AlertMiniGameUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_AlertMiniGameUI();
+            }
+            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_checkType = comp.GetController("checkType");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_btnCheck = (GButton)comp.GetChild("btnCheck");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_checkType = null;
+            m_txtContent = null;
+            m_txtTips = null;
+            m_btnLeft = null;
+            m_btnRight = null;
+            m_btnCheck = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertMiniGameUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -15,6 +15,7 @@ namespace UI.DressUp
         public GButton m_btnChoose;
         public GButton m_btnUp;
         public GButton m_btnDown;
+        public GButton m_btnDelete;
         public GButton m_btnGalleryJoin;
         public GTextField m_txtCount;
         public UI_ComItemList m_ComSelectRes;
@@ -73,6 +74,7 @@ namespace UI.DressUp
             m_btnChoose = (GButton)comp.GetChild("btnChoose");
             m_btnUp = (GButton)comp.GetChild("btnUp");
             m_btnDown = (GButton)comp.GetChild("btnDown");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_ComSelectRes = (UI_ComItemList)UI_ComItemList.Create(comp.GetChild("ComSelectRes"));
@@ -88,6 +90,7 @@ namespace UI.DressUp
             m_btnChoose = null;
             m_btnUp = null;
             m_btnDown = null;
+            m_btnDelete = null;
             m_btnGalleryJoin = null;
             m_txtCount = null;
             m_ComSelectRes.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -24,6 +24,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityZCJB;
+        public UI_BtnModle2 m_btnGetYuanXiao;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -31,6 +32,7 @@ namespace UI.Main
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
         public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnActivityDay7;
         public UI_BtnModle1 m_btnShow;
@@ -108,6 +110,7 @@ namespace UI.Main
             m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
+            m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -115,6 +118,7 @@ namespace UI.Main
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
             m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
@@ -156,6 +160,8 @@ namespace UI.Main
             m_btnActivityLuckyBox = null;
             m_btnActivityZCJB.Dispose();
             m_btnActivityZCJB = null;
+            m_btnGetYuanXiao.Dispose();
+            m_btnGetYuanXiao = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();
@@ -168,6 +174,8 @@ namespace UI.Main
             m_btnGiftBag2 = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_btnNewYearRedEnvelope.Dispose();
+            m_btnNewYearRedEnvelope = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnActivityDay7.Dispose();

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearLogin
+{
+    public partial class UI_ComLoginItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public const string URL = "ui://euyo6bk3t2f05";
+        public const string PACKAGE_NAME = "NewYearLogin";
+        public const string RES_NAME = "ComLoginItem";
+        private static UI_ComLoginItem _proxy;
+
+        public static UI_ComLoginItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComLoginItem();
+            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_ComLoginItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComLoginItem();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_Button1.cs

@@ -7,7 +7,6 @@ namespace UI.NewYearRedEnvelope
     public partial class UI_Button1
     {
         public GButton target;
-        public Controller m_ButtonType;
         public GRichTextField m_txtTime;
         public const string URL = "ui://pt3t9f1ujsko7";
         public const string PACKAGE_NAME = "NewYearRedEnvelope";
@@ -56,12 +55,10 @@ namespace UI.NewYearRedEnvelope
 
         private void Init(GComponent comp)
         {
-            m_ButtonType = comp.GetController("ButtonType");
             m_txtTime = (GRichTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ButtonType = null;
             m_txtTime = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_NewYearRedEnvelopeUI.cs

@@ -11,8 +11,8 @@ namespace UI.NewYearRedEnvelope
         public Controller m_openType;
         public GButton m_btnOpen;
         public GRichTextField m_txtTime;
-        public UI_Button1 m_btnGet;
         public UI_Button1 m_btnDoubleGet;
+        public GComponent m_itemReward;
         public GRichTextField m_textGetNum;
         public const string URL = "ui://pt3t9f1ujsko0";
         public const string PACKAGE_NAME = "NewYearRedEnvelope";
@@ -65,8 +65,8 @@ namespace UI.NewYearRedEnvelope
             m_openType = comp.GetController("openType");
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
             m_txtTime = (GRichTextField)comp.GetChild("txtTime");
-            m_btnGet = (UI_Button1)UI_Button1.Create(comp.GetChild("btnGet"));
             m_btnDoubleGet = (UI_Button1)UI_Button1.Create(comp.GetChild("btnDoubleGet"));
+            m_itemReward = (GComponent)comp.GetChild("itemReward");
             m_textGetNum = (GRichTextField)comp.GetChild("textGetNum");
         }
         public void Dispose(bool disposeTarget = false)
@@ -75,10 +75,9 @@ namespace UI.NewYearRedEnvelope
             m_openType = null;
             m_btnOpen = null;
             m_txtTime = null;
-            m_btnGet.Dispose();
-            m_btnGet = null;
             m_btnDoubleGet.Dispose();
             m_btnDoubleGet = null;
+            m_itemReward = null;
             m_textGetNum = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,86 @@
+using ET;
+using GFGGame;
+using UnityEngine;
+
+namespace ET
+{
+    public class NoticeRedPacketDouble : AMHandler<S2C_NoticeRedPacketDouble>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeRedPacketDouble message)
+        {
+            NewYearRedEnvelopeDataManager.Status = RedPacketStatus.Double;
+            var itemData = ItemUtil.CreateItemDataList(message.ItemId, message.ItemNum);
+            BonusController.TryShowBonusList(itemData);
+            await ETTask.CompletedTask;
+        }
+    }
+}
+
+namespace GFGGame
+{
+    public class NewYearRedEnvelopeSProxy
+    {
+        //获取红包信息
+        public static async ETTask<bool> ReqGetRedPacketInfo()
+        {
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            if (activityId <= 0)
+                return false;
+
+            S2C_GetRedPacketInfo response = null;
+            response = (S2C_GetRedPacketInfo)await MessageHelper.SendToServer(new C2S_GetRedPacketInfo() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    NewYearRedEnvelopeDataManager.Status = response.Status;
+                    NewYearRedEnvelopeDataManager.ItemId = response.ItemId;
+                    NewYearRedEnvelopeDataManager.ItemNum = response.ItemNum;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //开红包
+        public static async ETTask<bool> ReqOpenRedPacket(int activityId)
+        {
+            S2C_ReqOpenRedPacket response = null;
+            response = (S2C_ReqOpenRedPacket)await MessageHelper.SendToServer(new C2S_ReqOpenRedPacket() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    NewYearRedEnvelopeDataManager.Status = RedPacketStatus.Open;
+                    var itemData = ItemUtil.CreateItemDataList(response.ItemId, response.ItemNum);
+                    BonusController.TryShowBonusList(itemData);
+                    var ramdomInt = Random.Range(1, 4).ToString();
+                    PlayerPrefs.SetString("NewYearRedEnvelopeRamdomInt", ramdomInt);   
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //双倍红包
+        public static async ETTask<bool> ReqDoubleRedPacket(int activityId)
+        {
+            S2C_ReqDoubleRedPacket response = null;
+            response = (S2C_ReqDoubleRedPacket)await MessageHelper.SendToServer(new C2S_ReqDoubleRedPacket() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(NewYearRedEnvelopeDataManager.ItemId);
+                    if (!AntiAddictionController.CheckAntiAddictionRecharge(1))
+                    {
+                        ShopSProxy.ReqShopBuy(itemCfg.id, 1).Coroutine();
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

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

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

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

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs

@@ -0,0 +1,172 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using FairyGUI;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoEntryView : BaseView
+    {
+        private UI_ActivityGetYuanXiaoEntryUI _ui;
+        private ValueBarController _valueBarController;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
+
+        public override void Dispose()
+        {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityGetYuanXiaoEntryUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoEntryUI.Create();
+            viewCom = _ui.target;
+            isReturnView = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hd_yx_bg");
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_list.itemRenderer = ListRenderer;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+            _ui.m_btnStart.onClick.Add(OnBtnStartClick);
+            _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
+            _ui.m_btnShop.onClick.Add(OnBtnShopClick);
+            _ui.m_btnBack.onClick.Add(Hide);
+
+            _effectUIDic.Add("YXJ_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "YXJ_bg_tx"));
+            _effectUIDic.Add("YXJ_Button", EffectUIPool.CreateEffectUI(_ui.m_startBtnEffect, "ui_Activity", "YXJ_Button"));
+            _effectUIDic.Add("YXJ_Middle", EffectUIPool.CreateEffectUI(_ui.m_yuanXiaoEffect, "ui_Activity", "YXJ_Middle"));
+            _effectUIDic.Add("YXJ_Text", EffectUIPool.CreateEffectUI(_ui.m_titleTextEffect, "ui_Activity", "YXJ_Text"));
+            _effectUIDic.Add("YXJ_Open_Down", EffectUIPool.CreateEffectUI(_ui.m_cloudEffect, "ui_Activity", "YXJ_Open_Down"));
+            _effectUIDic.Add("YXJ_Open_Up", EffectUIPool.CreateEffectUI(_ui.m_leafEffect, "ui_Activity", "YXJ_Open_Up"));
+
+        }
+
+        protected async override void OnShown()
+        {
+            base.OnShown();
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() { PickUpGameArray.Instance.dataArray[0].comsumePassArr[0][0] });
+
+            //var result = await MiniGameProxy.ReqGetActivityGameInfos(5004);
+            //if (!isShowing || !result)
+            //{
+            //    return;
+            //}
+
+            _ui.m_list.numItems = PickUpGameArray.Instance.dataArray.Length;
+            _ui.m_list.selectedIndex = 0;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_GETYUANXIAO_START, StartGame);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_GETYUANXIAO_START, StartGame);
+        }
+
+        private void ListRenderer(int index, GObject item)
+        {
+            item.data = index;
+            UI_level level = UI_level.Proxy(item);
+            PickUpGame pickUpGame = PickUpGameArray.Instance.dataArray[index];
+            level.m_spendIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(pickUpGame.comsumePassArr[0][0]).res, "png");
+            level.m_iconLevel.url = string.Format("ui://ActivityGetYuanXiao/yx_xg_{0}", index % 4 + 1);
+            level.m_num.text = pickUpGame.comsumePassArr[0][1].ToString();
+            level.m_c1.selectedIndex = 0;
+
+            //level.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index].IsUnlock ? 0 : 1;
+            UI_level.ProxyEnd();
+        }
+
+        private void OnListItemClick(EventContext eventContext)
+        {
+            //GObject gObject = (GObject)eventContext.sender;
+            //int index = (int)gObject.data;
+            //UI_level level = UI_level.Proxy(gObject);
+            
+            //UI_level.ProxyEnd();
+        }
+
+        private void OnBtnStartClick()
+        {
+            //if (!MiniGameDateManager.Instance.gameinfoList[_ui.m_list.selectedIndex].IsUnlock)
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("关卡未解锁");
+            //    return;
+            //}
+            //if (MiniGameDateManager.Instance.gameinfoList[_ui.m_list.selectedIndex].IsCleared)
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("关卡已通过");
+            //    return;
+            //}
+
+            PickUpGame cfg = PickUpGameArray.Instance.dataArray[_ui.m_list.selectedIndex];
+            ViewManager.Show<ActivityGetYuanXiaoTargetView>(cfg);
+        }
+
+        private async void StartGame()
+        {
+            //int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(12);
+            //if(activityID == 0)
+            //{
+            //    return;
+            //}
+
+            PickUpGame cfg = PickUpGameArray.Instance.dataArray[_ui.m_list.selectedIndex];
+            //var result = await MiniGameProxy.ReqMiniGameStart(cfg.id, cfg.type, activityID);
+            //if (!result || !isShowing) return;
+
+            //ViewManager.Show<ActivityGetYuanXiaoView>(new object[] { cfg, activityID });
+            ViewManager.Show<ActivityGetYuanXiaoView>(new object[] { cfg, 0 });
+        }
+
+        private void OnBtnShopClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+        }
+
+        private void OnBtnTaskClick()
+        {
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(12);
+            if (activityID == 0)
+            {
+                return;
+            }
+            ViewManager.Show<ActivityGetYuanXiaoTaskView>(activityID);
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoFailView.cs

@@ -0,0 +1,60 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoFailView : BaseWindow
+    {
+        private UI_ActivityGetYuanXiaoFailUI _ui;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
+        public override void Dispose()
+        {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityGetYuanXiaoFailUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoFailUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            modal = true;
+            clickBlankToClose = false;
+
+            _ui.m_btnExit.onClick.Add(OnClickBtnExit);
+            _ui.m_btnRetry.onClick.Add(OnClickBtnTryAgain);
+
+            _effectUIDic.Add("YXJ_Quad_star", EffectUIPool.CreateEffectUI(_ui.m_starEffect, "ui_Activity", "YXJ_Quad_star"));
+            _effectUIDic.Add("YXJ_QuadText_Lose", EffectUIPool.CreateEffectUI(_ui.m_titleEffect, "ui_Activity", "YXJ_QuadText_Lose"));
+        }
+
+        private void OnClickBtnExit()
+        {
+            Hide();
+            ViewManager.Hide<ActivityGetYuanXiaoView>();
+        }
+
+        private void OnClickBtnTryAgain()
+        {
+            Hide();
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_GETYUANXIAO_RESET);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoFailView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoSuccessView.cs

@@ -0,0 +1,83 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using System.Collections.Generic;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoSuccessView : BaseWindow
+    {
+        private UI_ActivityGetYuanXiaoSuccessUI _ui;
+        private PickUpGame _cfg;
+        private List<ItemData> itemDatas;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityGetYuanXiaoSuccessUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoSuccessUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            modal = true;
+            clickBlankToClose = false;
+
+            _ui.m_listReward.itemRenderer = RenderListRewardItem;
+            _ui.m_btnExit.onClick.Add(OnClickBtnExit);
+
+            _effectUIDic.Add("YXJ_Quad_star", EffectUIPool.CreateEffectUI(_ui.m_starEffect, "ui_Activity", "YXJ_Quad_star"));
+            _effectUIDic.Add("YXJ_QuadText_win", EffectUIPool.CreateEffectUI(_ui.m_titleEffect, "ui_Activity", "YXJ_QuadText_win"));
+
+        }
+
+        public override void Dispose()
+        {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfg = (PickUpGame)viewData;
+            _ui.m_btnRetry.visible = (_cfg.isAgain != 0);
+
+            itemDatas = ItemUtil.CreateItemDataList(_cfg.bonusWinArr);
+            _ui.m_listReward.numItems = itemDatas.Count;
+        }
+
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            if (index >= itemDatas.Count)
+            {
+                return;
+            }
+
+            ItemData reward = itemDatas[index];
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+        }
+
+        private void OnClickBtnExit()
+        {
+            Hide();
+            ViewManager.Hide<ActivityGetYuanXiaoView>();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoSuccessView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoTargetView.cs

@@ -0,0 +1,81 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoTargetView : BaseWindow
+    {
+        private UI_ActivityGetYuanXiaoTargetUI _ui;
+        private PickUpGame _cfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_ActivityGetYuanXiaoTargetUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoTargetUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            modal = true;
+
+            _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
+            _ui.m_btnConfirm.onClick.Add(OnBtnConfirmClick);
+            _ui.m_collectList.itemRenderer = CollectionListRenderer;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfg = (PickUpGame)viewData;
+
+            _ui.m_c1.selectedIndex = (_cfg.targetIdArr.Length == 0 ? 1 : 0);
+            if(_ui.m_c1.selectedIndex == 0)
+            {
+                _ui.m_collectList.numItems = _cfg.targetIdArr.Length;
+            }
+            else
+            {
+                InitScore();
+            }
+        }
+
+        private void OnBtnConfirmClick()
+        {
+            Hide();
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_GETYUANXIAO_START);
+        }
+
+        private void OnBtnCancelClick()
+        {
+            Hide();
+        }
+
+        private void CollectionListRenderer(int index, GObject obj)
+        {
+            UI_gameTarget target = UI_gameTarget.Proxy(obj);
+            target.m_iconType.url = string.Format("ui://ActivityGetYuanXiao/yx_icon_{0}", _cfg.targetIdArr[index][0]);
+            int num = _cfg.targetIdArr[index][1];
+            target.m_num.text = num.ToString();
+            UI_gameTarget.ProxyEnd();
+        }
+
+        private void InitScore()
+        {
+            _ui.m_score.text = _cfg.targetScore.ToString();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoTargetView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoTaskView.cs

@@ -0,0 +1,82 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using FairyGUI;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoTaskView : BaseWindow
+    {
+        private UI_ActivityGetYuanXiaoTaskUI _ui;
+        private int _activityID;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityGetYuanXiaoTaskUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoTaskUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            modal = true;
+
+            _ui.m_itemList.itemRenderer = ListRenderer;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _activityID = (int)viewData;
+            _ui.m_itemList.numItems = PickUpGameArray.Instance.dataArray.Length;
+            _ui.m_itemList.scrollPane.ScrollTop();
+        }
+
+        private void ListRenderer(int index, GObject gObject)
+        {
+            UI_taskItem item = UI_taskItem.Proxy(gObject);
+            item.m_c1.selectedIndex = 0;
+            item.m_desc.text = "";
+            item.m_rewardList.data = index;
+            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(PickUpGameArray.Instance.dataArray[index].bonusWinArr);
+            item.m_rewardList.numItems = itemDatas.Count;
+            for (int i = 0; i < itemDatas.Count; i++)
+            {
+                GObject obj = item.m_rewardList.GetChildAt(i);
+                ItemData reward = itemDatas[i];
+                if (obj.data == null)
+                {
+                    obj.data = new ItemView(obj as GComponent);
+                }
+                (obj.data as ItemView).SetData(reward);
+            }
+            item.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index].FirstPassRewardStatus;
+            if(item.m_btnGet.data == null)
+            {
+                item.m_btnGet.data = PickUpGameArray.Instance.dataArray[index];
+                item.m_btnGet.onClick.Add(OnClickBtnGet);
+            }
+            UI_taskItem.ProxyEnd();
+        }
+
+        private async void OnClickBtnGet(EventContext context)
+        {
+            GObject obj = (GObject)context.sender;
+            PickUpGame pickUpGame = (PickUpGame)obj.data;
+            var result = await MiniGameProxy.ReqGetFirstPassReward(pickUpGame.id, pickUpGame.type, _activityID);
+            if (!result) return;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoTaskView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs

@@ -0,0 +1,462 @@
+using System.Collections;
+using UnityEngine;
+using UI.ActivityGetYuanXiao;
+using FairyGUI;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace GFGGame
+{
+    public class ActivityGetYuanXiaoView : BaseView
+    {
+        private UI_ActivityGetYuanXiaoUI _ui;
+        private List<YuanXiaoItem> items = new List<YuanXiaoItem>();
+        private PickUpGame _cfg;
+        private int _activityID;
+        private int _countTime;
+        private int _score;
+        private Dictionary<int, int> _collectDict;
+        private Vector3 _catcherInitPos;
+        private bool _firstIn = true;
+        private bool _gamePause = false;
+        private float _timer;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
+        public override void Dispose()
+        {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityGetYuanXiaoUI.PACKAGE_NAME;
+            _ui = UI_ActivityGetYuanXiaoUI.Create();
+            viewCom = _ui.target;
+            isReturnView = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hd_yx_bg_2");
+            _ui.m_collectList.itemRenderer = CollectListRenderer;
+            _ui.m_btnBack.onClick.Add(OnBtnBack);
+            _effectUIDic.Add("YXJ_Catch", EffectUIPool.CreateEffectUI(_ui.m_catcher.m_getEffect, "ui_Activity", "YXJ_Catch"));
+            _effectUIDic.Add("YXJ_text_start", EffectUIPool.CreateEffectUI(_ui.m_startEffect, "ui_Activity", "YXJ_text_start"));
+            _effectUIDic.Add("YXJ_gameing_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "YXJ_gameing_bg_tx"));
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            object[] arr = viewData as object[];
+            _cfg = (PickUpGame)arr[0];
+            _activityID = (int)arr[1];
+
+            if (_firstIn)
+            {
+                _firstIn = false;
+                _catcherInitPos = _ui.m_catcher.target.position;
+            }
+
+            ShowGameView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            HideGameView();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_GETYUANXIAO_RESET, ResetGame);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_GETYUANXIAO_RESET, ResetGame);
+        }
+
+        /// <summary>
+        /// 初始化元宵的FGUI组件
+        /// </summary>
+        /// <returns></returns>
+        YuanXiaoItem InitItemUICom()
+        {
+            GComponent gcom = UIPackage.CreateObject("ActivityGetYuanXiao", "YuanXiaoItem").asCom;
+            _ui.m_YuanXiaoParent.target.AddChild(gcom);
+            YuanXiaoItem item = new YuanXiaoItem();
+            item.CreateItem(gcom, _ui.m_catcher.m_catcher, this);
+            return item;
+        }
+
+        public void ClearYuanXiaoList()
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                items[i].Destroy();
+            }
+
+            items.Clear();
+        }
+
+        /// <summary>
+        /// 从对象池中取出对象
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public YuanXiaoItem Get(int type)
+        {
+            YuanXiaoItem item = items.Find(x => x.GetVisible() == false);
+            if (item == null)
+            {
+                item = InitItemUICom();
+            }
+            item.Init(type);
+
+            return item;
+        }
+
+        public void Restore(YuanXiaoItem item)
+        {
+            item.SetVisible(false);
+        }
+
+        /// <summary>
+        /// 生成元宵
+        /// </summary>
+        /// <param name="param"></param>
+        public void CreateItems(object param)
+        {
+            if (!isShowing)
+            {
+                return;
+            }
+
+            int num = _cfg.resIdArr.Length;
+
+            List<int> roadIndexs = GetRandomRoads(num);
+            for (int i = 0; i < num; i++)
+            {
+                PickUpCfg pickUpCfg = PickUpCfgArray.Instance.GetCfgsByid(_cfg.resArr[0])[_cfg.resIdArr[i] - 1];
+                float time = pickUpCfg.speed * 1f / 1000;
+                YuanXiaoItem item = Get(_cfg.resIdArr[i]);
+                items.Add(item);
+                int score = pickUpCfg.score;
+                item.SetScore(score);
+                Vector3 startPos = _ui.target.GetChild("start" + roadIndexs[i]).position;
+                Vector3 endPos = startPos;
+                endPos.y = _ui.m_end0.y;
+                item.Move(startPos, endPos, time, () => Restore(item));
+            }
+
+        }
+
+        /// <summary>
+        /// 随机路径
+        /// </summary>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        private List<int> GetRandomRoads(int count)
+        {
+            List<int> resultList = new List<int>();
+            List<int> list = new List<int>();
+            for (int i = 0; i < 4; i++)
+            {
+                list.Add(i);
+            }
+
+            for (int j = 0; j < count; j++)
+            {
+                int randomIndex = Random.Range(0, list.Count);
+                resultList.Add(list[randomIndex]);
+                list.RemoveAt(randomIndex);
+            }
+
+            return resultList;
+        }
+
+        /// <summary>
+        /// 接住元宵
+        /// </summary>
+        /// <param name="item"></param>
+        public void GetYuanXiao(YuanXiaoItem item)
+        {
+            // 回收组件
+            Restore(item);
+
+            if (_countTime == 0)
+            {
+                return;
+            }
+
+            // 显示得分标志
+            _score += item.GetScore();
+            _ui.m_score.text = _score.ToString();
+
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                UpdateCollectProgress(item.GetYuanXiaoType());
+            }
+            else
+            {
+                UpdateScore();
+            }
+            ShowFlyScore(item.GetScore());
+            _ui.m_catcher.m_getEffect.visible = false;
+            _ui.m_catcher.m_getEffect.visible = true;
+
+        }
+
+        private void ShowFlyScore(int score)
+        {
+            UI_flyScore flyItem = UI_flyScore.Proxy(_ui.m_catcher.m_flyscore.target);
+            flyItem.m_score.text = score.ToString();
+            flyItem.m_t0.Stop();
+            _ui.m_catcher.m_flyscore.target.visible = true;
+            flyItem.m_t0.Play(() =>
+            {
+                _ui.m_catcher.m_flyscore.target.visible = false;
+            });
+            UI_flyScore.ProxyEnd();
+        }
+
+        public void SetDragRect()
+        {
+            _ui.m_catcher.target.draggable = true;
+            _ui.m_catcher.target.dragBounds = new Rect(-_ui.m_catcher.target.width / 2, _ui.m_catcher.target.y, Screen.width + _ui.m_catcher.target.width, 0);
+        }
+
+        private void StartGame()
+        {
+            CreateItems(null);
+            Timers.inst.Add(1, 0, UpdateTime);
+            Timers.inst.AddUpdate(UpdateGame);
+        }
+
+        private async void PlayStartAnim()
+        {
+            GRoot.inst.touchable = false;
+            _ui.m_startEffect.visible = false;
+            _ui.m_startEffect.visible = true;
+            await Task.Delay(820);
+            GRoot.inst.touchable = true;
+            StartGame();
+        }
+
+        private void UpdateTime(object param)
+        {
+            if (!isShowing)
+            {
+                return;
+            }
+
+            _ui.m_time.text = TimeUtil.FormattingTimeTo_mmss(_countTime * 1000);
+            --_countTime;
+            if (_countTime < 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                GameEnd();
+            }
+        }
+
+        private void GameEnd()
+        {
+            _ui.m_catcher.target.draggable = false;
+            HideGameView();
+
+            bool win = true;
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                foreach (var v in _collectDict)
+                {
+                    if (v.Value > 0)
+                    {
+                        win = false;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                if (_score < _cfg.targetScore)
+                {
+                    win = false;
+                }
+            }
+
+            if (win)
+            {
+                ViewManager.Show<ActivityGetYuanXiaoSuccessView>(_cfg);
+            }
+            else
+            {
+                ViewManager.Show<ActivityGetYuanXiaoFailView>();
+            }
+        }
+
+        private void InitData()
+        {
+            _gamePause = false;
+            _timer = 0;
+            _countTime = _cfg.time;
+            _score = 0;
+            _collectDict = new Dictionary<int, int>();
+            items = new List<YuanXiaoItem>();
+        }
+
+        private void InitView()
+        {
+            _ui.m_startEffect.visible = false;
+            _ui.m_catcher.m_getEffect.visible = false;
+            _ui.m_catcher.m_flyscore.target.visible = false;
+            _ui.m_catcher.m_c2.selectedIndex = _cfg.id > PickUpGameArray.Instance.dataArray[0].id ? 1 : 0;
+            _ui.m_time.text = TimeUtil.FormattingTimeTo_mmss(_countTime * 1000);
+            _ui.m_score.text = _score.ToString();
+            _ui.m_catcher.target.position = _catcherInitPos;
+            InitTarget();
+        }
+
+        private void InitTarget()
+        {
+            // 分数
+            if (_cfg.targetIdArr.Length == 0)
+            {
+                _ui.m_targetScore.text = _cfg.targetScore.ToString();
+                _ui.m_c1.selectedIndex = 1;
+                UpdateScore();
+            }
+            // 收集
+            else
+            {
+                for (int i = 0; i < _cfg.targetIdArr.Length; i++)
+                {
+                    _collectDict.Add(_cfg.targetIdArr[i][0], _cfg.targetIdArr[i][1]);
+                }
+                _ui.m_c1.selectedIndex = 0;
+                _ui.m_collectList.numItems = _cfg.targetIdArr.Length;
+            }
+        }
+
+        private void UpdateScore()
+        {
+            _ui.m_progress.SetVar("cur", _score.ToString()).SetVar("target", _cfg.targetScore.ToString()).FlushVars();
+        }
+
+        private void UpdateCollectProgress(int collectType)
+        {
+            if (!_collectDict.ContainsKey(collectType))
+            {
+                return;
+            }
+
+            if (_collectDict[collectType] > 0)
+            {
+                --_collectDict[collectType];
+            }
+            _ui.m_collectList.numItems = _cfg.targetIdArr.Length;
+        }
+
+        private void CollectListRenderer(int index, GObject item)
+        {
+            UI_targetItem target = UI_targetItem.Proxy(item);
+            target.m_iconType.url = string.Format("ui://ActivityGetYuanXiao/yx_mb_{0}", _cfg.targetIdArr[index][0]);
+            int num = _collectDict[_cfg.targetIdArr[index][0]];
+            if (num == 0)
+            {
+                target.m_c1.selectedIndex = 1;
+            }
+            else
+            {
+                target.m_c1.selectedIndex = 0;
+                target.m_num.text = num.ToString();
+            }
+            UI_targetItem.ProxyEnd();
+        }
+
+        private void ShowGameView()
+        {
+            InitData();
+            InitView();
+            SetDragRect();
+            PlayStartAnim();
+        }
+
+        private void HideGameView()
+        {
+            Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(UpdateGame);
+            ClearYuanXiaoList();
+        }
+
+        private void ResetGame()
+        {
+            HideGameView();
+            ShowGameView();
+        }
+
+        private void OnBtnBack()
+        {
+            // 暂停游戏
+            PauseGame();
+
+            AlertMiniGame alertInfo = new AlertMiniGame();
+            alertInfo.desc = "确认是否退出游戏？退出游戏直接按失败结算";
+            alertInfo.btnConfirmClickAction = () =>
+            {
+                Hide();
+            };
+            alertInfo.btnCancelClickAction = () =>
+            {
+                ContinueGame();
+            };
+            ViewManager.Show<AlertMiniGameView>(alertInfo);
+        }
+
+        private void PauseGame()
+        {
+            _gamePause = true;
+            Timers.inst.Remove(UpdateTime);
+            for (int i = 0; i < items.Count; i++)
+            {
+                items[i].SetPause(true);
+            }
+        }
+
+        private void ContinueGame()
+        {
+            _gamePause = false;
+            Timers.inst.Add(1, 0, UpdateTime);
+            for (int i = 0; i < items.Count; i++)
+            {
+                items[i].SetPause(false);
+            }
+        }
+
+        private void UpdateGame(object param)
+        {
+            if (_gamePause)
+            {
+                return;
+            }
+            _timer += Time.deltaTime * 1000;
+            if(_timer >= _cfg.dropTime)
+            {
+                CreateItems(null);
+                _timer = 0;
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/YuanXiaoItem.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections;
+using UnityEngine;
+using FairyGUI;
+using UI.ActivityGetYuanXiao;
+
+namespace GFGGame
+{
+    public class YuanXiaoItem
+    {
+        private int _type;
+        private int _score;
+        private GComponent _com;
+        private GObject _catcher;
+        private ActivityGetYuanXiaoView _baseView;
+        private GTweener _tweener;
+
+        public YuanXiaoItem CreateItem(GComponent com, GObject catcher, ActivityGetYuanXiaoView baseView)
+        {
+            _com = com;
+            _catcher = catcher;
+            _baseView = baseView;
+            return this;
+        }
+
+        public void Init(int type)
+        {
+            SetVisible(true);
+            _type = type;
+            UI_YuanXiaoItem item = UI_YuanXiaoItem.Proxy(_com);
+            item.m_c1.selectedIndex = _type - 1;
+            UI_YuanXiaoItem.ProxyEnd();
+        }
+
+        public void Move(Vector3 start, Vector3 end, float time, Action action = null)
+        {
+            Vector3 startPos = start;
+            Vector3 endPos = end;
+
+            _com.position = startPos;
+            Timers.inst.Remove(HandleCollider);
+            Timers.inst.AddUpdate(HandleCollider);
+
+            _tweener = _com.TweenMoveY(endPos.y, time);
+            _tweener.SetEase(EaseType.QuadIn).OnComplete(()=>
+            {
+                Timers.inst.Remove(HandleCollider);
+                action?.Invoke();
+            });
+
+        }
+
+        private void HandleCollider(object param = null)
+        {
+            if(CheckCollider(_com, _catcher))
+            {
+                Timers.inst.Remove(HandleCollider);
+                _baseView.GetYuanXiao(this);
+            }
+        }
+
+        private bool CheckCollider(GObject obj1, GObject obj2)
+        {
+            Vector3 pos1 = obj1.LocalToGlobal(Vector2.zero);
+            Vector3 pos2 = obj2.LocalToGlobal(Vector2.zero);
+
+            bool collisionX = pos1.x + obj1.width >= pos2.x
+                && pos2.x + obj2.width >= pos1.x;
+
+            bool collisionY = pos1.y + obj1.height >= pos2.y
+                && pos2.y + obj2.height >= pos1.y;
+
+            return collisionX && collisionY;
+        }
+
+
+        public bool GetVisible()
+        {
+            return _com.visible;
+        }
+
+        public void SetVisible(bool visible)
+        {
+            _com.visible = visible;
+            if (!visible)
+            {
+                _tweener.Kill(false);
+            }
+        }
+
+        public int GetYuanXiaoType()
+        {
+            return _type;
+        }
+
+        public void SetScore(int score)
+        {
+            _score = score;
+        }
+
+        public int GetScore()
+        {
+            return _score;
+        }
+
+        public void Destroy()
+        {
+            _tweener.Kill(false);
+            Timers.inst.Remove(HandleCollider);
+            _com.Dispose();
+        }
+
+        public void SetPause(bool pause = true)
+        {
+            if (_com.visible)
+            {
+                _tweener.SetPaused(pause);
+            }
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/YuanXiaoItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertMiniGameView.cs

@@ -0,0 +1,70 @@
+using System.Collections;
+using UnityEngine;
+using UI.Common;
+using System;
+
+namespace GFGGame
+{
+    public class AlertMiniGame
+    {
+        public string desc;
+        public Action btnCancelClickAction;
+        public Action btnConfirmClickAction;
+    }
+
+    public class AlertMiniGameView : BaseWindow
+    {
+        private UI_AlertMiniGameUI _ui;
+        private Action _btnCancelAction;
+        private Action _btnConfirmAction;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_AlertMiniGameUI.PACKAGE_NAME;
+            _ui = UI_AlertMiniGameUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            modal = true;
+            clickBlankToClose = false;
+
+            _ui.m_btnLeft.onClick.Add(OnBtnCancelClick);
+            _ui.m_btnRight.onClick.Add(OnBtnConfirmClick);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            AlertMiniGame alertInfo = (AlertMiniGame)viewData;
+            _ui.m_txtContent.text = alertInfo.desc;
+            //_btnLeftAction = alertInfo.btnLeftClickAction;
+            //_ui.m_btnLeft.visible = (_btnLeftAction != null);
+            _btnConfirmAction = alertInfo.btnConfirmClickAction;
+            _btnCancelAction = alertInfo.btnCancelClickAction;
+        }
+
+        private void OnBtnCancelClick()
+        {
+            Hide();
+            _btnCancelAction?.Invoke();
+        }
+
+        private void OnBtnConfirmClick()
+        {
+            Hide();
+            _btnConfirmAction?.Invoke();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertMiniGameView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -107,6 +107,7 @@ namespace GFGGame
 
             _ui.m_btnUp.onClick.Add(OnClickBtnUp);
             _ui.m_btnDown.onClick.Add(OnClickBtnDown);
+            _ui.m_btnDelete.onTouchBegin.Add(OnClickBtnDelete);
 
         }
 
@@ -604,7 +605,14 @@ namespace GFGGame
             PhotographUtil.Instance.SetLayer(memoryHitGameObj, "down");
         }
 
-
+        private void OnClickBtnDelete()
+        {
+            if(memoryHitGameObj == null || !_ui.m_comSelectBox.target.visible || !_ui.m_comSelectBox.m_btnDelete.visible)
+            {
+                return;
+            }
+            OnTouchBtnDeleteBegin();
+        }
 
         private void OnClickBtnPhotograph()
         {

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -274,7 +274,7 @@ namespace GFGGame
                 _friendRoleId = FriendDataManager.Instance.FriendDatas[index];
 
                 OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_friendRoleId);
-                if (roleInfoDetail != null)
+                if (isShowing && roleInfoDetail != null)
                 {
                     UpdateScene(roleInfoDetail.customSuitData);
                 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/TypingFadeEffectPro.cs

@@ -232,7 +232,7 @@ namespace GFGGame
                     {
                         UpdateFadeProgressSingle(_printIndex, _vertIndex, _cancellationTokenSource.Token);
                         ++_printIndex;
-                        if(_printIndex < listCnt - 1)
+                        if(_printIndex < listCnt - 1 && _printIndex < charPositions.Count)
                         {
                             _vertIndex += charPositions[_printIndex].vertCount;
                         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -104,6 +104,7 @@ namespace GFGGame
             _ui.m_btnCiPai.target.onClick.Add(OnClickBtnCiPai);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
+            _ui.m_btnNewYearRedEnvelope.target.onClick.Add(OnClickBtnNewYearRedEnvelope);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
             _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
@@ -153,7 +154,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.AddEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
             EventAgent.AddEventListener(ConstMessage.VIEW_CLOSED, CheckAutoShowViews);
-            EventAgent.AddEventListener(ConstMessage.AFTER_DATA_INITED, OnFaterDataInited);
+            EventAgent.AddEventListener(ConstMessage.AFTER_DATA_INITED, OnAfterDataInited);
         }
 
         protected override void RemoveEventListener()
@@ -165,7 +166,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
             EventAgent.RemoveEventListener(ConstMessage.VIEW_CLOSED, CheckAutoShowViews);
-            EventAgent.RemoveEventListener(ConstMessage.AFTER_DATA_INITED, OnFaterDataInited);
+            EventAgent.RemoveEventListener(ConstMessage.AFTER_DATA_INITED, OnAfterDataInited);
         }
 
         protected override void OnShown()
@@ -254,15 +255,21 @@ namespace GFGGame
             }
             else
             {
-                OnFaterDataInited();
+                OnAfterDataInited();
             }
         }
 
-        private void OnFaterDataInited()
+        private void OnAfterDataInited()
         {
             GetAdIds();
             OnRedDotChanged();
             CheckAutoShowViews();
+            UpdateButtons();
+        }
+
+        private async void UpdateButtons()
+        {
+
         }
 
         private void AddEffect()
@@ -355,6 +362,11 @@ namespace GFGGame
             ViewManager.Show<DailyWelfareView>();
         }
 
+        private void OnClickBtnNewYearRedEnvelope()
+        {
+            ViewManager.Show<NewYearRedEnvelopeView>();
+        }
+
         private void OnClickBtnActivityLuckyBox()
         {
             ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
@@ -374,6 +386,7 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityTeaMainView>();
         }
+
         private void OnClickBtnZCJB()
         {
             ViewManager.Show<ActivityZCJBView>();
@@ -647,6 +660,9 @@ namespace GFGGame
                 ActivityDataManager.Instance.AllSevenDayBonusGot()));
             }
 
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            _ui.m_btnNewYearRedEnvelope.target.visible = actRedPacketId > 0;
+
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;

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

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

GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs

@@ -0,0 +1,89 @@
+using FairyGUI;
+using ET;
+using UnityEngine;
+using System;
+using UI.NewYearLogin;
+
+namespace GFGGame
+{
+    public class NewYearLoginView : BaseWindow
+    {
+        private UI_NewYearLoginUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_NewYearLoginUI.PACKAGE_NAME;
+            _ui = UI_NewYearLoginUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            //_ui.m_btnOpen.onClick.Add(OnClickBtnOpen);
+            //_ui.m_btnDoubleGet.target.onClick.Add(OnClickBtnDoubleGet);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+        }
+
+        private void RefreshViewInfo()
+        {
+            //_ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            //int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            //if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None) { 
+            //    _ui.m_openType.selectedIndex = 0;
+            //    _ui.m_titleImgType.selectedIndex = 0; 
+            //}
+            //else if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.Open) { 
+            //    RefreshOpenView();
+            //}
+
+            //_ui.m_textGetNum.text = NewYearRedEnvelopeDataManager.ItemNum.ToString();
+        }
+
+        private void OnClickBtnOpen(EventContext context)
+        {
+            ReqLeagueList();
+        }
+
+        private async void ReqLeagueList()
+        {
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
+            if (result)
+            {
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs

@@ -1,6 +1,9 @@
 using FairyGUI;
 using ET;
 using UI.NewYearRedEnvelope;
+using UI.CommonGame;
+using UnityEngine;
+using System;
 
 namespace GFGGame
 {
@@ -29,41 +32,98 @@ namespace GFGGame
             //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnOpen.onClick.Add(OnClickBtnOpen);
+            _ui.m_btnDoubleGet.target.onClick.Add(OnClickBtnDoubleGet);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            //EventAgent.AddEventListener(ConstMessage.MAIL_REFRESH, RefreshList);
+            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            //EventAgent.RemoveEventListener(ConstMessage.MAIL_REFRESH, RefreshList);
+            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+        }
+
+        private void RefreshViewInfo()
+        {
+            _ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None) { 
+                _ui.m_openType.selectedIndex = 0;
+                _ui.m_titleImgType.selectedIndex = 0; 
+            }
+            else if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.Open) { 
+                RefreshOpenView();
+            }
+
+            _ui.m_textGetNum.text = NewYearRedEnvelopeDataManager.ItemNum.ToString();
             Timers.inst.Add(1, 0, UpdateTime);
         }
 
+        private void RefreshOpenView()
+        {
+            _ui.m_openType.selectedIndex = 1;
+            var titleIndex = PlayerPrefs.GetString("NewYearRedEnvelopeRamdomInt");
+            _ui.m_titleImgType.selectedIndex = Convert.ToInt32(titleIndex);
+            UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemReward);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(NewYearRedEnvelopeDataManager.ItemId);
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
+            item.target.data = itemCfg;
+            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_txtCount.text = NewYearRedEnvelopeDataManager.ItemNum.ToString();
+            UI_ComItem.ProxyEnd();
+        }
+
         private void UpdateTime(object param)
         {
             int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-            string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
-            _ui.m_txtTime.text = strTime;
+            string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
+            _ui.m_txtTime.text = "µÚÒ»Ì죺" + strTime;
             UI_Button1 btn = UI_Button1.Proxy(_ui.m_btnDoubleGet.target);
             btn.m_txtTime.text = strTime;
             UI_Button1.ProxyEnd();
         }
 
+        private void OnClickBtnDoubleGet(EventContext context)
+        {
+            BuyDoubleRedPacket();
+        }
+
+        private async void BuyDoubleRedPacket()
+        {
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            bool result = await NewYearRedEnvelopeSProxy.ReqDoubleRedPacket(actRedPacketId);
+            if (result)
+            {
+                RefreshOpenView();
+            }
+        }
+
         private void OnClickBtnOpen(EventContext context)
         {
+            ReqLeagueList();
+        }
 
-            _ui.m_openType.selectedIndex = 1;
+        private async void ReqLeagueList()
+        {
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
+            if (result)
+            {
+                RefreshOpenView();
+            }
         }
 
         protected override void OnHide()

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao.meta

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

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: e9a5602c188271243ac21faee1fdf3c0
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 675e049f41b956e4cab5901caf9bd1c2
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 6e9752c4ad758bb438e73c3b0fbf9a77
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: a9d35173f0aa83945b2c365290280380
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiao/ActivityGetYuanXiao_fui.bytes.meta

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

GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI.meta

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

GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 09efcd8d201ef82419732359a01f0129
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: fe65a24147a454d4590cdd1f82177f0d
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_fui.bytes.meta

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

GameClient/Assets/ResIn/UI/Common/Common_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 5f0ff080c215a88439e9ad34cfd19746
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/Common/Common_atlas0_1.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 3d59a662769dc1545af100434de82264
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: