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

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

@@ -44,6 +44,7 @@ namespace GFGGame
             _ui = UI_ActivityVisitNPCUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_taskList.itemRenderer = RenderTaskList;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -105,12 +106,15 @@ namespace GFGGame
         }
         private async void OnClickRewardTIps()
         {
-            if(MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1)
+            if (MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1)
             {
                 bool result = await ActivityTeaSProxy.ReqGetNPCVisitReward(activityId, npcId + 1);
                 if (!result) return;
             }
-            ViewManager.Show<ReWardTipsView>(npcId);
+            else
+            {
+                ViewManager.Show<ReWardTipsView>(npcId);
+            }
         }
 
         private void GetRewardState()