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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -143,9 +143,17 @@ namespace GFGEditor
         public static string LeagueIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/LeagueIcon/";
         public static string LeagueIconMd5FileSaveName = "LeagueIconMd5";
 
-        public static string[] MiniGameSrcPaths { get { return new string[] { ResRootPath + "MiniGame/" }; } }
-        public static string MiniGameTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/";
-        public static string MiniGameMd5FileSaveName = "MiniGameMd5";
+        public static string[] MiniGameFlipPaths { get { return new string[] { ResRootPath + "MiniGame/FlipGame/" }; } }
+        public static string MiniGameFlipTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/FlipGame/";
+        public static string MiniGameFlipMd5FileSaveName = "MiniGameFlipMd5";
+
+        public static string[] MiniGameHRDPaths { get { return new string[] { ResRootPath + "MiniGame/HRDGame/" }; } }
+        public static string MiniGameHRDTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/HRDGame/";
+        public static string MiniGameHRDMd5FileSaveName = "MiniGameHRDMd5";
+
+        public static string[] MiniGameTZFEPaths { get { return new string[] { ResRootPath + "MiniGame/TZFEGame/" }; } }
+        public static string MiniGameTZFETargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/TZFEGame/";
+        public static string MiniGameTZFEMd5FileSaveName = "MiniGameTZFEMd5";
 
         public static void Import()
         {
@@ -262,7 +270,13 @@ namespace GFGEditor
 
             //小游戏资源
             EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
-            ImportRes(MiniGameSrcPaths, MiniGameTargetPath, MiniGameMd5FileSaveName);
+            ImportRes(MiniGameFlipPaths, MiniGameFlipTargetPath, MiniGameFlipMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameHRDPaths, MiniGameHRDTargetPath, MiniGameHRDMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameTZFEPaths, MiniGameTZFETargetPath, MiniGameTZFEMd5FileSaveName);
 
             EditorUtility.ClearProgressBar();
             AssetDatabase.Refresh();

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

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -283,7 +283,7 @@ namespace GFGEditor
             {
                 if (cfg.itemId == itemId)
                 {
-                    return "FU_ZHUANG_DIAN=" + ConstStoreId.CLOTHING_STORE_ID; ;
+                    return "FU_ZHUANG_DIAN=" + ConstStoreId.CLOTHING_STORE_ID; 
                 }
             }
 
@@ -366,6 +366,21 @@ namespace GFGEditor
         }
 
         /// <summary>
+        /// 尝试获取飞花令产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetArenaApproach(int itemId)
+        {
+            if (itemId == ConstItemID.ARENA_CUR_COST)
+            {
+                return "ARENA";
+            }
+            return null;
+        }
+            
+
+        /// <summary>
         /// 尝试获取剧情关卡产出途径
         /// </summary>
         /// <param name="itemId"></param>

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

@@ -97,6 +97,9 @@ namespace GFGGame
         ///商城-竞技场
         /// </summary>
         public const string STORE_ARENA = "STORE_ARENA";
-
+        /// <summary>
+        ///飞花令
+        /// </summary>
+        public const string ARENA = "ARENA";
     }
 }

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

@@ -216,5 +216,8 @@ namespace GFGGame
 
         // 更新华容道活动界面数据
         public const string ACTIVITY_HUARONGDAO_UPDATE = "ACTIVITY_HUARONGDAO_UPDATE";
+
+        //更新2048游戏关卡状态
+        public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
     }
 }

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

@@ -275,6 +275,8 @@ namespace GFGGame
             GameGlobal.AutoSevenDayLoginView = true;
             GameGlobal.AutoDailySignView = true;
             GameGlobal.AutoSpecialOfferGiftBoxView = true;
+            GameGlobal.AutoAcitivtyTipsLoginView = true;
+            GameGlobal.AutoMonthlyCardView = true;
             GameGlobal.AutoShowCompleted = false;
             GameGlobal.PreDataInited = false;
             GameGlobal.AfterDataInited = false;

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

@@ -0,0 +1,33 @@
+using ET;
+using GFGGame;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Data
+{
+    public class ActivityTeaDataManager : SingletonBase<ActivityTeaDataManager>
+    {
+        public List<ItemSyntheticProto> ItemSynthetics = new List<ItemSyntheticProto>(); 
+
+        public bool CheckOpen()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
+
+        public bool CheckOpenOne(int id)
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
+
+        public long GetEndTime()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
+            return activityInfo.EndTime;
+        }
+    }
+}

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

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivitySyntheticUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivitySyntheticUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GTextField m_txtTime;
+        public GList m_listSynthetic;
+        public GTextField m_txtTips;
+        public const string URL = "ui://wpsqkdbzyo402e";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivitySyntheticUI";
+        private static UI_ActivitySyntheticUI _proxy;
+
+        public static UI_ActivitySyntheticUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivitySyntheticUI();
+            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_ActivitySyntheticUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivitySyntheticUI();
+            }
+            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_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_listSynthetic = (GList)comp.GetChild("listSynthetic");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_txtTime = null;
+            m_listSynthetic = null;
+            m_txtTips = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivitySyntheticUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -0,0 +1,104 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityTeaMainUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GLoader m_titleBg;
+        public GLoader m_oneTimeIcon;
+        public GLoader m_oneViewIcon;
+        public GLoader m_oneNameIcon;
+        public GLoader m_twoTimeIcon;
+        public GLoader m_twoViewIcon;
+        public GLoader m_twoNameIcon;
+        public GLoader m_threeTimeIcon;
+        public GLoader m_threeViewIcon;
+        public GLoader m_threeNameIcon;
+        public const string URL = "ui://wpsqkdbznjon0";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityTeaMainUI";
+        private static UI_ActivityTeaMainUI _proxy;
+
+        public static UI_ActivityTeaMainUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityTeaMainUI();
+            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_ActivityTeaMainUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityTeaMainUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_titleBg = (GLoader)comp.GetChild("titleBg");
+            m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
+            m_oneViewIcon = (GLoader)comp.GetChild("oneViewIcon");
+            m_oneNameIcon = (GLoader)comp.GetChild("oneNameIcon");
+            m_twoTimeIcon = (GLoader)comp.GetChild("twoTimeIcon");
+            m_twoViewIcon = (GLoader)comp.GetChild("twoViewIcon");
+            m_twoNameIcon = (GLoader)comp.GetChild("twoNameIcon");
+            m_threeTimeIcon = (GLoader)comp.GetChild("threeTimeIcon");
+            m_threeViewIcon = (GLoader)comp.GetChild("threeViewIcon");
+            m_threeNameIcon = (GLoader)comp.GetChild("threeNameIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_titleBg = null;
+            m_oneTimeIcon = null;
+            m_oneViewIcon = null;
+            m_oneNameIcon = null;
+            m_twoTimeIcon = null;
+            m_twoViewIcon = null;
+            m_twoNameIcon = null;
+            m_threeTimeIcon = null;
+            m_threeViewIcon = null;
+            m_threeNameIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityTeaVisitUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_time;
+        public GLoader m_ruleIcon;
+        public GList m_taskList;
+        public GImage m_visitNumTips;
+        public GTextField m_visitNum;
+        public const string URL = "ui://wpsqkdbznjone";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityTeaVisitUI";
+        private static UI_ActivityTeaVisitUI _proxy;
+
+        public static UI_ActivityTeaVisitUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityTeaVisitUI();
+            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_ActivityTeaVisitUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityTeaVisitUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_time = (GTextField)comp.GetChild("time");
+            m_ruleIcon = (GLoader)comp.GetChild("ruleIcon");
+            m_taskList = (GList)comp.GetChild("taskList");
+            m_visitNumTips = (GImage)comp.GetChild("visitNumTips");
+            m_visitNum = (GTextField)comp.GetChild("visitNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_time = null;
+            m_ruleIcon = null;
+            m_taskList = null;
+            m_visitNumTips = null;
+            m_visitNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitItemUI.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVIsitItemUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_npcHead m_head;
+        public GLoader m_rewardIcon;
+        public GLoader m_lockIcon;
+        public GTextField m_name;
+        public GTextField m_lockTitle;
+        public GLoader m_visitBtn;
+        public GGroup m_unLock;
+        public const string URL = "ui://wpsqkdbznjonl";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVIsitItemUI";
+        private static UI_ActivityVIsitItemUI _proxy;
+
+        public static UI_ActivityVIsitItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVIsitItemUI();
+            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_ActivityVIsitItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVIsitItemUI();
+            }
+            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_head = (UI_npcHead)UI_npcHead.Create(comp.GetChild("head"));
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_lockIcon = (GLoader)comp.GetChild("lockIcon");
+            m_name = (GTextField)comp.GetChild("name");
+            m_lockTitle = (GTextField)comp.GetChild("lockTitle");
+            m_visitBtn = (GLoader)comp.GetChild("visitBtn");
+            m_unLock = (GGroup)comp.GetChild("unLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_head.Dispose();
+            m_head = null;
+            m_rewardIcon = null;
+            m_lockIcon = null;
+            m_name = null;
+            m_lockTitle = null;
+            m_visitBtn = null;
+            m_unLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitRewardItemUI.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVIsitRewardItemUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtDesc;
+        public GList m_listTaskReward;
+        public GTextField m_txtCount;
+        public GLoader m_GotBtn;
+        public GLoader m_ComeBt;
+        public GLoader m_GetRewardBt;
+        public const string URL = "ui://wpsqkdbznjonk";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVIsitRewardItemUI";
+        private static UI_ActivityVIsitRewardItemUI _proxy;
+
+        public static UI_ActivityVIsitRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVIsitRewardItemUI();
+            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_ActivityVIsitRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVIsitRewardItemUI();
+            }
+            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_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_GotBtn = (GLoader)comp.GetChild("GotBtn");
+            m_ComeBt = (GLoader)comp.GetChild("ComeBt");
+            m_GetRewardBt = (GLoader)comp.GetChild("GetRewardBt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtDesc = null;
+            m_listTaskReward = null;
+            m_txtCount = null;
+            m_GotBtn = null;
+            m_ComeBt = null;
+            m_GetRewardBt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitRewardItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVisitNPCUI.cs

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_ActivityVisitNPCUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_npcIcon;
+        public UI_CompDialogText m_DialogText;
+        public GLoader m_nextChatBtn;
+        public GButton m_btnBack;
+        public GTextField m_name;
+        public GTextField m_titleIcon;
+        public GLoader m_taskIcon;
+        public GLoader m_listBg;
+        public GList m_taskList;
+        public const string URL = "ui://wpsqkdbznjonj";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "ActivityVisitNPCUI";
+        private static UI_ActivityVisitNPCUI _proxy;
+
+        public static UI_ActivityVisitNPCUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityVisitNPCUI();
+            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_ActivityVisitNPCUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityVisitNPCUI();
+            }
+            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_npcIcon = (GLoader)comp.GetChild("npcIcon");
+            m_DialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("DialogText"));
+            m_nextChatBtn = (GLoader)comp.GetChild("nextChatBtn");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_name = (GTextField)comp.GetChild("name");
+            m_titleIcon = (GTextField)comp.GetChild("titleIcon");
+            m_taskIcon = (GLoader)comp.GetChild("taskIcon");
+            m_listBg = (GLoader)comp.GetChild("listBg");
+            m_taskList = (GList)comp.GetChild("taskList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_npcIcon = null;
+            m_DialogText.Dispose();
+            m_DialogText = null;
+            m_nextChatBtn = null;
+            m_btnBack = null;
+            m_name = null;
+            m_titleIcon = null;
+            m_taskIcon = null;
+            m_listBg = null;
+            m_taskList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVisitNPCUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_CompDialogText.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_CompDialogText
+    {
+        public GComponent target;
+        public Controller m_bgType;
+        public Controller m_showArrow;
+        public GLoader m_bg;
+        public GTextField m_txtContent;
+        public GTextField m_txtName;
+        public Transition m_In;
+        public const string URL = "ui://wpsqkdbznjono";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "CompDialogText";
+        private static UI_CompDialogText _proxy;
+
+        public static UI_CompDialogText Create(GObject gObject = null)
+        {
+            var ui = new UI_CompDialogText();
+            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_CompDialogText Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompDialogText();
+            }
+            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_bgType = comp.GetController("bgType");
+            m_showArrow = comp.GetController("showArrow");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_In = comp.GetTransition("In");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bgType = null;
+            m_showArrow = null;
+            m_bg = null;
+            m_txtContent = null;
+            m_txtName = null;
+            m_In = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_CompDialogText.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardItemUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_rewardBg;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public const string URL = "ui://wpsqkdbznjonm";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardItemUI";
+        private static UI_RewardItemUI _proxy;
+
+        public static UI_RewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardItemUI();
+            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_RewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardItemUI();
+            }
+            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_rewardBg = (GLoader)comp.GetChild("rewardBg");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardBg = null;
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTips.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardTips
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GTextField m_name;
+        public GTextField m_desc;
+        public GList m_rewardList;
+        public GImage m_back;
+        public GGraph m_effect1;
+        public GGraph m_effect2;
+        public const string URL = "ui://wpsqkdbzqbf41v";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardTips";
+        private static UI_RewardTips _proxy;
+
+        public static UI_RewardTips Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardTips();
+            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_RewardTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardTips();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_name = (GTextField)comp.GetChild("name");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_back = (GImage)comp.GetChild("back");
+            m_effect1 = (GGraph)comp.GetChild("effect1");
+            m_effect2 = (GGraph)comp.GetChild("effect2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_name = null;
+            m_desc = null;
+            m_rewardList = null;
+            m_back = null;
+            m_effect1 = null;
+            m_effect2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTips.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTipsItemUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_RewardTipsItemUI
+    {
+        public GComponent target;
+        public GLoader m_rewardBg;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public GTextField m_rewardName;
+        public const string URL = "ui://wpsqkdbzqbf42a";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "RewardTipsItemUI";
+        private static UI_RewardTipsItemUI _proxy;
+
+        public static UI_RewardTipsItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardTipsItemUI();
+            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_RewardTipsItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardTipsItemUI();
+            }
+            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_rewardBg = (GLoader)comp.GetChild("rewardBg");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_rewardName = (GTextField)comp.GetChild("rewardName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardBg = null;
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            m_rewardName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_RewardTipsItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_SyntheticItemUI
+    {
+        public GComponent target;
+        public Controller m_btnType;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public GComponent m_item3;
+        public GButton m_btnMake;
+        public GButton m_btnGet;
+        public const string URL = "ui://wpsqkdbzyo402m";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "SyntheticItemUI";
+        private static UI_SyntheticItemUI _proxy;
+
+        public static UI_SyntheticItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SyntheticItemUI();
+            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_SyntheticItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SyntheticItemUI();
+            }
+            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_btnType = comp.GetController("btnType");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_item3 = (GComponent)comp.GetChild("item3");
+            m_btnMake = (GButton)comp.GetChild("btnMake");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnType = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_item3 = null;
+            m_btnMake = null;
+            m_btnGet = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_SyntheticItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_npcHead.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_npcHead.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -15,6 +15,8 @@ namespace UI.ActivityHuaRongDao
         public GTextField m_txtTime;
         public GButton m_btnStart;
         public GButton m_btnBack;
+        public Transition m_hide;
+        public Transition m_show;
         public const string URL = "ui://wf8geywtltoy4";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoEntryUI";
@@ -70,6 +72,8 @@ namespace UI.ActivityHuaRongDao
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnStart = (GButton)comp.GetChild("btnStart");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,6 +86,8 @@ namespace UI.ActivityHuaRongDao
             m_txtTime = null;
             m_btnStart = null;
             m_btnBack = null;
+            m_hide = null;
+            m_show = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoSuccessUI.cs

@@ -7,9 +7,11 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_ActivityHuaRongDaoSuccessUI
     {
         public GComponent target;
+        public GList m_listReward;
         public UI_Again m_againCom;
+        public GButton m_btnExit2;
+        public GComponent m_reward;
         public GButton m_btnExit;
-        public GList m_listReward;
         public const string URL = "ui://wf8geywtltoyj";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoSuccessUI";
@@ -57,16 +59,20 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
+            m_listReward = (GList)comp.GetChild("listReward");
             m_againCom = (UI_Again)UI_Again.Create(comp.GetChild("againCom"));
+            m_btnExit2 = (GButton)comp.GetChild("btnExit2");
+            m_reward = (GComponent)comp.GetChild("reward");
             m_btnExit = (GButton)comp.GetChild("btnExit");
-            m_listReward = (GList)comp.GetChild("listReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_listReward = null;
             m_againCom.Dispose();
             m_againCom = null;
+            m_btnExit2 = null;
+            m_reward = null;
             m_btnExit = null;
-            m_listReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -7,13 +7,22 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_ActivityHuaRongDaoUI
     {
         public GComponent target;
+        public Controller m_state;
+        public GLoader m_loaBg;
         public UI_item m_item;
-        public UI_items m_items;
         public GTextField m_seconds;
         public GGroup m_tips;
-        public GButton m_btnBack;
         public GButton m_btnLookPic;
+        public GButton m_btnHidePic;
         public GButton m_btnRefresh;
+        public UI_items m_items;
+        public UI_items m_itemsOrigin;
+        public GGraph m_maskTouch;
+        public GGraph m_mask;
+        public GGraph m_maskGlobal;
+        public GButton m_btnBack;
+        public Transition m_showMask;
+        public Transition m_hideMask;
         public const string URL = "ui://wf8geywtnx120";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoUI";
@@ -61,25 +70,44 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
+            m_state = comp.GetController("state");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
-            m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
             m_seconds = (GTextField)comp.GetChild("seconds");
             m_tips = (GGroup)comp.GetChild("tips");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnLookPic = (GButton)comp.GetChild("btnLookPic");
+            m_btnHidePic = (GButton)comp.GetChild("btnHidePic");
             m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
+            m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
+            m_itemsOrigin = (UI_items)UI_items.Create(comp.GetChild("itemsOrigin"));
+            m_maskTouch = (GGraph)comp.GetChild("maskTouch");
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_maskGlobal = (GGraph)comp.GetChild("maskGlobal");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_showMask = comp.GetTransition("showMask");
+            m_hideMask = comp.GetTransition("hideMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_state = null;
+            m_loaBg = null;
             m_item.Dispose();
             m_item = null;
-            m_items.Dispose();
-            m_items = null;
             m_seconds = null;
             m_tips = null;
-            m_btnBack = null;
             m_btnLookPic = null;
+            m_btnHidePic = null;
             m_btnRefresh = null;
+            m_items.Dispose();
+            m_items = null;
+            m_itemsOrigin.Dispose();
+            m_itemsOrigin = null;
+            m_maskTouch = null;
+            m_mask = null;
+            m_maskGlobal = null;
+            m_btnBack = null;
+            m_showMask = null;
+            m_hideMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_item.cs

@@ -9,6 +9,8 @@ namespace UI.ActivityHuaRongDao
         public GComponent target;
         public GLoader m_icon;
         public GTextField m_index;
+        public Transition m_show;
+        public Transition m_hide;
         public const string URL = "ui://wf8geywtnx121";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "item";
@@ -58,11 +60,15 @@ namespace UI.ActivityHuaRongDao
         {
             m_icon = (GLoader)comp.GetChild("icon");
             m_index = (GTextField)comp.GetChild("index");
+            m_show = comp.GetTransition("show");
+            m_hide = comp.GetTransition("hide");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_icon = null;
             m_index = null;
+            m_show = null;
+            m_hide = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -31,6 +31,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
+        public UI_BtnModle2 m_btnTea;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
@@ -110,6 +111,7 @@ namespace UI.Main
             m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
+            m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
@@ -160,6 +162,8 @@ namespace UI.Main
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();
             m_btnWanShiLi = null;
+            m_btnTea.Dispose();
+            m_btnTea = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_FlipGameUI.cs

@@ -8,6 +8,7 @@ namespace UI.MiniGame
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GImage m_title;
         public GList m_cardList;
         public GLoader m_back;
         public GProgressBar m_ScareBar;
@@ -21,6 +22,8 @@ namespace UI.MiniGame
         public GImage m_star32;
         public GImage m_star33;
         public GGroup m_star3;
+        public GGraph m_barEffect;
+        public GGraph m_titleEffec;
         public const string URL = "ui://wgkh30qjjmg10";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "FlipGameUI";
@@ -69,6 +72,7 @@ namespace UI.MiniGame
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_title = (GImage)comp.GetChild("title");
             m_cardList = (GList)comp.GetChild("cardList");
             m_back = (GLoader)comp.GetChild("back");
             m_ScareBar = (GProgressBar)comp.GetChild("ScareBar");
@@ -82,10 +86,13 @@ namespace UI.MiniGame
             m_star32 = (GImage)comp.GetChild("star32");
             m_star33 = (GImage)comp.GetChild("star33");
             m_star3 = (GGroup)comp.GetChild("star3");
+            m_barEffect = (GGraph)comp.GetChild("barEffect");
+            m_titleEffec = (GGraph)comp.GetChild("titleEffec");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_title = null;
             m_cardList = null;
             m_back = null;
             m_ScareBar = null;
@@ -99,6 +106,8 @@ namespace UI.MiniGame
             m_star32 = null;
             m_star33 = null;
             m_star3 = null;
+            m_barEffect = null;
+            m_titleEffec = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs

@@ -15,10 +15,14 @@ namespace UI.MiniGame
         public GLoader m_addIcon;
         public GTextField m_ticketNum;
         public GLoader m_game1;
+        public GGraph m_effectIcon1;
+        public GGraph m_effectText1;
         public GLoader m_tipsOne;
         public GLoader m_needIcon1;
         public GTextField m_needNum1;
         public GLoader m_game2;
+        public GGraph m_effectIcon2;
+        public GGraph m_effectText2;
         public GLoader m_tipsTwo;
         public GLoader m_needIcon2;
         public GTextField m_needNum2;
@@ -77,10 +81,14 @@ namespace UI.MiniGame
             m_addIcon = (GLoader)comp.GetChild("addIcon");
             m_ticketNum = (GTextField)comp.GetChild("ticketNum");
             m_game1 = (GLoader)comp.GetChild("game1");
+            m_effectIcon1 = (GGraph)comp.GetChild("effectIcon1");
+            m_effectText1 = (GGraph)comp.GetChild("effectText1");
             m_tipsOne = (GLoader)comp.GetChild("tipsOne");
             m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
             m_needNum1 = (GTextField)comp.GetChild("needNum1");
             m_game2 = (GLoader)comp.GetChild("game2");
+            m_effectIcon2 = (GGraph)comp.GetChild("effectIcon2");
+            m_effectText2 = (GGraph)comp.GetChild("effectText2");
             m_tipsTwo = (GLoader)comp.GetChild("tipsTwo");
             m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
             m_needNum2 = (GTextField)comp.GetChild("needNum2");
@@ -95,10 +103,14 @@ namespace UI.MiniGame
             m_addIcon = null;
             m_ticketNum = null;
             m_game1 = null;
+            m_effectIcon1 = null;
+            m_effectText1 = null;
             m_tipsOne = null;
             m_needIcon1 = null;
             m_needNum1 = null;
             m_game2 = null;
+            m_effectIcon2 = null;
+            m_effectText2 = null;
             m_tipsTwo = null;
             m_needIcon2 = null;
             m_needNum2 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ResultTipsUI.cs

@@ -7,6 +7,10 @@ namespace UI.MiniGame
     public partial class UI_ResultTipsUI
     {
         public GComponent target;
+        public GGraph m_effectBg;
+        public GGraph m_effectSucces;
+        public GGraph m_effectFail;
+        public GImage m_bg;
         public GLoader m_resultTitle;
         public GTextField m_failTxt;
         public GLoader m_star1;
@@ -19,6 +23,8 @@ namespace UI.MiniGame
         public GLoader m_exitBtn;
         public GLoader m_consumeIcon;
         public GTextField m_consumeTxt;
+        public GGroup m_desc;
+        public Transition m_t0;
         public const string URL = "ui://wgkh30qjlw8c1w";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "ResultTipsUI";
@@ -66,6 +72,10 @@ namespace UI.MiniGame
 
         private void Init(GComponent comp)
         {
+            m_effectBg = (GGraph)comp.GetChild("effectBg");
+            m_effectSucces = (GGraph)comp.GetChild("effectSucces");
+            m_effectFail = (GGraph)comp.GetChild("effectFail");
+            m_bg = (GImage)comp.GetChild("bg");
             m_resultTitle = (GLoader)comp.GetChild("resultTitle");
             m_failTxt = (GTextField)comp.GetChild("failTxt");
             m_star1 = (GLoader)comp.GetChild("star1");
@@ -78,9 +88,15 @@ namespace UI.MiniGame
             m_exitBtn = (GLoader)comp.GetChild("exitBtn");
             m_consumeIcon = (GLoader)comp.GetChild("consumeIcon");
             m_consumeTxt = (GTextField)comp.GetChild("consumeTxt");
+            m_desc = (GGroup)comp.GetChild("desc");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_effectBg = null;
+            m_effectSucces = null;
+            m_effectFail = null;
+            m_bg = null;
             m_resultTitle = null;
             m_failTxt = null;
             m_star1 = null;
@@ -93,6 +109,8 @@ namespace UI.MiniGame
             m_exitBtn = null;
             m_consumeIcon = null;
             m_consumeTxt = null;
+            m_desc = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameCheckUI.cs

@@ -9,17 +9,21 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_backBtn;
         public GLoader m_bg;
+        public GLoader m_gameBg1;
         public GTextField m_gameTitle1;
         public GLoader m_game1;
         public GLoader m_newGame1;
         public GLoader m_needIcon1;
         public GTextField m_needNum1;
+        public GLoader m_gameLock1;
+        public GLoader m_gameBg2;
         public GTextField m_gameTitle2;
         public GLoader m_game2;
         public GLoader m_newGame2;
         public GLoader m_gameLock2;
         public GLoader m_needIcon2;
         public GTextField m_needNum2;
+        public GLoader m_gameBg3;
         public GTextField m_gameTitle3;
         public GLoader m_game3;
         public GLoader m_newGame3;
@@ -76,17 +80,21 @@ namespace UI.MiniGame
         {
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_gameBg1 = (GLoader)comp.GetChild("gameBg1");
             m_gameTitle1 = (GTextField)comp.GetChild("gameTitle1");
             m_game1 = (GLoader)comp.GetChild("game1");
             m_newGame1 = (GLoader)comp.GetChild("newGame1");
             m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
             m_needNum1 = (GTextField)comp.GetChild("needNum1");
+            m_gameLock1 = (GLoader)comp.GetChild("gameLock1");
+            m_gameBg2 = (GLoader)comp.GetChild("gameBg2");
             m_gameTitle2 = (GTextField)comp.GetChild("gameTitle2");
             m_game2 = (GLoader)comp.GetChild("game2");
             m_newGame2 = (GLoader)comp.GetChild("newGame2");
             m_gameLock2 = (GLoader)comp.GetChild("gameLock2");
             m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
             m_needNum2 = (GTextField)comp.GetChild("needNum2");
+            m_gameBg3 = (GLoader)comp.GetChild("gameBg3");
             m_gameTitle3 = (GTextField)comp.GetChild("gameTitle3");
             m_game3 = (GLoader)comp.GetChild("game3");
             m_newGame3 = (GLoader)comp.GetChild("newGame3");
@@ -99,17 +107,21 @@ namespace UI.MiniGame
         {
             m_backBtn = null;
             m_bg = null;
+            m_gameBg1 = null;
             m_gameTitle1 = null;
             m_game1 = null;
             m_newGame1 = null;
             m_needIcon1 = null;
             m_needNum1 = null;
+            m_gameLock1 = null;
+            m_gameBg2 = null;
             m_gameTitle2 = null;
             m_game2 = null;
             m_newGame2 = null;
             m_gameLock2 = null;
             m_needIcon2 = null;
             m_needNum2 = null;
+            m_gameBg3 = null;
             m_gameTitle3 = null;
             m_game3 = null;
             m_newGame3 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameView.cs

@@ -11,6 +11,8 @@ namespace UI.MiniGame
         public GList m_numList;
         public GLoader m_backBtn;
         public GTextField m_score;
+        public GGraph m_effectTitle;
+        public GImage m_title;
         public GLoader m_star3;
         public GLoader m_star2;
         public GLoader m_star1;
@@ -69,6 +71,8 @@ namespace UI.MiniGame
             m_numList = (GList)comp.GetChild("numList");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_score = (GTextField)comp.GetChild("score");
+            m_effectTitle = (GGraph)comp.GetChild("effectTitle");
+            m_title = (GImage)comp.GetChild("title");
             m_star3 = (GLoader)comp.GetChild("star3");
             m_star2 = (GLoader)comp.GetChild("star2");
             m_star1 = (GLoader)comp.GetChild("star1");
@@ -83,6 +87,8 @@ namespace UI.MiniGame
             m_numList = null;
             m_backBtn = null;
             m_score = null;
+            m_effectTitle = null;
+            m_title = null;
             m_star3 = null;
             m_star2 = null;
             m_star1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_cardItem.cs

@@ -10,6 +10,9 @@ namespace UI.MiniGame
         public Controller m_state;
         public GButton m_card;
         public GTextField m_id;
+        public GGraph m_removeEffect;
+        public GGraph m_flipEffect;
+        public Transition m_t0;
         public const string URL = "ui://wgkh30qjjmg11";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "cardItem";
@@ -60,12 +63,18 @@ namespace UI.MiniGame
             m_state = comp.GetController("state");
             m_card = (GButton)comp.GetChild("card");
             m_id = (GTextField)comp.GetChild("id");
+            m_removeEffect = (GGraph)comp.GetChild("removeEffect");
+            m_flipEffect = (GGraph)comp.GetChild("flipEffect");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_state = null;
             m_card = null;
             m_id = null;
+            m_removeEffect = null;
+            m_flipEffect = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -31,7 +31,6 @@ namespace UI.RoleInfo
         public GTextField m_txtRoleID;
         public GButton m_btnCopy;
         public GButton m_btnSetting;
-        public GButton m_btnHuaRongDao;
         public Transition m_Hide;
         public Transition m_Show;
         public const string URL = "ui://374k3dwvd4iw6k";
@@ -105,7 +104,6 @@ namespace UI.RoleInfo
             m_txtRoleID = (GTextField)comp.GetChild("txtRoleID");
             m_btnCopy = (GButton)comp.GetChild("btnCopy");
             m_btnSetting = (GButton)comp.GetChild("btnSetting");
-            m_btnHuaRongDao = (GButton)comp.GetChild("btnHuaRongDao");
             m_Hide = comp.GetTransition("Hide");
             m_Show = comp.GetTransition("Show");
         }
@@ -138,7 +136,6 @@ namespace UI.RoleInfo
             m_txtRoleID = null;
             m_btnCopy = null;
             m_btnSetting = null;
-            m_btnHuaRongDao = null;
             m_Hide = null;
             m_Show = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListBlackRewardtem.cs

@@ -8,6 +8,7 @@ namespace UI.Store
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_showItemType;
         public GLoader m_loaIcon;
         public GTextField m_txtMonth;
         public GGroup m_grpMonth;
@@ -62,6 +63,7 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_showItemType = comp.GetController("showItemType");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtMonth = (GTextField)comp.GetChild("txtMonth");
             m_grpMonth = (GGroup)comp.GetChild("grpMonth");
@@ -72,6 +74,7 @@ namespace UI.Store
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_showItemType = null;
             m_loaIcon = null;
             m_txtMonth = null;
             m_grpMonth = null;

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

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using Assets.Game.HotUpdate.Data;
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityTeaSProxy
+    {
+        public static async ETTask<bool> ReqGetNPCVisitInfo(int id)
+        {
+            var response = (S2C_GetNpcVisits) await MessageHelper.SendToServer(new C2S_GetNpcVisits { ActivityId = id });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            //MiniGameDateManager.Instance.NpcInfoList = response.NpcVisits;
+            return true;
+        }
+
+        public static async ETTask<bool> ReqUnLockNPCVisit(int id,int npcid)
+        {
+            var response = (S2C_UnlockNpcVisit)await MessageHelper.SendToServer(new C2S_UnlockNpcVisit { ActivityId = id , NpcId = npcid});
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            //MiniGameDateManager.Instance.NpcInfoList = response.NpcVisits;
+            return true;
+        }
+
+        public static async ETTask<bool> ReqGetNPCVisitReward(int id, int npcid)
+        {
+            var response = (S2C_GetNpcVisitRewrd)await MessageHelper.SendToServer(new C2S_GetNpcVisitRewrd { ActivityId = id, NpcId = npcid });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            //MiniGameDateManager.Instance.NpcInfoList = response.NpcVisits;
+            return true;
+        }
+
+        //获取合成列表
+        public static async ETTask<bool> ReqGetItemSyntheticInfos(int activityId)
+        {
+            S2C_GetItemSyntheticInfos response = null;
+            response = (S2C_GetItemSyntheticInfos)await MessageHelper.SendToServer(new C2S_GetItemSyntheticInfos() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityTeaDataManager.Instance.ItemSynthetics = response.ItemSynthetics;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //部件合成
+        public static async ETTask<bool> ReqItemSynthetic(int activityId ,int itemId)
+        {
+            S2C_ItemSynthetic response = null;
+            response = (S2C_ItemSynthetic)await MessageHelper.SendToServer(new C2S_ItemSynthetic() { ActivityId = activityId,ItemId = itemId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    //ActivityTeaDataManager.Instance.ItemSynthetics = response.ItemSynthetics;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+
+    }
+}

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

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

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

@@ -39,11 +39,33 @@ namespace GFGGame
         {
             var response = (S2C_GetStarMiniGameRewrd)await MessageHelper.SendToServer(new C2S_GetStarMiniGameRewrd { GameId = gameID, GameType = gameType, ActivityId = activityId,Star = star });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            MiniGameDateManager.Instance.gameinfoList[gameType-1] = response.GameInfo;
+            for (int i =0;i< MiniGameDateManager.Instance.gameinfoList.Count;i++)
+            {
+                if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 1)
+                {
+                    MiniGameDateManager.Instance.gameinfoList[i] = response.GameInfo;
+                }
+            }
             //奖励弹窗
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
             return true;
         }
+        public static async ETTask<bool> ReqGetFirstPassReward(int gameID, int gameType, int activityId)
+        {
+            var response = (S2C_GetFirstPassReward)await MessageHelper.SendToServer(new C2S_GetFirstPassReward { GameId = gameID, GameType = gameType, ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            for (int i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+            {
+                if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 2 && MiniGameDateManager.Instance.gameinfoList[i].FirstPassRewardStatus != response.GameInfo.FirstPassRewardStatus)
+                {
+                    MiniGameDateManager.Instance.gameinfoList[i] = response.GameInfo;
+                }
+            }
+            //奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            return true;
+        }
+
 
         public static async ETTask<bool> ReqGetGameUnlock(int id,int type,int activityId)
         {

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

@@ -183,10 +183,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    TravelData travelData = new TravelData();
-                    travelData.Status = response.TravelGuideInfo.Status;
-                    travelData.EndTime = response.TravelGuideInfo.EndTime;
-                    TravelDataManager.Instance.TravelData = travelData;
+                    TravelDataManager.Instance.TravelData.Status = response.TravelGuideInfo.Status;
+                    TravelDataManager.Instance.TravelData.EndTime = response.TravelGuideInfo.EndTime;
 
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -289,5 +289,10 @@ namespace GFGGame
         {
             return $"{MINIGAME_DIR_PATH}{res}.{extName}";
         }
+
+        public static string GetHUARONGDAOPicPath(string res, string extName = "png")
+        {
+            return $"{MINIGAME_DIR_PATH}HRDGame/{res}.{extName}";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -14,8 +14,11 @@ namespace GFGGame
             int[] items = suitCfg.partsArr;
             foreach (int itemId in items)
             {
-                int itemType = ItemUtilCS.GetItemSubType(itemId);
-                if (itemType != ConstDressUpItemType.FEN_WEI)
+                //int itemType = ItemUtilCS.GetItemSubType(itemId);
+                //if (itemType != ConstDressUpItemType.FEN_WEI && itemType != ConstDressUpItemType.BEI_JING 
+                    //&& itemType != ConstDressUpItemType.HUAN_JING && itemType != ConstDressUpItemType.QIAN_JING && itemType != ConstDressUpItemType.BEI_SHI)
+
+                if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId))
                 {
                     score += ItemDataManager.GetItemAdditionScore(itemId, InstanceZonesDataManager.currentScoreType, InstanceZonesDataManager.currentFightTags);
                 }

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

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs

@@ -0,0 +1,159 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UI.DressUp;
+using FairyGUI;
+using UI.ActivityAfternoonTea;
+using UI.CommonGame;
+using ET;
+
+namespace GFGGame
+{
+    public class ActivitySyntheticView : BaseWindow
+    {
+        private UI_ActivitySyntheticUI _ui;
+        private ValueBarController _valueBarController;
+        private SuitCfg _suitCfg;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivitySyntheticUI.PACKAGE_NAME;
+            _ui = UI_ActivitySyntheticUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_listSynthetic.itemRenderer = RenderListSyntheticItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _valueBarController.OnShown();
+            _valueBarController.Controller(6);
+
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
+            _suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;
+            RefreshTimeText();
+            _ui.m_txtTips.SetVar("name", _suitCfg.name).FlushVars();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivitySyntheticView).FullName);
+        }
+
+        private void RefreshTimeText()
+        {
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
+            long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+            string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
+            _ui.m_txtTime.text = "Ê£Óà:" + strTime;
+        }
+        
+        private void RenderListSyntheticItem(int index, GObject obj)
+        {
+            UI_SyntheticItemUI comBox = UI_SyntheticItemUI.Proxy(obj);
+            UI_ComItem item1 = UI_ComItem.Proxy(comBox.m_item1);
+            ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[index]);
+            var materiarsArr = itemSyntheticCfg.syntheticMateriarsArr;
+            ItemCfg itemCfg1 = ItemCfgArray.Instance.GetCfg(materiarsArr[0][0]);
+            RarityIconController.UpdateRarityIcon(item1.m_loaRarity, itemCfg1.id, false);
+            string ext1 = ItemUtil.GetItemResExt(itemCfg1.itemType, itemCfg1.subType, true);
+            item1.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg1.res, ext1);
+            if(item1.target.data == null)
+                item1.target.onClick.Add(OnSelectorItemClick);
+            item1.target.data = materiarsArr[0][0];
+            item1.m_QualityType.selectedIndex = itemCfg1.rarity - 1;
+            item1.m_txtCount.text = materiarsArr[0][1].ToString();
+            UI_ComItem.ProxyEnd();
+
+            UI_ComItem item2 = UI_ComItem.Proxy(comBox.m_item2);
+            ItemCfg itemCfg2 = ItemCfgArray.Instance.GetCfg(materiarsArr[1][0]);
+            RarityIconController.UpdateRarityIcon(item2.m_loaRarity, itemCfg2.id, false);
+            string ext2 = ItemUtil.GetItemResExt(itemCfg2.itemType, itemCfg2.subType, true);
+            item2.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg2.res, ext2);
+            if (item2.target.data == null)
+                item2.target.onClick.Add(OnSelectorItemClick);
+            item2.target.data = materiarsArr[1][0];
+            item2.m_QualityType.selectedIndex = itemCfg2.rarity - 1;
+            item2.m_txtCount.text = materiarsArr[1][1].ToString();
+            UI_ComItem.ProxyEnd();
+
+            UI_ComItem item3 = UI_ComItem.Proxy(comBox.m_item3);
+            ItemCfg itemCfg3 = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[index]);
+            RarityIconController.UpdateRarityIcon(item3.m_loaRarity, itemCfg3.id, false);
+            string ext3 = ItemUtil.GetItemResExt(itemCfg3.itemType, itemCfg3.subType, true);
+            item3.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg3.res, ext3);
+            if (item3.target.data == null)
+                item3.target.onClick.Add(OnSelectorItemClick);
+            item3.target.data = _suitCfg.partsArr[index];
+            item3.m_QualityType.selectedIndex = itemCfg3.rarity - 1;
+            item3.m_txtCount.text = "1";
+            UI_ComItem.ProxyEnd();
+
+            if (ItemDataManager.GetItemNum(_suitCfg.partsArr[index]) > 0)
+            {
+                comBox.m_btnType.selectedIndex = 2;
+            }
+            else if (ItemDataManager.GetItemNum(materiarsArr[0][0]) >= materiarsArr[0][1] && ItemDataManager.GetItemNum(materiarsArr[1][0]) >= materiarsArr[1][1])
+            {
+                comBox.m_btnType.selectedIndex = 1;
+                if(comBox.m_btnMake.data == null)
+                    comBox.m_btnMake.onClick.Add(OnClickBtnMake);
+
+                comBox.m_btnMake.data = _suitCfg.partsArr[index];
+            }
+            else { 
+                comBox.m_btnType.selectedIndex = 0;
+                if (comBox.m_btnGet.data == null)
+                    comBox.m_btnGet.onClick.Add(OnClickBtnGet);
+
+                comBox.m_btnGet.data = index;
+            }
+            UI_SyntheticItemUI.ProxyEnd();
+        }
+
+        private async void OnClickBtnMake(EventContext context)
+        {
+            if (!(context.sender is GObject obj)) return;
+            int itemID = (int)obj.data;
+            bool result = await ActivityTeaSProxy.ReqItemSynthetic( 5005 , itemID);
+            if (result)
+            {
+                _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;
+            }
+        }
+
+        private void OnClickBtnGet()
+        {
+            ViewManager.Show<StoryChapterView>();
+        }
+
+        private void OnSelectorItemClick(EventContext context)
+        {
+            if (!(context.sender is GObject obj)) return;
+            int itemID = (int)obj.data;
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -0,0 +1,94 @@
+using UnityEngine;
+using FairyGUI;
+using UI.ActivityAfternoonTea;
+using Assets.Game.HotUpdate.Data;
+
+namespace GFGGame
+{
+    public class ActivityTeaMainView : BaseWindow
+    {
+        private UI_ActivityTeaMainUI _ui;
+
+            public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityTeaMainUI.PACKAGE_NAME;
+            _ui = UI_ActivityTeaMainUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_oneViewIcon.onClick.Add(OnClickBtnHuaRongDaoView);
+            _ui.m_twoViewIcon.onClick.Add(OnClickBtnVisitView);
+            _ui.m_threeViewIcon.onClick.Add(OnClickBtnMergeView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityTeaMainView).FullName);
+        }
+
+        private void OnClickBtnHuaRongDaoView()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
+                return;
+            }
+            //小游戏入口
+            ViewManager.Show<ActivityHuaRongDaoEntryView>(5003);
+        }
+
+        private async void OnClickBtnVisitView()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
+                return;
+            }
+            //var result = await ActivityTeaSProxy.ReqGetNPCVisitInfo(5004);
+            //if (!result) return;
+            //拜访入口
+            ViewManager.Show<ActivityTeaVisitView>();
+        }
+
+        private void OnClickBtnMergeView()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
+                return;
+            }
+            //合成入口
+            ViewManager.Show<ActivitySyntheticView>();
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -0,0 +1,81 @@
+using UnityEngine;
+using FairyGUI;
+using UI.ActivityAfternoonTea;
+
+namespace GFGGame
+{
+    public class ActivityTeaVisitView : BaseWindow
+    {
+        private UI_ActivityTeaVisitUI _ui;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityTeaVisitUI.PACKAGE_NAME;
+            _ui = UI_ActivityTeaVisitUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_ruleIcon.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_visitNumTips.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_taskList.itemRenderer = RenderTaskList;
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xnbh_bg");
+            _ui.m_ruleIcon.data = 300026;
+            _ui.m_visitNumTips.data = 300026;
+            _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityTeaVisitView).FullName);
+        }
+
+        private void RenderTaskList(int index,GObject obj)
+        {
+            UI_ActivityVIsitItemUI item = UI_ActivityVIsitItemUI.Proxy(obj);
+            item.m_head.m_loaIcon.url = ResPathUtil.GetNpcHeadPath(ActivityVisitCfgArray.Instance.dataArray[index].picRes);
+            item.m_name.text = ActivityVisitCfgArray.Instance.dataArray[index].name;
+            if(item.m_visitBtn.data == null)
+            {
+                item.m_visitBtn.onClick.Add(OnClickVisitBtn);
+            }
+            item.m_visitBtn.data = index;
+            UI_ActivityVIsitItemUI.ProxyEnd();
+        }
+        private void OnClickVisitBtn(EventContext context)
+        {
+            if (!(context.sender is GObject btnVisit)) return;
+            int itemID = (int)btnVisit.data;
+            ViewManager.Show<ActivityVisitNpcView>(itemID);
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -0,0 +1,210 @@
+using UnityEngine;
+using FairyGUI;
+using System;
+using System.Collections.Generic;
+using UI.ActivityAfternoonTea;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class ActivityVisitNpcView : BaseWindow
+    {
+        private UI_ActivityVisitNPCUI _ui;
+        private int npcId;
+        private string _currentWords;
+        private bool isNextChat = false;
+        private int indexChat;
+        private GTextField _wordTextField;
+        TypingFadeEffectPro _typingEffect;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            _wordTextField = null;
+            _typingEffect = null;
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityVisitNPCUI.PACKAGE_NAME;
+            _ui = UI_ActivityVisitNPCUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_taskList.itemRenderer = RenderTaskList;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_nextChatBtn.onClick.Add(OnClickNextChat);
+            _ui.m_taskIcon.onClick.Add(OnClickRewardTIps);
+        }
+        protected override void AddEventListener()
+        {
+
+        }
+        protected override void RemoveEventListener()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
+
+            npcId = (int)this.viewData;
+
+            var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
+            _ui.m_taskList.data = taskCfgs;
+            _ui.m_npcIcon.url = ResPathUtil.GetNpcPicSPath(ActivityVisitCfgArray.Instance.dataArray[npcId].picRes);
+            _ui.m_loaBg.url = ResPathUtil.GetSceneBgPath(ActivityVisitCfgArray.Instance.dataArray[npcId].bgRes);
+            _ui.m_name.text = ActivityVisitCfgArray.Instance.dataArray[npcId].name;
+            _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length;
+            _ui.m_DialogText.m_txtName.text = ActivityVisitCfgArray.Instance.dataArray[npcId].name;
+            _ui.m_DialogText.m_txtContent.text = "";
+            _ui.m_DialogText.m_In.Play();
+            _wordTextField = null;
+
+            isNextChat = false;
+            indexChat = 0;
+            SetTypeWriting();
+        }
+
+        protected override void OnHide()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
+            base.OnHide();
+        }
+
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityVisitNpcView).FullName);
+        }
+        private void OnClickRewardTIps()
+        {
+            ViewManager.Show<ReWardTipsView>(npcId);
+        }
+        private void RenderTaskList(int index, GObject obj)
+        {
+            UI_ActivityVIsitRewardItemUI item = UI_ActivityVIsitRewardItemUI.Proxy(obj);
+
+            var tasks = (List<TaskCfg>)obj.parent.data;
+            var taskCfg = tasks[index];
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
+            item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
+            item.m_txtCount.text =
+                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
+            item.m_GetRewardBt.data = taskCfg.id;
+
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            }
+            item.m_ComeBt.data = taskCfg;
+
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+            item.m_listTaskReward.data = TaskDataManager.Instance.GetReward(taskCfg);
+            item.m_listTaskReward.numItems = TaskDataManager.Instance.GetReward(taskCfg).Length;
+
+            UI_ActivityVIsitRewardItemUI.ProxyEnd();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            int id = (int)btnGet.data;
+            var result = await TaskSProxy.GetTaskBonus(id);
+            if (!result) return;
+            _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length;
+        }
+        private void OnBtnGoClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGo)) return;
+            var taskCfg = (TaskCfg)btnGo.data;
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
+            var param = new object[taskCfg.jumpParamArr.Length];
+            for (var i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            ViewManager.JumpToView(taskCfg.jumpId, param);
+        }
+
+        private static void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            var rewards = (int[][])obj.parent.data;
+            UI_RewardItemUI item = UI_RewardItemUI.Proxy(obj);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
+            item.m_rewardIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_rewardNum.text = rewards[index][1].ToString();
+            UI_RewardItemUI.ProxyEnd();
+        }
+
+        private void OnTasksChange(EventContext context)
+        {
+            _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length;
+        }
+        private void SetTypeWriting()
+        {
+            int ind = Math.Min(indexChat, ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length - 1);
+            _currentWords = ActivityVisitCfgArray.Instance.dataArray[npcId].chatArr[ind];
+
+            _wordTextField = _ui.m_DialogText.m_txtContent;
+            _typingEffect = new TypingFadeEffectPro(_wordTextField);
+            _typingEffect.typeFinishedAction = ShowCurrentWords;
+
+            _wordTextField.text = _currentWords;
+
+            _typingEffect.SetSpeed(1.0f);
+            _typingEffect.Start();
+
+        }
+
+        private void ShowCurrentWords()
+        {
+            StopTyping();
+            _typingEffect?.Cancel();
+            _wordTextField.text = _currentWords;
+            isNextChat = true;
+            indexChat++;
+        }
+        private void StopTyping()
+        {
+            _typingEffect.Cancel();
+        }
+        private void OnClickNextChat()
+        {
+            if(isNextChat)
+            {
+                isNextChat = false;
+                if(indexChat == ActivityVisitCfgArray.Instance.dataArray[npcId].chatArr.Length)
+                {
+                    indexChat = 0;
+                }
+                SetTypeWriting();
+            }
+            else
+            {
+                ShowCurrentWords();
+                isNextChat = true;
+            }
+            
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/RewardTipsView.cs

@@ -0,0 +1,86 @@
+using UnityEngine;
+using FairyGUI;
+using UI.ActivityAfternoonTea;
+
+namespace GFGGame
+{
+    public class ReWardTipsView : BaseWindow
+    {
+        private UI_RewardTips _ui;
+        private int indexNPC;
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            base.Dispose();
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_RewardTips.PACKAGE_NAME;
+            _ui = UI_RewardTips.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(Hide);
+            _ui.m_back.onClick.Add(Hide);
+            _ui.m_rewardList.itemRenderer = RenderTaskList;
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effect1, "ui_Activity", "Com_window_L_up");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_effect2, "ui_Activity", "Com_window_R_Down");
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            indexNPC = (int)this.viewData;
+            _ui.m_name.text = ActivityVisitCfgArray.Instance.dataArray[indexNPC].name + "的奖励";
+            _ui.m_rewardList.numItems = ActivityVisitCfgArray.Instance.dataArray[indexNPC].bonusArr.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderTaskList(int index, GObject obj)
+        {
+            UI_RewardTipsItemUI item = UI_RewardTipsItemUI.Proxy(obj);
+            int resID = ActivityVisitCfgArray.Instance.dataArray[indexNPC].bonusArr[index][0];
+            item.m_rewardName.text = ItemCfgArray.Instance.GetCfg(resID).name;
+            item.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(resID));
+            item.m_rewardNum.text = ActivityVisitCfgArray.Instance.dataArray[indexNPC].bonusArr[index][1].ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickVisitBtn);
+            }
+            item.target.data = resID;
+            UI_RewardTipsItemUI.ProxyEnd();
+        }
+        private void OnClickVisitBtn(EventContext context)
+        {
+            if (!(context.sender is GObject btnVisit)) return;
+            int itemID = (int)btnVisit.data;
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/RewardTipsView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -3,14 +3,16 @@ using UnityEngine;
 using UI.ActivityHuaRongDao;
 using System.Collections.Generic;
 using FairyGUI;
+using System.Threading.Tasks;
+using ET;
 
 namespace GFGGame
 {
     public class ActivityHuaRongDaoEntryView : BaseWindow
     {
         private UI_ActivityHuaRongDaoEntryUI _ui;
-        public static int curLevel;
-        private int haveTimes = 1;
+        private int curLevel;
+        private int _activityID;
         private List<int> IDList;
 
         protected override void OnInit()
@@ -21,11 +23,11 @@ namespace GFGGame
 
             viewCom = _ui.target;
             isfullScreen = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
 
             _ui.m_btnStart.onClick.Add(OnBtnStartClick);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            InitBtnRule();
 
             InitIDList();
             _ui.m_scrollPane.m_listBg.itemRenderer = RenderListItem;
@@ -44,28 +46,35 @@ namespace GFGGame
             base.Dispose();
         }
 
-        protected override void OnShown()
+        protected override async void OnShown()
         {
             base.OnShown();
 
-            InitInfo();
+            _ui.m_hide.Play();
+            _activityID = 5003;
+            //_activityID = (int)viewData;
+            await InitInfo();
+            _ui.m_show.Play();
+            UpdateTime(null);
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
 
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE, InitInfo);
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE, UpdateUI);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE, InitInfo);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE, UpdateUI);
         }
 
         private void InitIDList()
@@ -79,11 +88,30 @@ namespace GFGGame
             }
         }
 
-        private void InitInfo()
+        private void UpdateUI()
+        {
+            InitInfo();
+        }
+
+        private async Task InitInfo()
         {
+            curLevel = await GetCurLevel(_activityID);
+
+            RoleLimitData limitData;
+
             _ui.m_curLevel.text = curLevel.ToString();
-            _ui.m_challengeTimes.SetVar("have", haveTimes.ToString())
-                .SetVar("sum", HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]).comsumeLimit.ToString()).FlushVars();
+            // 所有关卡都通关了
+            if (curLevel == IDList.Count)
+            {
+                _ui.m_challengeTimes.SetVar("have", "0").SetVar("sum", "0").FlushVars();
+            }
+            else
+            {
+                limitData = RoleLimitDataManager.GetLimitData(HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]).comsumeLimit);
+                int times = limitData.TotalPlayMax - limitData.PlayTimes;
+                _ui.m_challengeTimes.SetVar("have", times.ToString())
+                    .SetVar("sum", limitData.TotalPlayMax.ToString()).FlushVars();
+            }
 
             InitProgress();
             ProgressAutoLocate();
@@ -95,16 +123,14 @@ namespace GFGGame
             _ui.m_scrollPane.m_listBg.numItems = IDList.Count;
             _ui.m_scrollPane.m_listItems.numItems = IDList.Count;
             _ui.m_scrollPane.m_listBg.ResizeToFit();
-            //_ui.m_scrollPane.m_listBg.width = IDList.Count * 244 + (IDList)
-            //_ui.m_scrollPane.m_listBg.
         }
 
 
         private void ProgressAutoLocate()
         {
             _ui.m_scrollPane.target.scrollPane.posX
-                = curLevel * (_ui.m_scrollPane.m_listBg.GetChildAt(0).width + _ui.m_scrollPane.m_listBg.columnGap) 
-                + (curLevel > 0 ? -100 : 0);
+                = curLevel * (_ui.m_scrollPane.m_listBg.GetChildAt(0).width + _ui.m_scrollPane.m_listBg.columnGap)
+                + (curLevel > 0 ? -150 : 0);
         }
 
         private void RenderListItem(int index, GObject gObject)
@@ -133,7 +159,8 @@ namespace GFGGame
         {
             GObject obj = (GObject)eventContext.sender;
             int id = (int)obj.data;
-            ViewManager.Show<GiftDetailView>(HuarongRoadGameArray.Instance.GetCfg(IDList[id]).bonusWinArr);
+            //ViewManager.Show<GiftDetailView>(HuarongRoadGameArray.Instance.GetCfg(IDList[id]).bonusWinArr);
+            GoodsItemTipsController.ShowItemTips(HuarongRoadGameArray.Instance.GetCfg(IDList[id]).bonusWinArr[0][0]);
         }
 
         private void OnBtnBackClick()
@@ -141,17 +168,60 @@ namespace GFGGame
             Hide();
         }
 
-        private void OnBtnRuleClick()
+        private void InitBtnRule()
         {
-
+            if (_ui.m_btnRule.data == null)
+            {
+                _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+                _ui.m_btnRule.data = 300025;
+            }
         }
 
-        private void OnBtnStartClick()
+        private async void OnBtnStartClick()
         {
-            ViewManager.Show<ActivityHuaRongDaoView>(HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]));
+            // 通关了所有
+            if(curLevel == IDList.Count)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已通关所有关卡");
+                return;
+            }
+
+            HuarongRoadGame cfg = HuarongRoadGameArray.Instance.dataArray[curLevel];
+            var result = await MiniGameProxy.ReqMiniGameStart(cfg.id, cfg.type, _activityID);
+            if (!result) return;
+
+            ViewManager.Show<ActivityHuaRongDaoView>(new object[] { cfg, _activityID });
         }
 
+        private async Task<int> GetCurLevel(int id)
+        {
+            var result = await MiniGameProxy.ReqGetChallengeReward(id);
+            if (!result)
+            {
+                return -1;
+            }
+
+            int i;
+            for (i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+            {
+                if (!MiniGameDateManager.Instance.gameinfoList[i].IsCleared)
+                {
+                    return i;
+                }
+            }
 
+            return i;
+        }
 
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityID);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_txtTime.text = "剩余" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoSuccessView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_ActivityHuaRongDaoSuccessUI.Create();
             viewCom = _ui.target;
             viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             modal = true;
             clickBlankToClose = false;
 
@@ -44,14 +45,15 @@ namespace GFGGame
 
             cfg = (HuarongRoadGame)viewData;
             itemDatas = ItemUtil.CreateItemDataList(cfg.bonusWinArr);
-            _ui.m_listReward.numItems = itemDatas.Count;
-
-            _ui.m_againCom.target.visible = (cfg.comsumeStartArr.Length > 0);
+            InitReward();
+            //_ui.m_listReward.numItems = itemDatas.Count;
+            //_ui.m_againCom.target.visible = (cfg.comsumeStartArr.Length > 0);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            GetSuitItemController.TryShow(0);
         }
 
         protected override void AddEventListener()
@@ -92,5 +94,11 @@ namespace GFGGame
             ViewManager.Hide<ActivityHuaRongDaoView>();
             Hide();
         }
+
+        private void InitReward()
+        {
+            _ui.m_reward.data = new ItemView(_ui.m_reward);
+            (_ui.m_reward.data as ItemView).SetData(itemDatas[0]);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -3,23 +3,47 @@ using System.Collections.Generic;
 using UnityEngine;
 using UI.ActivityHuaRongDao;
 using FairyGUI;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
 
 namespace GFGGame
 {
     public class ActivityHuaRongDaoView : BaseWindow
     {
         private UI_ActivityHuaRongDaoUI _ui;
+
+        /// <summary>
+        /// 格子类
+        /// </summary>
         public class Grid
         {
-            public Vector2 pos;
+            public Vector2 pos; // UI坐标
             public int num;
         }
 
-        private Grid[,] _gridArr;
+        /// <summary>
+        /// 格子的行列信息
+        /// </summary>
+        public class GridInfo
+        {
+            public int col;
+            public int row;
+            public int num;
+        }
+
+        private int _activityID;
+        // 行/列 格子数
         private readonly int _gridNum = 3;
-        private List<GObject> _items;
         private bool _gameStart;
-        private HuarongRoadGame cfg;
+
+        private Grid[,] _gridArr;
+        private List<GObject> _items;
+        private HuarongRoadGame _cfg;
+        // 异步函数的取消控制
+        private CancellationTokenSource _cancellationTokenSource;
+        // 胜利后自动补齐的格子
+        private GObject _blankItem;
 
         public override void Dispose()
         {
@@ -38,15 +62,26 @@ namespace GFGGame
             packageName = UI_ActivityHuaRongDaoUI.PACKAGE_NAME;
             _ui = UI_ActivityHuaRongDaoUI.Create();
             viewCom = _ui.target;
-            viewCom.Center();
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
             isReturnView = true;
-            modal = true;
 
             _ui.m_item.target.visible = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_state.onChanged.Add(OnChangeLookOriginState);
+            _ui.m_btnRefresh.onClick.Add(OnClickBtnRefresh);
 
             InitGridInfo();
             CreateItems();
+            // 初始化空白处格子实体
+            if (_blankItem == null)
+            {
+                _blankItem = UIPackage.CreateObject("ActivityHuaRongDao", "item");
+                _ui.target.AddChild(_blankItem);
+            }
+
+            _ui.m_maskTouch.onTouchBegin.Add(TouchBegin);
+            _ui.m_maskTouch.onTouchEnd.Add(TouchEnd);
 
         }
 
@@ -54,18 +89,19 @@ namespace GFGGame
         {
             base.OnShown();
 
-            cfg = (HuarongRoadGame)viewData;
-            SetGridInfo();
-            InitItems();
-            _gameStart = false;
-            ResetCountdown();
-            Countdown(null);
-            Timers.inst.Add(1, 0, Countdown);
+            object[] arr = viewData as object[];
+            _cfg = (HuarongRoadGame)arr[0];
+            _activityID = (int)arr[1];
+
+            RefreshData();
+            _cancellationTokenSource = new CancellationTokenSource();
+            Task task = StartAnimation(_cancellationTokenSource.Token);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            StopMyAsyncFunction();
         }
 
         /// <summary>
@@ -86,14 +122,10 @@ namespace GFGGame
 
         }
 
-        private void SetGridInfo()
+        private void SetGridInfo(List<int> numList)
         {
             //List<int> numList = GetRandomArr(1, 8);
-            List<int> numList = GetArrByConfigStep(cfg.step);
-            while (CheckListCorrect(numList))
-            {
-                numList = GetArrByConfigStep(cfg.step);
-            }
+
             Vector2 originPos = _ui.m_item.target.position;
 
             for (int i = 0; i < _gridNum; i++)
@@ -123,32 +155,16 @@ namespace GFGGame
             return true;
         }
 
-        /// <summary>
-        /// 随机排序 min~max 连续的数字
-        /// </summary>
-        /// <param name="min"></param>
-        /// <param name="max"></param>
-        /// <returns></returns>
-        private List<int> GetRandomArr(int min, int max)
+        private List<int> CreateIncreaseArr()
         {
             List<int> list = new List<int>();
-            for (int i = min; i <= max; i++)
-            {
-                list.Add(i);
-            }
 
-            System.Random r = new System.Random();
-            for (int i = 0; i < list.Count; i++)
+            list.Add(0);
+            for (int i = 1; i <= 8; i++)
             {
-                int index = r.Next(list.Count);
-                int temp = list[index];
-                list[index] = list[i];
-                list[i] = temp;
+                list.Add(i);
             }
 
-            // 最后一个是空的
-            list.Add(0);
-
             return list;
         }
 
@@ -159,13 +175,7 @@ namespace GFGGame
         /// <returns></returns>
         private List<int> GetArrByConfigStep(int configStep)
         {
-            List<int> list = new List<int>();
-
-            list.Add(0);
-            for (int i = 1; i <= 8; i++)
-            {
-                list.Add(i);
-            }
+            List<int> list = CreateIncreaseArr();
 
             int num = 0;
             Vector2 zeroPos = new Vector2(0, 0);
@@ -173,7 +183,7 @@ namespace GFGGame
             Vector2 lastPos = zeroPos;
             while (num < configStep)
             {
-                int n = Random.Range(0, 4);
+                int n = UnityEngine.Random.Range(0, 4);
                 Vector2 tempPos = zeroPos + dirArr[n];
                 if (tempPos != lastPos && tempPos.x >= 0 && tempPos.y >= 0 && tempPos.x < _gridNum && tempPos.y < _gridNum)
                 {
@@ -204,7 +214,8 @@ namespace GFGGame
                     _items[itemIndex].position = _gridArr[i, j].pos;
                     UI_item item = UI_item.Proxy(_items[itemIndex]);
                     item.m_index.text = _gridArr[i, j].num.ToString();
-                    item.m_icon.url = string.Format("ui://ActivityHuaRongDao/hrd_1-{0}", _gridArr[i, j].num + 1);
+                    int groupID = _cfg.resArr[0];
+                    item.m_icon.url = GetPicRes(HuarongRoadCfgArray.Instance.GetCfgsByid(groupID)[_gridArr[i, j].num].resName);
                     _items[itemIndex].data = _gridArr[i, j].num;
                     UI_item.ProxyEnd();
                     ++itemIndex;
@@ -221,102 +232,138 @@ namespace GFGGame
             {
                 GObject gObject = UIPackage.CreateObject("ActivityHuaRongDao", "item");
                 gObject.name = "item" + i;
-                gObject.onClick.Add(OnItemClick);
                 _ui.m_items.target.AddChild(gObject);
                 _items.Add(gObject);
             }
         }
 
-        private void OnItemClick(EventContext eventContext)
+        private void ControlMenuItemVisual(bool show = true)
         {
-            GObject obj = eventContext.sender as GObject;
-            int num = (int)obj.data;
-            Grid newGrid = CheckCanMove(num);
-            if (newGrid != null)
-            {
-                _ui.m_items.target.touchable = false;
-                obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>
-                {
-                    _ui.m_items.target.touchable = true;
-                    if (CheckWin())
-                    {
-                        Win();
-                    }
-                });
-            }
+            _ui.m_btnBack.visible = show;
+            _ui.m_btnLookPic.visible = show;
+            _ui.m_btnHidePic.visible = show;
+            _ui.m_btnRefresh.visible = show;
+        }
+
+        private Vector2 inputPos = new Vector2();
+
+        private void TouchBegin(EventContext context)
+        {
+            inputPos.x = context.inputEvent.x;
+            inputPos.y = context.inputEvent.y;
         }
 
-        private Grid CheckCanMove(int num)
+        private void TouchEnd(EventContext context)
         {
-            int indexX = 0;
-            int indexY = 0;
+            GridInfo numGrid = null;
+            GridInfo nullGrid = new GridInfo();
 
-            // 找到格子
+            // 找到空格子
             for (int i = 0; i < _gridNum; i++)
             {
                 for (int j = 0; j < _gridNum; j++)
                 {
-                    if (_gridArr[i, j].num == num)
+                    if (_gridArr[i, j].num == 0)
                     {
-                        indexX = i;
-                        indexY = j;
+                        nullGrid.row = i;
+                        nullGrid.col = j;
                         break;
                     }
                 }
             }
 
-            // 判断格子四个方向是否有空格
-            if (CheckHaveNullGrid(indexX - 1, indexY) || CheckHaveNullGrid(indexX, indexY - 1)
-                || CheckHaveNullGrid(indexX + 1, indexY) || CheckHaveNullGrid(indexX, indexY + 1))
+            // 左
+            if ((context.inputEvent.x - inputPos.x) < 0 && Mathf.Abs(context.inputEvent.x - inputPos.x) > Mathf.Abs(context.inputEvent.y - inputPos.y))
             {
-                return UpdateGridInfo(num);
+                numGrid = CheckHaveNumGrid(nullGrid.row, nullGrid.col + 1);
+            }
+
+            // 右
+            if ((context.inputEvent.x - inputPos.x) > 0 && Mathf.Abs(context.inputEvent.x - inputPos.x) > Mathf.Abs(context.inputEvent.y - inputPos.y))
+            {
+                numGrid = CheckHaveNumGrid(nullGrid.row, nullGrid.col - 1);
+            }
+
+            // 上
+            if ((context.inputEvent.y - inputPos.y) < 0 && Mathf.Abs(context.inputEvent.y - inputPos.y) > Mathf.Abs(context.inputEvent.x - inputPos.x))
+            {
+                numGrid = CheckHaveNumGrid(nullGrid.row + 1, nullGrid.col);
+            }
+
+            // 下
+            if ((context.inputEvent.y - inputPos.y) > 0 && Mathf.Abs(context.inputEvent.y - inputPos.y) > Mathf.Abs(context.inputEvent.x - inputPos.x))
+            {
+                numGrid = CheckHaveNumGrid(nullGrid.row - 1, nullGrid.col);
+            }
+
+            if (numGrid != null)
+            {
+                int num = numGrid.num;
+                Grid grid = UpdateGridInfo(numGrid, nullGrid);
+                MoveItem(grid, num);
             }
 
-            return null;
         }
 
-        private bool CheckHaveNullGrid(int indexX, int indexY)
+        private void MoveItem(Grid newGrid, int changeNum)
         {
-            if (indexX >= 0 && indexX < _gridNum)
+            for(int i = 0; i < _items.Count; i++)
             {
-                if (indexY >= 0 && indexY < _gridNum)
+                GObject obj = _items[i];
+                int num = (int)obj.data;
+
+                if(num == changeNum)
                 {
-                    return _gridArr[indexX, indexY].num == 0;
+                    _ui.m_maskGlobal.visible = true;
+                    obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>
+                    {
+                        _ui.m_maskGlobal.visible = false;
+                        if (CheckWin())
+                        {
+                            ControlMenuItemVisual(false);
+                            Win(_cancellationTokenSource.Token);
+                        }
+                    });
+                    return;
                 }
             }
-
-            return false;
         }
 
-        private Grid UpdateGridInfo(int num)
+        /// <summary>
+        /// 查看空白格附近是否存在数字格
+        /// </summary>
+        /// <param name="indexX"></param>
+        /// <param name="indexY"></param>
+        /// <returns></returns>
+        private GridInfo CheckHaveNumGrid(int indexX, int indexY)
         {
-            Vector2 nullGridindex = new Vector2(-1, 0);
-            Vector2 numGridindex = new Vector2(-1, 0);
-
-
-            for (int i = 0; i < _gridNum; i++)
+            if (indexX >= 0 && indexX < _gridNum)
             {
-                for (int j = 0; j < _gridNum; j++)
+                if (indexY >= 0 && indexY < _gridNum)
                 {
-                    if (_gridArr[i, j].num == num)
-                    {
-                        numGridindex = new Vector2(i, j);
-                    }
-                    else if (_gridArr[i, j].num == 0)
-                    {
-                        nullGridindex = new Vector2(i, j);
-                    }
-                    if (numGridindex.x != -1 && nullGridindex.x != -1)
-                    {
-                        break;
-                    }
+                    GridInfo grid = new GridInfo();
+                    grid.row = indexX;
+                    grid.col = indexY;
+                    grid.num = _gridArr[indexX, indexY].num;
+                    return grid;
                 }
             }
 
-            _gridArr[(int)numGridindex.x, (int)numGridindex.y].num = 0;
-            _gridArr[(int)nullGridindex.x, (int)nullGridindex.y].num = num;
+            return null;
+        }
+
+        /// <summary>
+        /// 交换数字格和空白格的数据
+        /// </summary>
+        /// <param name="numGrid"></param>
+        /// <param name="nullGrid"></param>
+        /// <returns></returns>
+        private Grid UpdateGridInfo(GridInfo numGrid, GridInfo nullGrid)
+        {
+            _gridArr[numGrid.row, numGrid.col].num = 0;
+            _gridArr[nullGrid.row, nullGrid.col].num = numGrid.num;
 
-            return _gridArr[(int)nullGridindex.x, (int)nullGridindex.y];
+            return _gridArr[nullGrid.row, nullGrid.col];
         }
 
         private bool CheckWin()
@@ -358,36 +405,31 @@ namespace GFGGame
             return false;
         }
 
-        private void Win()
+        private async Task Win(CancellationToken cancellationToken)
         {
-            // 关卡推进
-            int passLevel = cfg.resArr[0];
-            ActivityHuaRongDaoEntryView.curLevel = Mathf.Max(passLevel, ActivityHuaRongDaoEntryView.curLevel);
-            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE);
-            // 弹出成功界面
-            ViewManager.Show<ActivityHuaRongDaoSuccessView>(cfg);
-        }
+            // 请求游戏结束协议
+            await MiniGameProxy.ReqMiniGameEnd(_cfg.id, _cfg.type, 0, true, _activityID, false);
 
