diff --git a/assets/bundle/common/.common.md b/assets/bundle/common/.common.md
new file mode 100644
index 0000000..4415aac
--- /dev/null
+++ b/assets/bundle/common/.common.md
@@ -0,0 +1,5 @@
+框架必备资源目录
+
+注：
+1. 尽可能不要在此目录中添加新功能资源，因此目录会在游戏打开时就加载，避免资源多玩家等待过程较长
+2. 开发游戏时，可替换此目录中所有预制皮肤、与修改动画资源效果
\ No newline at end of file
diff --git a/assets/bundle/common/prefab/alert.prefab b/assets/bundle/common/prefab/alert.prefab
index ea3ba11..b35df95 100644
--- a/assets/bundle/common/prefab/alert.prefab
+++ b/assets/bundle/common/prefab/alert.prefab
@@ -31,17 +31,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 36
       },
       {
-        "__id__": 39
+        "__id__": 38
       },
       {
-        "__id__": 41
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -74,7 +74,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_title",
+    "_name": "labTitle",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -256,7 +256,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_content",
+    "_name": "labContent",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -438,7 +438,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_ok",
+    "_name": "btnOk",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -461,11 +461,11 @@
         "__id__": 31
       },
       {
-        "__id__": 34
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -498,7 +498,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_ok",
+    "_name": "labOk",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -594,9 +594,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_string": "确认",
@@ -729,7 +729,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0877fdd4-5605-41e6-b643-be4904d506b7@f9941",
+      "__uuid__": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -752,8 +752,8 @@
     "fileId": "3dr+KXw4lC5oS1lceuHGsr"
   },
   {
-    "__type__": "cc.Button",
-    "_name": "btn_ok<Button>",
+    "__type__": "cc.Widget",
+    "_name": "btn_ok<Widget>",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
@@ -763,18 +763,50 @@
     "__prefab": {
       "__id__": 32
     },
-    "clickEvents": [
-      {
-        "__id__": 33
-      }
-    ],
+    "_alignFlags": 12,
+    "_target": null,
+    "_left": 189,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 40,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "37gJva6bdFs6GgPAU1af2N"
+  },
+  {
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 34
+    },
+    "clickEvents": [],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -803,61 +835,16 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 0.9,
-    "_target": {
-      "__id__": 18
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "64+udhPrdI4oLL+6S6rR5C"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "653bf8VPC5Fn49zFJFqXVgx",
-    "handler": "onOk",
-    "customEventData": ""
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "btn_ok<Widget>",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 18
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 35
-    },
-    "_alignFlags": 12,
+    "_zoomScale": 1.2,
     "_target": null,
-    "_left": 189,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 40,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
+    "interval": 0,
+    "once": false,
+    "effect": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "37gJva6bdFs6GgPAU1af2N"
+    "fileId": "01hl2bpMxE9Z0FrQXEarNf"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -882,7 +869,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -910,7 +897,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -923,7 +910,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "18797068-e98a-43a6-a481-afde51c33361@f9941",
+      "__uuid__": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -946,7 +933,7 @@
     "fileId": "a0vC/W2QdFb7e69t18Gf21"
   },
   {
-    "__type__": "653bf8VPC5Fn49zFJFqXVgx",
+    "__type__": "62d1cSSgkdOd4IWRi9kxqKW",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -955,23 +942,23 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 41
     },
