Просмотр исходного кода

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

Administrator 3 лет назад
Родитель
Сommit
d545db4db6
100 измененных файлов с 270 добавлено и 218 удалено
  1. BIN
      assets/gameMath/texture/MathSemeGirdUI/S342/game1.png
  2. 7 7
      assets/gameMath/texture/MathSemeGirdUI/S342/game1.png.meta
  3. 2 2
      assets/prefab/home/HomeSemeTestCheckUI.prefab
  4. 5 5
      assets/prefab/home/HomeStudentCheckUI.prefab
  5. 10 10
      assets/prefab/home/HomeUserDetailUI.prefab
  6. 3 3
      assets/prefab/home/HomeUserUI.prefab
  7. 4 4
      assets/script/config/SemeGirdCfg.ts
  8. 5 1
      assets/script/data/HomeData.ts
  9. 1 1
      assets/script/enums/Enum.ts
  10. 16 14
      assets/script/mgrs/LocalMsgManager.ts
  11. 1 1
      assets/script/mgrs/NetManager.ts
  12. 15 2
      assets/script/ui/MainScene.ts
  13. 1 1
      assets/script/ui/child/ClassUI.ts
  14. 1 0
      assets/script/ui/child/GameOptUI.ts
  15. 2 0
      assets/script/ui/child/GameResultUI.ts
  16. 1 1
      assets/script/ui/child/SemeGirdUI.ts
  17. 1 1
      assets/script/ui/child/SemeUI.ts
  18. 5 0
      assets/script/ui/home/HomeSemeUI.ts
  19. 5 0
      assets/script/ui/home/HomeStudentCheckUI.ts
  20. 1 1
      assets/script/utils/SDKUtils.ts
  21. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle
  22. BIN
      doimg/gamePass/232_9_3.png
  23. 1 1
      gameRes/gameChildSeme/S231/G01/P02/bt.png.meta
  24. 1 1
      gameRes/gameChildSeme/S231/G01/P03/bt.png.meta
  25. 1 1
      gameRes/gameChildSeme/S231/G01/P04/bt.png.meta
  26. 0 8
      gameRes/gameChildSeme/S231/G06/P01/data_231_6_1.json
  27. 1 1
      gameRes/gameChildSeme/S232/G12/P01/bt.png.meta
  28. 5 13
      gameRes/gameChildSeme/S232/G15/P09/data_232_15_9.json
  29. 2 2
      gameRes/gameChildSeme/S341/G01/guide/01_02.png.meta
  30. 1 1
      gameRes/gameChildSeme/S341/G02/guide/01_1.png.meta
  31. 2 2
      gameRes/gameChildSeme/S341/G03/P03/bt.png.meta
  32. 1 1
      gameRes/gameChildSeme/S341/G03/guide/02_15.png.meta
  33. 8 8
      gameRes/gameChildSeme/S341/G05/P05/data_341_5_5.json
  34. 1 1
      gameRes/gameChildSeme/S341/G06/guide/02_5.png.meta
  35. 1 1
      gameRes/gameChildSeme/S341/G08/guide/03_10.png.meta
  36. BIN
      gameRes/gameChildSeme/S341/G11/P06/bt.png
  37. 3 3
      gameRes/gameChildSeme/S341/G11/P06/bt.png.meta
  38. BIN
      gameRes/gameChildSeme/S341/G11/P07/bt.png
  39. 6 6
      gameRes/gameChildSeme/S341/G11/P07/bt.png.meta
  40. BIN
      gameRes/gameChildSeme/S341/G11/P08/bt.png
  41. 3 3
      gameRes/gameChildSeme/S341/G11/P08/bt.png.meta
  42. BIN
      gameRes/gameChildSeme/S341/G11/P09/bt.png
  43. 3 3
      gameRes/gameChildSeme/S341/G11/P09/bt.png.meta
  44. BIN
      gameRes/gameChildSeme/S341/G11/P10/bt.png
  45. 3 3
      gameRes/gameChildSeme/S341/G11/P10/bt.png.meta
  46. BIN
      gameRes/gameChildSeme/S341/G11/P11/bt.png
  47. 3 3
      gameRes/gameChildSeme/S341/G11/P11/bt.png.meta
  48. BIN
      gameRes/gameChildSeme/S341/G11/P12/bt.png
  49. 3 3
      gameRes/gameChildSeme/S341/G11/P12/bt.png.meta
  50. BIN
      gameRes/gameChildSeme/S341/G11/P13/bt.png
  51. 3 3
      gameRes/gameChildSeme/S341/G11/P13/bt.png.meta
  52. BIN
      gameRes/gameChildSeme/S341/G11/P14/bt.png
  53. 3 3
      gameRes/gameChildSeme/S341/G11/P14/bt.png.meta
  54. BIN
      gameRes/gameChildSeme/S341/G11/P15/bt.png
  55. 3 3
      gameRes/gameChildSeme/S341/G11/P15/bt.png.meta
  56. 2 2
      gameRes/gameChildSeme/S341/G14/guide/01_2.png.meta
  57. 4 4
      gameRes/gameChildSeme/S341/G15/P10/data_341_15_10.json
  58. 1 1
      gameRes/gameChildSeme/S341/G15/guide/01_333.png.meta
  59. 2 2
      gameRes/gameChildSeme/S341/G15/guide/01_4.png.meta
  60. 2 2
      gameRes/gameChildSeme/S451/G06/guide/01_01.png.meta
  61. 2 2
      gameRes/gameChildSeme/S451/G06/guide/02_2.png.meta
  62. 2 2
      gameRes/gameChildSeme/S451/G07/guide/02_03.png.meta
  63. 1 1
      gameRes/gameChildSeme/S451/G12/guide/05.png.meta
  64. BIN
      gameRes/gameChildSeme/S451/G13/P05/bt.png
  65. 36 0
      gameRes/gameChildSeme/S451/G13/P05/bt.png.meta
  66. 37 37
      gameRes/gameChildSeme/S451/G13/P05/data_451_13_5.json
  67. BIN
      gameRes/gameChildSeme/S451/G13/P09/bt.png
  68. 3 3
      gameRes/gameChildSeme/S451/G13/P09/bt.png.meta
  69. 2 2
      gameRes/gameChildSeme/S451/G16/guide/02.png.meta
  70. 1 1
      gameRes/gameChildSeme/S452/G08/P14/data_452_8_14.json
  71. 1 1
      gameRes/gameChildSeme/S561/G01/P01/audio.mp3.meta
  72. 1 1
      gameRes/gameChildSeme/S561/G01/P02/audio.mp3.meta
  73. 1 1
      gameRes/gameChildSeme/S561/G01/P03/audio.mp3.meta
  74. 1 1
      gameRes/gameChildSeme/S561/G01/P04/audio.mp3.meta
  75. 1 1
      gameRes/gameChildSeme/S561/G01/P05/audio.mp3.meta
  76. 1 1
      gameRes/gameChildSeme/S561/G01/P06/audio.mp3.meta
  77. 1 1
      gameRes/gameChildSeme/S561/G01/P07/audio.mp3.meta
  78. 1 1
      gameRes/gameChildSeme/S561/G01/P08/audio.mp3.meta
  79. 1 1
      gameRes/gameChildSeme/S561/G01/P09/audio.mp3.meta
  80. 1 1
      gameRes/gameChildSeme/S561/G01/P10/audio.mp3.meta
  81. 1 1
      gameRes/gameChildSeme/S561/G01/P11/audio.mp3.meta
  82. 1 1
      gameRes/gameChildSeme/S561/G01/P12/audio.mp3.meta
  83. 1 1
      gameRes/gameChildSeme/S561/G01/P13/audio.mp3.meta
  84. 1 1
      gameRes/gameChildSeme/S561/G01/P14/audio.mp3.meta
  85. 1 1
      gameRes/gameChildSeme/S561/G01/P15/audio.mp3.meta
  86. 1 1
      gameRes/gameChildSeme/S561/G02/P01/audio.mp3.meta
  87. 1 1
      gameRes/gameChildSeme/S561/G02/P02/audio.mp3.meta
  88. 1 1
      gameRes/gameChildSeme/S561/G02/P03/audio.mp3.meta
  89. 1 1
      gameRes/gameChildSeme/S561/G02/P04/audio.mp3.meta
  90. 1 1
      gameRes/gameChildSeme/S561/G02/P05/audio.mp3.meta
  91. 1 1
      gameRes/gameChildSeme/S561/G02/P06/audio.mp3.meta
  92. 1 1
      gameRes/gameChildSeme/S561/G02/P07/audio.mp3.meta
  93. 1 1
      gameRes/gameChildSeme/S561/G02/P08/audio.mp3.meta
  94. 1 1
      gameRes/gameChildSeme/S561/G02/P09/audio.mp3.meta
  95. 1 1
      gameRes/gameChildSeme/S561/G02/P10/audio.mp3.meta
  96. 1 1
      gameRes/gameChildSeme/S561/G02/P11/audio.mp3.meta
  97. 1 1
      gameRes/gameChildSeme/S561/G02/P12/audio.mp3.meta
  98. 1 1
      gameRes/gameChildSeme/S561/G02/P13/audio.mp3.meta
  99. 1 1
      gameRes/gameChildSeme/S561/G02/P15/audio.mp3.meta
  100. 1 1
      gameRes/gameChildSeme/S561/G03/P01/audio.mp3.meta