-        private int countDownNum;
-        private void Countdown(object param)
-        {
-            _ui.m_seconds.text = countDownNum.ToString() + "s";
-            --countDownNum;
-
-            if (countDownNum < 0)
+            // 成功动画
+            _ui.m_showMask.Play(async () =>
             {
-                _ui.m_tips.visible = false;
-                Timers.inst.Remove(Countdown);
+                _ui.m_hideMask.Play();
                 _gameStart = true;
-                return;
-            }
-        }
 
-        private void ResetCountdown()
-        {
-            countDownNum = 3;
-            _ui.m_tips.visible = true;
-            Timers.inst.Remove(Countdown);
+                await Task.Delay(400, cancellationToken);
+
+                // 刷新华容道入口界面UI
+                EventAgent.DispatchEvent(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE);
+                // 弹出成功界面
+                ViewManager.Show<ActivityHuaRongDaoSuccessView>(_cfg);
+            });
+            await Task.Delay(200, cancellationToken);
+            _blankItem.visible = true;
+            _blankItem.position = _gridArr[0, 0].pos;
+            UI_item item = UI_item.Proxy(_blankItem);
+            int groupID = _cfg.resArr[0];
+            item.m_icon.url = GetPicRes(HuarongRoadCfgArray.Instance.GetCfgsByid(groupID)[0].resName);
+            UI_item.ProxyEnd();
         }
 
         private void OnBtnBackClick()
@@ -406,5 +448,126 @@ namespace GFGGame
                 Hide();
             }
         }
+
+        private async Task StartAnimation(CancellationToken cancellationToken)
+        {
+            try
+            {
+                _ui.m_hideMask.Play();
+                _ui.m_maskGlobal.visible = true;
+                List<int> numList = CreateIncreaseArr();
+                SetGridInfo(numList);
+                InitItems();
+                CreateOriginPic();
+
+                // 隐藏所有
+                UI_item item;
+                for (int i = 0; i < _items.Count; i++)
+                {
+                    item = UI_item.Proxy(_items[i]);
+                    item.m_hide.Play();
+                }
+
+                // 入场
+                for (int i = 0; i < _items.Count; i++)
+                {
+                    item = UI_item.Proxy(_items[i]);
+                    item.m_show.Play();
+                    await Task.Delay(100, cancellationToken);
+                }
+                UI_item.ProxyEnd();
+
+                // 出现白色遮罩，刷新数组
+                await Task.Delay(900, cancellationToken);
+                _ui.m_showMask.Play(() =>
+                {
+                    _ui.m_maskGlobal.visible = false;
+                    _ui.m_hideMask.Play();
+                    _gameStart = true;
+                });
+
+                await Task.Delay(200, cancellationToken);
+                numList = GetArrByConfigStep(_cfg.step);
+                while (CheckListCorrect(numList))
+                {
+                    numList = GetArrByConfigStep(_cfg.step);
+                }
+                SetGridInfo(numList);
+                InitItems();
+            }
+
+            catch (TaskCanceledException)
+            {
+                //Debug.Log("异步函数被停止");
+            }
+        }
+
+        private void RefreshData()
+        {
+            _blankItem.visible = false;
+            _gameStart = false;
+            _ui.m_state.selectedIndex = 0;
+            ControlMenuItemVisual();
+        }
+
+        // 取消异步函数
+        public void StopMyAsyncFunction()
+        {
+            if (_cancellationTokenSource != null)
+            {
+                _cancellationTokenSource.Cancel();
+                _cancellationTokenSource.Dispose();
+                _cancellationTokenSource = null;
+            }
+        }
+
+        /// <summary>
+        /// 创建原图
+        /// </summary>
+        private void CreateOriginPic()
+        {
+            List<GObject> items = new List<GObject>();
+            for (int i = 1; i <= _gridNum * _gridNum; i++)
+            {
+                GObject gObject = UIPackage.CreateObject("ActivityHuaRongDao", "item");
+                _ui.m_itemsOrigin.target.AddChild(gObject);
+                items.Add(gObject);
+            }
+
+            int itemIndex = 0;
+            for (int i = 0; i < _gridNum; i++)
+            {
+                for (int j = 0; j < _gridNum; j++)
+                {
+                    items[itemIndex].position = _gridArr[i, j].pos;
+                    UI_item item = UI_item.Proxy(items[itemIndex]);
+                    item.m_index.text = _gridArr[i, j].num.ToString();
+                    //item.m_icon.url = string.Format("ui://ActivityHuaRongDao/hrd_1-{0}", _gridArr[i, j].num + 1);
+                    int groupID = _cfg.resArr[0];
+                    item.m_icon.url = GetPicRes(HuarongRoadCfgArray.Instance.GetCfgsByid(groupID)[_gridArr[i, j].num].resName);
+                    UI_item.ProxyEnd();
+                    ++itemIndex;
+                }
+            }
+        }
+
+        private void OnChangeLookOriginState()
+        {
+            bool look = (_ui.m_state.selectedIndex == 1);
+            _ui.m_maskTouch.touchable = !look;
+            _ui.m_items.target.visible = !look;
+            _ui.m_itemsOrigin.target.visible = look;
+        }
+
+        private void OnClickBtnRefresh()
+        {
+            _ui.m_state.selectedIndex = 0;
+            StartAnimation(_cancellationTokenSource.Token);
+        }
+
+        private string GetPicRes(string res)
+        {
+            return ResPathUtil.GetHUARONGDAOPicPath(res);
+        }
     }
 }

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

@@ -175,6 +175,14 @@ namespace GFGGame
                     // this.Hide();
                     isJump = ViewManager.Show<ClothingDecomposeView>();
                     break;
+                case ConstFunctionId.ARENA:
+                    if (!ArenaDataManager.Instance.IsSeasonOpen)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
+                        return;
+                    }
+                    isJump = ViewManager.Show<ArenaView>();
+                    break;
                 case ConstFunctionId.STORE:
 
                     int storeTabId = int.Parse(infos[1]);

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

@@ -115,7 +115,6 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.target.touchable = false;
-            GRoot.inst.touchable = false;
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if ((this.viewData as object[]) != null)
@@ -151,11 +150,8 @@ namespace GFGGame
 
             _valueBarController.OnShown();
 
-            _ui.m_t0.Play(() =>
-            {
-                _ui.target.touchable = true;
-                GRoot.inst.touchable = true;
-            });
+            _ui.m_t0.SetHook("canHit",()=> { _ui.target.touchable = true; });
+            _ui.m_t0.Play();
             
 
             Timers.inst.AddUpdate(CheckGuide);

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

@@ -107,6 +107,7 @@ namespace GFGGame
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
             _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
+            _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -391,6 +392,11 @@ namespace GFGGame
             ViewManager.Show<ActivityWanShiLiView>();
         }
 
