新春活动提交

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

@@ -7,6 +7,7 @@ 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;
@@ -61,6 +62,7 @@ namespace UI.ActivityAfternoonTea
 
         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");
@@ -71,6 +73,7 @@ namespace UI.ActivityAfternoonTea
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_head.Dispose();
             m_head = null;
             m_rewardIcon = null;

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

@@ -59,29 +59,31 @@ namespace GFGGame
         {
             if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
             {
-                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
             //小游戏入口
-            ViewManager.Show<ActivityHuaRongDaoEntryView>();
+            ViewManager.Show<ActivityHuaRongDaoEntryView>(5003);
         }
 
-        private void OnClickBtnVisitView()
+        private async void OnClickBtnVisitView()
         {
             if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
             {
-                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
+            //var result = await ActivityTeaSProxy.ReqGetNPCVisitInfo(5004);
+            //if (!result) return;
             //拜访入口
             ViewManager.Show<ActivityTeaVisitView>();
         }
 
         private void OnClickBtnMergeView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.TEA + 3))
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearMerge))
             {
-                PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
+                PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
             //合成入口

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

@@ -195,8 +195,7 @@ namespace GFGGame
                 isNextChat = false;
                 if(indexChat == ActivityVisitCfgArray.Instance.dataArray[npcId].chatArr.Length)
                 {
-                    ViewManager.GoBackFrom(typeof(ActivityVisitNpcView).FullName);
-                    return;
+                    indexChat = 0;
                 }
                 SetTypeWriting();
             }

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);