BIN
assets/gameMath/texture/MathSemeGirdUI/S342/game1.png


+ 7 - 7
assets/gameMath/texture/MathSemeGirdUI/S342/game1.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 276,
-  "height": 230,
+  "width": 246,
+  "height": 197,
   "platformSettings": {},
   "subMetas": {
     "game1": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 2,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 276,
-      "height": 226,
-      "rawWidth": 276,
-      "rawHeight": 230,
+      "width": 246,
+      "height": 197,
+      "rawWidth": 246,
+      "rawHeight": 197,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 2 - 2
assets/prefab/home/HomeSemeTestCheckUI.prefab

@@ -3245,7 +3245,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 180,
       "height": 37.8
     },
     "_anchorPoint": {
@@ -3311,7 +3311,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },

+ 5 - 5
assets/prefab/home/HomeStudentCheckUI.prefab

@@ -1118,7 +1118,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 64,
+      "width": 128,
       "height": 40.32
     },
     "_anchorPoint": {
@@ -1170,8 +1170,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "名字",
-    "_N$string": "名字",
+    "_string": "名字名字",
+    "_N$string": "名字名字",
     "_fontSize": 32,
     "_lineHeight": 32,
     "_enableWrapText": true,
@@ -1184,7 +1184,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -2550,7 +2550,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },

+ 10 - 10
assets/prefab/home/HomeUserDetailUI.prefab

@@ -277,8 +277,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 899,
-      "height": 582
+      "width": 897,
+      "height": 581
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -391,7 +391,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 83,
-      "height": 90
+      "height": 89
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1346,7 +1346,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
+      "width": 180,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1412,7 +1412,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -3512,7 +3512,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -3947,7 +3947,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 330,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -4013,7 +4013,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -4061,8 +4061,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 267,
-      "height": 101
+      "width": 266,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 3 - 3
assets/prefab/home/HomeUserUI.prefab

@@ -1726,7 +1726,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 120,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1738,7 +1738,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -274.371,
+        -257.098,
         210.792,
         0,
         0,
@@ -1792,7 +1792,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },

+ 4 - 4
assets/script/config/SemeGirdCfg.ts

@@ -127,7 +127,7 @@ let SemeCfg = [
         name: '4-5上学期',
         type: [
             {name: '观察能力', id: '45101', des: '测试'},
-            {name: '辨别能力', id: '45102', des: '测试'},
+            {name: '色彩能力', id: '45102', des: '测试'},
             {name: '分析能力', id: '45103', des: '测试'},
             {name: '运算能力', id: '45104', des: '测试'},
             {name: '观察能力', id: '45105', des: '测试'},
@@ -138,7 +138,7 @@ let SemeCfg = [
             {name: '运算能力', id: '45110', des: '测试'},
             {name: '归纳能力', id: '45111', des: '测试'},
             {name: '迁移能力', id: '45112', des: '测试'},
-            {name: '辨别能力', id: '45113', des: '测试'},
+            {name: '色彩能力', id: '45113', des: '测试'},
             {name: '常识能力', id: '45114', des: '测试'},
             {name: '关联能力', id: '45115', des: '测试'},
             {name: '空间能力', id: '45116', des: '测试'},
@@ -149,7 +149,7 @@ let SemeCfg = [
         name: '4-5下学期',
         type: [
             {name: '观察能力', id: '45201', des: '测试'},
-            {name: '辨别能力', id: '45202', des: '测试'},
+            {name: '色彩能力', id: '45202', des: '测试'},
             {name: '分析能力', id: '45203', des: '测试'},
             {name: '运算能力', id: '45204', des: '测试'},
             {name: '观察能力', id: '45205', des: '测试'},
@@ -160,7 +160,7 @@ let SemeCfg = [
             {name: '运算能力', id: '45210', des: '测试'},
             {name: '归纳能力', id: '45211', des: '测试'},
             {name: '迁移能力', id: '45212', des: '测试'},
-            {name: '辨别能力', id: '45213', des: '测试'},
+            {name: '色彩能力', id: '45213', des: '测试'},
             {name: '常识能力', id: '45214', des: '测试'},
             {name: '关联能力', id: '45215', des: '测试'},
             {name: '空间能力', id: '45216', des: '测试'},

+ 5 - 1
assets/script/data/HomeData.ts

@@ -74,7 +74,11 @@ export class HomeData {
             return value.status == '1'
         })
         if (this.role == HOME_ROLE_TYPE.visitor) product = this.curProductInfo[this.curUser.yearRange]
-        return HOME_PRODUCT_SEME[product.productId]
+        if (product) {
+            return HOME_PRODUCT_SEME[product.productId]
+        } else {
+            return 0
+        }
     }
     // 当前学期是否激活
     curSemeIsActive: boolean = false

+ 1 - 1
assets/script/enums/Enum.ts

@@ -11,7 +11,7 @@ export enum LOCAL {
     homeProductInfo = 'homeProductInfo', // 家长版激活信息
     homeWorkLockID = 'homeWorkLockID', // 家长版布置作业信息
     homeClassChildren = 'homeClassChildren', // 家长版班级孩子信息
-    loginAndUsersVersion = 'loginAndUsersVersion', // 家长版用户版本号
+    loginAndUsersVersion = 'ONLY_TAG:loginAndUsersVersion', // 家长版用户版本号
     getActivatesVersion = 'getActivatesVersion', // 家长版激活信息本号
     getLockInfoVersion = 'getLockInfoVersion', // 家长布置作业信息本号
     classChildrenVersion = 'classChildrenVersion', // 家长版班级孩子信息本号

+ 16 - 14
assets/script/mgrs/LocalMsgManager.ts

@@ -29,23 +29,25 @@ export class LocalMsgManager {
             Data.game.semeID = data.semeID
             Data.game.gameID = data.gameID
             Data.game.partID = data.partID
-            Data.child.isInClass = true
-            Data.child.classResult = {}
-            Mgr.ui.closeAll()
-            Mgr.ui.show(UI.GameUI)
-            if (data.isStart && data.students.length > 0) {
-                Data.child.classStudents = data.students
-                if (data.jumpFaceLogin) {
-                    Mgr.ui.show(UI.ClassLoginUI)
-                } else {
-                    if (Mgr.platform.isAndroid()) {
-                        let className = 'org/cocos2dx/javascript/SDKUtils'
-                        let methodName = 'loginFace'
-                        let methodSignature = '()V'
-                        jsb.reflection.callStaticMethod(className, methodName, methodSignature)
+            if (data.isStart) {
+                Data.child.isInClass = true
+                Data.child.classResult = {}
+                if (data.students.length > 0) {
+                    Data.child.classStudents = data.students
+                    if (data.jumpFaceLogin) {
+                        Mgr.ui.show(UI.ClassLoginUI)
+                    } else {
+                        if (Mgr.platform.isAndroid()) {
+                            let className = 'org/cocos2dx/javascript/SDKUtils'
+                            let methodName = 'loginFace'
+                            let methodSignature = '()V'
+                            jsb.reflection.callStaticMethod(className, methodName, methodSignature)
+                        }
                     }
                 }
             }
+            Mgr.ui.closeAll()
+            Mgr.ui.show(UI.GameUI)
         }
     }
     classEndResp() {

+ 1 - 1
assets/script/mgrs/NetManager.ts

@@ -41,7 +41,7 @@ export class NetManager {
     private keepAliveID: any = null // 心跳定时器
     private keepAliveTime: number = 7000 // 心跳间隔
     private reConnectID: any = null // 重连定时器
-    private reConnectTime: number = 7000 // 重连间隔
+    private reConnectTime: number = 3000 // 重连间隔
     private curAutoReconnect: number = 0 // 重连次数
 
     private isMaxReconnect: boolean = false

+ 15 - 2
assets/script/ui/MainScene.ts

@@ -93,7 +93,11 @@ export default class MainScene extends BaseUI {
                         let versionKey = requestKeyArr.shift()
                         let serverVersion = res.data.find(value => value.key == versionKey)
                         if (serverVersion) {
-                            let version = Mgr.storage.getNumber(versionKey + 'Version', -1)
+                            let localKey = versionKey + 'Version'
+                            if (versionKey == 'loginAndUsers') {
+                                localKey = 'ONLY_TAG:' + localKey
+                            }
+                            let version = Mgr.storage.getNumber(localKey, -1)
                             let lowVer = serverVersion.version > version
                             if (versionKey == 'loginAndUsers' && lowVer) {
                                 Mgr.http.request({
@@ -103,7 +107,16 @@ export default class MainScene extends BaseUI {
                                     success: (res: any) => {
                                         Data.home.userInfo = res.data
                                         Mgr.storage.set(LOCAL.homeUserInfo, JSON.stringify(res.data))
-                                        Data.home.curUser = res.data[0]
+                                        if (Data.home.curUser) {
+                                            let user = res.data.find(value => value.id == Data.home.curUser.id)
+                                            if (user) {
+                                                Data.home.curUser = user
+                                            } else {
+                                                Data.home.curUser = res.data[0]
+                                            }
+                                        } else {
+                                            Data.home.curUser = res.data[0]
+                                        }
                                         Mgr.storage.set(LOCAL.homeCurUser, Data.home.curUser)
                                         Mgr.storage.set(LOCAL.loginAndUsersVersion, serverVersion.version)
                                         finish(versionKey)

+ 1 - 1
assets/script/ui/child/ClassUI.ts

@@ -20,7 +20,7 @@ export class ClassUI extends BaseUI {
     }
 
     protected onEnable() {
-        cc.find('login', this.node).active = ConstValue.DEBUG
+        cc.find('login', this.node).active = ConstValue.DEBUG && false
         this.setBtn()
         this.classList.numItems = Data.child.allClass.length
         this.chooseClass.active = false

+ 1 - 0
assets/script/ui/child/GameOptUI.ts

@@ -345,6 +345,7 @@ export default class GameOptUI extends BaseUI {
         if (success) {
             Mgr.ui.show(UI.GameUI)
         } else {
+            Data.home.testSemeName = Data.home.nickname
             Mgr.ui.show(UI.HomeSemeTestResultUI, {saveHistory: true})
             Mgr.ui.hide(UI.GameUI)
         }

+ 2 - 0
assets/script/ui/child/GameResultUI.ts

@@ -83,6 +83,8 @@ export class GameResultUI extends BaseUI {
             Mgr.ui.fadeShow(UI.HomeSemeUI)
         } else if (Data.game.curGameType == GAME_TYPE.gameMath) {
             Mgr.ui.show(UI.MathSemeGirdUI)
+        } else if (Data.game.curGameType == GAME_TYPE.gamePass) {
+            Mgr.ui.show(UI.PassSemeGirdUI)
         }
         Mgr.ui.hide(UI.GameUI)
         Mgr.ui.hide(UI.GameOptUI)

+ 1 - 1
assets/script/ui/child/SemeGirdUI.ts

@@ -69,7 +69,7 @@ export default class SemeGirdUI extends BaseUI {
         Data.game.gameID = node['gameID']
         Data.game.partID = 1
         this.lastSemeID = Data.game.semeID
-        if (Data.child.isTeacher && ConstValue.DEBUG) {
+        if (Data.child.isTeacher && ConstValue.DEBUG && false) {
             Mgr.ui.show(UI.GuideMainUI)
         } else {
             Mgr.ui.show(UI.GameUI)

+ 1 - 1
assets/script/ui/child/SemeUI.ts

@@ -18,7 +18,7 @@ export default class SemeUI extends BaseUI {
     protected onLoad() {
         // 开发模式
         cc.find('layout/main_example', this.node).active = ConstValue.DEBUG
-        cc.find('layout/main_createFace', this.node).active = ConstValue.DEBUG
+        cc.find('layout/main_createFace', this.node).active = ConstValue.DEBUG && false
         // 安卓原生界面
         cc.find('layout/main_native', this.node).active = Mgr.platform.isAndroid()
     }

+ 5 - 0
assets/script/ui/home/HomeSemeUI.ts

@@ -30,6 +30,11 @@ export class HomeSemeUI extends BaseUI {
         this.homeWorkType = args && args.homeWork
         cc.find('btnHomeWork', this.node).active = this.homeWorkType
         this.curSeme = Data.home.curActiveSemeID
+        if (!this.curSeme) {
+            Mgr.ui.tip('产品未激活,请您激活产品')
+            this.hide()
+            return
+        }
         this.showToggle()
         this.initCurSeme()
     }

+ 5 - 0
assets/script/ui/home/HomeStudentCheckUI.ts

@@ -61,6 +61,11 @@ export default class HomeStudentCheckUI extends BaseUI {
         } else {
             this.students = [].concat(Data.home.classChildren)
             this.curActiveSemeID = Data.home.curActiveSemeID
+            if (!this.curActiveSemeID) {
+                Mgr.ui.tip('产品未激活,请您激活产品')
+                this.hide()
+                return
+            }
             this.homeWorkID = [].concat(Data.home.homeWorkID)
             this.chooseClassID = Data.home.curUser.classId
             this.initGames()

+ 1 - 1
assets/script/utils/SDKUtils.ts

@@ -10,7 +10,7 @@ window['SDKUtils'] = {
     // 安卓webserver 学生端登录通知消息
     sendLoginMsg(client) {
         if (Data.child.isInClass) {
-            Mgr.localMsg.sendClassMsg(client)
+            Mgr.localMsg.sendClassMsg(false, client)
             Mgr.localMsg.sendClassLockMsg(client)
         }
     },

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

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

BIN
doimg/gamePass/232_9_3.png


+ 1 - 1
gameRes/gameChildSeme/S231/G01/P02/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 630,
+  "width": 583,
   "height": 44,
   "platformSettings": {},
   "subMetas": {

+ 1 - 1
gameRes/gameChildSeme/S231/G01/P03/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 530,
+  "width": 485,
   "height": 44,
   "platformSettings": {},
   "subMetas": {

+ 1 - 1
gameRes/gameChildSeme/S231/G01/P04/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 630,
+  "width": 583,
   "height": 44,
   "platformSettings": {},
   "subMetas": {

+ 0 - 8
gameRes/gameChildSeme/S231/G06/P01/data_231_6_1.json

@@ -28,14 +28,6 @@
       "y": "342.0",
       "act": -1,
       "v": "-1"
-    },
-    {
-      "name": "item4",
-      "tex": "",
-      "x": "864.9",
-      "y": "508.6",
-      "act": -1,
-      "v": "-1"
     }
   ],
   "bgNode": [

+ 1 - 1
gameRes/gameChildSeme/S232/G12/P01/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 760,
+  "width": 713,
   "height": 44,
   "platformSettings": {},
   "subMetas": {

+ 5 - 13
gameRes/gameChildSeme/S232/G15/P09/data_232_15_9.json

@@ -3,29 +3,21 @@
   "bg": "bg",
   "bt": "bt",
   "btY": "310.0",
-  "allDur": 2,
+  "allDur": 1,
   "node": [
     {
       "name": "item1",
       "tex": "item1",
-      "x": "278.2",
-      "y": "301.5",
-      "act": -1,
-      "v": "1"
-    },
-    {
-      "name": "item3",
-      "tex": "item3",
-      "x": "1000.2",
-      "y": "237.9",
+      "x": "356.9",
+      "y": "358.4",
       "act": -1,
       "v": "1"
     },
     {
       "name": "item2",
       "tex": "item2",
-      "x": "688.0",
-      "y": "480.6",
+      "x": "883.8",
+      "y": "360.1",
       "act": -1,
       "v": "-1"
     }

+ 2 - 2
gameRes/gameChildSeme/S341/G01/guide/01_02.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 982,
-  "height": 1321,
+  "width": 310,
+  "height": 417,
   "platformSettings": {},
   "subMetas": {
     "01_02": {

+ 1 - 1
gameRes/gameChildSeme/S341/G02/guide/01_1.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 689,
+  "width": 672,
   "height": 302,
   "platformSettings": {},
   "subMetas": {

+ 2 - 2
gameRes/gameChildSeme/S341/G03/P03/bt.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 685,
-  "height": 44,
+  "width": 518,
+  "height": 43,
   "platformSettings": {},
   "subMetas": {
     "bt": {

+ 1 - 1
gameRes/gameChildSeme/S341/G03/guide/02_15.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 349,
+  "width": 356,
   "height": 289,
   "platformSettings": {},
   "subMetas": {

+ 8 - 8
gameRes/gameChildSeme/S341/G05/P05/data_341_5_5.json

@@ -13,7 +13,7 @@
       "w": "70.0",
       "h": "70.0",
       "act": 0,
-      "v": "-1"
+      "v": "1"
     },
     {
       "name": "circle",
@@ -23,7 +23,7 @@
       "w": "70.0",
       "h": "70.0",
       "act": 0,
-      "v": "-1"
+      "v": "1"
     },
     {
       "name": "circle",
@@ -33,7 +33,7 @@
       "w": "70.0",
       "h": "70.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -43,31 +43,31 @@
       "w": "70.0",
       "h": "70.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [
     {
       "name": "01",
-      "tex": "01",
+      "tex": "01-",
       "x": "255.0",
       "y": "358.0"
     },
     {
       "name": "02",
-      "tex": "02",
+      "tex": "02-",
       "x": "510.0",
       "y": "358.0"
     },
     {
       "name": "03-",
-      "tex": "03-",
+      "tex": "03",
       "x": "765.0",
       "y": "358.0"
     },
     {
       "name": "04-",
-      "tex": "04-",
+      "tex": "04",
       "x": "1020.0",
       "y": "358.0"
     }

+ 1 - 1
gameRes/gameChildSeme/S341/G06/guide/02_5.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 513,
+  "width": 488,
   "height": 242,
   "platformSettings": {},
   "subMetas": {

+ 1 - 1
gameRes/gameChildSeme/S341/G08/guide/03_10.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 315,
+  "width": 322,
   "height": 414,
   "platformSettings": {},
   "subMetas": {

BIN
gameRes/gameChildSeme/S341/G11/P06/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P06/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P07/bt.png


+ 6 - 6
gameRes/gameChildSeme/S341/G11/P07/bt.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "fcdfa303-e197-47f6-9b15-6e7e86048ff7",
+  "uuid": "2a1555c4-435a-4063-a4a8-11c12770f4ff",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
     "bt": {
       "ver": "1.0.4",
-      "uuid": "76d966a9-4a89-48b2-9dbf-fbbf8e6b7861",
-      "rawTextureUuid": "fcdfa303-e197-47f6-9b15-6e7e86048ff7",
+      "uuid": "2f0d0a94-b143-4763-84c9-e93ff895cb29",
+      "rawTextureUuid": "2a1555c4-435a-4063-a4a8-11c12770f4ff",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P08/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P08/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P09/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P09/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P10/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P10/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P11/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P11/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P12/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P12/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P13/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P13/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P14/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P14/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

BIN
gameRes/gameChildSeme/S341/G11/P15/bt.png


+ 3 - 3
gameRes/gameChildSeme/S341/G11/P15/bt.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 585,
+  "width": 485,
   "height": 43,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 585,
+      "width": 485,
       "height": 43,
-      "rawWidth": 585,
+      "rawWidth": 485,
       "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,

+ 2 - 2
gameRes/gameChildSeme/S341/G14/guide/01_2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1114,
-  "height": 800,
+  "width": 1158,
+  "height": 1506,
   "platformSettings": {},
   "subMetas": {
     "01_2": {

+ 4 - 4
gameRes/gameChildSeme/S341/G15/P10/data_341_15_10.json

@@ -19,7 +19,7 @@
       "x": "955.1",
       "y": "470.0",
       "act": -1,
-      "v": "2"
+      "v": "3"
     },
     {
       "name": "x6",
@@ -35,7 +35,7 @@
       "x": "277.5",
       "y": "184.0",
       "act": 0,
-      "v": "1"
+      "v": "2"
     },
     {
       "name": "x5",
@@ -43,7 +43,7 @@
       "x": "615.0",
       "y": "184.0",
       "act": 0,
-      "v": "2"
+      "v": "1"
     },
     {
       "name": "x2",
@@ -51,7 +51,7 @@
       "x": "977.5",
       "y": "184.0",
       "act": 0,
-      "v": "3"
+      "v": "2"
     }
   ],
   "bgNode": []

+ 1 - 1
gameRes/gameChildSeme/S341/G15/guide/01_333.png.meta

@@ -8,7 +8,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 357,
-  "height": 180,
+  "height": 182,
   "platformSettings": {},
   "subMetas": {
     "01_333": {

+ 2 - 2
gameRes/gameChildSeme/S341/G15/guide/01_4.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1227,
-  "height": 641,
+  "width": 331,
+  "height": 258,
   "platformSettings": {},
   "subMetas": {
     "01_4": {

+ 2 - 2
gameRes/gameChildSeme/S451/G06/guide/01_01.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 213,
-  "height": 554,
+  "width": 149,
+  "height": 390,
   "platformSettings": {},
   "subMetas": {
     "01_01": {

+ 2 - 2
gameRes/gameChildSeme/S451/G06/guide/02_2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 2,
-  "height": 390,
+  "width": 93,
+  "height": 18,
   "platformSettings": {},
   "subMetas": {
     "02_2": {

+ 2 - 2
gameRes/gameChildSeme/S451/G07/guide/02_03.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 355,
-  "height": 550,
+  "width": 358,
+  "height": 551,
   "platformSettings": {},
   "subMetas": {
     "02_03": {

+ 1 - 1
gameRes/gameChildSeme/S451/G12/guide/05.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 216,
+  "width": 232,
   "height": 237,
   "platformSettings": {},
   "subMetas": {

BIN
gameRes/gameChildSeme/S451/G13/P05/bt.png


+ 36 - 0
gameRes/gameChildSeme/S451/G13/P05/bt.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "31fd5bdf-a011-4352-89d6-98c975893e70",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 991,
+  "height": 62,
+  "platformSettings": {},
+  "subMetas": {
+    "bt": {
+      "ver": "1.0.4",
+      "uuid": "201abbe2-9587-403c-aa09-d9a73210e381",
+      "rawTextureUuid": "31fd5bdf-a011-4352-89d6-98c975893e70",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 991,
+      "height": 62,
+      "rawWidth": 991,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 37 - 37
gameRes/gameChildSeme/S451/G13/P05/data_451_13_5.json

@@ -1,123 +1,123 @@
 {
   "gameMode": 2,
+  "bg": "bg",
+  "bt": "bt",
+  "btY": "296.2",
+  "allDur": 6,
   "node": [
     {
-      "name": "item1",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "273.5",
       "y": "417.3",
-      "v": "1",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item2",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "550.5",
       "y": "417.3",
-      "v": "1",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item3",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "837.5",
       "y": "417.3",
-      "v": "1",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item4",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "1122.5",
       "y": "417.3",
-      "v": "1",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item5",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "273.5",
       "y": "161.3",
-      "v": "1",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item6",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "550.5",
       "y": "161.3",
-      "v": "0",
-      "act": 0
+      "act": 0,
+      "v": "1"
     },
     {
-      "name": "item7",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "837.5",
       "y": "161.3",
-      "v": "0",
-      "act": 0
+      "act": 0,
+      "v": "-1"
     },
     {
-      "name": "item8",
+      "name": "data_56_shang_09_01_02",
       "tex": "data_56_shang_09_01_02",
       "x": "1122.5",
       "y": "161.3",
-      "v": "0",
-      "act": 0
+      "act": 0,
+      "v": "-1"
     }
   ],
-  "bg": "bg",
-  "bt": "05",
-  "btY": "296.2",
   "bgNode": [
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_01",
       "tex": "data_45_shang_13_05_01",
       "x": "214.1",
       "y": "517.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_02",
       "tex": "data_45_shang_13_05_02",
       "x": "491.1",
       "y": "517.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_03",
       "tex": "data_45_shang_13_05_03",
       "x": "778.1",
       "y": "517.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_04",
       "tex": "data_45_shang_13_05_04",
       "x": "1063.1",
       "y": "517.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_05",
       "tex": "data_45_shang_13_05_05",
       "x": "214.1",
       "y": "261.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_06",
       "tex": "data_45_shang_13_05_06",
       "x": "491.1",
       "y": "261.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_07",
       "tex": "data_45_shang_13_05_07",
       "x": "778.1",
       "y": "261.7"
     },
     {
-      "name": "bg",
+      "name": "data_45_shang_13_05_08",
       "tex": "data_45_shang_13_05_08",
       "x": "1063.1",
       "y": "261.7"
     }
-  ],
-  "allDur": 5
+  ]
 }

BIN
gameRes/gameChildSeme/S451/G13/P09/bt.png


+ 3 - 3
gameRes/gameChildSeme/S451/G13/P09/bt.png.meta

@@ -8,7 +8,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 991,
-  "height": 61,
+  "height": 62,
   "platformSettings": {},
   "subMetas": {
     "bt": {
@@ -23,9 +23,9 @@
       "trimX": 0,
       "trimY": 0,
       "width": 991,
-      "height": 61,
+      "height": 62,
       "rawWidth": 991,
-      "rawHeight": 61,
+      "rawHeight": 62,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 2 - 2
gameRes/gameChildSeme/S451/G16/guide/02.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1280,
-  "height": 800,
+  "width": 1204,
+  "height": 261,
   "platformSettings": {},
   "subMetas": {
     "02": {

+ 1 - 1
gameRes/gameChildSeme/S452/G08/P14/data_452_8_14.json

@@ -39,7 +39,7 @@
     },
     {
       "name": "data_56_shang_09_01_02",
-      "tex": "",
+      "tex": "data_45_xia_08_14_02",
       "x": "313.7",
       "y": "204.8",
       "act": 0,

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P01/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "7cf91078-7323-4566-bdee-ebabf8a6bd1f",
   "downloadMode": 0,
-  "duration": 3.168,
+  "duration": 3.744,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P02/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "4c7d6964-685f-4d91-b793-ddd0382331c2",
   "downloadMode": 0,
-  "duration": 3.168,
+  "duration": 3.708,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P03/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "8629b111-4aff-4ed5-98ba-a94df1a93334",
   "downloadMode": 0,
-  "duration": 4.032,
+  "duration": 4.572,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P04/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "06082f93-d4ee-4094-b3de-611ddf6d9f1d",
   "downloadMode": 0,
-  "duration": 4.176,
+  "duration": 5.076,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P05/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "52b218dc-61b7-43d0-ab72-11ab5b05eaf4",
   "downloadMode": 0,
-  "duration": 4.176,
+  "duration": 5.076,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P06/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "62f4ab7d-3562-4c12-bd35-251b0a351723",
   "downloadMode": 0,
-  "duration": 4.176,
+  "duration": 5.076,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P07/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "47281f9c-25ff-4c99-a27d-4ed8ffa48ce0",
   "downloadMode": 0,
-  "duration": 5.256,
+  "duration": 6.84,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P08/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "62932c08-fc61-4157-8f29-3343c5997a58",
   "downloadMode": 0,
-  "duration": 3.24,
+  "duration": 4.14,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P09/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "91f619c1-ffe3-4417-b961-0b040ad1157a",
   "downloadMode": 0,
-  "duration": 6.552,
+  "duration": 8.244,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P10/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "a21f5050-eccf-4ad5-bcd9-61883737ad62",
   "downloadMode": 0,
-  "duration": 5.04,
+  "duration": 6.408,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P11/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "14aa14d3-afed-41ca-bb53-648e627097e1",
   "downloadMode": 0,
-  "duration": 5.04,
+  "duration": 6.408,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P12/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "42dfd09d-fc54-4e19-9093-630aadd6d89d",
   "downloadMode": 0,
-  "duration": 5.04,
+  "duration": 6.408,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P13/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "cf93c4f5-0e54-403e-834b-a9087da5acf6",
   "downloadMode": 0,
-  "duration": 5.256,
+  "duration": 7.056,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P14/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "5c25bec0-33d5-4033-a868-810cae72b4c2",
   "downloadMode": 0,
-  "duration": 5.112,
+  "duration": 6.552,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G01/P15/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "41d3314e-abf4-4ad3-af17-cda0cbb55355",
   "downloadMode": 0,
-  "duration": 5.4,
+  "duration": 6.804,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P01/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "75feb405-9ff8-4f86-b353-d8c7a115b400",
   "downloadMode": 0,
-  "duration": 4.248,
+  "duration": 5.184,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P02/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "b1f66c11-ed91-483b-82a9-7b5cc26c110d",
   "downloadMode": 0,
-  "duration": 4.896,
+  "duration": 6.156,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P03/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "e564db12-39ff-4c95-a174-fa27917291f0",
   "downloadMode": 0,
-  "duration": 4.824,
+  "duration": 5.724,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P04/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "5be6b2c6-43c2-4c9b-8e30-9fb3cfd93eab",
   "downloadMode": 0,
-  "duration": 5.04,
+  "duration": 6.192,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P05/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "2a16d22d-40df-4d0f-b946-f61edf2b0164",
   "downloadMode": 0,
-  "duration": 4.536,
+  "duration": 5.256,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P06/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "a70eecc3-693a-499f-8b7f-4a3ded174eb2",
   "downloadMode": 0,
-  "duration": 4.104,
+  "duration": 4.86,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P07/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "29f3c678-dfed-4e99-ac75-71b5ee49aa09",
   "downloadMode": 0,
-  "duration": 5.112,
+  "duration": 6.408,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P08/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "0fc0caa7-cef7-4481-a43c-9d3b1a3af20b",
   "downloadMode": 0,
-  "duration": 4.968,
+  "duration": 5.796,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P09/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "5763fe3b-5339-4837-b6bb-994bb20a7bfd",
   "downloadMode": 0,
-  "duration": 5.976,
+  "duration": 6.768,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P10/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "abbb4ed0-dc74-4091-add9-581fb18a3ecd",
   "downloadMode": 0,
-  "duration": 4.32,
+  "duration": 5.112,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P11/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "c19a865d-3750-47e1-8daa-ec08edd8c191",
   "downloadMode": 0,
-  "duration": 5.112,
+  "duration": 6.084,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P12/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "86a0729a-e16d-4dc9-9ce9-7e21f7909ab1",
   "downloadMode": 0,
-  "duration": 5.184,
+  "duration": 6.156,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P13/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "b20691cd-3162-4df6-b01d-a0f88dea26e4",
   "downloadMode": 0,
-  "duration": 4.104,
+  "duration": 4.896,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G02/P15/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "706c703e-749f-4ddc-8ff0-ccfec4a2c773",
   "downloadMode": 0,
-  "duration": 5.328,
+  "duration": 6.336,
   "subMetas": {}
 }

+ 1 - 1
gameRes/gameChildSeme/S561/G03/P01/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "5b8ba0d4-dd5c-4155-befe-b263742c2e1e",
   "downloadMode": 0,
-  "duration": 2.736,
+  "duration": 2.988,
   "subMetas": {}
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов