【修改】修改登录逻辑

assets/edt_scene/scene_login.fire

@@ -538,7 +538,7 @@
         "__id__": 15
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 19
@@ -12811,6 +12811,9 @@
     "registerPanel": {
       "__id__": 303
     },
+    "loadProgressBar": {
+      "__id__": 22
+    },
     "_id": "baZpNDkyFPF5yhy3+Dmeah"
   }
 ]

assets/edt_scene/scene_main.fire.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.2.6",
+  "uuid": "626ef1a7-f2eb-46c9-8d97-955bc43f66f7",
+  "asyncLoadAssets": false,
+  "autoReleaseAssets": false,
+  "subMetas": {}
+}

assets/script/app/ctrl/LoginCtr.js

@@ -26,6 +26,7 @@ cc.Class({
             default: undefined,
             type: RegisterPanel,
         },
+        loadProgressBar: JMLoadProgressBar,
     },
 
 
@@ -36,6 +37,14 @@ cc.Class({
         // 进行授权、登录、注册等操作
         this.initAuth();
         this.initUI();
+
+        cc.game.on('e_socket_on_logined', this._handleSocketOnLogined, this);
+        cc.game.on('e_socket_on_closed', this._handleSocketOnClosed, this);
+    },
+
+    onDestroy () {
+        cc.game.targetOff(this);
+        this._super();
     },
 
     initAuth () {
@@ -52,11 +61,107 @@ cc.Class({
         this.registerPanel.reloadData(()=> {
             this.showpanel(TagType.LOGIN);
         });
+
+        // 隐藏进度
+        this.showDownloadProgress(false);
+    },
+
+    /**
+     * 是否显示下载进度。不显示下载进度时，展示授权按钮
+     *
+     * @param {Boolean} isShow
+     */
+    showDownloadProgress (isShow) {
+        // 更新布局
+        this.loadProgressBar.node.active = isShow;
+
+        if (isShow) {
+            this.loadProgressBar.progressBar.progress = 0;
+            this.loadProgressBar.setProgress(15, 1);
+        }
     },
 
     showpanel (tagType) {
         this._tagType = tagType;
         this.loginPanel.node.active = tagType == TagType.LOGIN;
         this.registerPanel.node.active = tagType == TagType.REGISTER;
-    }
+    },
+
+    /**
+     * 登录成功
+     *
+     */
+    _handleSocketOnLogined () {
+        this.didLoginSuccessful();
+    },
+
+    /**
+     * 登录成功
+     *
+     */
+    _handleSocketOnClosed () {
+        this.didLoginFailed();
+    },
+
+    /**
+     * 登录成功
+     *
+     */
+    didLoginSuccessful () {
+        G.LogUtils.log('didLoginSuccessful');
+        this.enterMainScene();
+    },
+
+    /**
+     * 登录失败
+     *
+     */
+    didLoginFailed () {
+        G.LogUtils.log('didLoginFailed');
+    },
+
+    // 进入主界面
+    enterMainScene () {
+        // 避免反复进入
+        if (this._alreadyEnterScene)
+            return;
+
+        // 提前预加载大厅场景
+        if (!this.didLoadMainScene) {
+            this.preLoadMainScene();
+        }
+
+        this._alreadyEnterScene = true;
+        this.scheduleOnce(() => {
+            G.AppUtils.runScene('scene_main');
+        }, 0.1);
+
+        this.showDownloadProgress(true);
+        this.loadProgressBar.setProgress(0.1, 1);
+    },
+
+    // 预加载主界面
+    preLoadMainScene () {
+        // 加载中、或者加载成功时，不再加载
+        if (this.isPreLoading || this.didLoadHomeScene) {
+            return;
+        }
+        this.isPreLoading = true;
+
+        // 开始预加载资源
+        let temp = undefined;
+        cc.director.preloadScene('scene_main', (completedCount, totalCount, item)=>{
+            temp = G.AppUtils.getLoadProgressInfo(temp, completedCount, totalCount);
+            this.downloadPercent = Math.floor(temp.precent * 100);
+        }, (error, asset) => {
+            this.isPreLoading = false;
+            if (error) {
+                this.addToast('网络异常！场景加载失败');
+                return;
+            }
+
+            this.didLoadMainScene = true;
+            this.enterMainScene();
+        });
+    },
 });

assets/script/app/ctrl/MainCtr.js

@@ -0,0 +1,23 @@
+const SceneCtrlBase = require('SceneCtrlBase');
+
+cc.Class({
+    extends: SceneCtrlBase,
+
+    editor: {
+        menu: 'Ctrl/MainCtrl'
+    },
+
+    properties: {
+    
+    },
+
+
+    onLoad () {
+        this._super();
+        this.initUI();
+    },
+
+    initUI() {
+
+    }
+});

assets/script/app/ctrl/MainCtr.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "7b41b503-059c-484a-8613-6d9a6b742fed",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/model/PublicMgr.js

@@ -24,9 +24,9 @@ let PublicMgr = {
         this.initEventListeners();
 
         // 玩家系统信息 20100
-        cc.game.on('on_h5user_system_info', this._onPublishUserSystemInfo, this);
+        cc.game.on('on_user_system_info', this._onPublishUserSystemInfo, this);
         // 更新玩家信息 20101
-        cc.game.on('on_h5user_info', this._onPublishUserInfo, this);
+        // cc.game.on('on_h5user_info', this._onPublishUserInfo, this);
     },
 
     /**
@@ -207,7 +207,7 @@ let PublicMgr = {
 
     // 玩家推送信息处理
     _onUserInfo (data) {
-        G.UserMgr.setUserSystemInfo(data);
+        // G.UserMgr.setUserSystemInfo(data);
 
         // 发送用户信息更新
         // 通知UI刷新

assets/script/core/model/user/UserMgr.js

@@ -71,13 +71,14 @@ let UserMgr = {
             this._baseInfo = responseInfo.baseInfo;
 
             // 登录完成判断
-            G.PublicMgr.isDoneUserSelfInfo = true;
-            if (G.PublicMgr.isDoneSystemInfo) {
-                G.PublicMgr.isDoneUserSelfInfo = false;
-                G.PublicMgr.isDoneSystemInfo = false;
+            // G.PublicMgr.isDoneUserSelfInfo = true;
+            // if (G.PublicMgr.isDoneSystemInfo) {
+            //     G.PublicMgr.isDoneUserSelfInfo = false;
+            //     G.PublicMgr.isDoneSystemInfo = false;
 
-                G.PublicMgr.emit(JMC.PUBLIC_MSG.LOGIN_SUCCESS);
-            }
+            //     G.PublicMgr.emit(JMC.PUBLIC_MSG.LOGIN_SUCCESS);
+            // }
+            G.PublicMgr.emit(JMC.PUBLIC_MSG.LOGIN_SUCCESS);
         } else {
             // 断开网络并且弹出重连窗口
             G.NetworkMgr.closeSocket();