From f29aa38a60cbbd207a7be5c27a5cf8727a6be419 Mon Sep 17 00:00:00 2001
From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com>
Date: Tue, 2 Jan 2024 19:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/resources/UICanvas.prefab          | 51 ++++++++++++++-----
 .../prefab/ui/加载页面/LoadingView.prefab     |  9 ++--
 JisolGameCocos/assets/script/Main.ts          |  1 +
 JisolGameCocos/extensions/ngame               |  2 +-
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/JisolGameCocos/assets/resources/UICanvas.prefab b/JisolGameCocos/assets/resources/UICanvas.prefab
index 9cc79b76..2dbe3b3e 100644
--- a/JisolGameCocos/assets/resources/UICanvas.prefab
+++ b/JisolGameCocos/assets/resources/UICanvas.prefab
@@ -27,9 +27,6 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 12
-      },
       {
         "__id__": 14
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 18
+      },
+      {
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -200,10 +200,13 @@
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -263,7 +266,7 @@
     "fileId": "75BOpt00JFQa2ABpf8j5sd"
   },
   {
-    "__type__": "cc.Widget",
+    "__type__": "1c16bQ/GLJGbqTREE81sG8h",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -274,6 +277,26 @@
     "__prefab": {
       "__id__": 10
     },
+    "isAutoWidth": true,
+    "isAutoHeight": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "36gXm5tolLYKrIDVy3UEZ5"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": false,
+    "__prefab": {
+      "__id__": 12
+    },
     "_alignFlags": 45,
     "_target": null,
     "_left": 0,
@@ -288,15 +311,15 @@
     "_isAbsBottom": true,
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 100,
+    "_originalWidth": 720,
+    "_originalHeight": 1280,
     "_alignMode": 2,
     "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "deZ5DeQmRGsJ4z2/TXkcsg"
+    "fileId": "7a6Iw5uDtLwoWRbGDBWcqh"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -321,7 +344,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -349,7 +372,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_cameraComponent": {
       "__id__": 3
@@ -371,7 +394,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 19
     },
     "_alignFlags": 45,
     "_target": null,
@@ -390,7 +413,7 @@
     "_originalWidth": 0,
     "_originalHeight": 0,
     "_alignMode": 2,
-    "_lockFlags": 0,
+    "_lockFlags": 45,
     "_id": ""
   },
   {
@@ -407,7 +430,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "root": {
       "__id__": 6
diff --git a/JisolGameCocos/assets/resources/prefab/ui/加载页面/LoadingView.prefab b/JisolGameCocos/assets/resources/prefab/ui/加载页面/LoadingView.prefab
index 3c378cf2..73101763 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/加载页面/LoadingView.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/加载页面/LoadingView.prefab
@@ -210,11 +210,11 @@
     "__prefab": {
       "__id__": 8
     },
-    "_alignFlags": 44,
+    "_alignFlags": 45,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 0,
+    "_top": -270,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -225,7 +225,7 @@
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
     "_originalWidth": 658,
-    "_originalHeight": 0,
+    "_originalHeight": 1550,
     "_alignMode": 2,
     "_lockFlags": 0,
     "_id": ""
@@ -792,6 +792,9 @@
     "__prefab": {
       "__id__": 37
     },
+    "mask": false,
+    "maskOpcity": 80,
+    "isClickMaskeClose": false,
     "progress": {
       "__id__": 29
     },
diff --git a/JisolGameCocos/assets/script/Main.ts b/JisolGameCocos/assets/script/Main.ts
index e775dfff..dc3741cc 100644
--- a/JisolGameCocos/assets/script/Main.ts
+++ b/JisolGameCocos/assets/script/Main.ts
@@ -5,6 +5,7 @@ import { JNSyncAction } from '../../extensions/ngame/assets/ngame/sync/JNSyncAct
 import { GOnHookPets } from '../../extensions/ngame/assets/ngame/message/proto';
 import { Env, EnvCurrent } from './Env';
 import { GAction } from './consts/GAction';
+import { view } from 'cc';
 const { ccclass, property } = _decorator;
 
 window['GUser'] = "100000";
diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame
index 22fe6820..ab4de0a5 160000
--- a/JisolGameCocos/extensions/ngame
+++ b/JisolGameCocos/extensions/ngame
@@ -1 +1 @@
-Subproject commit 22fe68202ba5e785b2bcc30b8031e049dc326b1d
+Subproject commit ab4de0a5e48849a45bdada19489d93c1c9f72bcb