重命名

assets/lobbyRes/ui/login/AutoLoginView.prefab → assets/lobbyRes/ui/login/AutoLogin.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "AutoLoginView",
+    "_name": "AutoLogin",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "AutoLoginView",
+    "_name": "AutoLogin",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -1745,6 +1745,12 @@
     "__prefab": {
       "__id__": 77
     },
+    "popupMask": {
+      "__id__": 9
+    },
+    "popupRoot": {
+      "__id__": 12
+    },
     "btnClose": {
       "__id__": 19
     },

assets/lobbyRes/ui/login/AutoLoginView.prefab.meta → assets/lobbyRes/ui/login/AutoLogin.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "AutoLoginView"
+    "syncNodeName": "AutoLogin"
   }
 }

assets/lobbyRes/ui/login/LoginView.prefab

@@ -35,25 +35,22 @@
       },
       {
         "__id__": 202
-      },
-      {
-        "__id__": 234
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 254
+        "__id__": 234
       },
       {
-        "__id__": 256
+        "__id__": 236
       },
       {
-        "__id__": 258
+        "__id__": 238
       }
     ],
     "_prefab": {
-      "__id__": 260
+      "__id__": 240
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5635,521 +5632,18 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "demo",
-    "_objFlags": 512,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 235
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 251
-      }
-    ],
-    "_prefab": {
-      "__id__": 253
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "btnLogout",
-    "_objFlags": 512,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 234
-    },
-    "_children": [
-      {
-        "__id__": 236
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 242
-      },
-      {
-        "__id__": 244
-      },
-      {
-        "__id__": 246
-      },
-      {
-        "__id__": 248
-      }
-    ],
-    "_prefab": {
-      "__id__": 250
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 697.041,
-      "y": 202.127,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 512,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 235
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 237
-      },
-      {
-        "__id__": 239
-      }
-    ],
-    "_prefab": {
-      "__id__": 241
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 236
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 238
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "aatode2qhJRJ9Zp699w/3X"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 236
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 240
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_string": "LogOut",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 1,
-    "_enableWrapText": false,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f1JS89+QhDaJdOsy06pd22"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
       "__id__": 1
     },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "bb7RCqhC1LmqVF4xw/l8tI",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 235
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 243
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "d5uy3C/7FBB7W8U+hJQmg3"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 235
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 245
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "dbyL+yCR5FFaBF2p+xyxjd"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 235
-    },
     "_enabled": true,
     "__prefab": {
-      "__id__": 247
-    },
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 2,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 235
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "44MTOuEOxLqakGiu+P5M4D"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
       "__id__": 235
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 249
-    },
-    "_alignFlags": 33,
-    "_target": null,
-    "_left": 0,
-    "_right": -697.041,
-    "_top": -172.127,
-    "_bottom": 0,
-    "_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": "d6U3cx1LZGipzjmbs0lF9K"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "be8beVumdF7oaNjEbuKuT4",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 234
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 252
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "90gY1WXwRLLpa4zXboQLRj"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "d8Vp6wg4RGA6j8fTed/xcN",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 255
-    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1624,
@@ -6176,7 +5670,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 257
+      "__id__": 237
     },
     "_alignFlags": 45,
     "_target": null,
@@ -6212,7 +5706,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 259
+      "__id__": 239
     },
     "btnGuest": {
       "__id__": 126

assets/lobbyRes/ui/register/RegisterView.prefab.meta → assets/lobbyRes/ui/register/Register.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "RegisterView"
+    "syncNodeName": "Register"
   }
 }

assets/lobbyRes/ui/register/RegisterSuccessView.prefab → assets/lobbyRes/ui/register/RegisterSuccess.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "RegisterSuccessView",
+    "_name": "RegisterSuccess",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "RegisterSuccessView",
+    "_name": "RegisterSuccess",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -1745,6 +1745,12 @@
     "__prefab": {
       "__id__": 77
     },
+    "popupMask": {
+      "__id__": 9
+    },
+    "popupRoot": {
+      "__id__": 12
+    },
     "btnClose": {
       "__id__": 19
     },

assets/lobbyRes/ui/register/RegisterSuccessView.prefab.meta → assets/lobbyRes/ui/register/RegisterSuccess.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "RegisterSuccessView"
+    "syncNodeName": "RegisterSuccess"
   }
 }

assets/lobbyRes/ui/resetPsd/ResetPsdView.prefab → assets/lobbyRes/ui/resetPsd/ResetPsd.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "ResetPsdView",
+    "_name": "ResetPsd",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ResetPsdView",
+    "_name": "ResetPsd",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -2889,7 +2889,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 56.048,
+      "x": 55.048,
       "y": -48.574,
       "z": 0
     },
@@ -2930,7 +2930,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 353.9453125,
+      "width": 345.046875,
       "height": 20.16
     },
     "_anchorPoint": {
@@ -2966,7 +2966,7 @@
       "b": 215,
       "a": 255
     },
-    "_string": "6-digit code sent. Expires in 20m. Never share ite.",
+    "_string": "6-digit code sent. Expires in 20m. Never share it.",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 16,
@@ -3021,8 +3021,6 @@
       "__id__": 0
     },
     "fileId": "88oET+1pZPLq/KG6BovNsh",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -4622,6 +4620,12 @@
     "__prefab": {
       "__id__": 195
     },
+    "popupMask": {
+      "__id__": 9
+    },
+    "popupRoot": {
+      "__id__": 12
+    },
     "btnClose": {
       "__id__": 19
     },

assets/lobbyRes/ui/resetPsd/ResetPsdView.prefab.meta → assets/lobbyRes/ui/resetPsd/ResetPsd.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "ResetPsdView"
+    "syncNodeName": "ResetPsd"
   }
 }

assets/lobbyRes/ui/support/SupportView.prefab → assets/lobbyRes/ui/support/Support.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "SupportView",
+    "_name": "Support",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "SupportView",
+    "_name": "Support",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -5150,6 +5150,12 @@
     "__prefab": {
       "__id__": 219
     },
+    "popupMask": {
+      "__id__": 9
+    },
+    "popupRoot": {
+      "__id__": 12
+    },
     "btnClose": {
       "__id__": 25
     },

assets/lobbyRes/ui/support/SupportView.prefab.meta → assets/lobbyRes/ui/support/Support.prefab.meta

@@ -8,6 +8,6 @@
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "SupportView"
+    "syncNodeName": "Support"
   }
 }

assets/scripts/components/button/OTPButton.ts

