新春活动提交

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

@@ -0,0 +1,30 @@
+using ET;
+using GFGGame;
+using System.Collections;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Data
+{
+    public class ActivityTeaDataManager : SingletonBase<ActivityTeaDataManager>
+    {
+        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_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,86 @@
+/** 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 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_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_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,90 @@
+/** 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 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_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_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_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/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/Views/ActivityAfternoonTea.meta

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

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

@@ -0,0 +1,92 @@
+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>();
+        }
+
+        private void OnClickBtnVisitView()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                return;
+            }
+            //拜访入口
+            ViewManager.Show<ActivityTeaVisitView>();
+        }
+
+        private void OnClickBtnMergeView()
+        {
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.TEA + 3))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                return;
+            }
+            //合成入口
+
+        }
+
+    }
+}

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,79 @@
+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_taskList.itemRenderer = RenderTaskList;
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xnbh_bg");
+            _ui.m_ruleIcon.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,211 @@
+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)
+                {
+                    ViewManager.GoBackFrom(typeof(ActivityVisitNpcView).FullName);
+                    return;
+                }
+                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/MainUI/MainUIView.cs

@@ -107,7 +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);
+            _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -657,16 +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();
+            _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_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();

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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 3c3cdbe35548d0740b996841f2a9c403
+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: 98e015a6f2875244c87e87970b28c37c
+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: bcfb974309fec634abbc1def741e56f7
+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: 345e30aff8189e4459edcf1b6028fa72
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: