|
|
@@ -1,4 +1,5 @@
|
|
|
|
|
|
+import JsbSystem from "../../../mk/system/JsbSystem";
|
|
|
import LoadingBar from "../../component/LoadingBar";
|
|
|
|
|
|
const { ccclass, property } = cc._decorator;
|
|
|
@@ -20,6 +21,7 @@ export default class Login extends cc.Component {
|
|
|
}
|
|
|
|
|
|
start() {
|
|
|
+ JsbSystem.getDeviceInfo();
|
|
|
}
|
|
|
|
|
|
private setProgress(current) {
|
|
|
@@ -33,17 +35,19 @@ export default class Login extends cc.Component {
|
|
|
this.process += 2;
|
|
|
this.setProgress(this.process);
|
|
|
}
|
|
|
- if (!gData.loginData.loadResCompelete) {
|
|
|
- gData.loginData.loadLocalRes();
|
|
|
- return;
|
|
|
- }
|
|
|
- if (gData.appData.getDeviceInfoCompelete) {
|
|
|
- gData.loginData.login();
|
|
|
- gData.appData.getDeviceInfoCompelete = false;
|
|
|
- return;
|
|
|
+ if (gData.loginData.loadResCompelete) {
|
|
|
+ if (gData.appData.getDeviceInfoCompelete) {
|
|
|
+ gData.loginData.login();
|
|
|
+ gData.appData.getDeviceInfoCompelete = false;
|
|
|
+ }
|
|
|
+ else if (gData.gameData.dataFinish) {//登录流程完毕
|
|
|
+ mk.ui.openPanel("game/prefab/game");
|
|
|
+ gData.gameData.dataFinish = false;
|
|
|
+ }
|
|
|
}
|
|
|
- if (gData.gameData.dataFinish) {//登录流程完毕
|
|
|
- mk.ui.openPanel("game/prefab/game");
|
|
|
+ else {
|
|
|
+ gData.loginData.loadLocalRes();
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|