+        private void  OnClickBtnTea()
+        {
+            ViewManager.Show<ActivityTeaMainView>();
+        }
+
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -651,10 +657,16 @@ namespace GFGGame
 
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
+            _ui.m_btnTea.target.visible = ActivityTeaDataManager.Instance.CheckOpen();
         }
 
         private void UpdateTime()
         {
+            if (_ui.m_btnTea.target.visible)
+            {
+                long time = ActivityTeaDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+                _ui.m_btnTea.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            }
             if (_ui.m_btnActivityDay7.target.visible)
             {
                 long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
@@ -1070,6 +1082,34 @@ namespace GFGGame
                     return;
                 }
             }
+            ////月卡弹窗
+            //if (GameGlobal.AutoMonthlyCardView)
+            //{
+            //    GameGlobal.AutoMonthlyCardView = false;
+            //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            //    {
+            //        long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            //        long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
+            //        if (endTime1 < TimeHelper.ServerNow())
+            //        {
+            //            if (endTime2 < TimeHelper.ServerNow())
+            //            {
+            //                ViewManager.Show<MonthlyCardTipsView>();
+            //            }
+            //        }
+            //        return; 
+            //    }
+            //}
+            ////活动公告弹窗
+            //if (GameGlobal.AutoAcitivtyTipsLoginView)
+            //{
+            //    GameGlobal.AutoAcitivtyTipsLoginView = false;
+            //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
+            //    {
+            //        ViewManager.Show<ActivityMainTipsView>();
+            //        return;
+            //    }
+            //}
             if (GameGlobal.AutoSpecialOfferGiftBoxView)
             {
                 //List<int> shopListId = new List<int>() { 40012, 40013 };

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -16,8 +16,9 @@ namespace GFGGame
         private MiniGame[] gameNameDate;
         //由于每个游戏都有一个表
         private List<CardGame> CardGameDate;
+        private List<GameInfoProto> CardGameInfo = new List<GameInfoProto>();
         private List<Merge2048Game> Merge2048GameDate;
-        private List<HuarongRoadGame> HuarongRoadGameDate;
+        private List<GameInfoProto> Merge2048GameInfo = new List<GameInfoProto>();
 
         private int oneNumItems;
         private int twoNumItems;
@@ -57,27 +58,38 @@ namespace GFGGame
             {
                 case 0:
                     oneNumItems = 0;
-                    twoNumItems = 0;
                     break;
                 case 2:
                     oneNumItems = 3;
-                    twoNumItems = 0;
                     break;
                 case 4:
                     oneNumItems = 3;
-                    twoNumItems = 3;
                     break;
                 default:
                     oneNumItems = 0;
-                    twoNumItems = 0;
                     break;
             }
-            _ui.m_reward.m_rewardOneList.numItems = oneNumItems;
-            _ui.m_reward.m_rewardTwoList.numItems = twoNumItems;
+            foreach(GameInfoProto t in MiniGameDateManager.Instance.gameinfoList)
+            {
+                if(t.GameType == 1)
+                {
+                    CardGameInfo.Add(t);
+                }
+                if(t.GameType == 2)
+                {
+                    Merge2048GameInfo.Add(t);
+                }
+            }
 
+            _ui.m_reward.m_rewardOneList.numItems = CardGameInfo[0].StarRewardStatus.Count == 0? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
+            oneNumItems = CardGameInfo[0].StarRewardStatus.Count == 0 ? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
+            _ui.m_reward.m_rewardTwoList.numItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
+            twoNumItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
         }
         protected override void OnHide()
         {
+            CardGameInfo.Clear();
+            Merge2048GameInfo.Clear();
             base.OnHide();
         }
 
@@ -110,13 +122,13 @@ namespace GFGGame
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}游戏关卡{1}首次通关", MiniGameArray.Instance.GetCfg(gameList[2]).typeName,index);
+            item.m_rewardDesc.text = string.Format("{0}游戏关卡{1}首次通关", MiniGameArray.Instance.GetCfg(gameList[2]).typeName,index+1);
             item.m_rewardList.itemRenderer = RenditemReward;
             //读表
             //var reward;
-            item.m_getBtn.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[1].StarRewardStatus[2 - index];
+            item.m_getBtn.m_c1.selectedIndex = Merge2048GameInfo[index].FirstPassRewardStatus;
             item.m_rewardList.data = gameList[2];
-            item.m_rewardList.numItems = Merge2048GameDate[0].bonusStar3Arr.Length;
+            item.m_rewardList.numItems = Merge2048GameDate[index].bonusWinFirstArr.Length;
 
             if (item.m_getBtn.target.data == null)
             {
@@ -128,7 +140,7 @@ namespace GFGGame
             rewardList.Add(Merge2048GameDate[0].type);
             rewardList.Add(1);
             rewardList.Add(3 - index);
-            rewardList.Add(MiniGameDateManager.Instance.gameinfoList[1].StarRewardStatus[2 - index]);
+            rewardList.Add(Merge2048GameInfo[index].FirstPassRewardStatus);
             item.m_getBtn.target.data = rewardList;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
@@ -184,12 +196,20 @@ namespace GFGGame
 
             if (!(context.sender is GObject btnGet)) return;
             List<int> itemList = btnGet.data as List<int>;
-            if(itemList[4] != 1)
+            if (itemList[4] != 1)
             {
                 return;
             }
-            var result = await MiniGameProxy.ReqGetReward(itemList[0], itemList[1], itemList[2], itemList[3]);
-            if (!result) return;
+            if (itemList[1] == 1)
+            { 
+                var result = await MiniGameProxy.ReqGetReward(itemList[0], itemList[1], itemList[2], itemList[3]);
+                if (!result) return;
+            }
+            else if(itemList[1] == 2)
+            {
+                var result = await MiniGameProxy.ReqGetFirstPassReward(itemList[0], itemList[1], itemList[2]);
+                if (!result) return;
+            }
             _ui.m_reward.m_rewardOneList.numItems = oneNumItems;
             _ui.m_reward.m_rewardTwoList.numItems = twoNumItems;
         }
@@ -203,8 +223,7 @@ namespace GFGGame
                 case 2:
                     Merge2048GameDate = Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(i,j);
                     break;
-                case 3:
-                    HuarongRoadGameDate = HuarongRoadGameArray.Instance.GetCfgsBytypeAndsubType(i, j);
+                default:
                     break;
             }
 

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -62,18 +62,15 @@ namespace GFGGame
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
-        private EffectUI _effectUI3;
-        private EffectUI _effectUI4;
+        private List<EffectUI> _effectFlipList = new List<EffectUI>();
+        private List<EffectUI> _effectRemoveList = new List<EffectUI>();
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
-            EffectUIPool.Recycle(_effectUI4);
-            _effectUI4 = null;
+            DestroyObjectFromView();
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -89,11 +86,14 @@ namespace GFGGame
             _ui = UI_FlipGameUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_cardList.itemRenderer = ListCardItem;
             _ui.m_back.onClick.Add(OnClickBtnBack);
 
             UIObjectFactory.SetPackageItemExtension("ui://MiniGame/CardComponent", typeof(Card));
 
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_barEffect, "ui_Activity", "YXJY_Game_JinDu");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_titleEffec, "ui_Activity", "YXJY_Game_Text");
         }
 
         protected override void OnShown()
@@ -114,15 +114,33 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
-            _ui.m_cardList.RemoveChildrenToPool();
-            base.OnHide();
+            DestroyObjectFromView();
             cardList.Clear();
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateBar);
             Timers.inst.Remove(UpdateHit);
             Timers.inst.Remove(StartTime);
+            
+            base.OnHide();
+
         }
 
+        private void DestroyObjectFromView()
+        {
+            for (int i = 0; i < _effectFlipList.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectFlipList[i]);
+                _effectFlipList[i] = null;
+            }
+            _effectFlipList.Clear();
+
+            for (int i = 0; i < _effectRemoveList.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectRemoveList[i]);
+                _effectRemoveList[i] = null;
+            }
+            _effectRemoveList.Clear();
+        }
         private void OnClickBtnBack()
         {
             Timers.inst.Remove(UpdateTime);
@@ -156,6 +174,15 @@ namespace GFGGame
             UI_cardItem cardItem = UI_cardItem.Proxy(item);
             Dictionary<string, int> itemInfo = new Dictionary<string, int>();
 
+            cardItem.target.visible = true;
+            cardItem.target.alpha = 1;
+            EffectUI _effectUI1 = EffectUIPool.CreateEffectUI(cardItem.m_flipEffect, "ui_Activity", "YXJY_Game_OpenCard");
+            _effectFlipList.Add(_effectUI1);
+            cardItem.m_flipEffect.visible = false;
+            EffectUI _effectUI2 = EffectUIPool.CreateEffectUI(cardItem.m_removeEffect, "ui_Activity", "YXJY_Game_CardDie");
+            _effectRemoveList.Add(_effectUI2);
+            cardItem.m_removeEffect.visible = false;
+
             cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(CardCfgArray.Instance.dataArray[cardArray[index]].resName);
             if (cardItem.target.data == null)
             {
@@ -210,9 +237,13 @@ namespace GFGGame
             _ui.m_ScareBar.min = 0;
             _ui.m_ScareBar.value = gameTime;
             _ui.m_star1.SetPosition(((float)(gameTime - CustemsNum[0])/(float)gameTime) * _ui.m_ScareBar.width + 70,_ui.m_star1.position.y, _ui.m_star1.position.z);
-            _ui.m_star2.SetPosition(((float)(gameTime - CustemsNum[1]) / (float)gameTime) * _ui.m_ScareBar.width, _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star2.SetPosition(((float)(gameTime - CustemsNum[1]) / (float)gameTime) * _ui.m_ScareBar.width + 10, _ui.m_star1.position.y, _ui.m_star1.position.z);
             _ui.m_star3.SetPosition(((float)(gameTime - CustemsNum[2]) / (float)gameTime) * _ui.m_ScareBar.width, _ui.m_star1.position.y, _ui.m_star1.position.z);
 
+            _ui.m_title.visible = false;
+            _ui.m_titleEffec.visible = true;
+            _ui.m_barEffect.x = _ui.m_ScareBar.width;
+
             _ui.m_cardList.touchable = true;
             //计时器
             Timers.inst.Add(1.0f, 0, UpdateTime);
@@ -250,8 +281,8 @@ namespace GFGGame
                         //翻牌
                         card.Turn();
                         //.
-                        cardList.Remove(cardInfo);
-                        
+                        cardList.RemoveAt(0);
+                        isSame = true;
                         break;
                  }
                 else
@@ -269,29 +300,37 @@ namespace GFGGame
             {
                 cardInfo["state"] = 1;
                 card.Turn();
+                item.m_flipEffect.visible = true;
                 cardList.Add(cardInfo);
             }
             UI_cardItem.ProxyEnd();
         }
         private void StartTime(object param = null)
         {
+
             _ui.m_cardList.touchable = false;
             canHit = false;
             UpdateCard();
-            Timers.inst.Remove(StartTime);
         }
         //这里是处理已翻开的数量
         private void UpdateCard()
         {
+            Timers.inst.Remove(StartTime);
             List<Dictionary<string, int>> removeList = new List<Dictionary<string, int>>();
-            for (int i = 1; i < cardList.Count; i++)
+            for (int i = 1; i < cardList.Count; i+= 2)
             {
                 if(cardList[i]["id"] == cardList[i-1]["id"])
                 {
                     cardList[i]["state"] = 2;
                     //消除
-                    _ui.m_cardList.GetChildAt(cardList[i]["index"]).visible = false;
-                    _ui.m_cardList.GetChildAt(cardList[i - 1]["index"]).visible = false;
+                    UI_cardItem item1 = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i]["index"]));
+                    item1.m_t0.Play();
+                    UI_cardItem.ProxyEnd();
+
+                    UI_cardItem item2 = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i-1]["index"]));
+                    item2.m_t0.Play();
+                    UI_cardItem.ProxyEnd();
+
                     currentCardNum -= 2;
                     removeList.Add(cardList[i-1]);
                     removeList.Add(cardList[i]);
@@ -316,6 +355,7 @@ namespace GFGGame
                     //翻回去
                     Card card = (Card)item.m_card;
                     card.Turn();
+                    item.m_flipEffect.visible = false;
                     cardList[i - 1]["state"] = 0;
                     UI_cardItem.ProxyEnd();
                     if (cardList.Count % 2 == 0 && i == cardList.Count - 1)
@@ -324,6 +364,7 @@ namespace GFGGame
                         //翻回去
                         Card cardLast = (Card)carditem.m_card;
                         cardLast.Turn();
+                        carditem.m_flipEffect.visible = false;
                         cardList[i]["state"] = 0;
                         UI_cardItem.ProxyEnd();
                     }
@@ -346,11 +387,11 @@ namespace GFGGame
         }
         private void UpdateHit(object param = null)
         {
-            Timers.inst.Remove(UpdateHit);
             StartHit = true;
             firstHit = true;
             canHit = true;
             _ui.m_cardList.touchable = true;
+            Timers.inst.Remove(UpdateHit);
         }
         private void UpdateTime(object param = null)
         {
@@ -367,6 +408,7 @@ namespace GFGGame
         {
             barTime -= 0.1f;
             _ui.m_ScareBar.value = barTime;
+            _ui.m_barEffect.x -= (880.0f/ (float)(gameTime*10));
         }
 
         private void Gameover(bool isPass = false)

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -23,8 +23,21 @@ namespace GFGGame
         private int NumTicketOne = 3;
         private int NumTicketTwo = 3;
 
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -40,6 +53,7 @@ namespace GFGGame
             _ui = UI_GameStartUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_game1.onClick.Add(OnClickBtnGameOne);
             _ui.m_game2.onClick.Add(OnClickBtnGameTwo);
@@ -49,6 +63,11 @@ namespace GFGGame
             _ui.m_rewardBtn.onClick.Add(OnClickBtnReward);
             _ui.m_tipsOne.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tipsTwo.onClick.Add(RuleController.ShowRuleView);
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effectIcon1, "ui_Activity", "YXJY_Icon");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_effectText1, "ui_Activity", "YXJY_Game_Text");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_effectIcon2, "ui_Activity", "SGLL_Icon");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_effectText2, "ui_Activity", "SGLL_Game_Text");
         }
 
         protected override void OnShown()
@@ -93,8 +112,11 @@ namespace GFGGame
             _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_needNum2.visible = false;
             _ui.m_needIcon2.visible = false;
+            _ui.m_game1.url = "";
+            _ui.m_game2.url = "";
             _ui.m_tipsOne.data = 300026;
             _ui.m_tipsTwo.data = 300027;
+
             ItemData item;
             if (BagDataManager.Instance.GetBagData().TryGetValue(3000017,out item))
             {

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -23,9 +23,18 @@ namespace GFGGame
             30,
             60,
         };
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
         public override void Dispose()
         {
-
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -45,6 +54,10 @@ namespace GFGGame
             _ui.m_againBtn.onClick.Add(OnClickAgain);
 
             _ui.m_rewardList.itemRenderer = RenderRewardList;
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effectBg, "ui_Activity", "Game_Quad_Open");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_effectSucces, "ui_Activity", "Game_Quad_Win");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_effectFail, "ui_Activity", "Game_Quad_Lose");
         }
         protected override void OnShown()
         {
@@ -89,10 +102,14 @@ namespace GFGGame
                 default:
                     break;
             }
+
+            _ui.m_t0.Play();
             if (gameResult)
             {
                 _ui.m_failTxt.visible = false;
                 _ui.m_success.visible = true ;
+                _ui.m_effectFail.visible = false;
+                _ui.m_effectSucces.visible = true;
                 _ui.m_resultTxt.text = "通关奖励";
                 _ui.m_resultTitle.url = "ui://MiniGame/shengli_bt";
                 UpdateStar();
@@ -101,9 +118,13 @@ namespace GFGGame
             {
                 _ui.m_failTxt.visible = true;
                 _ui.m_success.visible = false;
+                _ui.m_effectSucces.visible = false;
+                _ui.m_effectFail.visible = true;
                 _ui.m_resultTxt.text = "失败奖励";
                 _ui.m_resultTitle.url = "ui://MiniGame/shibai_bt";
             }
+            _ui.m_resultTitle.visible = false;
+            _ui.m_bg.visible = false;
             activityGameDate = ActivityOpenCfgArray.Instance.GetCfgsBytype(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
@@ -150,6 +171,8 @@ namespace GFGGame
         {
             this.Hide();
             ViewManager.Hide(viewJumpView[gameType]);
+            ViewManager.Show<GameStartView>();
+            EventAgent.DispatchEvent(ConstMessage.TZFE_GAME_UPDATE);
         }
         private async void OnClickAgain()
         {

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs

@@ -39,9 +39,20 @@ namespace GFGGame
             _ui.m_game1.onClick.Add(OnClickBtnGameOne);
             _ui.m_game2.onClick.Add(OnClickBtnGameTwo);
             _ui.m_game3.onClick.Add(OnClickBtnGameThree);
+            _ui.m_gameBg1.onClick.Add(OnClickBtnGameOne);
+            _ui.m_gameBg2.onClick.Add(OnClickBtnGameTwo);
+            _ui.m_gameBg3.onClick.Add(OnClickBtnGameThree);
             _ui.m_backBtn.onClick.Add(OnClickBtnBack);
             _ui.m_tipsOne.onClick.Add(RuleController.ShowRuleView);
         }
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.TZFE_GAME_UPDATE, OnCheckChange);
+        }
+        protected override void RemoveEventListener()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.TZFE_GAME_UPDATE, OnCheckChange);
+        }
 
         protected override void OnShown()
         {
@@ -64,8 +75,11 @@ namespace GFGGame
             _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
-            _ui.m_gameLock2.visible = false;
-            _ui.m_gameLock3.visible = false;
+
+            _ui.m_game1.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[0].subType, gameDate[0].targetNum)[0].resName);
+            _ui.m_game2.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[1].subType, gameDate[1].targetNum)[0].resName);
+            _ui.m_game3.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[2].subType, gameDate[2].targetNum)[0].resName);
+            OnCheckChange();
             _ui.m_tipsOne.data = 300027;
         }
         private void OnClickBtnBack()
@@ -73,27 +87,79 @@ namespace GFGGame
             this.Hide();
         }
 
+       private async void  OnCheckChange()
+        {
+            var result = await MiniGameProxy.ReqGetChallengeReward(1);
+            if (!result) return;
+            int j = 0;
+            for (int i = 1; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+            {
+                GameInfoProto t = MiniGameDateManager.Instance.gameinfoList[i];
+                if (t.GameType == type)
+                {
+                    _ui.m_gameLock1.visible = false;
+                    _ui.m_newGame1.visible = MiniGameDateManager.Instance.gameinfoList[i].PlayCount == 0 ? true : false;
+
+                    j++;
+                    switch (j)
+                    {
+                        case 1:
+
+                            break;
+                        case 2:
+                            _ui.m_gameLock2.visible = !MiniGameDateManager.Instance.gameinfoList[i-1].IsCleared;
+                            _ui.m_newGame2.visible = t.PlayCount == 0 ? true : false;
+                            break;
+                        case 3:
+                            _ui.m_gameLock3.visible = !MiniGameDateManager.Instance.gameinfoList[i - 1].IsCleared;
+                            _ui.m_newGame3.visible = t.PlayCount == 0 ? true : false;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+        }
+
         private async void OnClickBtnGameOne()
         {
+            if(_ui.m_gameLock1.visible == true)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                return;
+            }
             var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[0].id, type, activityGameDate[0].id);
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
             ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[0].id });
+            this.Hide();
         }
         private async void OnClickBtnGameTwo()
         {
+            if (_ui.m_gameLock2.visible == true)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                return;
+            }
             var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[1].id, type, activityGameDate[0].id);
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
             ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[1].id });
+            this.Hide();
         }
 
         private async void OnClickBtnGameThree()
         {
+            if (_ui.m_gameLock3.visible == true)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                return;
+            }
             var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[2].id, type, activityGameDate[0].id);
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
             ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[2].id });
+            this.Hide();
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -48,8 +48,12 @@ namespace GFGGame
         private List<NumPos> numPosArray = new List<NumPos>();
         private int time = 0;
 
+        private EffectUI _effectUI1;
+
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -65,12 +69,16 @@ namespace GFGGame
             _ui = UI_TZFEGameView.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_numList.itemRenderer = ListNumItem;
             _ui.m_numList.onTouchBegin.Add(OnClickBegin);
             _ui.m_numList.onTouchEnd.Add(OnClickEnd);
             _ui.m_backBtn.onClick.Add(OnClickBtnBack);
             _ui.m_mergeBtn.onClick.Add(OnClickMergeTips);
             Map = new int[rows, columns];
+
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effectTitle, "ui_Activity", "SGLL_Game_Text");
         }
 
         protected override void OnShown()
@@ -141,6 +149,7 @@ namespace GFGGame
             _ui.m_score.visible = false;
             _ui.m_time.visible = false;
             _ui.m_timeNum.visible = false;
+            _ui.m_title.visible = false;
             rand = new System.Random();
             UpdateStar();
             Timers.inst.Add(1.0f, 0, UpdateTime);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -51,8 +51,6 @@ namespace GFGGame
             _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
             _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
 
-            _ui.m_btnHuaRongDao.onClick.Add(OnBtnHuaRongDaoClick);
-            _ui.m_btnHuaRongDao.visible = false;
         }
 
         protected override void AddEventListener()
@@ -312,10 +310,5 @@ namespace GFGGame
             _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
 
         }
-
-        private void OnBtnHuaRongDaoClick()
-        {
-            ViewManager.Show<ActivityHuaRongDaoEntryView>();
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -39,12 +39,11 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
-
             _month = TimeUtil.GetCurMonth();
             _ui.m_list.numItems = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear()).Count;
         }
@@ -64,23 +63,30 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListBlackRewardtem item = UI_ListBlackRewardtem.Proxy(obj);
+          
             MonthlyCardClothesCfg clothesCfg = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear())[index];
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(clothesCfg.clothesArr[0]);
-            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-
-            item.m_txtMonth.text = string.Format("{0}月", clothesCfg.month);
-
-            bool isCurMonth = clothesCfg.month == _month;
-            item.m_imgMask.visible = !isCurMonth;
-            item.m_grpMonth.visible = isCurMonth;
-            item.m_grpName.visible = isCurMonth;
-            item.m_imggot.visible = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), clothesCfg.month);
-            if (item.target.data == null)
+            if (clothesCfg.clothesArr.Length == 0)
             {
-                item.target.onClick.Add(OnBtnGetClick);
+                item.m_showItemType.selectedIndex = 1;
+            }
+            else {
+                item.m_showItemType.selectedIndex = 0;
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(clothesCfg.clothesArr[0]);
+                item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+
+                item.m_txtMonth.text = string.Format("{0}月", clothesCfg.month);
+
+                bool isCurMonth = clothesCfg.month == _month;
+                item.m_imgMask.visible = !isCurMonth;
+                item.m_grpMonth.visible = isCurMonth;
+                item.m_grpName.visible = isCurMonth;
+                item.m_imggot.visible = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), clothesCfg.month);
+                if (item.target.data == null)
+                {
+                    item.target.onClick.Add(OnBtnGetClick);
+                }
+                item.target.data = clothesCfg.month;
             }
-            item.target.data = clothesCfg.month;
-
             UI_ListBlackRewardtem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -34,6 +34,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_listAchieveTask.itemRenderer = RenderListAchieveTask;
+            _ui.m_listAchieveTask.SetVirtual();
         }
 
         private void OnBtnBackClick()

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelTimeDetailView.cs

@@ -76,6 +76,7 @@ namespace GFGGame
             if (curTime >= endTime)
             {
                 Hide();
+                EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
                 return;
             }
 
@@ -93,7 +94,7 @@ namespace GFGGame
             string[] strArr = timeStr.Split(':');
 
             int num = int.Parse(strArr[0]) + (int.Parse(strArr[1]) > 0 ? 1 : 0);
-            _ui.m_numFinishSpend.text = num.ToString();
+            _ui.m_numFinishSpend.text = num.ToString();                                                                                               
         }
 
         private void OnClickBtnFinish()
@@ -107,7 +108,7 @@ namespace GFGGame
                 Count = spendNum
             };
             list.Add(item);
-            TravelSProxy.ReqTravelSpeedUp(1, list);
+            SpeedUp(1, list);
         }
 
         private void OnClickBtnSpeedUp()
@@ -121,7 +122,13 @@ namespace GFGGame
                 Count = spendNum
             };
             list.Add(item);
-            TravelSProxy.ReqTravelSpeedUp(2, list);
+            SpeedUp(2, list);
+        }
+
+        private async void SpeedUp(int type, List<ItemInfoProto> list)
+        {
+            await TravelSProxy.ReqTravelSpeedUp(type, list);
+            UpdateTime(null);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
             _effectUIDic.Add("XQFS_Button_YouLi", EffectUIPool.CreateEffectUI(_ui.m_btnGo.m_btnGo_eff, "ui_HaiZhiShi", "XQFS_Button_YouLi"));
             _effectUIDic.Add("XQFS_XinFeng_ComBack", EffectUIPool.CreateEffectUI(_ui.m_btnGet.m_btnGet_eff, "ui_HaiZhiShi", "XQFS_XinFeng_ComBack"));
 
-            _ui.m_btnSpeedUp.visible = false;
+            //_ui.m_btnSpeedUp.visible = false;
         }
 
         protected override void AddEventListener()

GameClient/Assets/ResIn/UI/ActivityAfternoonTea.meta

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

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta → GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3f2bd12fcbac28c40bcd1f0fc8e66f5c
+guid: 814beaa44572dc54ca02eecaf5cf4376
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta → GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 62f322eccf7ed704fb99ab516b6a9d82
+guid: d2cb548b95026574785e83626fdf2299
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 37cf30c6d3bbda8418f24027a9640a42
+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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: abf38dde5bf83d148a30c56a530498b5
+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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 748a10093a7f8634e8ff3381ca643b78
+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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 0b01f954a8f28194c9203b26d8e63406
+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/ActivityAfternoonTea/ActivityAfternoonTea_fui.bytes.meta

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