-    "lab_title": {
+    "labTitle": {
       "__id__": 7
     },
-    "lab_content": {
+    "labContent": {
       "__id__": 15
     },
-    "lab_ok": {
+    "labOk": {
       "__id__": 24
     },
-    "lab_cancel": null,
+    "labCancel": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "92SJypfohE74p2ebUwinVx"
+    "fileId": "47J7t+4o1I4K1DhzF4ptYb"
   },
   {
     "__type__": "cc.PrefabInfo",
diff --git a/assets/bundle/common/prefab/alert.prefab.meta b/assets/bundle/common/prefab/alert.prefab.meta
index 82cd2eb..caae09e 100644
--- a/assets/bundle/common/prefab/alert.prefab.meta
+++ b/assets/bundle/common/prefab/alert.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "51127053-183b-41dc-b9d5-de54f6774526",
+  "uuid": "dd372fa7-ac37-4b27-b500-f7e9ed586277",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/prefab/confirm.prefab b/assets/bundle/common/prefab/confirm.prefab
index 92dcaf5..c0e7a11 100644
--- a/assets/bundle/common/prefab/confirm.prefab
+++ b/assets/bundle/common/prefab/confirm.prefab
@@ -28,23 +28,23 @@
         "__id__": 18
       },
       {
-        "__id__": 37
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 54
+      },
       {
         "__id__": 56
       },
       {
         "__id__": 58
-      },
-      {
-        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -77,7 +77,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_title",
+    "_name": "labTitle",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -259,7 +259,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_content",
+    "_name": "labContent",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -441,7 +441,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_ok",
+    "_name": "btnOk",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -464,11 +464,11 @@
         "__id__": 31
       },
       {
-        "__id__": 34
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -501,7 +501,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_ok",
+    "_name": "labOk",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -597,9 +597,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_string": "确认",
@@ -732,7 +732,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0877fdd4-5605-41e6-b643-be4904d506b7@f9941",
+      "__uuid__": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -755,8 +755,8 @@
     "fileId": "3dr+KXw4lC5oS1lceuHGsr"
   },
   {
-    "__type__": "cc.Button",
-    "_name": "btn_ok<Button>",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
+    "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
@@ -766,18 +766,14 @@
     "__prefab": {
       "__id__": 32
     },
-    "clickEvents": [
-      {
-        "__id__": 33
-      }
-    ],
+    "clickEvents": [],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -806,25 +802,16 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 0.9,
-    "_target": {
-      "__id__": 18
-    },
+    "_zoomScale": 1.2,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "64+udhPrdI4oLL+6S6rR5C"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "653bf8VPC5Fn49zFJFqXVgx",
-    "handler": "onOk",
-    "customEventData": ""
+    "fileId": "cczwU4HOlCgLXPB/F285Oq"
   },
   {
     "__type__": "cc.Widget",
@@ -836,7 +823,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 34
     },
     "_alignFlags": 12,
     "_target": null,
@@ -877,7 +864,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_cancel",
+    "_name": "btnCancel",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -885,26 +872,26 @@
     },
     "_children": [
       {
-        "__id__": 38
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 45
       },
       {
-        "__id__": 48
+        "__id__": 47
       },
       {
-        "__id__": 50
+        "__id__": 49
       },
       {
-        "__id__": 53
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -937,27 +924,27 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_cancal",
+    "_name": "labCancal",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 37
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 38
       },
       {
-        "__id__": 41
+        "__id__": 40
       },
       {
-        "__id__": 43
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -994,11 +981,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 39
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1022,20 +1009,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 41
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_string": "取消",
@@ -1090,11 +1077,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 43
     },
     "_params": [],
     "_dataID": "",
@@ -1123,11 +1110,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 37
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 46
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1151,11 +1138,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 37
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 48
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1168,7 +1155,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0877fdd4-5605-41e6-b643-be4904d506b7@f9941",
+      "__uuid__": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -1191,29 +1178,25 @@
     "fileId": "08v+UeZXZH+a5Tu0BOuubs"
   },
   {
-    "__type__": "cc.Button",
-    "_name": "btn_cancel<Button>",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
+    "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 37
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 50
     },
-    "clickEvents": [
-      {
-        "__id__": 52
-      }
-    ],
+    "clickEvents": [],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1242,25 +1225,16 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 0.9,
-    "_target": {
-      "__id__": 37
-    },
+    "_zoomScale": 1.2,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "23mGTQh9JPcaNniCjfDZ/c"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "653bf8VPC5Fn49zFJFqXVgx",
-    "handler": "onCancel",
-    "customEventData": ""
+    "fileId": "daGKiAeoBC6pT7wxFXKKO9"
   },
   {
     "__type__": "cc.Widget",
@@ -1268,11 +1242,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 37
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 52
     },
     "_alignFlags": 36,
     "_target": null,
