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

GameClient/Assets/Editor/ToolsMenu.cs

@@ -29,7 +29,7 @@ namespace GFGEditor
         }
 
 #if PT_DEV
-        [MenuItem("外网/")]
+        [MenuItem("外网DEV/")]
         public static void VersionTag()
         {
             

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