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

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

@@ -12,7 +12,6 @@ namespace UI.ActivityAfternoonTea
         public UI_CompDialogText m_DialogText;
         public GLoader m_nextChatBtn;
         public GButton m_btnBack;
-        public GTextField m_name;
         public GTextField m_titleIcon;
         public UI_Component2 m_taskIcon;
         public GLoader m_listBg;
@@ -70,7 +69,6 @@ namespace UI.ActivityAfternoonTea
             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 = (UI_Component2)UI_Component2.Create(comp.GetChild("taskIcon"));
             m_listBg = (GLoader)comp.GetChild("listBg");
@@ -85,7 +83,6 @@ namespace UI.ActivityAfternoonTea
             m_DialogText = null;
             m_nextChatBtn = null;
             m_btnBack = null;
-            m_name = null;
             m_titleIcon = null;
             m_taskIcon.Dispose();
             m_taskIcon = null;

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

@@ -92,7 +92,7 @@ namespace GFGGame
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                PromptController.Instance.ShowFloatTextPrompt("拜访活动已结束");
                 Timers.inst.Remove(UpdateTime);
                 GameController.GoBackToMainView();
                 return;

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

@@ -64,14 +64,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            npcId = (int)this.viewData;
             if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                Timers.inst.Remove(UpdateView);
-                ViewManager.Show<ActivityTeaMainView>();
-                return;
+                _ui.target.touchable = false;
+                Timers.inst.Add(0.5f, 1, UpdateActivity);
             }
-            npcId = (int)this.viewData;
             if (!TaskDataManager.Instance.TaskInfosDic.TryGetValue(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr[0], out TaskInfo item))
             {
                 TaskSProxy.GetTaskInfos();
@@ -79,7 +77,10 @@ namespace GFGGame
                 {
                     return;
                 }
-                Timers.inst.Add(2.0f, 1, UpdateView);
+                if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) != 0)
+                {
+                    Timers.inst.Add(2.0f, 1, UpdateView);
+                }
             }
             else
             {
@@ -94,13 +95,19 @@ namespace GFGGame
             base.OnHide();
         }
 
+        private void UpdateActivity(object param = null)
+        {
+            PromptController.Instance.ShowFloatTextPrompt("拜访活动已结束");
+            Timers.inst.Remove(UpdateActivity);
+            GameController.GoBackToMainView();
+            return;
+        }
         private void UpdateView(object param = null)
         {
             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;
             redDot = true;
             for (int i = 0; i < taskCfgs.Count; i++)

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

@@ -385,6 +385,19 @@ namespace GFGGame
 
         private void OnClickBtnOpenServerActivity()
         {
+            var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStory" + GameGlobal.userId);
+            if (titleIndex == null || titleIndex == "")
+            {
+                PlayerPrefs.SetString("seeOpenServerActivityStory"+ GameGlobal.userId, "1");
+                ViewManager.Show<StoryDialogView>(new object[] { "10151", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
+            }
+            else
+                ViewManager.Show<OpenServerActivityView>();
+        }
+
+        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        {
+            ViewManager.DeleteViewStackCountDown(null, 1);
             ViewManager.Show<OpenServerActivityView>();
         }
 

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

@@ -166,10 +166,9 @@ namespace GFGGame
             .SetRightButton(true, "确定", async (object data) =>
             {
                 var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.type, timeIndex, false, activityGameDate[0].id, true);
-                if (!result) return;
                 this.Hide();
             }).SetShowCheck(false);
-        }
+        }         
 
         private void ListCardItem(int index, GObject item)
         {
@@ -268,6 +267,7 @@ namespace GFGGame
             if (StartHit)
             {
                 StartHit = false;
+                _ui.m_back.touchable = false;
                 Timers.inst.Add(1.0f, 1, StartTime);
             }
             Card card = (Card)item.m_card;
@@ -330,7 +330,7 @@ namespace GFGGame
                     UI_cardItem.ProxyEnd();
 
                     UI_cardItem item2 = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i - 1]["index"]));
-                    item2.m_t0.Play();
+                    item2.m_t0.Play(()=> { _ui.m_back.touchable = true; });
                     UI_cardItem.ProxyEnd();
 
                     currentCardNum -= 2;
@@ -393,6 +393,7 @@ namespace GFGGame
             firstHit = true;
             canHit = true;
             _ui.m_cardList.touchable = true;
+            _ui.m_back.touchable = true;
             Timers.inst.Remove(UpdateHit);
         }
         private void UpdateOneHit(object param = null)