@@ -55,7 +55,7 @@ export class OTPButton extends Component {
         const cd = AppKernel.stores.mainStore.otpCD;
         this.button.interactable = cd <= 0;
         if (cd <= 0) {
-            this.label.string = "Send Code";
+            this.label.string = "Send";
             return;
         }
 
@@ -70,7 +70,7 @@ export class OTPButton extends Component {
         console.log('otp cd: ', cd);
         if (cd <= 0) {
             this.stopTimer();
-            this.label.string = "Resend Code";
+            this.label.string = "Resend";
             this.button.interactable = true;
         }
     }

assets/scripts/define/UIDefine.ts

@@ -8,11 +8,11 @@ export const UIViewID = {
     StoreView: "StoreView",
     PlayHistory: "PlayHistory",
     GamePolicyView: "GamePolicyView",
-    RegisterView: "RegisterView",
-    ResetPsdView: "ResetPsdView",
-    AutoLoginView: "AutoLoginView",
-    RegisterSuccessView: "RegisterSuccessView",
-    SupportView: "SupportView",
+    Register: "Register",
+    ResetPsd: "ResetPsd",
+    AutoLogin: "AutoLogin",
+    RegisterSuccess: "RegisterSuccess",
+    Support: "Support",
 } as const;
 
 export type UIViewID = typeof UIViewID[keyof typeof UIViewID];
@@ -69,29 +69,29 @@ export const UIViewConfigs: Record<string, UIViewConfig> = {
         prefabPath: 'ui/policy/GamePolicyView',
         layer: UILayer.Popup,
     },
-    [UIViewID.RegisterView]: {
-        id: UIViewID.RegisterView,
-        prefabPath: 'ui/register/RegisterView',
+    [UIViewID.Register]: {
+        id: UIViewID.Register,
+        prefabPath: 'ui/register/Register',
         layer: UILayer.Popup
     },
-    [UIViewID.ResetPsdView]: {
-        id: UIViewID.ResetPsdView,
-        prefabPath: 'ui/resetPsd/ResetPsdView',
+    [UIViewID.ResetPsd]: {
+        id: UIViewID.ResetPsd,
+        prefabPath: 'ui/resetPsd/ResetPsd',
         layer: UILayer.Popup
     },
-    [UIViewID.AutoLoginView]: {
-        id: UIViewID.AutoLoginView,
-        prefabPath: 'ui/login/AutoLoginView',
+    [UIViewID.AutoLogin]: {
+        id: UIViewID.AutoLogin,
+        prefabPath: 'ui/login/AutoLogin',
         layer: UILayer.Popup
     },
-    [UIViewID.RegisterSuccessView]: {
-        id: UIViewID.RegisterSuccessView,
-        prefabPath: 'ui/register/RegisterSuccessView',
+    [UIViewID.RegisterSuccess]: {
+        id: UIViewID.RegisterSuccess,
+        prefabPath: 'ui/register/RegisterSuccess',
         layer: UILayer.Popup
     },
-    [UIViewID.SupportView]: {
-        id: UIViewID.SupportView,
-        prefabPath: 'ui/support/SupportView',
+    [UIViewID.Support]: {
+        id: UIViewID.Support,
+        prefabPath: 'ui/support/Support',
         layer: UILayer.Popup
     }
 

assets/scripts/modules/lobby/ui/LoginView/AutoLoginView.ts → assets/scripts/modules/lobby/ui/LoginView/AutoLogin.ts

@@ -1,15 +1,15 @@
 import { _decorator, Button, Color, EditBox, instantiate, Label, Node, RichText, Sprite, SpriteFrame, UITransform } from 'cc';
-import { UIView } from '@scripts/framework/ui/UIView';
 import { UIViewID } from '@scripts/define/UIDefine';
 import { UICloseReason } from '@scripts/framework/ui/UILayer';
 import { addBtnClick } from '@scripts/utils/UIHelper';
 import { AppKernel } from '@scripts/app/AppKernel';
+import { UIPopup } from '@scripts/framework/ui/UIPopup';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('AutoLoginView')
-export class AutoLoginView extends UIView {
-  readonly viewId = UIViewID.AutoLoginView;
+@ccclass('AutoLogin')
+export class AutoLogin extends UIPopup {
+  readonly viewId = UIViewID.AutoLogin;
 
   @property(Node)
   private btnClose: Node = null;
@@ -23,7 +23,7 @@ export class AutoLoginView extends UIView {
   }
 
   private onBtnCloseClick() {
-    AppKernel.ui.close(UIViewID.ResetPsdView);
+    AppKernel.ui.close(UIViewID.ResetPsd);
     const loginView = AppKernel.ui.get(UIViewID.LoginView) as any;
     if (loginView && loginView?.enabled) {
       loginView?._googleWebBtn?.setActive(true);
@@ -34,14 +34,5 @@ export class AutoLoginView extends UIView {
     this.onBtnCloseClick()
   }
 
-  protected onOpen(_params: unknown): void | Promise<void> {
-  }
-
-  protected onClose(_reason: UICloseReason): void | Promise<void> {
-  }
-
-  protected onDestroy(): void {
-  }
-
-
+  
 }

assets/scripts/modules/lobby/ui/LoginView/LoginView.ts

@@ -155,13 +155,6 @@ export class LoginView extends UIView {
     AppKernel.ui.loading(false);
   }
 
-  private async onBtnLogOutClick() {
-    // AppKernel.ui.loading(true);
-    // const res = await AppKernel.fb.logOut();
-    // console.log('facebook logout res: ', res);
-    // AppKernel.ui.loading(false);
-  }
-
   private async onGoogleWebLogin(res) {
     AppKernel.ui.loading(true);
     await AppKernel.services.loginService.googleLogin(res);
@@ -176,7 +169,7 @@ export class LoginView extends UIView {
 
   private onBtnRegisterClick() {
     this._googleWebBtn?.setActive(false);
-    AppKernel.ui.open(UIViewID.RegisterView);
+    AppKernel.ui.open(UIViewID.Register);
   }
 
   private onBtnLoginClick() {
@@ -188,12 +181,12 @@ export class LoginView extends UIView {
 
   private onBtnResetPsdClick() {
     this._googleWebBtn?.setActive(false);
-    AppKernel.ui.open(UIViewID.ResetPsdView);
+    AppKernel.ui.open(UIViewID.ResetPsd);
   }
 
   private async onBtnSupportClick() {
     this._googleWebBtn?.setActive(false);
-    AppKernel.ui.open(UIViewID.SupportView);
+    AppKernel.ui.open(UIViewID.Support);
 
   }
 

assets/scripts/modules/lobby/ui/RegisterView/RegisterView.ts → assets/scripts/modules/lobby/ui/Register/Register.ts

@@ -1,15 +1,15 @@
 import { _decorator, Button, Color, EditBox, instantiate, Label, Node, RichText, Sprite, SpriteFrame, UITransform } from 'cc';
-import { UIView } from '@scripts/framework/ui/UIView';
 import { UIViewID } from '@scripts/define/UIDefine';
 import { UICloseReason } from '@scripts/framework/ui/UILayer';
 import { addBtnClick } from '@scripts/utils/UIHelper';
 import { AppKernel } from '@scripts/app/AppKernel';
+import { UIPopup } from '@scripts/framework/ui/UIPopup';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('RegisterView')
-export class RegisterView extends UIView {
-  readonly viewId = UIViewID.RegisterView;
+@ccclass('Register')
+export class Register extends UIPopup {
+  readonly viewId = UIViewID.Register;
 
   @property(Node)
   private btnClose: Node = null;
@@ -37,7 +37,7 @@ export class RegisterView extends UIView {
   }
 
   private onBtnCloseClick() {
-    AppKernel.ui.close(UIViewID.RegisterView);
+    AppKernel.ui.close(UIViewID.Register);
     const loginView = AppKernel.ui.get(UIViewID.LoginView) as any;
     if (loginView && loginView?.enabled) {
       loginView?._googleWebBtn?.setActive(true);
@@ -52,14 +52,4 @@ export class RegisterView extends UIView {
     AppKernel.services.loginService.register({ account, code, password, act });
   }
 
-  protected onOpen(_params: unknown): void | Promise<void> {
-  }
-
-  protected onClose(_reason: UICloseReason): void | Promise<void> {
-  }
-
-  protected onDestroy(): void {
-  }
-
-
 }

assets/scripts/modules/lobby/ui/RegisterView/RegisterSuccessView.ts → assets/scripts/modules/lobby/ui/Register/RegisterSuccess.ts

@@ -1,15 +1,15 @@
 import { _decorator, Button, Color, EditBox, instantiate, Label, Node, RichText, Sprite, SpriteFrame, UITransform } from 'cc';
-import { UIView } from '@scripts/framework/ui/UIView';
 import { UIViewID } from '@scripts/define/UIDefine';
 import { UICloseReason } from '@scripts/framework/ui/UILayer';
 import { addBtnClick } from '@scripts/utils/UIHelper';
 import { AppKernel } from '@scripts/app/AppKernel';
+import { UIPopup } from '@scripts/framework/ui/UIPopup';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('RegisterSuccessView')
-export class RegisterSuccessView extends UIView {
-  readonly viewId = UIViewID.RegisterSuccessView;
+@ccclass('RegisterSuccess')
+export class RegisterSuccess extends UIPopup {
+  readonly viewId = UIViewID.RegisterSuccess;
 
   @property(Node)
   private btnClose: Node = null;
@@ -23,7 +23,7 @@ export class RegisterSuccessView extends UIView {
   }
 
   private onBtnCloseClick() {
-    AppKernel.ui.close(UIViewID.ResetPsdView);
+    AppKernel.ui.close(UIViewID.ResetPsd);
     const loginView = AppKernel.ui.get(UIViewID.LoginView) as any;
     if (loginView && loginView?.enabled) {
       loginView?._googleWebBtn?.setActive(true);
@@ -33,15 +33,4 @@ export class RegisterSuccessView extends UIView {
   private onBtnPlayClick() {
     this.onBtnCloseClick()
   }
-
-  protected onOpen(_params: unknown): void | Promise<void> {
-  }
-
-  protected onClose(_reason: UICloseReason): void | Promise<void> {
-  }
-
-  protected onDestroy(): void {
-  }
-
-
 }

assets/scripts/modules/lobby/ui/ResetPsdView/ResetPsdView.ts → assets/scripts/modules/lobby/ui/ResetPsd/ResetPsd.ts

@@ -1,15 +1,15 @@
 import { _decorator, Button, Color, EditBox, instantiate, Label, Node, RichText, Sprite, SpriteFrame, UITransform } from 'cc';
-import { UIView } from '@scripts/framework/ui/UIView';
 import { UIViewID } from '@scripts/define/UIDefine';
 import { UICloseReason } from '@scripts/framework/ui/UILayer';
 import { addBtnClick } from '@scripts/utils/UIHelper';
 import { AppKernel } from '@scripts/app/AppKernel';
+import { UIPopup } from '@scripts/framework/ui/UIPopup';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('ResetPsdView')
-export class ResetPsdView extends UIView {
-  readonly viewId = UIViewID.ResetPsdView;
+@ccclass('ResetPsd')
+export class ResetPsd extends UIPopup {
+  readonly viewId = UIViewID.ResetPsd;
 
   @property(Node)
   private btnClose: Node = null;
@@ -34,7 +34,7 @@ export class ResetPsdView extends UIView {
   }
 
   private onBtnCloseClick() {
-    AppKernel.ui.close(UIViewID.ResetPsdView);
+    AppKernel.ui.close(UIViewID.ResetPsd);
     const loginView = AppKernel.ui.get(UIViewID.LoginView) as any;
     if (loginView && loginView?.enabled) {
       loginView?._googleWebBtn?.setActive(true);
@@ -51,15 +51,4 @@ export class ResetPsdView extends UIView {
       newpassword: password,
     })
   }
-
-  protected onOpen(_params: unknown): void | Promise<void> {
-  }
-
-  protected onClose(_reason: UICloseReason): void | Promise<void> {
-  }
-
-  protected onDestroy(): void {
-  }
-
-
 }

assets/scripts/modules/lobby/ui/SupportView/SupportView.ts → assets/scripts/modules/lobby/ui/Support/Support.ts

@@ -1,16 +1,16 @@
 import { _decorator, Button, Color, EditBox, instantiate, Label, Node, RichText, Sprite, SpriteFrame, UITransform } from 'cc';
-import { UIView } from '@scripts/framework/ui/UIView';
 import { UIViewID } from '@scripts/define/UIDefine';
 import { UICloseReason } from '@scripts/framework/ui/UILayer';
 import { addBtnClick } from '@scripts/utils/UIHelper';
 import { AppKernel } from '@scripts/app/AppKernel';
 import { SelectBox } from '@scripts/components/selectBox/SelectBox';
+import { UIPopup } from '@scripts/framework/ui/UIPopup';
 
 const { ccclass, property } = _decorator;
 
-@ccclass('SupportView')
-export class SupportView extends UIView {
-  readonly viewId = UIViewID.SupportView;
+@ccclass('Support')
+export class Support extends UIPopup {
+  readonly viewId = UIViewID.Support;
 
   @property(Node)
   private btnClose: Node = null;
@@ -48,7 +48,7 @@ export class SupportView extends UIView {
   }
 
   private onBtnCloseClick() {
-    AppKernel.ui.close(UIViewID.SupportView);
+    AppKernel.ui.close(UIViewID.Support);
     const loginView = AppKernel.ui.get(UIViewID.LoginView) as any;
     if (loginView && loginView?.enabled) {
       loginView?._googleWebBtn?.setActive(true);
@@ -63,15 +63,4 @@ export class SupportView extends UIView {
     
   }
 
-
-  protected onOpen(_params: unknown): void | Promise<void> {
-  }
-
-  protected onClose(_reason: UICloseReason): void | Promise<void> {
-  }
-
-  protected onDestroy(): void {
-  }
-
-
 }