@@ -1321,7 +1295,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1349,7 +1323,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1362,7 +1336,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "18797068-e98a-43a6-a481-afde51c33361@f9941",
+      "__uuid__": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1385,7 +1359,7 @@
     "fileId": "a0vC/W2QdFb7e69t18Gf21"
   },
   {
-    "__type__": "653bf8VPC5Fn49zFJFqXVgx",
+    "__type__": "62d1cSSgkdOd4IWRi9kxqKW",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1394,25 +1368,25 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 59
     },
-    "lab_title": {
+    "labTitle": {
       "__id__": 7
     },
-    "lab_content": {
+    "labContent": {
       "__id__": 15
     },
-    "lab_ok": {
+    "labOk": {
       "__id__": 24
     },
-    "lab_cancel": {
-      "__id__": 43
+    "labCancel": {
+      "__id__": 42
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "92SJypfohE74p2ebUwinVx"
+    "fileId": "60BMaXLxhAKJP/pKkFHCFA"
   },
   {
     "__type__": "cc.PrefabInfo",
diff --git a/assets/bundle/common/prefab/confirm.prefab.meta b/assets/bundle/common/prefab/confirm.prefab.meta
index 4341e06..d9f043a 100644
--- a/assets/bundle/common/prefab/confirm.prefab.meta
+++ b/assets/bundle/common/prefab/confirm.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "b2c7551a-2cd9-4ef0-beef-fdce5988ff03",
+  "uuid": "3bcb958f-74b1-4892-86e8-fbd9da64f441",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/prefab/mask.prefab b/assets/bundle/common/prefab/mask.prefab
index a0d3343..9aeaf7c 100644
--- a/assets/bundle/common/prefab/mask.prefab
+++ b/assets/bundle/common/prefab/mask.prefab
@@ -77,7 +77,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1200,
-      "height": 720
+      "height": 719.9999999999999
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
diff --git a/assets/bundle/common/prefab/mask.prefab.meta b/assets/bundle/common/prefab/mask.prefab.meta
index 2ea6af7..8b767ca 100644
--- a/assets/bundle/common/prefab/mask.prefab.meta
+++ b/assets/bundle/common/prefab/mask.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
+  "uuid": "688857f4-0ec7-473d-a7f8-c70cb5299f5f",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/prefab/notify.prefab b/assets/bundle/common/prefab/notify.prefab
index f119e48..3914a78 100644
--- a/assets/bundle/common/prefab/notify.prefab
+++ b/assets/bundle/common/prefab/notify.prefab
@@ -241,7 +241,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.2109375,
+      "width": 131.18507361778845,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -280,7 +280,7 @@
     "_string": "content",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
+    "_actualFontSize": 45.13888888888889,
     "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
@@ -407,7 +407,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "bdc6c564-ad81-4651-ab71-5c81ead4122d@f9941",
+      "__uuid__": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
diff --git a/assets/bundle/common/prefab/notify.prefab.meta b/assets/bundle/common/prefab/notify.prefab.meta
index 1b13326..b21ca8d 100644
--- a/assets/bundle/common/prefab/notify.prefab.meta
+++ b/assets/bundle/common/prefab/notify.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "80f1f6cc-e3c7-4c99-8b81-1083aa66330a",
+  "uuid": "6146102f-6a2f-4ee9-9d5d-9acdf389ebeb",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/prefab/wait.prefab b/assets/bundle/common/prefab/wait.prefab
index 31f496f..d84438d 100644
--- a/assets/bundle/common/prefab/wait.prefab
+++ b/assets/bundle/common/prefab/wait.prefab
@@ -3,19 +3,18 @@
     "__type__": "cc.Prefab",
     "_name": "wait",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
     },
     "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
     "persistent": false
   },
   {
     "__type__": "cc.Node",
     "_name": "wait",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": null,
     "_children": [
       {
@@ -59,7 +58,6 @@
       "y": 1,
       "z": 1
     },
-    "_mobility": 0,
     "_layer": 1073741824,
     "_euler": {
       "__type__": "cc.Vec3",
@@ -73,7 +71,6 @@
     "__type__": "cc.Node",
     "_name": "bg",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -112,7 +109,6 @@
       "y": 1,
       "z": 1
     },
-    "_mobility": 0,
     "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
@@ -126,25 +122,25 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 4
-    },
+    "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1200
+      "height": 1280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 4
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -154,15 +150,11 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 6
-    },
-    "_customMaterial": null,
+    "_visFlags": 0,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
@@ -173,8 +165,7 @@
       "a": 60
     },
     "_spriteFrame": {
-      "__uuid__": "57520716-48c8-4a19-8acf-41c9f8777fb0@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+      "__uuid__": "57520716-48c8-4a19-8acf-41c9f8777fb0@f9941"
     },
     "_type": 1,
     "_fillType": 0,
@@ -189,7 +180,10 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 6
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -199,14 +193,10 @@
     "__type__": "cc.Widget",
     "_name": "loading<Widget>",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 8
-    },
     "_alignFlags": 45,
     "_target": null,
     "_left": 0,
@@ -225,7 +215,10 @@
     "_originalHeight": 2,
     "_alignMode": 2,
     "_lockFlags": 0,
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 8
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -239,16 +232,12 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "c5KGHiK9REY4bg8g3FbCdj",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "fileId": "c5KGHiK9REY4bg8g3FbCdj"
   },
   {
     "__type__": "cc.Node",
     "_name": "loading",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -284,7 +273,6 @@
       "y": 1,
       "z": 1
     },
-    "_mobility": 0,
     "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
@@ -298,14 +286,11 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 10
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 12
-    },
+    "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 138,
@@ -316,7 +301,10 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 12
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -326,15 +314,11 @@
     "__type__": "cc.Sprite",
     "_name": "loading<Sprite>",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 10
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 14
-    },
-    "_customMaterial": null,
+    "_visFlags": 0,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
@@ -345,8 +329,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f5b846a5-9b1c-4bb5-ae4e-162c279af472@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+      "__uuid__": "06942a20-0474-4385-9a85-293366d2473e@f9941"
     },
     "_type": 0,
     "_fillType": 0,
@@ -361,7 +344,10 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 14
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -375,34 +361,31 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b4DOS8ivZJwbuvCM8qdysu",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "fileId": "b4DOS8ivZJwbuvCM8qdysu"
   },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 17
-    },
+    "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1200
+      "height": 1280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 17
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -412,14 +395,10 @@
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 19
-    },
     "_alignFlags": 45,
     "_target": null,
     "_left": 0,
@@ -438,7 +417,10 @@
     "_originalHeight": 2,
     "_alignMode": 2,
     "_lockFlags": 0,
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 19
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -448,18 +430,17 @@
     "__type__": "95143M/82NCOLKGzw14JlmS",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "__prefab": {
-      "__id__": 21
-    },
     "loading": {
       "__id__": 10
     },
-    "_id": ""
+    "_id": "",
+    "__prefab": {
+      "__id__": 21
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -473,8 +454,6 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": null,
-    "targetOverrides": null
+    "fileId": "a0daVw8DRLi6ToMaTA0VS2"
   }
 ]
