Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -87,7 +87,7 @@ namespace GFGGame
                 message = "有新的版本，请前往AppStore更新。";
             }
 #endif
-            Alert.Show("message")
+            Alert.Show(message)
                     .SetLeftButton(true, "知道了", (data) =>
                     {