Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

assets/script/mgrs/NetManager.ts

@@ -39,7 +39,7 @@ export class NetManager {
     private timeOutID: any = null // 接收数据定时器
     private timeOutTime: number = 7000 // 超时间隔  达到会主动关闭连接
     private keepAliveID: any = null // 心跳定时器
-    private keepAliveTime: number = 7000 // 心跳间隔
+    private keepAliveTime: number = 20000 // 心跳间隔
     private reConnectID: any = null // 重连定时器
     private reConnectTime: number = 3000 // 重连间隔
     private curAutoReconnect: number = 0 // 重连次数
@@ -105,8 +105,6 @@ export class NetManager {
         }
     }
     private sendKeepAlive() {
-        // 屏蔽心跳 多设备会超时
-        return
         if (this.keepAliveID !== null) {
             clearTimeout(this.keepAliveID)
         }

assets/script/ui/home/HomeSemeUI.ts

@@ -135,7 +135,11 @@ export class HomeSemeUI extends BaseUI {
         Data.game.gameID = node['gameID']
         Data.game.partID = 1
         Mgr.ui.closeAll()
-        Mgr.ui.show(UI.GuideMainUI)
+        if (Data.game.curGameType == GAME_TYPE.gameChild) {
+            Mgr.ui.show(UI.GuideMainUI)
+        } else {
+            Mgr.ui.show(UI.GameUI)
+        }
     }
     onHomeWorkSureClick() {
         if (this.curSeme != Data.home.curSemeID) {

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle

@@ -6,7 +6,7 @@ versionberg {
     major 1
     minor 1
     patch 0
-    build 86 // ${commitCount}
+    build 87 // ${commitCount}
     nameTemplate '${major}.${minor}.${patch}.${build}'// 1.1.0.58
     codeTemplate '${major}0${minor}0${patch}${build}'// 1010058
 }

settings/project.json

@@ -1,5 +1,5 @@
 {
-  "last-module-event-record-time": 1652670448431,
+  "last-module-event-record-time": 1654595790211,
   "group-list": [
     "default",
     "water"