\ No newline at end of file
diff --git a/assets/bundle/common/prefab/wait.prefab.meta b/assets/bundle/common/prefab/wait.prefab.meta
index 2c61762..381b2bf 100644
--- a/assets/bundle/common/prefab/wait.prefab.meta
+++ b/assets/bundle/common/prefab/wait.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "9498d064-7cb5-4005-b470-3af693c28cc7",
+  "uuid": "a5e71c41-8cf0-4e66-be77-8f58eab4962a",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/texture.meta b/assets/bundle/common/texture.meta
index 2887d77..d286fc8 100644
--- a/assets/bundle/common/texture.meta
+++ b/assets/bundle/common/texture.meta
@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "d2d7a1b4-d814-4160-ab5a-cb88468d04b9",
+  "uuid": "0489d8e2-9e0b-4c7e-b5ec-647a864e9214",
   "files": [],
   "subMetas": {},
   "userData": {
diff --git a/assets/bundle/common/texture/auto-atlas.pac.meta b/assets/bundle/common/texture/auto-atlas.pac.meta
index df38085..efc6f4e 100644
--- a/assets/bundle/common/texture/auto-atlas.pac.meta
+++ b/assets/bundle/common/texture/auto-atlas.pac.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.8",
   "importer": "auto-atlas",
   "imported": true,
-  "uuid": "e4725e0a-3ded-431d-bc33-08cb815804ec",
+  "uuid": "9fa4ce44-23c1-4a20-9b6c-29623ff951af",
   "files": [
     ".json"
   ],
diff --git a/assets/bundle/common/texture/bg_window.png.meta b/assets/bundle/common/texture/bg_window.png.meta
index e09340e..c5df8bd 100644
--- a/assets/bundle/common/texture/bg_window.png.meta
+++ b/assets/bundle/common/texture/bg_window.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "18797068-e98a-43a6-a481-afde51c33361",
+  "uuid": "f9cfbca9-9f35-4dda-8925-64e34e6e9802",
   "files": [
     ".json",
     ".png"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "18797068-e98a-43a6-a481-afde51c33361@6c48a",
+      "uuid": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@6c48a",
       "displayName": "bg_window",
       "id": "6c48a",
       "name": "texture",
@@ -29,13 +29,13 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "18797068-e98a-43a6-a481-afde51c33361",
+        "imageUuidOrDatabaseUri": "f9cfbca9-9f35-4dda-8925-64e34e6e9802",
         "visible": false
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "18797068-e98a-43a6-a481-afde51c33361@f9941",
+      "uuid": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@f9941",
       "displayName": "bg_window",
       "id": "f9941",
       "name": "spriteFrame",
@@ -62,7 +62,7 @@
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "18797068-e98a-43a6-a481-afde51c33361@6c48a",
+        "imageUuidOrDatabaseUri": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@6c48a",
         "atlasUuid": "",
         "packable": true,
         "pixelsToUnit": 100,
@@ -128,7 +128,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "18797068-e98a-43a6-a481-afde51c33361@6c48a",
+    "redirect": "f9cfbca9-9f35-4dda-8925-64e34e6e9802@6c48a",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false
   }
diff --git a/assets/bundle/common/texture/btn_ok.png.meta b/assets/bundle/common/texture/btn_ok.png.meta
index ee42e11..0f4e1f7 100644
--- a/assets/bundle/common/texture/btn_ok.png.meta
+++ b/assets/bundle/common/texture/btn_ok.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "0877fdd4-5605-41e6-b643-be4904d506b7",
+  "uuid": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06",
   "files": [
     ".json",
     ".png"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "0877fdd4-5605-41e6-b643-be4904d506b7@6c48a",
+      "uuid": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@6c48a",
       "displayName": "btn_ok",
       "id": "6c48a",
       "name": "texture",
@@ -29,13 +29,13 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0877fdd4-5605-41e6-b643-be4904d506b7",
+        "imageUuidOrDatabaseUri": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06",
         "visible": false
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "0877fdd4-5605-41e6-b643-be4904d506b7@f9941",
+      "uuid": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@f9941",
       "displayName": "btn_ok",
       "id": "f9941",
       "name": "spriteFrame",
@@ -62,7 +62,7 @@
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0877fdd4-5605-41e6-b643-be4904d506b7@6c48a",
+        "imageUuidOrDatabaseUri": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@6c48a",
         "atlasUuid": "",
         "packable": true,
         "pixelsToUnit": 100,
@@ -128,7 +128,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "0877fdd4-5605-41e6-b643-be4904d506b7@6c48a",
+    "redirect": "56a0bfc3-686d-4e85-bb26-5f5a6855ae06@6c48a",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false
   }
diff --git a/assets/bundle/common/texture/loading.png.meta b/assets/bundle/common/texture/loading.png.meta
index 6d50776..a2bd468 100644
--- a/assets/bundle/common/texture/loading.png.meta
+++ b/assets/bundle/common/texture/loading.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "f5b846a5-9b1c-4bb5-ae4e-162c279af472",
+  "uuid": "06942a20-0474-4385-9a85-293366d2473e",
   "files": [
     ".json",
     ".png"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "f5b846a5-9b1c-4bb5-ae4e-162c279af472@6c48a",
+      "uuid": "06942a20-0474-4385-9a85-293366d2473e@6c48a",
       "displayName": "loading",
       "id": "6c48a",
       "name": "texture",
@@ -29,13 +29,13 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "f5b846a5-9b1c-4bb5-ae4e-162c279af472",
+        "imageUuidOrDatabaseUri": "06942a20-0474-4385-9a85-293366d2473e",
         "visible": false
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "f5b846a5-9b1c-4bb5-ae4e-162c279af472@f9941",
+      "uuid": "06942a20-0474-4385-9a85-293366d2473e@f9941",
       "displayName": "loading",
       "id": "f9941",
       "name": "spriteFrame",
@@ -62,7 +62,7 @@
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "f5b846a5-9b1c-4bb5-ae4e-162c279af472@6c48a",
+        "imageUuidOrDatabaseUri": "06942a20-0474-4385-9a85-293366d2473e@6c48a",
         "atlasUuid": "",
         "packable": true,
         "pixelsToUnit": 100,
@@ -128,7 +128,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "f5b846a5-9b1c-4bb5-ae4e-162c279af472@6c48a",
+    "redirect": "06942a20-0474-4385-9a85-293366d2473e@6c48a",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false
   }
diff --git a/assets/bundle/common/texture/toast.png.meta b/assets/bundle/common/texture/toast.png.meta
index b8b1d24..7db3c7e 100644
--- a/assets/bundle/common/texture/toast.png.meta
+++ b/assets/bundle/common/texture/toast.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "bdc6c564-ad81-4651-ab71-5c81ead4122d",
+  "uuid": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc",
   "files": [
     ".json",
     ".png"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "bdc6c564-ad81-4651-ab71-5c81ead4122d@6c48a",
+      "uuid": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@6c48a",
       "displayName": "toast",
       "id": "6c48a",
       "name": "texture",
@@ -29,13 +29,13 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bdc6c564-ad81-4651-ab71-5c81ead4122d",
+        "imageUuidOrDatabaseUri": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc",
         "visible": false
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "bdc6c564-ad81-4651-ab71-5c81ead4122d@f9941",
+      "uuid": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@f9941",
       "displayName": "toast",
       "id": "f9941",
       "name": "spriteFrame",
@@ -62,7 +62,7 @@
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bdc6c564-ad81-4651-ab71-5c81ead4122d@6c48a",
+        "imageUuidOrDatabaseUri": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@6c48a",
         "atlasUuid": "",
         "packable": true,
         "pixelsToUnit": 100,
@@ -128,7 +128,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "bdc6c564-ad81-4651-ab71-5c81ead4122d@6c48a",
+    "redirect": "ef58b575-d5bd-4b6b-ac05-6364e90ff8fc@6c48a",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false
   }
diff --git a/assets/script/game/initialize/bll/InitRes.ts b/assets/script/game/initialize/bll/InitRes.ts
index 06cbab8..e801673 100644
--- a/assets/script/game/initialize/bll/InitRes.ts
+++ b/assets/script/game/initialize/bll/InitRes.ts
@@ -26,8 +26,6 @@ export class InitResSystem extends ecs.ComblockSystem implements ecs.IEntityEnte
     entityEnter(e: Initialize): void {
         var queue: AsyncQueue = new AsyncQueue();
 
-        // 加载自定义资源
-        this.loadCustom(queue);
         // 加载多语言包加载多语言包
         this.loadLanguage(queue);
         // 加载公共资源
@@ -38,14 +36,6 @@ export class InitResSystem extends ecs.ComblockSystem implements ecs.IEntityEnte
         queue.play();
     }
 
-    /** 加载自定义内容（可选） */
-    private loadCustom(queue: AsyncQueue) {
-        queue.push(async (next: NextFunction, params: any, args: any) => {
-            // 加载多语言对应字体
-            oops.res.load("language/font/" + oops.language.current, next);
-        });
-    }
-
     /** 加载化语言包（可选） */
     private loadLanguage(queue: AsyncQueue) {
         queue.push((next: NextFunction, params: any, args: any) => {