Browse Source

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

zhaoyang 2 years ago
parent
commit
aa7218ba3a

+ 7 - 5
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -65,14 +65,15 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
-            if(LocalCache.GetBool(GameConst.WRITE_EXTERNAL_STORAGE_FORBIDDEN, false))
-            {
-                AlertSystem.Show("保存至本地需要使用存储权限,您已经禁止!请前往手机系统设置开启应用存储权限。");
-                return;
-            }
             //检查用户是否已授予对需要授权的设备资源或信息的访问权。
             if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite))
             {
+                if (LocalCache.GetBool(GameConst.WRITE_EXTERNAL_STORAGE_FORBIDDEN, false))
+                {
+                    AlertSystem.Show("保存至本地需要使用存储权限,您已经禁止!请前往手机系统设置开启应用存储权限。")
+                            .SetLeftButton(true, "知道了");
+                    return;
+                }
                 PromptController.Instance.ShowFloatTextPrompt("保存至本地需要使用存储权限,请同意!");
                 //请求用户授权访问需要授权的设备资源或信息.
                 PermissionCallbacks permissionCallbacks = new PermissionCallbacks();
@@ -90,6 +91,7 @@ namespace GFGGame
                 };
                 Permission.RequestUserPermission(Permission.ExternalStorageWrite, permissionCallbacks);
             }
+            LocalCache.SetBool(GameConst.WRITE_EXTERNAL_STORAGE_FORBIDDEN, false);
             TrySavePicturoToLocal();
         }
 

+ 1 - 1
GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -95,7 +95,7 @@ namespace GFGGame
 
         private static void StartGame()
         {
-            LauncherView.Instance.SetDesc($"稍等片刻,精彩立刻呈现...");
+            LauncherView.Instance.SetDesc($"稍等片刻,精彩马上呈现...");
             HotUpdateCodeLoader.Instance.StartLoad();
         }
 

+ 2 - 0
update_res.sh

@@ -0,0 +1,2 @@
+cd GameClient/Assets/Res
+svn update