Browse Source

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

HYX 2 năm trước cách đây
mục cha
commit
720b000858
100 tập tin đã thay đổi với 1392 bổ sung1095 xóa
  1. 2 1
      .gitignore
  2. 22 6
      assets/gameChinese/bgAni/45/15_5.anim
  3. 4 4
      assets/prefab/child/StudentLockUI.prefab
  4. 7 7
      assets/prefab/chinese/ChineseMainUI.prefab
  5. 136 26
      assets/prefab/chinese/ChineseSemeGirdUI.prefab
  6. 10 10
      assets/prefab/chinese/ChineseSemeUI.prefab
  7. 0 0
      assets/resources/finger.meta
  8. 0 0
      assets/resources/finger/1.png
  9. 0 0
      assets/resources/finger/1.png.meta
  10. 0 0
      assets/resources/finger/2.png
  11. 0 0
      assets/resources/finger/2.png.meta
  12. 0 0
      assets/resources/finger/3.png
  13. 0 0
      assets/resources/finger/3.png.meta
  14. 0 0
      assets/resources/finger/4.png
  15. 0 0
      assets/resources/finger/4.png.meta
  16. 5 5
      assets/script/config/ChineseStoryCfg.ts
  17. 13 13
      assets/script/config/ChineseWordCfg.ts
  18. 5 8
      assets/script/mgrs/LocalMsgManager.ts
  19. 6 0
      assets/script/ui/BaseUI.ts
  20. 2 2
      assets/script/ui/child/GameOptUI.ts
  21. 0 1
      assets/script/ui/child/GuideMainUI.ts
  22. 10 1
      assets/script/ui/chinese/ChineseGameUI.ts
  23. 34 10
      assets/script/ui/chinese/ChineseMainUI.ts
  24. 4 0
      assets/script/ui/chinese/ChineseSemeGirdUI.ts
  25. 11 0
      assets/script/ui/chinese/ChineseSemeUI.ts
  26. 0 2
      assets/script/ui/gameMode/BaseGameUI.ts
  27. 1 1
      assets/script/ui/public/HotUpdateUI.ts
  28. 2 1
      assets/script/ui/public/TopBtnUI.ts
  29. 3 3
      assets/script/uiutils/GamePageView.ts
  30. 0 0
      assets/texture/FingerSetUI.meta
  31. 0 0
      assets/texture/FingerSetUI/block.png
  32. 0 0
      assets/texture/FingerSetUI/block.png.meta
  33. 0 0
      assets/texture/FingerSetUI/panel_finger.png
  34. 0 0
      assets/texture/FingerSetUI/panel_finger.png.meta
  35. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  36. 6 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle
  37. 6 6
      config/output/ChineseStoryCfg.js
  38. 13 13
      config/output/ChineseWordCfg.js
  39. 23 22
      config/output/PinyinChange.js
  40. BIN
      config/多音字配置.xlsx
  41. BIN
      config/识字宝故事配置.xlsx
  42. BIN
      config/识字宝文字配置.xlsx
  43. 66 66
      gameRes/gameChineseSeme/20048/guide/guide_20048.json
  44. 66 66
      gameRes/gameChineseSeme/20064/guide/guide_20064.json
  45. 1 0
      gameRes/gameChineseSeme/20196/guide/guide_20196.json
  46. 57 57
      gameRes/gameChineseSeme/20247/guide/guide_20247.json
  47. 21 21
      gameRes/gameChineseSeme/20249/guide/guide_20249.json
  48. 21 21
      gameRes/gameChineseSeme/20276/guide/guide_20276.json
  49. 21 21
      gameRes/gameChineseSeme/20301/guide/guide_20301.json
  50. 48 48
      gameRes/gameChineseSeme/20303/guide/guide_20303.json
  51. 21 21
      gameRes/gameChineseSeme/20837/guide/guide_20837.json
  52. 66 66
      gameRes/gameChineseSeme/20848/guide/guide_20848.json
  53. 99 99
      gameRes/gameChineseSeme/20849/guide/guide_20849.json
  54. BIN
      gameRes/gameChineseSeme/20919/ani4.png
  55. 38 0
      gameRes/gameChineseSeme/20919/ani4.png.meta
  56. 21 21
      gameRes/gameChineseSeme/21018/guide/guide_21018.json
  57. 21 21
      gameRes/gameChineseSeme/21335/guide/guide_21335.json
  58. BIN
      gameRes/gameChineseSeme/21387/audio3.mp3
  59. 1 1
      gameRes/gameChineseSeme/21387/audio3.mp3.meta
  60. 21 21
      gameRes/gameChineseSeme/21482/guide/guide_21482.json
  61. 21 21
      gameRes/gameChineseSeme/21507/guide/guide_21507.json
  62. BIN
      gameRes/gameChineseSeme/22351/audio3.mp3
  63. 1 1
      gameRes/gameChineseSeme/22351/audio3.mp3.meta
  64. 21 21
      gameRes/gameChineseSeme/22352/guide/guide_22352.json
  65. 21 21
      gameRes/gameChineseSeme/22799/guide/guide_22799.json
  66. 21 21
      gameRes/gameChineseSeme/23475/guide/guide_23475.json
  67. BIN
      gameRes/gameChineseSeme/23544/audio3.mp3
  68. 1 1
      gameRes/gameChineseSeme/23544/audio3.mp3.meta
  69. 21 21
      gameRes/gameChineseSeme/23545/guide/guide_23545.json
  70. 66 66
      gameRes/gameChineseSeme/24072/guide/guide_24072.json
  71. BIN
      gameRes/gameChineseSeme/24202/audio3.mp3
  72. 1 1
      gameRes/gameChineseSeme/24202/audio3.mp3.meta
  73. 47 47
      gameRes/gameChineseSeme/24202/guide/guide_24202.json
  74. 12 12
      gameRes/gameChineseSeme/24215/guide/guide_24215.json
  75. 21 21
      gameRes/gameChineseSeme/24773/guide/guide_24773.json
  76. BIN
      gameRes/gameChineseSeme/25226/audio1.mp3
  77. 1 1
      gameRes/gameChineseSeme/25226/audio1.mp3.meta
  78. 12 12
      gameRes/gameChineseSeme/25235/guide/guide_25235.json
  79. BIN
      gameRes/gameChineseSeme/25925/ani4.png
  80. 38 0
      gameRes/gameChineseSeme/25925/ani4.png.meta
  81. 21 21
      gameRes/gameChineseSeme/25925/guide/guide_25925.json
  82. 3 3
      gameRes/gameChineseSeme/26071/guide/guide_26071.json
  83. 11 11
      gameRes/gameChineseSeme/26228/guide/guide_26228.json
  84. 1 1
      gameRes/gameChineseSeme/26354.meta
  85. BIN
      gameRes/gameChineseSeme/26354/guide/audio.mp3
  86. 1 1
      gameRes/gameChineseSeme/26354/guide/audio.mp3.meta
  87. 25 25
      gameRes/gameChineseSeme/26354/guide/guide_26354.json
  88. BIN
      gameRes/gameChineseSeme/26377/audio3.mp3
  89. 1 1
      gameRes/gameChineseSeme/26377/audio3.mp3.meta
  90. BIN
      gameRes/gameChineseSeme/26465/ani4.png
  91. 38 0
      gameRes/gameChineseSeme/26465/ani4.png.meta
  92. BIN
      gameRes/gameChineseSeme/26539/audio3.mp3
  93. 1 1
      gameRes/gameChineseSeme/26539/audio3.mp3.meta
  94. 12 12
      gameRes/gameChineseSeme/26539/guide/guide_26539.json
  95. 12 12
      gameRes/gameChineseSeme/26550/guide/guide_26550.json
  96. 21 21
      gameRes/gameChineseSeme/26641/guide/guide_26641.json
  97. BIN
      gameRes/gameChineseSeme/26790/audio3.mp3
  98. 1 1
      gameRes/gameChineseSeme/26790/audio3.mp3.meta
  99. 12 12
      gameRes/gameChineseSeme/26790/guide/guide_26790.json
  100. 12 12
      gameRes/gameChineseSeme/27743/guide/guide_27743.json

+ 2 - 1
.gitignore

@@ -14,6 +14,8 @@
 /build/upload/
 /build/release/
 /build/debug/
+/build/chinesedebug/
+/build/chineserelease/
 /build/jsb-link/assets/
 /build/jsb-link/jsb-adapter/
 /build/jsb-link/src/
@@ -21,7 +23,6 @@
 /build/jsb-link/cocos-project-template.json
 /build/jsb-link/main.js
 /build/jsb-link/project.json
-/packages-hot-update/
 /packages/simple-code
 /packages/simple-code-cache
 

+ 22 - 6
assets/gameChinese/bgAni/45/15_5.anim

@@ -95,12 +95,28 @@
           ],
           "motionPath": [
             [
-              -459,
-              -554,
-              -818,
-              -566,
-              -224,
-              -546
+              -819,
+              -511,
+              -956,
+              -346,
+              -814,
+              -517
+            ],
+            [
+              -715,
+              -602,
+              -720,
+              -597,
+              -665,
+              -657
+            ],
+            [
+              -449,
+              -602,
+              -540,
+              -605,
+              -214,
+              -594
             ],
             [
               758,

+ 4 - 4
assets/prefab/child/StudentLockUI.prefab

@@ -195,7 +195,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "03e9fa4a-2fdf-44f1-a05b-2dea7c1cb8a6"
+      "__id__": 0
     },
     "fileId": "94Ef3IT7tBj4v8sk7aRYc2",
     "sync": false
@@ -302,7 +302,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "03e9fa4a-2fdf-44f1-a05b-2dea7c1cb8a6"
+      "__id__": 0
     },
     "fileId": "5dBfj0pB1F9byMS9ncGa2E",
     "sync": false
@@ -317,7 +317,7 @@
     "_enabled": true,
     "quickClose": false,
     "cache": false,
-    "showType": 0,
+    "showType": 500,
     "prevent": true,
     "_id": ""
   },
@@ -327,7 +327,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "03e9fa4a-2fdf-44f1-a05b-2dea7c1cb8a6"
+      "__id__": 0
     },
     "fileId": "",
     "sync": false

+ 7 - 7
assets/prefab/chinese/ChineseMainUI.prefab

@@ -827,7 +827,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 24
@@ -18581,7 +18581,7 @@
       "a": 255
     },
     "_miterLimit": 10,
-    "_id": "a90FDK7OdJy6evqk4OEHqw"
+    "_id": "42i2IhwK5MtJH5zAEJkFRF"
   },
   {
     "__type__": "cc.ClickEvent",
@@ -18858,7 +18858,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        65.477,
         0,
         0,
         0,
@@ -18954,8 +18954,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 36
+      "width": 290,
+      "height": 160
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -18966,7 +18966,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -125,
+        -94.114,
         0,
         0,
         0,
@@ -21525,7 +21525,7 @@
       "a": 255
     },
     "_miterLimit": 10,
-    "_id": "abIiSEBQ1DjqV2Zo5s6evb"
+    "_id": "81j43MtUFC85ImrRUBWjWn"
   },
   {
     "__type__": "cc.ClickEvent",

+ 136 - 26
assets/prefab/chinese/ChineseSemeGirdUI.prefab

@@ -33,11 +33,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -201,7 +201,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "59RGKOBNNFWaZgcXYjHrzD",
     "sync": false
@@ -308,7 +308,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "edke3s9lVM2LXGH2C1vpt+",
     "sync": false
@@ -516,7 +516,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "fa57G/jZ5PVJBF0KRjwaOC",
     "sync": false
@@ -536,14 +536,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 39
       },
       {
-        "__id__": 37
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -607,11 +607,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -675,11 +675,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -744,19 +744,22 @@
       },
       {
         "__id__": 25
+      },
+      {
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 31
       },
       {
-        "__id__": 29
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -907,7 +910,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "08rTh3/INL2o7O0T0q3hg3",
     "sync": false
@@ -1012,7 +1015,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "38ngcJ779LoJD3vAeEPd/x",
     "sync": false
@@ -1117,12 +1120,119 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "33Gil8Y+JPGJNJfFJYV0/+",
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "classTip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 62,
+      "height": 51
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        80.853,
+        29.27,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1fa932ba-d1a1-44ef-b150-69b53677f99e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "11KTQxlohObrf4nTrp8nRt",
+    "sync": false
+  },
+  {
     "__type__": "466e8BS6wJF6bKBj6rcxcSE",
     "_name": "",
     "_objFlags": 0,
@@ -1149,7 +1259,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_N$interactable": true,
@@ -1223,7 +1333,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "3ehr6GD4VIJajKBS39J5DY",
     "sync": false
@@ -1266,7 +1376,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "df9Y8q3XlBw64chA4nKvKr",
     "sync": false
@@ -1297,7 +1407,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "994x+bC75EwIrQMFayVwsb",
     "sync": false
@@ -1344,7 +1454,7 @@
     "_slideMode": 1,
     "pageDistance": 0.3,
     "pageChangeEvent": {
-      "__id__": 38
+      "__id__": 41
     },
     "_virtual": true,
     "cyclic": false,
@@ -1353,7 +1463,7 @@
     "_updateRate": 0,
     "frameByFrameRenderNum": 0,
     "renderEvent": {
-      "__id__": 39
+      "__id__": 42
     },
     "selectedMode": 0,
     "repeatEventSingle": false,
@@ -1384,7 +1494,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "1bH1TM6LZFNKy0LNcl/3xf",
     "sync": false
@@ -1409,7 +1519,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "02a154c2-6ff6-4228-b710-ccd3b652e7b9"
+      "__id__": 0
     },
     "fileId": "",
     "sync": false

+ 10 - 10
assets/prefab/chinese/ChineseSemeUI.prefab

@@ -1150,8 +1150,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 63,
-      "height": 52
+      "width": 62,
+      "height": 51
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1163,7 +1163,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -1592,7 +1592,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -2021,7 +2021,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -2450,7 +2450,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -2879,7 +2879,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -3308,7 +3308,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -3737,7 +3737,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,
@@ -4166,7 +4166,7 @@
       "ctor": "Float64Array",
       "array": [
         29.448,
-        29.27,
+        19.27,
         0,
         0,
         0,

+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger.meta → assets/resources/finger.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/1.png → assets/resources/finger/1.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/1.png.meta → assets/resources/finger/1.png.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/2.png → assets/resources/finger/2.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/2.png.meta → assets/resources/finger/2.png.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/3.png → assets/resources/finger/3.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/3.png.meta → assets/resources/finger/3.png.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/4.png → assets/resources/finger/4.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/finger/4.png.meta → assets/resources/finger/4.png.meta


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 5 - 5
assets/script/config/ChineseStoryCfg.ts


+ 13 - 13
assets/script/config/ChineseWordCfg.ts

@@ -134,7 +134,7 @@ export let ChineseWordCfg=
         '树':{ id: '451_1_4', word: '树', phrase1: '树木', phrase2: '森林里有很多树木。', pinyin: 'shù', stroke: '一、丨、丿、丶、㇇、丶、一、亅、丶' },
         '刚':{ id: '451_1_5', word: '刚', phrase1: '刚才', phrase2: '刚才有一辆小车开了过去。', pinyin: 'gāng', stroke: '丨、𠃌、丿、丶、丨、亅' },
         '对':{ id: '451_1_6', word: '对', phrase1: '对手', phrase2: '台上的对手正在比赛。', pinyin: 'duì', stroke: '㇇、丶、一、亅、丶' },
-        '伴':{ id: '451_1_7', word: '伴', phrase1: '伙伴', phrase2: '们是对方的伙伴。', pinyin: 'bàn', stroke: '丿、丨、丶、丿、一、一、丨' },
+        '伴':{ id: '451_1_7', word: '伴', phrase1: '伙伴', phrase2: '们是对方的伙伴。', pinyin: 'bàn', stroke: '丿、丨、丶、丿、一、一、丨' },
         '秋':{ id: '451_2_1', word: '秋', phrase1: '秋天', phrase2: '秋天来了,天气也变凉爽了。', pinyin: 'qiū', stroke: '丿、一、丨、丿、丶、㇀、丿、丿、㇏' },
         '只':{ id: '451_2_2', word: '只', phrase1: '一只', phrase2: '天空中飞来了一只小鸟。', pinyin: 'zhī', stroke: '丨、𠃍、一、丿、丶' },
         '黑':{ id: '451_2_3', word: '黑', phrase1: '黑色', phrase2: '我今天穿了一件黑色的衣服。', pinyin: 'hēi', stroke: '丨、𠃍、丶、丿、一、丨、一、一、㇀、丶、丶、丶' },
@@ -155,7 +155,7 @@ export let ChineseWordCfg=
         '眉':{ id: '451_4_4', word: '眉', phrase1: '眉毛', phrase2: '医生的眉毛长的又黑又浓。', pinyin: 'méi', stroke: '𠃍、丨、一、丿、丨、𠃍、一、一、一' },
         '问':{ id: '451_4_5', word: '问', phrase1: '问题', phrase2: '他想不通这个问题。', pinyin: 'wèn', stroke: '丶、丨、𠃌、丨、𠃍、一' },
         '那':{ id: '451_4_6', word: '那', phrase1: '那个', phrase2: '那个桌子上有很多零食。', pinyin: 'nà', stroke: '𠃌、一、一、丿、𠄎、丨' },
-        '入':{ id: '451_4_7', word: '入', phrase1: '进入', phrase2: '熊宝宝慢慢进入了梦乡。', pinyin: 'rù', stroke: '丿、㇏' },
+        '入':{ id: '451_4_7', word: '入', phrase1: '进入', phrase2: '熊宝宝慢慢进入了梦乡。', pinyin: 'rù', stroke: '丿、㇏' },
         '活':{ id: '451_5_1', word: '活', phrase1: '干活', phrase2: '农民爷爷正在田里干活。', pinyin: 'huó', stroke: '丶、丶、㇀、丿、一、丨、丨、𠃍、一' },
         '猫':{ id: '451_5_2', word: '猫', phrase1: '小猫', phrase2: '这只小猫好可爱。', pinyin: 'māo', stroke: '丿、㇁、丿、一、丨、丨、丨、𠃍、一、丨、一' },
         '学':{ id: '451_5_3', word: '学', phrase1: '学习', phrase2: '我们应该认真学习。', pinyin: 'xué', stroke: '丶、丶、丿、㇀、㇇、㇇、亅、一' },
@@ -200,7 +200,7 @@ export let ChineseWordCfg=
         '原':{ id: '451_10_7', word: '原', phrase1: '草原', phrase2: '草原上有很多只羊。', pinyin: 'yuán', stroke: '一、丿、丿、丨、𠃍、一、一、亅、丿、丶' },
         '习':{ id: '451_11_1', word: '习', phrase1: '学习', phrase2: '小朋友们正在学习汉字。', pinyin: 'xí', stroke: '𠃌、丶、㇀' },
         '课':{ id: '451_11_2', word: '课', phrase1: '上课', phrase2: '乐乐正在上课。', pinyin: 'kè', stroke: '丶、㇊、丨、𠃍、一、一、一、丨、丿、㇏' },
-        '床':{ id: '451_11_3', word: '床', phrase1: '床上', phrase2: '夏明在他的床上看书。', pinyin: 'chuáng', stroke: '丶、一、丿、一、丨、丿、㇏' },
+        '床':{ id: '451_11_3', word: '床', phrase1: '床上', phrase2: '夏明在他的床上看书。', pinyin: 'chuáng', stroke: '丶、一、丿、一、丨、丿、㇏' },
         '没':{ id: '451_11_4', word: '没', phrase1: '没有', phrase2: '这个人一分钱都没有。', pinyin: 'méi', stroke: '丶、丶、㇀、丿、㇅、㇇、㇏' },
         '师':{ id: '451_11_5', word: '师', phrase1: '老师', phrase2: '果果的妈妈是一名老师。', pinyin: 'shī', stroke: '丨、丿、一、丨、𠃌、丨' },
         '各':{ id: '451_11_6', word: '各', phrase1: '各自', phrase2: '他们手里各自拿了两把尺子。', pinyin: 'gè', stroke: '丿、㇇、㇏、丨、𠃍、一' },
@@ -243,17 +243,17 @@ export let ChineseWordCfg=
         '松':{ id: '561_1_1', word: '松', phrase1: '松树', phrase2: '任凭天寒地冻,松树也绿盖如春。', pinyin: 'sōng', stroke: '一、丨、丿、丶、丿、㇏、𠃋、丶' },
         '森':{ id: '561_1_2', word: '森', phrase1: '森林', phrase2: '森林里各类植物生长得很茂盛。', pinyin: 'sēn', stroke: '一、丨、丿、㇏、一、丨、丿、丶、一、丨、丿、㇏' },
         '鼠':{ id: '561_1_3', word: '鼠', phrase1: '老鼠', phrase2: '猫蹲下身来准备向老鼠猛扑过去。', pinyin: 'shǔ', stroke: '丿、丨、一、𠃍、一、一、𠄌、丶、丶、𠄌、丶、丶、㇂' },
-        '细':{ id: '561_1_4', word: '细', phrase1: '细小', phrase2: '这里的沙粒很细小,踩上去很柔软。', pinyin: 'xì', stroke: '𠃋、𠃋、㇀、丨、𠃍、一、丨、一' },
+        '细':{ id: '561_1_4', word: '细', phrase1: '细小', phrase2: '这里细小的沙粒踩上去很柔软。', pinyin: 'xì', stroke: '𠃋、𠃋、㇀、丨、𠃍、一、丨、一' },
         '泉':{ id: '561_1_5', word: '泉', phrase1: '泉水', phrase2: '泉水叮咚叮咚,从山间流过。', pinyin: 'quán', stroke: '丿、丨、𠃍、一、一、亅、㇇、丿、㇏' },
         '屋':{ id: '561_1_6', word: '屋', phrase1: '房屋', phrase2: '年久失修,那间房屋已经残破了。', pinyin: 'wū', stroke: '𠃍、一、丿、一、𠃋、丶、一、丨、一' },
         '信':{ id: '561_1_7', word: '信', phrase1: '信箱', phrase2: '我亲眼看见她把信投送到信箱里。', pinyin: 'xìn', stroke: '丿、丨、丶、一、一、一、丨、𠃍、一' },
-        '采':{ id: '561_1_8', word: '采', phrase1: '采花', phrase2: '我是一只小蜜蜂,一天到晚采花忙。', pinyin: 'cǎi', stroke: '丿、丶、丶、丿、一、丨、丿、㇏' },
+        '采':{ id: '561_1_8', word: '采', phrase1: '采花', phrase2: '我是小蜜蜂,一天到晚采花忙。', pinyin: 'cǎi', stroke: '丿、丶、丶、丿、一、丨、丿、㇏' },
         '夕':{ id: '561_2_1', word: '夕', phrase1: '夕阳', phrase2: '黄昏,爸爸和妈妈一起去看夕阳。', pinyin: 'xī', stroke: '丿、㇇、丶' },
         '劳':{ id: '561_2_2', word: '劳', phrase1: '劳动', phrase2: '劳动人民最光荣。', pinyin: 'láo', stroke: '一、丨、丨、㇀、㇇、𠃌、丿' },
         '夜':{ id: '561_2_3', word: '夜', phrase1: '深夜', phrase2: '王老师很辛苦,常常备课到深夜。', pinyin: 'yè', stroke: '丶、一、丿、丨、丿、㇇、丶、㇏' },
         '市':{ id: '561_2_4', word: '市', phrase1: '城市', phrase2: '这里是我们城市的商业中心。', pinyin: 'shì', stroke: '丶、一、丨、𠃌、丨' },
         '村':{ id: '561_2_5', word: '村', phrase1: '农村', phrase2: '我喜欢淳朴的农村生活。', pinyin: 'cūn', stroke: '一、丨、丿、丶、一、亅、丶' },
-        '梦':{ id: '561_2_6', word: '梦', phrase1: '梦乡', phrase2: '夜阑人静,他们很快就进入了梦乡。', pinyin: 'mèng', stroke: '一、丨、丿、丶、一、丨、丿、㇏、丿、㇇、丶' },
+        '梦':{ id: '561_2_6', word: '梦', phrase1: '梦乡', phrase2: '夜深了,他们很快就进入了梦乡。', pinyin: 'mèng', stroke: '一、丨、丿、丶、一、丨、丿、㇏、丿、㇇、丶' },
         '曲':{ id: '561_2_7', word: '曲', phrase1: '乐曲', phrase2: '我们伴随着欢乐的乐曲跳起舞来。', pinyin: 'qū', stroke: '丨、𠃍、一、丨、丨、一' },
         '轻':{ id: '561_2_8', word: '轻', phrase1: '轻快', phrase2: '小鸟在树枝上轻快地飞来飞去。', pinyin: 'qīng', stroke: '一、𠃋、丨、㇀、㇇、丶、一、丨、一' },
         '国':{ id: '561_3_1', word: '国', phrase1: '祖国', phrase2: '我热爱祖国的锦绣河山。', pinyin: 'guó', stroke: '丨、𠃍、一、一、丨、一、丶、一' },
@@ -288,11 +288,11 @@ export let ChineseWordCfg=
         '纸':{ id: '561_6_6', word: '纸', phrase1: '报纸', phrase2: '爷爷和奶奶经常在一起看报纸。', pinyin: 'zhǐ', stroke: '𠃋、𠃋、㇀、丿、𠄌、一、㇂' },
         '铅':{ id: '561_6_7', word: '铅', phrase1: '铅笔', phrase2: '我喜欢用彩色的铅笔在纸上画画。', pinyin: 'qiān', stroke: '丿、一、一、一、𠄌、丿、㇅、丨、𠃍、一' },
         '笔':{ id: '561_6_8', word: '笔', phrase1: '毛笔', phrase2: '他拿起毛笔,开始书写文章。', pinyin: 'bǐ', stroke: '丿、一、丶、丿、一、丶、丿、一、一、乚' },
-        '枫':{ id: '561_7_1', word: '枫', phrase1: '枫树', phrase2: '秋天到了,枫树的叶子渐渐变红了。', pinyin: 'fēng', stroke: '一、丨、丿、丶、丿、⺄、丿、丶' },
+        '枫':{ id: '561_7_1', word: '枫', phrase1: '枫树', phrase2: '秋天,枫树的叶子渐渐变红了。', pinyin: 'fēng', stroke: '一、丨、丿、丶、丿、⺄、丿、丶' },
         '丰':{ id: '561_7_2', word: '丰', phrase1: '丰收', phrase2: '果园里到处是一片丰收的景象。', pinyin: 'fēng', stroke: '一、一、一、丨' },
         '景':{ id: '561_7_3', word: '景', phrase1: '风景', phrase2: '这美丽的江南,真是风景如画。', pinyin: 'jǐng', stroke: '丨、𠃍、一、一、丶、一、丨、𠃍、一、亅、丿、丶' },
         '棉':{ id: '561_7_4', word: '棉', phrase1: '棉花', phrase2: '天边的云朵犹如棉花一样洁白。', pinyin: 'mián', stroke: '一、丨、丿、丶、丿、丨、𠃍、一、一、丨、𠃌、丨' },
-        '坏':{ id: '561_7_5', word: '坏', phrase1: '破坏', phrase2: '地震后,各地都有被破坏的痕迹。', pinyin: 'huài', stroke: '一、丨、㇀、一、丿、丨、丶' },
+        '坏':{ id: '561_7_5', word: '坏', phrase1: '破坏', phrase2: '地震后,各地都有被破坏的痕迹。', pinyin: 'huài', stroke: '一、丨、㇀、一、丿、丨、丶' },
         '昨':{ id: '561_7_6', word: '昨', phrase1: '昨天', phrase2: '他昨天在池塘里捉到了一些鱼。', pinyin: 'zuó', stroke: '丨、𠃍、一、一、丿、一、丨、一、一' },
         '肉':{ id: '561_7_7', word: '肉', phrase1: '鱼肉', phrase2: '人为刀俎,我为鱼肉。', pinyin: 'ròu', stroke: '丨、𠃌、丿、丶、丿、丶' },
         '压':{ id: '561_7_8', word: '压', phrase1: '压力', phrase2: '我们绝不屈服于任何外来的压力。', pinyin: 'yā', stroke: '一、丿、一、丨、一、丶' },
@@ -323,7 +323,7 @@ export let ChineseWordCfg=
         '尖':{ id: '561_11_1', word: '尖', phrase1: '尖叫', phrase2: '她发出一声尖叫,然后沉默了。', pinyin: 'jiān', stroke: '丨、丿、丶、一、丿、㇏' },
         '浪':{ id: '561_11_2', word: '浪', phrase1: '浪花', phrase2: '海面上出现了奔腾不息的浪花。', pinyin: 'làng', stroke: '丶、丶、㇀、丶、𠃍、一、一、𠄌、丿、㇏' },
         '尘':{ id: '561_11_3', word: '尘', phrase1: '灰尘', phrase2: '妈妈正在擦掉窗户上的灰尘。', pinyin: 'chén', stroke: '丨、丿、丶、一、丨、一' },
-        '洋':{ id: '561_11_4', word: '洋', phrase1: '海洋', phrase2: '海洋里的生物千奇百怪,非常迷人。', pinyin: 'yáng', stroke: '丶、丶、㇀、丶、丿、一、一、一、丨' },
+        '洋':{ id: '561_11_4', word: '洋', phrase1: '海洋', phrase2: '海洋里的生物千奇百怪。', pinyin: 'yáng', stroke: '丶、丶、㇀、丶、丿、一、一、一、丨' },
         '实':{ id: '561_11_5', word: '实', phrase1: '果实', phrase2: '秋天农民伯伯收获了香甜的果实。', pinyin: 'shí', stroke: '丶、㇀、㇇、丶、丶、一、丿、丶' },
         '令':{ id: '561_11_6', word: '令', phrase1: '命令', phrase2: '接到命令,部队立即出发。', pinyin: 'lìng', stroke: '丿、㇏、丶、㇇、丶' },
         '川':{ id: '561_11_7', word: '川', phrase1: '山川', phrase2: '祖国的山川河流气势壮观。', pinyin: 'chuān', stroke: '丿、丨、丨' },
@@ -333,7 +333,7 @@ export let ChineseWordCfg=
         '灰':{ id: '561_12_3', word: '灰', phrase1: '灰色', phrase2: '我家养了一只灰色的小狗。', pinyin: 'huī', stroke: '一、丿、㇀、丿、丿、㇏' },
         '透':{ id: '561_12_4', word: '透', phrase1: '穿透', phrase2: '钉子在力的作用下穿透了木板。', pinyin: 'tòu', stroke: '丿、一、丨、丿、㇏、𠄎、丿、丶、㇋、㇏' },
         '背':{ id: '561_12_5', word: '背', phrase1: '背影', phrase2: '我站在原地看着他们的背影。', pinyin: 'bèi', stroke: '丨、一、㇀、丿、乚、丨、𠃌、一、一' },
-        '莲':{ id: '561_12_6', word: '莲', phrase1: '莲花', phrase2: '莲花开在污泥中,人才出在贫寒家。', pinyin: 'lián', stroke: '一、丨、丨、一、𠃋、一、丨、丶、㇋、㇏' },
+        '莲':{ id: '561_12_6', word: '莲', phrase1: '莲花', phrase2: '莲花出淤泥而不染。', pinyin: 'lián', stroke: '一、丨、丨、一、𠃋、一、丨、丶、㇋、㇏' },
         '音':{ id: '561_12_7', word: '音', phrase1: '音乐', phrase2: '他一边跑步,一边听音乐。', pinyin: 'yīn', stroke: '丶、一、丶、丿、一、丨、𠃍、一、一' },
         '展':{ id: '561_12_8', word: '展', phrase1: '画展', phrase2: '同学们看画展看得入神了。', pinyin: 'zhǎn', stroke: '𠃍、一、丿、一、丨、丨、一、𠄌、丿、㇏' },
         '铃':{ id: '561_13_1', word: '铃', phrase1: '铃铛', phrase2: '羊的铃铛叮铃铃地响彻整个山区。', pinyin: 'líng', stroke: '丿、一、一、一、𠄌、丿、㇏、丶、㇇、丶' },
@@ -348,12 +348,12 @@ export let ChineseWordCfg=
         '卜':{ id: '561_14_2', word: '卜', phrase1: '占卜', phrase2: '不可以完全相信占卜的结果。', pinyin: 'bǔ', stroke: '丨、丶' },
         '困':{ id: '561_14_3', word: '困', phrase1: '围困', phrase2: '鲨鱼群将这个人围困在石头上。', pinyin: 'kùn', stroke: '丨、𠃍、一、丨、丿、丶、一' },
         '品':{ id: '561_14_4', word: '品', phrase1: '品尝', phrase2: '他正乐滋滋地品尝着冰淇淋。', pinyin: 'pǐn', stroke: '丨、𠃍、一、丨、𠃍、一、丨、𠃍、一' },
-        '寸':{ id: '561_14_5', word: '寸', phrase1: '尺寸', phrase2: '这件衣服的尺寸有点小,他穿不上。', pinyin: 'cùn', stroke: '一、亅、丶' },
+        '寸':{ id: '561_14_5', word: '寸', phrase1: '尺寸', phrase2: '这件衣服的尺寸小,他穿不上。', pinyin: 'cùn', stroke: '一、亅、丶' },
         '钢':{ id: '561_14_6', word: '钢', phrase1: '钢铁', phrase2: '军人是经过千锤百炼的钢铁战士。', pinyin: 'gāng', stroke: '丿、一、一、一、𠄌、丨、𠃌、丿、丶' },
         '棋':{ id: '561_14_7', word: '棋', phrase1: '下棋', phrase2: '爷爷在下棋时不愿被别人吵扰。', pinyin: 'qí', stroke: '一、丨、丿、丶、一、丨、丨、一、一、一、丿、丶' },
         '熟':{ id: '561_14_8', word: '熟', phrase1: '成熟', phrase2: '麦子成熟了,大地一片金黄。', pinyin: 'shú', stroke: '丶、一、丨、𠃍、一、㇇、亅、㇀、丿、⺄、丶、㇀、丶、丶、丶' },
         '吐':{ id: '561_15_1', word: '吐', phrase1: '呕吐', phrase2: '她先是头晕,继而又呕吐。', pinyin: 'tù', stroke: '丨、𠃍、一、一、丨、一' },
-        '蝌':{ id: '561_15_2', word: '蝌', phrase1: '蝌蚪', phrase2: '蝌蚪说:早上好,你是我的妈妈吗?', pinyin: 'kē', stroke: '丨、𠃍、一、丨、一、丶、丿、一、丨、丿、丶、丶、丶、一、丨' },
+        '蝌':{ id: '561_15_2', word: '蝌', phrase1: '蝌蚪', phrase2: '蝌蚪说:你好,你是我的妈妈吗?', pinyin: 'kē', stroke: '丨、𠃍、一、丨、一、丶、丿、一、丨、丿、丶、丶、丶、一、丨' },
         '蚪':{ id: '561_15_3', word: '蚪', phrase1: '蝌蚪', phrase2: '青蛙总忘记自己从前是蝌蚪。', pinyin: 'dǒu', stroke: '丨、𠃍、一、丨、一、丶、丶、丶、一、丨' },
         '扔':{ id: '561_15_4', word: '扔', phrase1: '扔掉', phrase2: '他在垃圾桶前扔掉了手上的垃圾。', pinyin: 'rēng', stroke: '一、亅、㇀、𠄎、丿' },
         '旗':{ id: '561_15_5', word: '旗', phrase1: '红旗', phrase2: '少先队员的红领巾是红旗的一角。', pinyin: 'qí', stroke: '丶、一、𠃌、丿、丿、一、一、丨、丨、一、一、一、丿、丶' },
@@ -361,7 +361,7 @@ export let ChineseWordCfg=
         '杏':{ id: '561_15_7', word: '杏', phrase1: '银杏', phrase2: '秋天是赏一树银杏的好时节。', pinyin: 'xìng', stroke: '一、丨、丿、㇏、丨、𠃍、一' },
         '蛇':{ id: '561_15_8', word: '蛇', phrase1: '毒蛇', phrase2: '毒蛇嘴里没好牙。', pinyin: 'shé', stroke: '丨、𠃍、一、丨、一、丶、丶、㇀、㇇、丿、乚' },
         '矿':{ id: '561_16_1', word: '矿', phrase1: '矿工', phrase2: '矿工的工作是挖掘地下宝藏。', pinyin: 'kuàng', stroke: '一、丿、丨、𠃍、一、丶、一、丿' },
-        '纺':{ id: '561_16_2', word: '纺', phrase1: '纺车', phrase2: '我将棉花捻过,然后将它穿过纺车。', pinyin: 'fǎng', stroke: '𠃋、𠃋、㇀、丶、一、𠃌、丿' },
+        '纺':{ id: '561_16_2', word: '纺', phrase1: '纺车', phrase2: '我将棉花捻过后,再穿过纺车。', pinyin: 'fǎng', stroke: '𠃋、𠃋、㇀、丶、一、𠃌、丿' },
         '织':{ id: '561_16_3', word: '织', phrase1: '织品', phrase2: '妈妈经常用毛线织一些织品。', pinyin: 'zhī', stroke: '𠃋、𠃋、㇀、丨、𠃍、一、丿、丶' },
         '治':{ id: '561_16_4', word: '治', phrase1: '治疗', phrase2: '小女孩正在接受治疗。', pinyin: 'zhì', stroke: '丶、丶、㇀、𠃋、丶、丨、𠃍、一' },
         '灭':{ id: '561_16_5', word: '灭', phrase1: '灭火', phrase2: '消防员叔叔正在努力灭火。', pinyin: 'miè', stroke: '一、㇀、丿、丿、㇏' },

+ 5 - 8
assets/script/mgrs/LocalMsgManager.ts

@@ -4,6 +4,7 @@ import {MSG} from '../enums/MSG'
 import {UI} from '../enums/UI'
 import {APP_TYPE, GAME_TYPE} from '../enums/Enum'
 import {IStudentInfo} from '../data/ChildData'
+import {ccUtils} from '../utils/ccUtils'
 
 export interface MSG_Class {
     isInClass: boolean
@@ -26,7 +27,7 @@ export class LocalMsgManager {
         Mgr.event.addTop(MSG[MSG.classLock], this, this.classLockResp)
         Mgr.event.addTop(MSG[MSG.classEnd], this, this.classEndResp)
     }
-    classResp(data: MSG_Class) {
+    async classResp(data: MSG_Class) {
         if (Data.child.isStudent && data.isInClass && Data.game.curGameType == data.gameType) {
             Data.game.semeID = data.semeID
             Data.game.gameID = data.gameID
@@ -44,8 +45,9 @@ export class LocalMsgManager {
                     }
                     break
                 case GAME_TYPE.gameChinese:
+                    Data.game.semeBundle = await ccUtils.getBundleAsync(GAME_TYPE[Data.game.curGameType] + 'Seme')
                     Mgr.ui.show(UI.ChineseMainUI, {chineseToggle: data.chineseToggle})
-                    Mgr.ui.show(UI.StudentLockUI)
+                    if (data.chineseToggle < 3) Mgr.ui.show(UI.StudentLockUI)
                     break
                 default:
                     break
@@ -133,12 +135,7 @@ export class LocalMsgManager {
         this.sendMsg(data, client)
     }
     sendMsg(data, client = '') {
-        if (
-            Data.child.isTeacher &&
-            Mgr.platform.isAndroid() &&
-            Data.global.curAppType == APP_TYPE.school &&
-            Data.game.curGameType == GAME_TYPE.gameChild
-        ) {
+        if (Data.child.isTeacher && Mgr.platform.isAndroid() && Data.global.curAppType == APP_TYPE.school) {
             let className = 'org/cocos2dx/javascript/SDKUtils'
             let methodName = 'sendMsg'
             let methodSignature = '(Ljava/lang/String;Ljava/lang/String;)V'

+ 6 - 0
assets/script/ui/BaseUI.ts

@@ -104,6 +104,12 @@ export class BaseUI extends cc.Component {
     ) {
         if (addRef == undefined) addRef = true
         if ((node && !cc.isValid(node)) || !bundle) {
+            cc.warn(
+                'BaseUI.load node is not Valid:',
+                (node && !cc.isValid(node)) == true,
+                'bundle is Valid:',
+                cc.isValid(bundle),
+            )
             return
         }
         if (childUrl) {

+ 2 - 2
assets/script/ui/child/GameOptUI.ts

@@ -57,7 +57,7 @@ export default class GameOptUI extends BaseUI {
         this.fingerNode.active = false
         //读取手指颜色
         if (Data.global.curAppType == APP_TYPE.school) {
-            this.loadGameImg('texture/FingerSetUI/finger/' + Data.child.fingerType, this.fingerNode)
+            this.loadResImg('finger/' + Data.child.fingerType, this.fingerNode)
         }
         this.onFingerTouch()
     }
@@ -381,7 +381,7 @@ export default class GameOptUI extends BaseUI {
     }
     //网络事件=======================================
     classEndResp(data) {
-        Mgr.ui.show(UI.ClassResultUI)
+        if (Data.game.curGameType == GAME_TYPE.gameChild) Mgr.ui.show(UI.ClassResultUI)
     }
 
     // 点击事件=======================================

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

@@ -26,7 +26,6 @@ export class GuideMainUI extends BaseUI {
         ccUtils.setTogglesChecked(0, this.node, 'toggles')
         this.onToggleClick(null, 0)
         this.initInfo()
-        Mgr.ui.show(UI.GameOptUI)
     }
 
     protected onDisable() {

+ 10 - 1
assets/script/ui/chinese/ChineseGameUI.ts

@@ -8,6 +8,7 @@ import {PathUtils} from '../../utils/PathUtils'
 import ChineseGameAni from './game/ChineseGameAni'
 import {GAME_EVENT} from '../../enums/Enum'
 import value = cc.js.value
+import {MSG} from '../../enums/MSG'
 
 const {ccclass, property} = cc._decorator
 @ccclass
@@ -67,6 +68,7 @@ export default class ChineseGameUI extends BaseUI {
         this.gameAni.initUI(this)
         this.resetGame()
         Mgr.event.add(GAME_EVENT.gameResultFresh, this, this.endGame)
+        Mgr.event.addTop(MSG[MSG.chineseToggle], this, this.chineseToggleChange)
     }
 
     onHide(): any {
@@ -83,7 +85,7 @@ export default class ChineseGameUI extends BaseUI {
 
     endGame() {
         if (this.curStage >= this.maxStage) {
-            this.onBackClick()
+            if (!Data.child.isInClass || !Data.child.isStudent) this.onBackClick()
         } else {
             this.resetGame()
         }
@@ -141,5 +143,12 @@ export default class ChineseGameUI extends BaseUI {
         if (Data.child.isStudent && Data.child.isInClass) return
         this.hide()
         Mgr.ui.show(UI.ChineseMainUI, {chineseToggle: 4})
+        if (Data.child.isInClass) Mgr.localMsg.sendChineseToggleMsg(4)
+    }
+    chineseToggleChange(data) {
+        if (data.chineseToggle != 3) {
+            this.hide()
+            Mgr.ui.show(UI.ChineseMainUI, {chineseToggle: data.chineseToggle})
+        }
     }
 }

+ 34 - 10
assets/script/ui/chinese/ChineseMainUI.ts

@@ -10,7 +10,7 @@ import {GuideCell} from '../../cell/GuideCell'
 import {PathUtils} from '../../utils/PathUtils'
 import {BaseGameUI} from '../gameMode/BaseGameUI'
 import {MSG} from '../../enums/MSG'
-import {ChineseStoryCfg} from "../../config/ChineseStoryCfg";
+import {ChineseStoryCfg} from '../../config/ChineseStoryCfg'
 let nodes = ['story', 'learn', 'express', 'game', 'write']
 
 const {ccclass, property} = cc._decorator
@@ -19,7 +19,6 @@ export default class ChineseMainUI extends BaseGameUI {
     get curWordIndex(): number {
         return this._curWordIndex
     }
-
     set curWordIndex(value: number) {
         this._curWordIndex = value
         this.word = this.words[this._curWordIndex].word
@@ -27,7 +26,6 @@ export default class ChineseMainUI extends BaseGameUI {
         this.stroke = this.words[this._curWordIndex].stroke
         this.phrase1 = this.words[this._curWordIndex].phrase1
         this.phrase2 = this.words[this._curWordIndex].phrase2
-        this.changeWord()
     }
 
     list: List
@@ -74,12 +72,13 @@ export default class ChineseMainUI extends BaseGameUI {
     }
 
     async onShow(args, fromUI: number) {
+        Mgr.ui.show(UI.GameOptUI)
         ccUtils.setLabel('课程' + Data.game.gameID, this.node, 'title/titlelb')
-        ccUtils.setLabel('课程' + Data.game.gameID, this.story, 'title/titlelb')
+        ccUtils.setLabel('课程' + Data.game.gameID, this.story, 'storyTitle/titlelb')
         this.words = Data.game.words
         this.curWordIndex = Data.game.partID - 1
+        await this.changeWord()
         this.list.numItems = this.words.length
-        await this.initGuide()
         let checked = 0
         if (args && args.chineseToggle != undefined) checked = args.chineseToggle
         this.curStoryPage = 0
@@ -91,16 +90,22 @@ export default class ChineseMainUI extends BaseGameUI {
             let bgAniJson: cc.JsonAsset = await this.loadSync(Data.game.gameBundle, url, cc.JsonAsset)
             this.showBgAni(bgAniJson ? bgAniJson.json : {})
         })
+        this.classStartResp(null)
     }
 
     protected onEnable() {
         Mgr.event.addTop(MSG[MSG.chineseToggle], this, this.chineseToggleChange)
+        Mgr.event.add(MSG[MSG.classEnd], this, this.classEndResp)
+        Mgr.event.add(MSG[MSG.class], this, this.classStartResp)
     }
 
     protected onDisable() {
         this.onRightClick(null)
         this.clearBgChildren(cc.find('bg', this.story))
         Mgr.event.removeAll(this)
+        Mgr.ui.hide(UI.GameOptUI)
+        ccUtils.instantChildren(cc.find('content/line', this.story), 0)
+        ccUtils.instantChildren(cc.find('words/word', this.story), 0)
     }
 
     protected update(dt: number) {
@@ -186,6 +191,7 @@ export default class ChineseMainUI extends BaseGameUI {
     }
 
     showToggleNode(toggleIndex: number) {
+        Data.game.chineseToggle = toggleIndex
         nodes.forEach((value, index) => {
             cc.find(value, this.node).active = index == toggleIndex
         })
@@ -199,7 +205,7 @@ export default class ChineseMainUI extends BaseGameUI {
                 this.onFreshClick()
                 break
             case 'express':
-                this.scheduleOnce(()=>{
+                this.scheduleOnce(() => {
                     this.wordSsr.redrawAll()
                     this.wordSsr.resetStroke()
                 })
@@ -302,10 +308,25 @@ export default class ChineseMainUI extends BaseGameUI {
     showBgAni(jsonData: any) {
         this.createBgAni(jsonData, cc.find('bg', this.story))
     }
+    //网络事件=======================================
+    classStartResp(data) {
+        ccUtils.setTogglesInteract(!Data.child.isStudent || !Data.child.isInClass, this.node, 'toggles')
+    }
+    classEndResp(data) {
+        if (Data.child.isStudent) {
+            ccUtils.setTogglesInteract(true, this.node, 'toggles')
+            Mgr.ui.hide(UI.StudentLockUI)
+        }
+    }
     chineseToggleChange(data) {
-        if (data.chineseToggle >= 3) {
+        if (Data.child.isStudent && Data.child.isInClass) {
             this.showToggleNode(data.chineseToggle)
-            ccUtils.setTogglesChecked(data.chineseToggle, this.node, 'toggles')
+            if (data.chineseToggle >= 3) {
+                Mgr.ui.hide(UI.StudentLockUI)
+                ccUtils.setTogglesChecked(data.chineseToggle, this.node, 'toggles')
+            } else {
+                Mgr.ui.show(UI.StudentLockUI)
+            }
         }
     }
     backClick() {
@@ -316,7 +337,7 @@ export default class ChineseMainUI extends BaseGameUI {
     onToggleClick(event) {
         if (Data.child.isStudent && Data.child.isInClass) return
         let nodeName = event.target.name
-        let checkIndex=nodes.indexOf(nodeName)
+        let checkIndex = nodes.indexOf(nodeName)
         this.showToggleNode(checkIndex)
         Mgr.localMsg.sendChineseToggleMsg(checkIndex)
     }
@@ -351,10 +372,13 @@ export default class ChineseMainUI extends BaseGameUI {
         }
     }
 
-    onWordClick(event) {
+    async onWordClick(event) {
+        if (Data.child.isStudent && Data.child.isInClass) return
         Data.game.partID = event.target.index + 1
+        Mgr.localMsg.sendClassMsg()
         this.curWordIndex = event.target.index
         this.list.numItems = this.words.length
+        await this.changeWord()
     }
 
     initPlayBtn(isPlay: boolean) {

+ 4 - 0
assets/script/ui/chinese/ChineseSemeGirdUI.ts

@@ -35,6 +35,8 @@ export default class ChineseSemeGirdUI extends BaseUI {
         gameChoose.active = Data.game.gameID == index + 1 && Data.game.semeID == this.lastSemeID
         this.loadGameImg('texture/ChineseSemeGirdUI/gameChoose' + (index + 1), gameChoose)
         // ccUtils.setAllGray(node, !Data.home.curSemeIsActive)
+        cc.find('classTip', node).active =
+            Data.child.isTeacher && index + 1 == Data.child.classGameID && Data.game.semeID == Data.child.classSemeID
     }
 
     backClick() {
@@ -47,6 +49,8 @@ export default class ChineseSemeGirdUI extends BaseUI {
             let node = event.target
             Data.game.gameID = node['gameID']
             Data.game.partID = 1
+            Data.game.chineseToggle = 0
+            Mgr.localMsg.sendClassMsg()
             this.lastSemeID = Data.game.semeID
             Data.game.semeBundle = await ccUtils.getBundleAsync(GAME_TYPE[Data.game.curGameType] + 'Seme')
             Mgr.ui.show(UI.ChineseMainUI)

+ 11 - 0
assets/script/ui/chinese/ChineseSemeUI.ts

@@ -5,10 +5,12 @@ import {Data, Mgr} from '../../GameControl'
 import {APP_TYPE, GAME_TYPE} from '../../enums/Enum'
 import {UI} from '../../enums/UI'
 import {ccUtils} from '../../utils/ccUtils'
+import {observer, render} from '../../mobx/observer'
 
 const {ccclass, property} = cc._decorator
 
 @ccclass
+@observer
 export default class ChineseSemeUI extends BaseUI {
     onShow(args, fromUI: number) {
         Data.game.curGameType = GAME_TYPE.gameChinese
@@ -38,4 +40,13 @@ export default class ChineseSemeUI extends BaseUI {
         this.hide()
         Mgr.ui.show(UI.ChineseCheckUI)
     }
+    @render
+    showSocketState() {
+        // 显示当前正在上课的课程
+        let semeNodes = cc.find('seme', this.node).children
+        for (let i = 0; i < semeNodes.length; i++) {
+            let classTip = cc.find('classTip', semeNodes[i])
+            classTip.active = Data.child.isTeacher && Data.child.classSemeID.toString() == semeNodes[i].name
+        }
+    }
 }

+ 0 - 2
assets/script/ui/gameMode/BaseGameUI.ts

@@ -321,8 +321,6 @@ export class BaseGameUI extends BaseUI {
         }
         if (this.page) {
             this.page.resetPage(0)
-        } else {
-            Data.game.curPageNum = 0
         }
         this.unscheduleAllCallbacks()
     }

+ 1 - 1
assets/script/ui/public/HotUpdateUI.ts

@@ -92,7 +92,7 @@ export default class HotUpdateUI extends BaseUI {
         if (Data.game.curGameType == GAME_TYPE.gameChild) {
             Mgr.ui.show(UI.SemeUI)
         } else if (Data.game.curGameType == GAME_TYPE.gameChinese) {
-            Mgr.ui.show(UI.ChineseMainUI)
+            Mgr.ui.show(UI.ChineseSemeUI)
         }
     }
 }

+ 2 - 1
assets/script/ui/public/TopBtnUI.ts

@@ -175,7 +175,8 @@ export default class TopBtnUI extends BaseUI {
         }
     }
     hotUpdateClick() {
-        this.hide()
+        Mgr.ui.hide(UI.ChineseSemeUI)
+        Mgr.ui.hide(UI.SemeUI)
         Mgr.ui.show(UI.HotUpdateUI)
     }
 }

+ 3 - 3
assets/script/uiutils/GamePageView.ts

@@ -25,8 +25,8 @@ export default class GamePageView extends cc.PageView {
     scrollEnd() {
         this.initCurPage(this.getCurrentPageIndex())
     }
-    initCurPage(page, callFuc: boolean = true) {
-        if (page != this.curPage && callFuc && this.changePageFuc) this.changePageFuc(page)
+    initCurPage(page) {
+        if (page != this.curPage && this.changePageFuc) this.changePageFuc(page)
         this.curPage = page
         this.leftPage.active = this.curPage > 0
         this.rightPage.active = this.curPage < this.getPages().length - 1
@@ -48,7 +48,7 @@ export default class GamePageView extends cc.PageView {
         return this.isScrolling() || this.isAutoScrolling()
     }
     resetPage(page: number) {
-        this.initCurPage(page, false)
+        this.initCurPage(page)
         this.scrollToPage(page, 0)
     }
     setCanScroll(can: boolean) {

+ 0 - 0
assets/gameChild/texture/FingerSetUI.meta → assets/texture/FingerSetUI.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/block.png → assets/texture/FingerSetUI/block.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/block.png.meta → assets/texture/FingerSetUI/block.png.meta


+ 0 - 0
assets/gameChild/texture/FingerSetUI/panel_finger.png → assets/texture/FingerSetUI/panel_finger.png


+ 0 - 0
assets/gameChild/texture/FingerSetUI/panel_finger.png.meta → assets/texture/FingerSetUI/panel_finger.png.meta


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

@@ -125,7 +125,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.zedu.fileprovider"
+            android:authorities="${FILE_PROVIDER}"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

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

@@ -2,7 +2,6 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'com.android.application'
 apply plugin: 'io.github.rockerhieu.versionberg'
-
 versionberg {
     major 1
     minor 1
@@ -62,6 +61,9 @@ android {
         zedu {
             dimension "versionCode"
             resValue "string", "app_name", "智聪教育"
+            manifestPlaceholders = [
+                    FILE_PROVIDER: "com.zedu.fileprovider",
+            ]
         }
         //识字宝
         chinese {
@@ -70,6 +72,9 @@ android {
             applicationId android.defaultConfig.applicationId + ".chinese"
             versionCode 101001
             versionName "1.1.0.1"
+            manifestPlaceholders = [
+                    FILE_PROVIDER: "com.zedu.chinese.fileprovider",
+            ]
         }
     }
     sourceSets.main {

+ 6 - 6
config/output/ChineseStoryCfg.js

@@ -1,17 +1,17 @@
 module.exports =
 {
         '231_1':{ id: '231_1', title: '山村', tip: '小朋友们,这首古诗童谣呈现了一幅美丽的山村风景,你们从文中发现了什么?你们觉得这个地方怎么样?', story: '一去二三里,\n烟村四五家,\n亭台六七座,\n八九十枝花。' },
-        '231_2':{ id: '231_2', title: '夏', tip: '小朋友们,夏天来了,大家都会穿什么衣服呢?夏天的天气和冬天的天气有什么不同呢?', story: '夏天到,知了叫,\n火红太阳当头照。\n十只青蛙呱呱叫,\n小人儿张口吃冰棒!' },
+        '231_2':{ id: '231_2', title: '夏', tip: '小朋友们,夏天来了,大家都会穿什么衣服呢?夏天的天气和冬天的天气有什么不同呢?', story: '夏天到,知了叫,\n火红太阳当头照。\t十只青蛙呱呱叫,\n小人儿张口吃冰棒!' },
         '231_3':{ id: '231_3', title: '秋', tip: '小朋友,秋天是一个收获的季节,秋天成熟的水果有哪些?你们眼中的秋天是什么样子的呢?', story: '秋天到,蟋蟀叫,\n苹果大,樱桃小,\n全都挂在树梢上,\n丰收季节来到了!' },
-        '231_4':{ id: '231_4', title: '春来了', tip: '春暖花开,万物复苏。小朋友们,说一说春天的花草树木又有哪些变化呢?', story: '春天到,鸟儿叫,\n小蜗牛,木桩爬,\n小蚯蚓,土里钻,\n森林里可真热闹!' },
+        '231_4':{ id: '231_4', title: '春来了', tip: '春暖花开,万物复苏。小朋友们,说一说春天的花草树木又有哪些变化呢?', story: '春天到,鸟儿叫,\n小蜗牛,木桩爬,\t小蚯蚓,土里钻,\n森林里可真热闹!' },
         '231_5':{ id: '231_5', title: '小雪花', tip: '小朋友们,文中是什么季节?你们眼里的冬天是什么样子呢?冬天到了你们有什么感觉?', story: '小雪花,天上飘,\n空中飞舞真漂亮。\n娃娃冻的把火烤!' },
         '231_6':{ id: '231_6', title: '种西瓜', tip: '小朋友们,爷爷种出大西瓜,需要做哪些事情呢?也请小朋友们感受一下劳动的艰辛!养成珍惜劳动成果的好习惯!', story: '田地里,种西瓜,\n烈日下,除草浇水盼长大。\t夏天到,西瓜熟,个个长的圆又大。\n爷爷拖着工具运回家。' },
         '231_7':{ id: '231_7', title: '娃娃上课', tip: '小朋友,你们喜欢凌乱的桌子和杂乱的教室吗?我们是不是应该养成随时整理的好习惯呢?', story: '小广播,叭叭响,\n告诉娃娃下课了。\t小书桌,文具多,\n娃娃随手爱乱丢。\n教室脏脏乱哄哄!' },
         '231_8':{ id: '231_8', title: '春雨', tip: '春天来了,文中大家能看到什么事物呢?也请小朋友们想一想,春天来了,身边的景物发生了哪些变化?', story: '春雨绵绵,禾苗绿绿,\n柳条发芽,燕子飞来,\t青蛙呱呱,嗓门很大,\n一下子,吵醒了娃娃。' },
         '231_9':{ id: '231_9', title: '猫头鹰', tip: '小朋友们,猫头鹰是害鸟吗?小猫头鹰抓住老鼠飞回去同妈妈一起吃,你们想通过什么方式来表达对妈妈的爱呢?', story: '月光下,猫头鹰出来把鼠抓!\n捉住老鼠不吞下,\t飞回家里给妈妈,\n妈妈张开怀抱抱抱它!' },
-        '231_10':{ id: '231_10', title: '鸭和蛙', tip: '河里有哪些动物?文中有几只鸭子?几只青蛙?几个娃娃?请小朋友们说一说吧!', story: '东边河里四只鸭,西边河里五只蛙,\n岸边站着两个娃,娃娃数了六只蛙,\n哎呀哎呀数错啦,\n个个乐的笑哈哈!' },
+        '231_10':{ id: '231_10', title: '鸭和蛙', tip: '河里有哪些动物?文中有几只鸭子?几只青蛙?几个娃娃?请小朋友们说一说吧!', story: '东边河里四只鸭,西边河里五只蛙,\n岸边站着两个娃,\t娃娃数了六只蛙,\n哎呀哎呀数错啦,\n个个乐的笑哈哈!' },
         '231_11':{ id: '231_11', title: '拍皮球', tip: '小朋友你们喜欢拍皮球吗?想一想拍皮球有哪些好处呢?你们平时又爱哪些运动呢?', story: '一二三,四五六,\n哥哥妹妹拍皮球。\n七八九,数一数,\n边拍边数乐悠悠。' },
-        '231_12':{ id: '231_12', title: '小鸟', tip: '小朋友们,小鸟有牙齿吗?小鸟的尾巴、眼睛和耳朵分别是什么样子的呢?请说一说吧!', story: '小鸟尾巴扁又扁,\n没有牙齿耳目圆,\n站在枝头把歌唱,\n见到朋友问声好。' },
+        '231_12':{ id: '231_12', title: '小鸟', tip: '小朋友们,小鸟有牙齿吗?小鸟的尾巴、眼睛和耳朵分别是什么样子的呢?请说一说吧!', story: '小鸟尾巴扁又扁,\n没有牙齿耳目圆,\t站在枝头把歌唱,\n见到朋友问声好。' },
         '231_13':{ id: '231_13', title: '娃娃吃饭', tip: '请小朋友们想一想,你们平时最爱吃什么菜呢?吃饭不挑食,对身体有什么好处呢?', story: '小朋友,爱吃菜,\n萝卜白菜我都爱,\t看见米饭吃个饱,\n吃饱了,长得快,\n爸爸妈妈夸我乖!' },
         '231_14':{ id: '231_14', title: '打电话', tip: '文中的娃娃在做什么?她们是好朋友吗?长藤上的“小黄瓜”可以吃吗?', story: '小娃娃,打电话,\n一根长藤千里拉,\n结出两条长黄瓜,\t黄瓜不在田里长,\n娃娃却能把话聊。' },
         '231_15':{ id: '231_15', title: '百兽王', tip: '小朋友们猜一猜,文中讲的是什么动物呢?并说一说它长的什么样呢?', story: '从前有座山,\n山中有个王,\n身穿花皮袄,\n人称百兽王,\t只要它出来,\n惊的百兽慌,\n百鸟一听它的声,\n吓的全都飞走了。' },
@@ -34,12 +34,12 @@ module.exports =
         '341_16':{ id: '341_16', title: '孝敬歌', tip: '小朋友们,我们在家应该怎么孝敬父母呢?请想一想吧!', story: '学做菜,会洗衣,家务劳动要学习。\n衣和物,放整齐,自己的事自己理。\t不挑吃,不挑穿,珍惜粮食节水电。\n孝父母,敬长辈,小小年纪好儿女。' },
         '451_1':{ id: '451_1', title: '大树爷爷与啄木鸟', tip: '啄木鸟是怎么帮大树爷爷治病的呢?小朋友们如果生病了,又会用什么方式治病呢?', story: '从前,山上住着一位大树爷爷,但是大树爷爷生病了,大树爷爷伤心地哭了出来。\t这声音刚好被正在树上休息的,啄木鸟医生听到了,它赶紧飞过去问:“大树爷爷,发生什么事情了?”\t大树爷爷对啄木鸟说:“我生病了,啄木鸟医生快帮我治治病吧!”听了大树爷爷的话,啄木鸟立马帮大树爷爷医治。\t它左看右看,最终,终于发现大树爷爷身上有一个洞,洞里面有很多虫子,于是啄木鸟就把洞里的所有虫子吃掉了。\t大树爷爷的病终于被治好了,大树爷爷笑着对啄木鸟说:“谢谢你帮我把病治好了,你真不愧是森林里的医生呀!”\t啄木鸟谦虚地说:“不用谢,这是我应该做的。”从此,啄木鸟就和大树爷爷成为了好伙伴。' },
         '451_2':{ id: '451_2', title: '小狗和大象', tip: '小狗为什么会掉进水里?如果你看到别的小朋友不小心掉在水里,你会怎么做呢?', story: '秋天到了,一只黑色的小狗在江边骑车,忽然,它看见树下有一只凶猛的狮子。\t凶猛的狮子也看到了它,正准备向它扑过来,这时的小狗非常的害怕,慌慌张张地准备逃跑。\t不料,竟一不小心掉进了水里,可是它不会游泳,在水里挣扎了很久。\t这时,一只路过的大象走了过来。看到了这一幕,立即把小狗救了起来。\t小狗对大象的救命之恩感激不尽,因此小狗和大象成为了最好的朋友。' },
-        '451_3':{ id: '451_3', title: '空手而归的小猴', tip: '小猴子最后拿了什么东西回家呢?小朋友你们在文中获得了哪些道理呢?', story: '有一天,一只小猴子在森林里玩,突然它发现了一片玉米地。\t它在玉米地里看到了大大的玉米,于是它就摘了几个玉米,小猴子抱着这些玉米准备回家。\t在回家的路上,又看到了一片桃园,树上的桃子又大又红,于是,小猴子就扔了玉米去摘桃子。\t突然,一只小兔子从树丛中钻了出来,小猴子看到这么可爱的小兔子,于是就把手中的桃子扔了,去追小兔子。\t可是小兔子跑得飞快,小猴子跑地满头是汗,一转眼,小兔子跳到草丛中不见了。\t小猴子心里后悔极了,最后它只能空着手回家了。' },
+        '451_3':{ id: '451_3', title: '空手而归的小猴', tip: '小猴子最后拿了什么东西回家呢?小朋友你们在文中获得了哪些道理呢?', story: '有一天,一只小猴子在森林里玩,突然它发现了一片玉米地。\t它在玉米地里看到了大大的玉米,于是它就摘了几个玉米,小猴子抱着这些玉米准备回家。\t在回家的路上,又看到了一片桃园,树上的桃子又大又红,于是,小猴子就扔了玉米去摘桃子。\t突然,一只小兔子从树丛中钻了出来,小猴子看到这么可爱的小兔子,于是就把手中的桃子扔了,去追小兔子。\t可是小兔子跑得飞快,小猴子跑地满头是汗,一转眼,小兔子跳到草丛中不见了。\t小猴子心里后悔极了,最后它只能空着手回家了。' },
         '451_4':{ id: '451_4', title: '贪玩的蜻蜓', tip: '蜻蜓为什么被饿死?除了蚂蚁会储存食物,还有什么动物也会储存食物来过冬呢?', story: '今天是暖和的一天,蚂蚁一家在运食物。\t蚂蚁爸爸背着一块大大的西瓜;蚂蚁妈妈背着饭菜残渣;蚂蚁儿子背着饼干屑。\t这时,飞过来一只蜻蜓,它皱着眉问蚂蚁:“你们为什么那么好的天气还要工作啊!”\t蚂蚁爸爸说:“马上冬天了,要储存些食物,免得冬天到了没食物吃。”可蜻蜓并没有在意蚂蚁爸爸说的话。\t渐渐地入冬了,蜻蜓果然被饿死了。蚂蚁家正在享受大餐的生活。' },
         '451_5':{ id: '451_5', title: '礼让的小猫和大象', tip: '哪只动物先过了桥?小朋友们如果在路上遇到行人,会怎么做呢?', story: '早晨,一只活泼的小猫准备去上学,路上有一条小河,河上有一座独木桥。\t小猫正准备过桥,看到对岸河边有一只大象,可是桥很窄,一次只能过一只动物。\t小猫向大象招了招手,说:“大象,你先过吧!”大象说:“不,你先过吧,不然你上学会迟到的。”\t就这样,它们两个让来让去,最后还是小猫先过了桥,小猫表示非常感谢。\t接着,大象也过了桥,大象直夸小猫是个懂礼貌的好孩子。\t小猫到了学校,老师知道小猫先让大象过桥的故事后,还在班里表扬了小猫。' },
         '451_6':{ id: '451_6', title: '聪明的小鸡', tip: '老鹰最后吃到小鸡了吗?小鸡用了什么办法逃跑了呢?', story: '一天,老鹰出来觅食,在路上遇到了一只小鸡,老鹰要把这只小鸡吃掉。\t这时,小鸡慌张地说道:“鹰先生,你吃我一个吃不饱的,我把弟弟和妹妹都拉过来,让你一块吃,好吗?”\t老鹰听了,觉得很有道理,就说:“可以,还不快去。”小鸡连忙跑回家,再也没敢出来,老鹰这才知道被骗了。\t可是逃跑的小鸡早已不知去向,老鹰只能无可奈何地继续寻找食物了。' },
         '451_7':{ id: '451_7', title: '报恩的蚂蚁', tip: '蚂蚁和猫头鹰为什么会成为好朋友?如果别的小朋友遇到了困难,你会怎么做?', story: '炎热的夏季到了,一只蚂蚁一不小心掉进了池塘里,蚂蚁正在拼命地挣扎。\t这时,一只猫头鹰观察到了这一情景。它连忙将荷叶丢进池塘,蚂蚁爬上荷叶获救了。\t蚂蚁对猫头鹰的救命之恩感激不尽。过了很久,蚂蚁看到一个男人用枪瞄准了猫头鹰,可是猫头鹰没有任何察觉。\t这时蚂蚁爬到男人的脚上,狠狠地咬了一口。男人一痛,就把子弹打歪了,猫头鹰也获救了。\t蚂蚁也报答了猫头鹰的救命之恩,从此以后猫头鹰和蚂蚁变成了好伙伴。' },
-        '451_8':{ id: '451_8', title: '穿鞋的小猴', tip: '小猴子为什么爬不上树?小朋友,你们从文章中获得了哪些道理呢?', story: '有一只小猴跑下山去,发现有一位种南瓜的老人常常穿着鞋走路,小猴觉得格外有趣。\t于是,它就偷了一双鞋子穿在了自己的脚上,这时来了一只凶猛的老虎。\t小猴着急地想爬上树,可是穿着鞋子怎么也爬不上去,着急的小猴不知道该怎么办才好,眼看老虎就要追过来了。\t猴子的妈妈让它把鞋子脱掉试一试,于是它把鞋子脱掉了就立即爬上了树,这才躲过一劫。\t小猴子从此以后再也不模仿别人穿鞋了。' },
+        '451_8':{ id: '451_8', title: '穿鞋的小猴', tip: '小猴子为什么爬不上树?小朋友,你们从文章中获得了哪些道理呢?', story: '有一只小猴跑下山去,发现有一位种南瓜的老人常常穿着鞋走路,小猴觉得格外有趣。\t于是,它就偷了一双鞋子穿在了自己的脚上,这时来了一只凶猛的老虎。\t小猴着急地想爬上树,可是穿着鞋子怎么也爬不上去,着急的小猴不知道该怎么办才好,眼看老虎就要追过来了。\t猴子的妈妈让它把鞋子脱掉试一试,于是它把鞋子脱掉了就立即爬上了树,这才躲过一劫。\t小猴子从此以后再也不模仿别人穿鞋了。' },
         '451_9':{ id: '451_9', title: '找太阳的小孩子', tip: '你们觉得太阳像什么呢?我们什么时候会看到太阳呢?太阳是从哪边升起,又是从哪边落下呢?', story: '从前有一个小孩子,他听说太阳是红红的、圆圆的便要去找太阳。\t他先是看到了桌子上的苹果,他拿着又红又圆的苹果给爸爸看,说:“爸爸,这是太阳吗?”\t爸爸说:“不,这是苹果。”他又抬起头,又看到了门上挂的红红的,圆圆的灯笼问爸爸:“爸爸,这是太阳吗?”\t爸爸说:“不,这是灯笼。”小孩子着急地问爸爸:“太阳到底在哪里呢?”\t爸爸说:“太阳只有一个,你去窗外看,它还会发光呢!”小孩子走出房间,一抬头就看到了太阳。\t他着急地说:“爸爸,我找到了,太阳红红的,圆圆的,还会发光,照在身上暖洋洋的。' },
         '451_10':{ id: '451_10', title: '爱交朋友的小猪', tip: '如果小朋友们碰到小猪,会愿意和它交朋友吗?为什么?', story: '从前,森林里有一只爱交朋友的小猪。\t可是这只小猪喜欢在泥土里玩,却从不洗澡,小猪身上臭烘烘的。这一天,小猪哼着歌,去森林里交新朋友。\t小猪先看到了小鸡,小猪问小鸡说:“小鸡,你愿意和我做朋友吗?”小鸡说:“我不要和你做朋友。”\t小猪只好失望地离开了。后来,小猪又在路上碰到了松鼠,小猪上前问松鼠:“松鼠,你愿意和我做朋友吗?”\t松鼠说:“我才不愿意呢!”小猪坐在地上感到非常苦恼,于是它去请教了大公鸡。\t大公鸡告诉它说:“因为你身体很脏,大家都不喜欢你。”小猪一听,立马回家洗了澡。\t大家听说小猪变干净了,原来不想和小猪做朋友的人,也都主动过来和小猪交朋友,小猪开心极了。\t从此以后,小猪每天都洗澡,因为它知道,大家都喜欢和讲卫生的小动物交朋友。' },
         '451_11':{ id: '451_11', title: '考零分的小猴子', tip: '小猴子为什么会考零分呢?小朋友们从文中得到了哪些道理呢?', story: '一天,学校要考试了,大象乐乐、狮子牛牛还有小猴聪聪约好了一起复习功课。\t第二天到了,大家在一起等小猴聪聪,它们等啊等,始终没看到小猴聪聪,最后大家只好去小猴聪聪家。\t到了它家,发现小猴聪聪正躺在床上睡觉。大象乐乐和狮子牛牛只好自己去复习。\t考试那天,大象乐乐和狮子牛牛信心十足,小猴聪聪却提心吊胆的,考试开始了,复习过的小动物都很快做完了卷子。\t只有小猴聪聪的卷子什么都没有写,考试时间到了,小猴聪聪只好交了个白卷。\t考试结果下来了,老师公布了结果,大象乐乐和狮子牛牛各得了一百分,小猴聪聪得了零分。\t回到家,大象乐乐和狮子牛牛都受到了爸爸妈妈的表扬,小猴聪聪却被批评了一顿,小猴聪聪决定以后好好复习。' },

+ 13 - 13
config/output/ChineseWordCfg.js

@@ -134,7 +134,7 @@ module.exports =
         '树':{ id: '451_1_4', word: '树', phrase1: '树木', phrase2: '森林里有很多树木。' },
         '刚':{ id: '451_1_5', word: '刚', phrase1: '刚才', phrase2: '刚才有一辆小车开了过去。' },
         '对':{ id: '451_1_6', word: '对', phrase1: '对手', phrase2: '台上的对手正在比赛。' },
-        '伴':{ id: '451_1_7', word: '伴', phrase1: '伙伴', phrase2: '们是对方的伙伴。' },
+        '伴':{ id: '451_1_7', word: '伴', phrase1: '伙伴', phrase2: '们是对方的伙伴。' },
         '秋':{ id: '451_2_1', word: '秋', phrase1: '秋天', phrase2: '秋天来了,天气也变凉爽了。' },
         '只':{ id: '451_2_2', word: '只', phrase1: '一只', phrase2: '天空中飞来了一只小鸟。' },
         '黑':{ id: '451_2_3', word: '黑', phrase1: '黑色', phrase2: '我今天穿了一件黑色的衣服。' },
@@ -155,7 +155,7 @@ module.exports =
         '眉':{ id: '451_4_4', word: '眉', phrase1: '眉毛', phrase2: '医生的眉毛长的又黑又浓。' },
         '问':{ id: '451_4_5', word: '问', phrase1: '问题', phrase2: '他想不通这个问题。' },
         '那':{ id: '451_4_6', word: '那', phrase1: '那个', phrase2: '那个桌子上有很多零食。' },
-        '入':{ id: '451_4_7', word: '入', phrase1: '进入', phrase2: '熊宝宝慢慢进入了梦乡。' },
+        '入':{ id: '451_4_7', word: '入', phrase1: '进入', phrase2: '熊宝宝慢慢进入了梦乡。' },
         '活':{ id: '451_5_1', word: '活', phrase1: '干活', phrase2: '农民爷爷正在田里干活。' },
         '猫':{ id: '451_5_2', word: '猫', phrase1: '小猫', phrase2: '这只小猫好可爱。' },
         '学':{ id: '451_5_3', word: '学', phrase1: '学习', phrase2: '我们应该认真学习。' },
@@ -200,7 +200,7 @@ module.exports =
         '原':{ id: '451_10_7', word: '原', phrase1: '草原', phrase2: '草原上有很多只羊。' },
         '习':{ id: '451_11_1', word: '习', phrase1: '学习', phrase2: '小朋友们正在学习汉字。' },
         '课':{ id: '451_11_2', word: '课', phrase1: '上课', phrase2: '乐乐正在上课。' },
-        '床':{ id: '451_11_3', word: '床', phrase1: '床上', phrase2: '夏明在他的床上看书。' },
+        '床':{ id: '451_11_3', word: '床', phrase1: '床上', phrase2: '夏明在他的床上看书。' },
         '没':{ id: '451_11_4', word: '没', phrase1: '没有', phrase2: '这个人一分钱都没有。' },
         '师':{ id: '451_11_5', word: '师', phrase1: '老师', phrase2: '果果的妈妈是一名老师。' },
         '各':{ id: '451_11_6', word: '各', phrase1: '各自', phrase2: '他们手里各自拿了两把尺子。' },
@@ -243,17 +243,17 @@ module.exports =
         '松':{ id: '561_1_1', word: '松', phrase1: '松树', phrase2: '任凭天寒地冻,松树也绿盖如春。' },
         '森':{ id: '561_1_2', word: '森', phrase1: '森林', phrase2: '森林里各类植物生长得很茂盛。' },
         '鼠':{ id: '561_1_3', word: '鼠', phrase1: '老鼠', phrase2: '猫蹲下身来准备向老鼠猛扑过去。' },
-        '细':{ id: '561_1_4', word: '细', phrase1: '细小', phrase2: '这里的沙粒很细小,踩上去很柔软。' },
+        '细':{ id: '561_1_4', word: '细', phrase1: '细小', phrase2: '这里细小的沙粒踩上去很柔软。' },
         '泉':{ id: '561_1_5', word: '泉', phrase1: '泉水', phrase2: '泉水叮咚叮咚,从山间流过。' },
         '屋':{ id: '561_1_6', word: '屋', phrase1: '房屋', phrase2: '年久失修,那间房屋已经残破了。' },
         '信':{ id: '561_1_7', word: '信', phrase1: '信箱', phrase2: '我亲眼看见她把信投送到信箱里。' },
-        '采':{ id: '561_1_8', word: '采', phrase1: '采花', phrase2: '我是一只小蜜蜂,一天到晚采花忙。' },
+        '采':{ id: '561_1_8', word: '采', phrase1: '采花', phrase2: '我是小蜜蜂,一天到晚采花忙。' },
         '夕':{ id: '561_2_1', word: '夕', phrase1: '夕阳', phrase2: '黄昏,爸爸和妈妈一起去看夕阳。' },
         '劳':{ id: '561_2_2', word: '劳', phrase1: '劳动', phrase2: '劳动人民最光荣。' },
         '夜':{ id: '561_2_3', word: '夜', phrase1: '深夜', phrase2: '王老师很辛苦,常常备课到深夜。' },
         '市':{ id: '561_2_4', word: '市', phrase1: '城市', phrase2: '这里是我们城市的商业中心。' },
         '村':{ id: '561_2_5', word: '村', phrase1: '农村', phrase2: '我喜欢淳朴的农村生活。' },
-        '梦':{ id: '561_2_6', word: '梦', phrase1: '梦乡', phrase2: '夜阑人静,他们很快就进入了梦乡。' },
+        '梦':{ id: '561_2_6', word: '梦', phrase1: '梦乡', phrase2: '夜深了,他们很快就进入了梦乡。' },
         '曲':{ id: '561_2_7', word: '曲', phrase1: '乐曲', phrase2: '我们伴随着欢乐的乐曲跳起舞来。' },
         '轻':{ id: '561_2_8', word: '轻', phrase1: '轻快', phrase2: '小鸟在树枝上轻快地飞来飞去。' },
         '国':{ id: '561_3_1', word: '国', phrase1: '祖国', phrase2: '我热爱祖国的锦绣河山。' },
@@ -288,11 +288,11 @@ module.exports =
         '纸':{ id: '561_6_6', word: '纸', phrase1: '报纸', phrase2: '爷爷和奶奶经常在一起看报纸。' },
         '铅':{ id: '561_6_7', word: '铅', phrase1: '铅笔', phrase2: '我喜欢用彩色的铅笔在纸上画画。' },
         '笔':{ id: '561_6_8', word: '笔', phrase1: '毛笔', phrase2: '他拿起毛笔,开始书写文章。' },
-        '枫':{ id: '561_7_1', word: '枫', phrase1: '枫树', phrase2: '秋天到了,枫树的叶子渐渐变红了。' },
+        '枫':{ id: '561_7_1', word: '枫', phrase1: '枫树', phrase2: '秋天,枫树的叶子渐渐变红了。' },
         '丰':{ id: '561_7_2', word: '丰', phrase1: '丰收', phrase2: '果园里到处是一片丰收的景象。' },
         '景':{ id: '561_7_3', word: '景', phrase1: '风景', phrase2: '这美丽的江南,真是风景如画。' },
         '棉':{ id: '561_7_4', word: '棉', phrase1: '棉花', phrase2: '天边的云朵犹如棉花一样洁白。' },
-        '坏':{ id: '561_7_5', word: '坏', phrase1: '破坏', phrase2: '地震后,各地都有被破坏的痕迹。' },
+        '坏':{ id: '561_7_5', word: '坏', phrase1: '破坏', phrase2: '地震后,各地都有被破坏的痕迹。' },
         '昨':{ id: '561_7_6', word: '昨', phrase1: '昨天', phrase2: '他昨天在池塘里捉到了一些鱼。' },
         '肉':{ id: '561_7_7', word: '肉', phrase1: '鱼肉', phrase2: '人为刀俎,我为鱼肉。' },
         '压':{ id: '561_7_8', word: '压', phrase1: '压力', phrase2: '我们绝不屈服于任何外来的压力。' },
@@ -323,7 +323,7 @@ module.exports =
         '尖':{ id: '561_11_1', word: '尖', phrase1: '尖叫', phrase2: '她发出一声尖叫,然后沉默了。' },
         '浪':{ id: '561_11_2', word: '浪', phrase1: '浪花', phrase2: '海面上出现了奔腾不息的浪花。' },
         '尘':{ id: '561_11_3', word: '尘', phrase1: '灰尘', phrase2: '妈妈正在擦掉窗户上的灰尘。' },
-        '洋':{ id: '561_11_4', word: '洋', phrase1: '海洋', phrase2: '海洋里的生物千奇百怪,非常迷人。' },
+        '洋':{ id: '561_11_4', word: '洋', phrase1: '海洋', phrase2: '海洋里的生物千奇百怪。' },
         '实':{ id: '561_11_5', word: '实', phrase1: '果实', phrase2: '秋天农民伯伯收获了香甜的果实。' },
         '令':{ id: '561_11_6', word: '令', phrase1: '命令', phrase2: '接到命令,部队立即出发。' },
         '川':{ id: '561_11_7', word: '川', phrase1: '山川', phrase2: '祖国的山川河流气势壮观。' },
@@ -333,7 +333,7 @@ module.exports =
         '灰':{ id: '561_12_3', word: '灰', phrase1: '灰色', phrase2: '我家养了一只灰色的小狗。' },
         '透':{ id: '561_12_4', word: '透', phrase1: '穿透', phrase2: '钉子在力的作用下穿透了木板。' },
         '背':{ id: '561_12_5', word: '背', phrase1: '背影', phrase2: '我站在原地看着他们的背影。' },
-        '莲':{ id: '561_12_6', word: '莲', phrase1: '莲花', phrase2: '莲花开在污泥中,人才出在贫寒家。' },
+        '莲':{ id: '561_12_6', word: '莲', phrase1: '莲花', phrase2: '莲花出淤泥而不染。' },
         '音':{ id: '561_12_7', word: '音', phrase1: '音乐', phrase2: '他一边跑步,一边听音乐。' },
         '展':{ id: '561_12_8', word: '展', phrase1: '画展', phrase2: '同学们看画展看得入神了。' },
         '铃':{ id: '561_13_1', word: '铃', phrase1: '铃铛', phrase2: '羊的铃铛叮铃铃地响彻整个山区。' },
@@ -348,12 +348,12 @@ module.exports =
         '卜':{ id: '561_14_2', word: '卜', phrase1: '占卜', phrase2: '不可以完全相信占卜的结果。' },
         '困':{ id: '561_14_3', word: '困', phrase1: '围困', phrase2: '鲨鱼群将这个人围困在石头上。' },
         '品':{ id: '561_14_4', word: '品', phrase1: '品尝', phrase2: '他正乐滋滋地品尝着冰淇淋。' },
-        '寸':{ id: '561_14_5', word: '寸', phrase1: '尺寸', phrase2: '这件衣服的尺寸有点小,他穿不上。' },
+        '寸':{ id: '561_14_5', word: '寸', phrase1: '尺寸', phrase2: '这件衣服的尺寸小,他穿不上。' },
         '钢':{ id: '561_14_6', word: '钢', phrase1: '钢铁', phrase2: '军人是经过千锤百炼的钢铁战士。' },
         '棋':{ id: '561_14_7', word: '棋', phrase1: '下棋', phrase2: '爷爷在下棋时不愿被别人吵扰。' },
         '熟':{ id: '561_14_8', word: '熟', phrase1: '成熟', phrase2: '麦子成熟了,大地一片金黄。' },
         '吐':{ id: '561_15_1', word: '吐', phrase1: '呕吐', phrase2: '她先是头晕,继而又呕吐。' },
-        '蝌':{ id: '561_15_2', word: '蝌', phrase1: '蝌蚪', phrase2: '蝌蚪说:早上好,你是我的妈妈吗?' },
+        '蝌':{ id: '561_15_2', word: '蝌', phrase1: '蝌蚪', phrase2: '蝌蚪说:你好,你是我的妈妈吗?' },
         '蚪':{ id: '561_15_3', word: '蚪', phrase1: '蝌蚪', phrase2: '青蛙总忘记自己从前是蝌蚪。' },
         '扔':{ id: '561_15_4', word: '扔', phrase1: '扔掉', phrase2: '他在垃圾桶前扔掉了手上的垃圾。' },
         '旗':{ id: '561_15_5', word: '旗', phrase1: '红旗', phrase2: '少先队员的红领巾是红旗的一角。' },
@@ -361,7 +361,7 @@ module.exports =
         '杏':{ id: '561_15_7', word: '杏', phrase1: '银杏', phrase2: '秋天是赏一树银杏的好时节。' },
         '蛇':{ id: '561_15_8', word: '蛇', phrase1: '毒蛇', phrase2: '毒蛇嘴里没好牙。' },
         '矿':{ id: '561_16_1', word: '矿', phrase1: '矿工', phrase2: '矿工的工作是挖掘地下宝藏。' },
-        '纺':{ id: '561_16_2', word: '纺', phrase1: '纺车', phrase2: '我将棉花捻过,然后将它穿过纺车。' },
+        '纺':{ id: '561_16_2', word: '纺', phrase1: '纺车', phrase2: '我将棉花捻过后,再穿过纺车。' },
         '织':{ id: '561_16_3', word: '织', phrase1: '织品', phrase2: '妈妈经常用毛线织一些织品。' },
         '治':{ id: '561_16_4', word: '治', phrase1: '治疗', phrase2: '小女孩正在接受治疗。' },
         '灭':{ id: '561_16_5', word: '灭', phrase1: '灭火', phrase2: '消防员叔叔正在努力灭火。' },

+ 23 - 22
config/output/PinyinChange.js

@@ -7,29 +7,30 @@ module.exports =
         '231_11':{ id: '231_11', oldpy: 'shù yī shù|biān shù', newpy: 'shǔ yī shǔ|biān shǔ' },
         '231_13':{ id: '231_13', oldpy: 'cháng de', newpy: 'zhǎng de' },
         '231_14':{ id: '231_14', oldpy: 'tián lǐ cháng', newpy: 'tián lǐ zhǎng' },
+        '341_1':{ id: '341_1', oldpy: 'qīng qīng dì', newpy: 'qīng qīng de' },
         '341_2':{ id: '341_2', oldpy: 'mén', newpy: 'men' },
-        '341_4':{ id: '341_4', oldpy: 'dū', newpy: 'dōu' },
-        '341_5':{ id: '341_5', oldpy: 'dū|mén', newpy: 'dōu|men' },
-        '341_7':{ id: '341_7', oldpy: 'dū|mén', newpy: 'dōu|men' },
-        '341_8':{ id: '341_8', oldpy: 'bié zhǐ lù', newpy: 'bié zhǐ lòu' },
-        '341_10':{ id: '341_10', oldpy: 'wēn róu dì', newpy: 'wēn róu de' },
-        '341_11':{ id: '341_11', oldpy: 'mén', newpy: 'men' },
+        '341_4':{ id: '341_4', oldpy: 'dū|cōng cōng dì', newpy: 'dōu|cōng cōng de' },
+        '341_5':{ id: '341_5', oldpy: 'dū|mén|men shàng', newpy: 'dōu|men|mén shàng' },
+        '341_7':{ id: '341_7', oldpy: 'dū|mén|cháng chū le |zhèi xiē|', newpy: 'dōu|men|zhǎng chū le|zhè xiē' },
+        '341_8':{ id: '341_8', oldpy: 'bié zhī lù', newpy: 'bié zhǐ lòu' },
+        '341_10':{ id: '341_10', oldpy: 'wēn róu dì|gàn gān jìng jìng', newpy: 'wēn róu de|gān gān jìng jìng' },
+        '341_11':{ id: '341_11', oldpy: 'mén|xiān juàn qǐ', newpy: 'men|xiān juǎn qǐ' },
         '341_12':{ id: '341_12', oldpy: 'dū|mén', newpy: 'dōu|men' },
-        '451_1':{ id: '451_1', oldpy: 'xīn dì|cóng cǐ|xū dì|bù yòng', newpy: 'xīn de|chóng zi|xū de|bú yòng' },
-        '451_2':{ id: '451_2', oldpy: 'yī zhī|shī zǐ|zhāng dì|bù liào|yī bù xiǎo|gǎn jī bù jìn', newpy: 'yì zhī|shī zi|zhāng de|bú liào|yí bù xiǎo|gǎn jī bú jìn' },
-        '451_3':{ id: '451_3', oldpy: 'yī tiān|hóu zǐ|yī zhī|zhèi xiē|táo zǐ|tù zǐ|pǎo dé|pǎo dì', newpy: 'yì tiān|hóu zi|yì zhī|zhè xiē|táo zi|tù zi|pǎo de|pǎo de' },
-        '451_4':{ id: '451_4', oldpy: 'yī tiān|yī jiā|bèi zhe|ér zǐ|wéi shèn mǒ|jiàn dì', newpy: 'yì tiān|yì jiā|bēi zhe|ér zi|wèi shén me|jiàn de' },
-        '451_5':{ id: '451_5', oldpy: 'yī zhī|yī tiáo|yī zuò|yī cì|hái zǐ', newpy: 'yì zhī|yì tiáo|yí zuò|yí cì|hái zi' },
-        '451_6':{ id: '451_6', oldpy: 'yī tiān|yī zhī|zhāng dì|mèi dū|hé dì', newpy: 'yì tiān|yì zhī|zhāng de|mèi dōu|hé de' },
-        '451_7':{ id: '451_7', oldpy: 'yī zhī|yī bù xiǎo|mìng dì|hěn dì|yī tòng|zi tán', newpy: 'yì zhī|yí bù xiǎo|mìng de|hěn de|yí tòng|zǐ dàn' },
-        '451_8':{ id: '451_8', oldpy: 'yī zhī|yī wèi|zhe jí|hóu zǐ|xié zǐ|yī jié', newpy: 'yì zhī|yí wèi|zháo jí|hóu zi|xié zi|yì jié' },
-        '451_9':{ id: '451_9', oldpy: 'hái zǐ|zhuō zǐ|pín guǒ|zhe jí dì', newpy: 'hái zi|zhuō zi|píng guǒ|zháo jí de' },
-        '451_10':{ id: '451_10', oldpy: 'yī zhī|hng zhe|wàng dì|dū bù|dū xǐ', newpy: 'yì zhī|hēng zhe|wàng de|dōu bù|dōu xǐ' },
-        '451_11':{ id: '451_11', oldpy: 'yī tiān|zǐ|yī qǐ|juǎn zi|dū méi|bù liǎo|dū shòu|yī dùn', newpy: 'yì tiān|zi|yì qǐ|juàn zi|dōu méi|bù le|dōu shòu|yí dùn' },
+        '451_1':{ id: '451_1', oldpy: 'xīn dì|xū dì|bù yòng|yī wèi|chóng zǐ|', newpy: 'xīn de|xū de|bú yòng|yí wèi|chóng zi' },
+        '451_2':{ id: '451_2', oldpy: 'yī zhī|shī zǐ|zhāng dì|bù liào|yī bù xiǎo|gǎn jī bù jìn|yī mù', newpy: 'yì zhī|shī zi|zhāng de|bú liào|yí bù xiǎo|gǎn jī bú jìn|yí mù' },
+        '451_3':{ id: '451_3', oldpy: 'yī tiān|hóu zǐ|yī zhī|zhèi xiē|táo zǐ|tù zǐ|pǎo dé|pǎo dì|yī piàn|zuàn le', newpy: 'yì tiān|hóu zi|yì zhī|zhè xiē|táo zi|tù zi|pǎo de|pǎo de|yí piàn|zuān le' },
+        '451_4':{ id: '451_4', oldpy: 'yī tiān|yī jiā|bèi zhe|ér zǐ|wéi shèn mǒ|jiàn dì|yī kuài', newpy: 'yì tiān|yì jiā|bēi zhe|ér zi|wèi shén me|jiàn de|yí kuài' },
+        '451_5':{ id: '451_5', oldpy: 'yī zhī|yī tiáo|yī zuò|yī cì|hái zǐ|tā mén', newpy: 'yì zhī|yì tiáo|yí zuò|yí cì|hái zi|tā men' },
+        '451_6':{ id: '451_6', oldpy: 'yī tiān|yī zhī|zhāng dì|mèi dū|hé dì|yī kuài|mèi mèi|hái bù', newpy: 'yì tiān|yì zhī|zhāng de|mèi dōu|hé de|yí kuài|mèi mei|hái bú' },
+        '451_7':{ id: '451_7', oldpy: 'yī zhī|yī bù xiǎo|mìng dì|hěn dì|yī tòng|zi tán|zhè yī|bù jìn|yī kǒu', newpy: 'yì zhī|yí bù xiǎo|mìng de|hěn de|yí tòng|zǐ dàn|zhè yì|bú jìn|yì kǒu' },
+        '451_8':{ id: '451_8', oldpy: 'yī zhī|yī wèi|zhe jí|hóu zǐ|xié zǐ|yī jié|yī shuāng|zháo jí dì|shì yī shì', newpy: 'yì zhī|yí wèi|zháo jí|hóu zi|xié zi|yì jié|yì shuāng|zháo jí de|shì yí shì' },
+        '451_9':{ id: '451_9', oldpy: 'hái zǐ|zhuō zǐ|pín guǒ|zhe jí dì|yī tái tóu', newpy: 'hái zi|zhuō zi|píng guǒ|zháo jí de|yì tái tóu' },
+        '451_10':{ id: '451_10', oldpy: 'yī zhī|hng zhe|wàng dì|dū bù|dū xǐ|yī tiān|bù yuàn', newpy: 'yì zhī|hēng zhe|wàng de|dōu bù|dōu xǐ|yì tiān|bú yuàn' },
+        '451_11':{ id: '451_11', oldpy: 'yī tiān|zǐ|yī qǐ|juǎn zi|dū méi|bù liǎo|dū shòu|yī dùn|yī bǎi', newpy: 'yì tiān|zi|yì qǐ|juàn zi|dōu méi|bù le|dōu shòu|yí dùn|yì bǎi' },
         '451_12':{ id: '451_12', oldpy: 'yā zǐ|yī zhī|yī tiān|yī piàn|yī kàn|yī dìng|zhe jí dì|bí zǐ|yī tīng|yī yàng|hái zǐ', newpy: 'yā zi|yì zhī|yì tiān|yí piàn|yí kàn|yí dìng|zháo jí de|bí zi|yì tīng|yí yàng|hái zi' },
         '451_13':{ id: '451_13', oldpy: 'dū hào|hóu zǐ|dū lái|yī bǎ|yī zhī|zhī jiàn|táo zǐ|dū wǎng|yī tái|là xià|dū yī|dū huān|dū hěn', newpy: 'dōu hào|hóu zi|dōu lái|yì bǎ|yì zhī|zhǐ jiàn|táo zi|dōu wǎng|yì tái|luò xià|dōu yī|dōu huān|dōu hěn' },
-        '451_14':{ id: '451_14', oldpy: 'yáng dì|là xià|yī piàn|dū shì|yǒu mén|dū zài|dū hěn|dū huí|yī cì', newpy: 'yáng de|luò xià|yí piàn|dōu shì|yǒu men|dōu zài|dōu hěn|dōu huí|yí cì' },
-        '451_15':{ id: '451_15', oldpy: 'yī xiē|zǐ mén|dū jié|yī wèi|yī xiē|cháng chū|dū méi|dū ná|xīn dì|dū wèi|dū bèi', newpy: 'yì xiē|zi men|dōu jié|yí wèi|yì xiē|zhǎng chū|dōu méi|dōu ná|xīn de|dōu wèi|dōu bèi' },
+        '451_14':{ id: '451_14', oldpy: 'yáng dì|là xià|yī piàn|dū shì|yǒu mén|dū zài|dū hěn|dū huí|yī cì|yī gòng', newpy: 'yáng de|luò xià|yí piàn|dōu shì|yǒu men|dōu zài|dōu hěn|dōu huí|yí cì|yí gòng' },
+        '451_15':{ id: '451_15', oldpy: 'yī xiē|zǐ mén|dū jié|yī wèi|yī xiē|cháng chū|dū méi|dū ná|xīn dì|dū wèi|dū bèi|xiǎo hái zǐ|dū huí', newpy: 'yì xiē|zi men|dōu jié|yí wèi|yì xiē|zhǎng chū|dōu méi|dōu ná|xīn de|dōu wèi|dōu bèi|xiǎo hái zi|dōu huí' },
         '451_16':{ id: '451_16', oldpy: 'yī qǐ|xié zǐ|kù zǐ|zhuī zǐ|wǒ mén|xīn dì|zhèi xiē|yī juàn|yī céng|yī bàn', newpy: 'yì qǐ|xié zi|kù zi|zhuī zi|wǒ men|xīn de|zhè xiē|yì juǎn|yì céng|yí bàn' },
         '561_1':{ id: '561_1', oldpy: 'mén|dū|qiè dì|yī bǎ', newpy: 'men|dōu|qiè de|yì bǎ' },
         '561_2':{ id: '561_2', oldpy: 'là|mén', newpy: 'luò|men' },
@@ -37,10 +38,10 @@ module.exports =
         '561_6':{ id: '561_6', oldpy: 'mén|dū|dé', newpy: 'men|dōu|de' },
         '561_7':{ id: '561_7', oldpy: 'wéi shèn mǒ bù|mén', newpy: 'wèi shén me bú|men' },
         '561_8':{ id: '561_8', oldpy: 'yī gān|jí dé|mén|dū', newpy: 'yī gǎn|jí de|men|dōu' },
-        '561_9':{ id: '561_9', oldpy: 'bèi zhe|shuí zhī', newpy: 'bēi zhe|shéi zhī' },
-        '561_10':{ id: '561_10', oldpy: 'dū|mén|diǎn qǐ|fèng shàng', newpy: 'dōu|men|diān qǐ|féng shàng' },
+        '561_9':{ id: '561_9', oldpy: 'bèi zhe|shuí zhī|dài zǐ', newpy: 'bēi zhe|shéi zhī|dài zi' },
+        '561_10':{ id: '561_10', oldpy: 'dū|mén|diǎn qǐ|fèng shàng|kǒu zǐ', newpy: 'dōu|men|diān qǐ|féng shàng|kǒu zi' },
         '561_11':{ id: '561_11', oldpy: 'dū|zhe shí', newpy: 'dōu|zhuó shí' },
-        '561_12':{ id: '561_12', oldpy: 'mén', newpy: 'men' },
+        '561_12':{ id: '561_12', oldpy: 'mén|huī mēng meng', newpy: 'men|huī méng méng' },
         '561_13':{ id: '561_13', oldpy: 'mén|jìn háng|dī dá dī dá dì|dū|dì yí', newpy: 'men|jìn xíng|dī dā dī dā de|dōu|dì yī' },
         '561_14':{ id: '561_14', oldpy: 'bǔ', newpy: 'bo' },
         '561_15':{ id: '561_15', oldpy: 'tù|mén|zuàn|dū', newpy: 'tǔ|men|zuān|dōu' },

BIN
config/多音字配置.xlsx


BIN
config/识字宝故事配置.xlsx


BIN
config/识字宝文字配置.xlsx


+ 66 - 66
gameRes/gameChineseSeme/20048/guide/guide_20048.json

@@ -44,11 +44,11 @@
         "isGraphics": false
       },
       {
-        "x": 3.461,
-        "y": -30.186,
-        "nodeName": "33",
+        "x": -0.153,
+        "y": 65.955,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "33",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
@@ -64,7 +64,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 21,
+            "startDelay": 16,
             "actions": [
               {
                 "actionType": 6,
@@ -76,7 +76,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +89,15 @@
         "isGraphics": false
       },
       {
-        "x": 6.589,
-        "y": -30.351,
-        "nodeName": "3",
+        "x": 10.971,
+        "y": 74.159,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "3",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +108,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +121,15 @@
         "isGraphics": false
       },
       {
-        "x": 6.947,
-        "y": -28.532,
-        "nodeName": "03",
+        "x": 10.869,
+        "y": 74.666,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "03",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,
@@ -142,39 +142,26 @@
         "isGraphics": false
       },
       {
-        "x": -0.153,
-        "y": 65.955,
-        "nodeName": "22",
+        "x": -15.403,
+        "y": 140.695,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 16,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11,
             "actions": [
               {
                 "actionType": 4,
@@ -187,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": 10.971,
-        "y": 74.159,
-        "nodeName": "2",
+        "x": -13.456,
+        "y": 140.043,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 10.5,
             "actions": [
               {
                 "actionType": 3,
@@ -206,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 13,
             "actions": [
               {
                 "actionType": 4,
@@ -219,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": 10.869,
-        "y": 74.666,
-        "nodeName": "02",
+        "x": -7.394,
+        "y": 140.835,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 12.5,
             "actions": [
               {
                 "actionType": 3,
@@ -240,26 +227,39 @@
         "isGraphics": false
       },
       {
-        "x": -15.403,
-        "y": 140.695,
-        "nodeName": "11",
+        "x": 3.461,
+        "y": -30.186,
+        "nodeName": "33",
         "opacity": 0,
-        "tex": "11",
+        "tex": "33",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
-                "runTime": 2,
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 11,
+            "startDelay": 21,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 4,
@@ -272,15 +272,15 @@
         "isGraphics": false
       },
       {
-        "x": -13.456,
-        "y": 140.043,
-        "nodeName": "1",
+        "x": 6.589,
+        "y": -30.351,
+        "nodeName": "3",
         "opacity": 0,
-        "tex": "1",
+        "tex": "3",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 10.5,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 3,
@@ -291,7 +291,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 13,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 4,
@@ -304,15 +304,15 @@
         "isGraphics": false
       },
       {
-        "x": -7.394,
-        "y": 140.835,
-        "nodeName": "01",
+        "x": 6.947,
+        "y": -28.532,
+        "nodeName": "03",
         "opacity": 0,
-        "tex": "01",
+        "tex": "03",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12.5,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 3,

+ 66 - 66
gameRes/gameChineseSeme/20064/guide/guide_20064.json

@@ -44,11 +44,11 @@
         "isGraphics": false
       },
       {
-        "x": -14.598,
-        "y": -115.27,
-        "nodeName": "33",
+        "x": -31.913,
+        "y": 31.29,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "33",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
@@ -64,7 +64,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 21,
+            "startDelay": 16,
             "actions": [
               {
                 "actionType": 6,
@@ -76,7 +76,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +89,15 @@
         "isGraphics": false
       },
       {
-        "x": -8.25,
-        "y": -113.258,
-        "nodeName": "3",
+        "x": -36.21,
+        "y": 34.648,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "3",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +108,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +121,15 @@
         "isGraphics": false
       },
       {
-        "x": -9.502,
-        "y": -113.777,
-        "nodeName": "03",
+        "x": -35.893,
+        "y": 34.879,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "03",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,
@@ -142,39 +142,26 @@
         "isGraphics": false
       },
       {
-        "x": -31.913,
-        "y": 31.29,
-        "nodeName": "22",
+        "x": -0.093,
+        "y": 1.969,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 16,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11,
             "actions": [
               {
                 "actionType": 4,
@@ -187,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": -36.21,
-        "y": 34.648,
-        "nodeName": "2",
+        "x": -0.782,
+        "y": -0.221,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 10.5,
             "actions": [
               {
                 "actionType": 3,
@@ -206,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 13,
             "actions": [
               {
                 "actionType": 4,
@@ -219,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": -35.893,
-        "y": 34.879,
-        "nodeName": "02",
+        "x": -1.492,
+        "y": -0.871,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 12.5,
             "actions": [
               {
                 "actionType": 3,
@@ -240,26 +227,39 @@
         "isGraphics": false
       },
       {
-        "x": -0.093,
-        "y": 1.969,
-        "nodeName": "11",
+        "x": -14.598,
+        "y": -115.27,
+        "nodeName": "33",
         "opacity": 0,
-        "tex": "11",
+        "tex": "33",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
-                "runTime": 2,
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 11,
+            "startDelay": 21,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 4,
@@ -272,15 +272,15 @@
         "isGraphics": false
       },
       {
-        "x": -0.782,
-        "y": -0.221,
-        "nodeName": "1",
+        "x": -8.25,
+        "y": -113.258,
+        "nodeName": "3",
         "opacity": 0,
-        "tex": "1",
+        "tex": "3",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 10.5,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 3,
@@ -291,7 +291,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 13,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 4,
@@ -304,15 +304,15 @@
         "isGraphics": false
       },
       {
-        "x": -1.492,
-        "y": -0.871,
-        "nodeName": "01",
+        "x": -9.502,
+        "y": -113.777,
+        "nodeName": "03",
         "opacity": 0,
-        "tex": "01",
+        "tex": "03",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12.5,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 3,

+ 1 - 0
gameRes/gameChineseSeme/20196/guide/guide_20196.json

@@ -125,6 +125,7 @@
               {
                 "actionType": 4,
                 "runTime": 1,
+                "startDelay": 9.5,
                 "isSequence": true
               }
             ]

+ 57 - 57
gameRes/gameChineseSeme/20247/guide/guide_20247.json

@@ -44,9 +44,9 @@
         "isGraphics": false
       },
       {
-        "x": 74.642,
-        "y": -90.54,
-        "nodeName": "33",
+        "x": -74.166,
+        "y": -89.01,
+        "nodeName": "22",
         "opacity": 0,
         "tex": "11",
         "actions": [
@@ -64,7 +64,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 21,
+            "startDelay": 16,
             "actions": [
               {
                 "actionType": 6,
@@ -76,7 +76,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +89,15 @@
         "isGraphics": false
       },
       {
-        "x": 70.86,
-        "y": -90.172,
-        "nodeName": "3",
+        "x": -78.173,
+        "y": -88.879,
+        "nodeName": "2",
         "opacity": 0,
         "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +108,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +121,15 @@
         "isGraphics": false
       },
       {
-        "x": 73.277,
-        "y": -89.609,
-        "nodeName": "03",
+        "x": -76.166,
+        "y": -88.007,
+        "nodeName": "02",
         "opacity": 0,
         "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,
@@ -142,9 +142,9 @@
         "isGraphics": false
       },
       {
-        "x": -74.166,
-        "y": -89.01,
-        "nodeName": "22",
+        "x": 28.535,
+        "y": 89.68,
+        "nodeName": "11",
         "opacity": 0,
         "tex": "11",
         "actions": [
@@ -153,28 +153,15 @@
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 16,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11,
             "actions": [
               {
                 "actionType": 4,
@@ -187,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": -78.173,
-        "y": -88.879,
-        "nodeName": "2",
+        "x": 23.781,
+        "y": 89.75,
+        "nodeName": "1",
         "opacity": 0,
         "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 10.5,
             "actions": [
               {
                 "actionType": 3,
@@ -206,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 13,
             "actions": [
               {
                 "actionType": 4,
@@ -219,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": -76.166,
-        "y": -88.007,
-        "nodeName": "02",
+        "x": 25.443,
+        "y": 90.146,
+        "nodeName": "01",
         "opacity": 0,
         "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 12.5,
             "actions": [
               {
                 "actionType": 3,
@@ -240,9 +227,9 @@
         "isGraphics": false
       },
       {
-        "x": 28.535,
-        "y": 89.68,
-        "nodeName": "11",
+        "x": 74.642,
+        "y": -90.54,
+        "nodeName": "33",
         "opacity": 0,
         "tex": "11",
         "actions": [
@@ -251,15 +238,28 @@
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
-                "runTime": 2,
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 11,
+            "startDelay": 21,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 4,
@@ -272,15 +272,15 @@
         "isGraphics": false
       },
       {
-        "x": 23.781,
-        "y": 89.75,
-        "nodeName": "1",
+        "x": 70.86,
+        "y": -90.172,
+        "nodeName": "3",
         "opacity": 0,
         "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 10.5,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 3,
@@ -291,7 +291,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 13,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 4,
@@ -304,15 +304,15 @@
         "isGraphics": false
       },
       {
-        "x": 25.443,
-        "y": 90.146,
-        "nodeName": "01",
+        "x": 73.277,
+        "y": -89.609,
+        "nodeName": "03",
         "opacity": 0,
         "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12.5,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 3,

+ 21 - 21
gameRes/gameChineseSeme/20249/guide/guide_20249.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 76.427,
-        "y": -16.059,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 18.5,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -91.272,
         "y": 11.374,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 76.427,
+        "y": -16.059,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 18.5,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/20276/guide/guide_20276.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 68.707,
-        "y": -0.032,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 20,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -100.359,
         "y": 4.382,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 68.707,
+        "y": -0.032,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 20,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/20301/guide/guide_20301.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 62.985,
-        "y": 3.365,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 19,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -114.016,
         "y": 2.639,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 62.985,
+        "y": 3.365,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 19,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 48 - 48
gameRes/gameChineseSeme/20303/guide/guide_20303.json

@@ -44,39 +44,26 @@
         "isGraphics": false
       },
       {
-        "x": 58.712,
-        "y": -4.063,
-        "nodeName": "22",
+        "x": -91.967,
+        "y": 0.172,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 15,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 16.5,
+            "startDelay": 12,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +76,15 @@
         "isGraphics": false
       },
       {
-        "x": 57.36,
-        "y": -2.269,
-        "nodeName": "2",
+        "x": -98.785,
+        "y": -2.887,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 17,
+            "startDelay": 11.5,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +95,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 19,
+            "startDelay": 14,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +108,15 @@
         "isGraphics": false
       },
       {
-        "x": 56.195,
-        "y": -2.957,
-        "nodeName": "02",
+        "x": -98.721,
+        "y": -1.814,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 19,
+            "startDelay": 14,
             "actions": [
               {
                 "actionType": 3,
@@ -142,18 +129,19 @@
         "isGraphics": false
       },
       {
-        "x": -91.651,
-        "y": 1.346,
-        "nodeName": "11",
+        "x": 60.036,
+        "y": -2.815,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "11",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
+                "actionType": 6,
+                "opacity": 75,
                 "runTime": 2,
                 "isSequence": true
               }
@@ -161,7 +149,19 @@
           },
           {
             "isSequence": false,
-            "startDelay": 12,
+            "startDelay": 16,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 17,
             "actions": [
               {
                 "actionType": 4,
@@ -174,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": -98.562,
-        "y": -3.697,
-        "nodeName": "1",
+        "x": 57.493,
+        "y": -1.319,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "1",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12,
+            "startDelay": 16.5,
             "actions": [
               {
                 "actionType": 3,
@@ -193,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 14,
+            "startDelay": 19,
             "actions": [
               {
                 "actionType": 4,
@@ -206,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": -99.305,
-        "y": -4.376,
-        "nodeName": "01",
+        "x": 58.058,
+        "y": -1.782,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "01",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 14,
+            "startDelay": 19,
             "actions": [
               {
                 "actionType": 3,

+ 21 - 21
gameRes/gameChineseSeme/20837/guide/guide_20837.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 10.872,
-        "y": 1.178,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 20,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -70.459,
         "y": -51.011,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 10.872,
+        "y": 1.178,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 20,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 66 - 66
gameRes/gameChineseSeme/20848/guide/guide_20848.json

@@ -44,11 +44,11 @@
         "isGraphics": false
       },
       {
-        "x": -0.377,
-        "y": -58.841,
-        "nodeName": "33",
+        "x": 44.642,
+        "y": 90.339,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "33",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
@@ -64,7 +64,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 22,
+            "startDelay": 16,
             "actions": [
               {
                 "actionType": 6,
@@ -76,7 +76,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 24,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +89,15 @@
         "isGraphics": false
       },
       {
-        "x": -0.39,
-        "y": -43.438,
-        "nodeName": "3",
+        "x": 42.331,
+        "y": 86.603,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "3",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 24,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +108,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 26,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +121,15 @@
         "isGraphics": false
       },
       {
-        "x": 0.903,
-        "y": -43.308,
-        "nodeName": "03",
+        "x": 41.483,
+        "y": 88.112,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "03",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 26,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,
@@ -142,39 +142,26 @@
         "isGraphics": false
       },
       {
-        "x": 44.642,
-        "y": 90.339,
-        "nodeName": "22",
+        "x": -58.504,
+        "y": 89.878,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 16,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11,
             "actions": [
               {
                 "actionType": 4,
@@ -187,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": 42.331,
-        "y": 86.603,
-        "nodeName": "2",
+        "x": -58.529,
+        "y": 85.442,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 10.5,
             "actions": [
               {
                 "actionType": 3,
@@ -206,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 13,
             "actions": [
               {
                 "actionType": 4,
@@ -219,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": 41.483,
-        "y": 88.112,
-        "nodeName": "02",
+        "x": -57.971,
+        "y": 83.618,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 12.5,
             "actions": [
               {
                 "actionType": 3,
@@ -240,26 +227,39 @@
         "isGraphics": false
       },
       {
-        "x": -58.504,
-        "y": 89.878,
-        "nodeName": "11",
+        "x": -0.377,
+        "y": -58.841,
+        "nodeName": "33",
         "opacity": 0,
-        "tex": "11",
+        "tex": "33",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
-                "runTime": 2,
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 11,
+            "startDelay": 22,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 24,
             "actions": [
               {
                 "actionType": 4,
@@ -272,15 +272,15 @@
         "isGraphics": false
       },
       {
-        "x": -58.529,
-        "y": 85.442,
-        "nodeName": "1",
+        "x": -0.39,
+        "y": -43.438,
+        "nodeName": "3",
         "opacity": 0,
-        "tex": "1",
+        "tex": "3",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 10.5,
+            "startDelay": 24,
             "actions": [
               {
                 "actionType": 3,
@@ -291,7 +291,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 13,
+            "startDelay": 26,
             "actions": [
               {
                 "actionType": 4,
@@ -304,15 +304,15 @@
         "isGraphics": false
       },
       {
-        "x": -57.971,
-        "y": 83.618,
-        "nodeName": "01",
+        "x": 0.903,
+        "y": -43.308,
+        "nodeName": "03",
         "opacity": 0,
-        "tex": "01",
+        "tex": "03",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12.5,
+            "startDelay": 26,
             "actions": [
               {
                 "actionType": 3,

+ 99 - 99
gameRes/gameChineseSeme/20849/guide/guide_20849.json

@@ -44,104 +44,6 @@
         "isGraphics": false
       },
       {
-        "x": 88.341,
-        "y": -85.275,
-        "nodeName": "66",
-        "opacity": 0,
-        "tex": "66",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 8,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 37,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 39,
-            "actions": [
-              {
-                "actionType": 4,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
-        "x": 85.28,
-        "y": -82.528,
-        "nodeName": "6",
-        "opacity": 0,
-        "tex": "6",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 39,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 2,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 41,
-            "actions": [
-              {
-                "actionType": 4,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
-        "x": 87.569,
-        "y": -81.791,
-        "nodeName": "06",
-        "opacity": 0,
-        "tex": "06",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 41,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -87.262,
         "y": -92.423,
         "nodeName": "55",
@@ -423,7 +325,7 @@
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 30,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 3,
@@ -617,6 +519,104 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 88.341,
+        "y": -85.275,
+        "nodeName": "66",
+        "opacity": 0,
+        "tex": "66",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 8,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 37,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 39,
+            "actions": [
+              {
+                "actionType": 4,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
+      },
+      {
+        "x": 85.28,
+        "y": -82.528,
+        "nodeName": "6",
+        "opacity": 0,
+        "tex": "6",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 39,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 2,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 41,
+            "actions": [
+              {
+                "actionType": 4,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
+      },
+      {
+        "x": 87.569,
+        "y": -81.791,
+        "nodeName": "06",
+        "opacity": 0,
+        "tex": "06",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 41,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/20919/ani4.png


+ 38 - 0
gameRes/gameChineseSeme/20919/ani4.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a6ea4244-a5ad-4a90-bad5-47f7f57c534f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 111,
+  "height": 137,
+  "platformSettings": {},
+  "subMetas": {
+    "ani4": {
+      "ver": "1.0.6",
+      "uuid": "5e4c2b89-5fd9-4ccf-9d8b-caae28e7d997",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a6ea4244-a5ad-4a90-bad5-47f7f57c534f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 111,
+      "height": 137,
+      "rawWidth": 111,
+      "rawHeight": 137,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 21 - 21
gameRes/gameChineseSeme/21018/guide/guide_21018.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 99.058,
-        "y": 4.162,
-        "nodeName": "03",
-        "opacity": 0,
-        "tex": "03",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 25,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": 58.29,
         "y": 12.528,
         "nodeName": "22",
@@ -323,6 +302,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 99.058,
+        "y": 4.162,
+        "nodeName": "03",
+        "opacity": 0,
+        "tex": "03",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 25,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/21335/guide/guide_21335.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": -2.103,
-        "y": -85.784,
-        "nodeName": "09",
-        "opacity": 0,
-        "tex": "09",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 51,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -1.503,
         "y": -80.188,
         "nodeName": "88",
@@ -898,6 +877,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": -2.103,
+        "y": -85.784,
+        "nodeName": "09",
+        "opacity": 0,
+        "tex": "09",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 51,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/21387/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/21387/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "cc520e3d-c5f1-428a-922c-8b1f28772c77",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 3.168,
+  "duration": 3.312,
   "subMetas": {}
 }

+ 21 - 21
gameRes/gameChineseSeme/21482/guide/guide_21482.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 2.153,
-        "y": -86.402,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 20,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": 3.803,
         "y": 55.756,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 2.153,
+        "y": -86.402,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 20,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/21507/guide/guide_21507.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 62.592,
-        "y": -1.555,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 19,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -137.202,
         "y": 17.874,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 62.592,
+        "y": -1.555,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 19,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/22351/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/22351/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "6a2a7038-d049-4e9b-84ef-d71024cb2865",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 3.852,
+  "duration": 3.636,
   "subMetas": {}
 }

+ 21 - 21
gameRes/gameChineseSeme/22352/guide/guide_22352.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": -1.246,
-        "y": 8.558,
-        "nodeName": "03",
-        "opacity": 0,
-        "tex": "03",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 25,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": 62.05,
         "y": 83.961,
         "nodeName": "22",
@@ -323,6 +302,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": -1.246,
+        "y": 8.558,
+        "nodeName": "03",
+        "opacity": 0,
+        "tex": "03",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 25,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/22799/guide/guide_22799.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 7.034,
-        "y": -102.416,
-        "nodeName": "03",
-        "opacity": 0,
-        "tex": "03",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 25,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": 2.494,
         "y": 40.965,
         "nodeName": "22",
@@ -323,6 +302,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 7.034,
+        "y": -102.416,
+        "nodeName": "03",
+        "opacity": 0,
+        "tex": "03",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 25,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 21 - 21
gameRes/gameChineseSeme/23475/guide/guide_23475.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": -0.479,
-        "y": -101.311,
-        "nodeName": "03",
-        "opacity": 0,
-        "tex": "03",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 25,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": 1.383,
         "y": 28.376,
         "nodeName": "22",
@@ -323,6 +302,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": -0.479,
+        "y": -101.311,
+        "nodeName": "03",
+        "opacity": 0,
+        "tex": "03",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 25,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/23544/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/23544/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "b046fa87-65b3-4893-808a-ef316a132919",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 3.6,
+  "duration": 3.276,
   "subMetas": {}
 }

+ 21 - 21
gameRes/gameChineseSeme/23545/guide/guide_23545.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 100.109,
-        "y": -0.652,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 19,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -100.036,
         "y": -5.672,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 100.109,
+        "y": -0.652,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 19,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 66 - 66
gameRes/gameChineseSeme/24072/guide/guide_24072.json

@@ -44,11 +44,11 @@
         "isGraphics": false
       },
       {
-        "x": 52.791,
-        "y": 0.28,
-        "nodeName": "33",
+        "x": -87.346,
+        "y": 6.175,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "33",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
@@ -64,7 +64,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 21,
+            "startDelay": 16,
             "actions": [
               {
                 "actionType": 6,
@@ -76,7 +76,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +89,15 @@
         "isGraphics": false
       },
       {
-        "x": 47.959,
-        "y": -2.816,
-        "nodeName": "3",
+        "x": -88.944,
+        "y": 5.711,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "3",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 23,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +108,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +121,15 @@
         "isGraphics": false
       },
       {
-        "x": 47.673,
-        "y": -2.259,
-        "nodeName": "03",
+        "x": -90.605,
+        "y": 7.338,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "03",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 25,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,
@@ -142,39 +142,26 @@
         "isGraphics": false
       },
       {
-        "x": -87.346,
-        "y": 6.175,
-        "nodeName": "22",
+        "x": -129.204,
+        "y": 49.854,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 16,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
+                "actionType": 3,
+                "runTime": 2,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11,
             "actions": [
               {
                 "actionType": 4,
@@ -187,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": -88.944,
-        "y": 5.711,
-        "nodeName": "2",
+        "x": -129.815,
+        "y": 48.688,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 10.5,
             "actions": [
               {
                 "actionType": 3,
@@ -206,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 13,
             "actions": [
               {
                 "actionType": 4,
@@ -219,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": -90.605,
-        "y": 7.338,
-        "nodeName": "02",
+        "x": -130.977,
+        "y": 48.862,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 12.5,
             "actions": [
               {
                 "actionType": 3,
@@ -240,26 +227,39 @@
         "isGraphics": false
       },
       {
-        "x": -129.204,
-        "y": 49.854,
-        "nodeName": "11",
+        "x": 52.791,
+        "y": 0.28,
+        "nodeName": "33",
         "opacity": 0,
-        "tex": "11",
+        "tex": "33",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
-                "runTime": 2,
+                "actionType": 6,
+                "opacity": 75,
+                "runTime": 1,
                 "isSequence": true
               }
             ]
           },
           {
             "isSequence": false,
-            "startDelay": 11,
+            "startDelay": 21,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 4,
@@ -272,15 +272,15 @@
         "isGraphics": false
       },
       {
-        "x": -129.815,
-        "y": 48.688,
-        "nodeName": "1",
+        "x": 47.959,
+        "y": -2.816,
+        "nodeName": "3",
         "opacity": 0,
-        "tex": "1",
+        "tex": "3",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 10.5,
+            "startDelay": 23,
             "actions": [
               {
                 "actionType": 3,
@@ -291,7 +291,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 13,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 4,
@@ -304,15 +304,15 @@
         "isGraphics": false
       },
       {
-        "x": -130.977,
-        "y": 48.862,
-        "nodeName": "01",
+        "x": 47.673,
+        "y": -2.259,
+        "nodeName": "03",
         "opacity": 0,
-        "tex": "01",
+        "tex": "03",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 12.5,
+            "startDelay": 25,
             "actions": [
               {
                 "actionType": 3,

BIN
gameRes/gameChineseSeme/24202/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/24202/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "2da53bfa-3931-43ee-93da-dc3ad5b45a92",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 2.592,
+  "duration": 2.664,
   "subMetas": {}
 }

+ 47 - 47
gameRes/gameChineseSeme/24202/guide/guide_24202.json

@@ -44,19 +44,18 @@
         "isGraphics": false
       },
       {
-        "x": 49.757,
-        "y": -56.782,
-        "nodeName": "22",
+        "x": -22.031,
+        "y": 12.33,
+        "nodeName": "11",
         "opacity": 0,
-        "tex": "22",
+        "tex": "11",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 6,
-                "opacity": 75,
+                "actionType": 3,
                 "runTime": 2,
                 "isSequence": true
               }
@@ -64,19 +63,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 17,
-            "actions": [
-              {
-                "actionType": 6,
-                "opacity": 255,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          },
-          {
-            "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 12,
             "actions": [
               {
                 "actionType": 4,
@@ -89,15 +76,15 @@
         "isGraphics": false
       },
       {
-        "x": 77.459,
-        "y": -125.946,
-        "nodeName": "2",
+        "x": -32.608,
+        "y": 56.805,
+        "nodeName": "1",
         "opacity": 0,
-        "tex": "2",
+        "tex": "1",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 18,
+            "startDelay": 11.5,
             "actions": [
               {
                 "actionType": 3,
@@ -108,7 +95,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 14,
             "actions": [
               {
                 "actionType": 4,
@@ -121,15 +108,15 @@
         "isGraphics": false
       },
       {
-        "x": 78.191,
-        "y": -128.1,
-        "nodeName": "02",
+        "x": -32.201,
+        "y": 56.137,
+        "nodeName": "01",
         "opacity": 0,
-        "tex": "02",
+        "tex": "01",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 20,
+            "startDelay": 14,
             "actions": [
               {
                 "actionType": 3,
@@ -142,18 +129,19 @@
         "isGraphics": false
       },
       {
-        "x": -22.031,
-        "y": 12.33,
-        "nodeName": "11",
+        "x": 49.757,
+        "y": -56.782,
+        "nodeName": "22",
         "opacity": 0,
-        "tex": "11",
+        "tex": "22",
         "actions": [
           {
             "isSequence": false,
             "startDelay": 8,
             "actions": [
               {
-                "actionType": 3,
+                "actionType": 6,
+                "opacity": 75,
                 "runTime": 2,
                 "isSequence": true
               }
@@ -161,7 +149,19 @@
           },
           {
             "isSequence": false,
-            "startDelay": 12,
+            "startDelay": 17,
+            "actions": [
+              {
+                "actionType": 6,
+                "opacity": 255,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          },
+          {
+            "isSequence": false,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 4,
@@ -174,15 +174,15 @@
         "isGraphics": false
       },
       {
-        "x": -32.608,
-        "y": 56.805,
-        "nodeName": "1",
+        "x": 77.459,
+        "y": -125.946,
+        "nodeName": "2",
         "opacity": 0,
-        "tex": "1",
+        "tex": "2",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 11.5,
+            "startDelay": 18,
             "actions": [
               {
                 "actionType": 3,
@@ -193,7 +193,7 @@
           },
           {
             "isSequence": false,
-            "startDelay": 14,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 4,
@@ -206,15 +206,15 @@
         "isGraphics": false
       },
       {
-        "x": -32.201,
-        "y": 56.137,
-        "nodeName": "01",
+        "x": 78.191,
+        "y": -128.1,
+        "nodeName": "02",
         "opacity": 0,
-        "tex": "01",
+        "tex": "02",
         "actions": [
           {
             "isSequence": false,
-            "startDelay": 14,
+            "startDelay": 20,
             "actions": [
               {
                 "actionType": 3,

+ 12 - 12
gameRes/gameChineseSeme/24215/guide/guide_24215.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": -136.01,
-        "y": -5.196,
+        "x": -2.482,
+        "y": -0.157,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,8 +66,8 @@
         "isGraphics": false
       },
       {
-        "x": 35.851,
-        "y": -0.278,
+        "x": 15.644,
+        "y": -42.077,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": -132.224,
-        "y": -4.756,
+        "x": -11.444,
+        "y": -0.189,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": 35.882,
-        "y": 0.518,
+        "x": 15.675,
+        "y": -41.281,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": -132.224,
-        "y": -4.756,
+        "x": -11.444,
+        "y": -0.189,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": 35.882,
-        "y": 0.518,
+        "x": 15.675,
+        "y": -41.281,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

+ 21 - 21
gameRes/gameChineseSeme/24773/guide/guide_24773.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 84.137,
-        "y": 7.209,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 19,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -91.596,
         "y": -5.77,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 84.137,
+        "y": 7.209,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 19,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/25226/audio1.mp3


+ 1 - 1
gameRes/gameChineseSeme/25226/audio1.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "32867c86-967e-4292-b75d-12878a29769e",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 0.684,
+  "duration": 0.653063,
   "subMetas": {}
 }

+ 12 - 12
gameRes/gameChineseSeme/25235/guide/guide_25235.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": -110.17,
-        "y": -8.639,
+        "x": -101.166,
+        "y": 0.263,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,8 +66,8 @@
         "isGraphics": false
       },
       {
-        "x": 38.07,
-        "y": 0.015,
+        "x": 69.779,
+        "y": 4.264,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": -109.204,
-        "y": -8.918,
+        "x": -102.718,
+        "y": 3.424,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": 43.66,
-        "y": 1.448,
+        "x": 71.466,
+        "y": 21.054,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": -109.448,
-        "y": -9.301,
+        "x": -102.962,
+        "y": 3.041,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": 43.66,
-        "y": 1.448,
+        "x": 71.466,
+        "y": 21.054,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

BIN
gameRes/gameChineseSeme/25925/ani4.png


+ 38 - 0
gameRes/gameChineseSeme/25925/ani4.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "905d7306-1c20-4c46-ad3c-ad879ce8c801",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 181,
+  "height": 132,
+  "platformSettings": {},
+  "subMetas": {
+    "ani4": {
+      "ver": "1.0.6",
+      "uuid": "dacabe09-78fe-4220-bbd5-311b4b7514e9",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "905d7306-1c20-4c46-ad3c-ad879ce8c801",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 181,
+      "height": 132,
+      "rawWidth": 181,
+      "rawHeight": 132,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 21 - 21
gameRes/gameChineseSeme/25925/guide/guide_25925.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 88.295,
-        "y": -20.206,
-        "nodeName": "02",
-        "opacity": 0,
-        "tex": "02",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 20,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -100.718,
         "y": 26.127,
         "nodeName": "11",
@@ -225,6 +204,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 88.295,
+        "y": -20.206,
+        "nodeName": "02",
+        "opacity": 0,
+        "tex": "02",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 20,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

+ 3 - 3
gameRes/gameChineseSeme/26071/guide/guide_26071.json

@@ -236,7 +236,7 @@
         "isGraphics": false
       },
       {
-        "x": 75.239,
+        "x": 26.795,
         "y": 120.257,
         "nodeName": "02",
         "opacity": 0,
@@ -257,8 +257,8 @@
         "isGraphics": false
       },
       {
-        "x": 75.239,
-        "y": 120.257,
+        "x": 85.47,
+        "y": 103.567,
         "nodeName": "03",
         "opacity": 0,
         "tex": "03",

+ 11 - 11
gameRes/gameChineseSeme/26228/guide/guide_26228.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": -129.877,
-        "y": -13.856,
+        "x": -98.348,
+        "y": 17.736,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,7 +66,7 @@
         "isGraphics": false
       },
       {
-        "x": 43.85,
+        "x": 71.85,
         "y": -0.166,
         "nodeName": "2",
         "opacity": 0,
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": -126.146,
-        "y": -13.88,
+        "x": -96.337,
+        "y": 16.565,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": 44.214,
-        "y": -4.771,
+        "x": 65.604,
+        "y": 5.145,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": -126.146,
-        "y": -13.88,
+        "x": -96.337,
+        "y": 16.565,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": 44.214,
-        "y": -4.771,
+        "x": 65.604,
+        "y": 5.145,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

+ 1 - 1
gameRes/gameChineseSeme/26354.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "fd2442c0-6f05-40ee-946a-1f694891033a",
+  "uuid": "728807dd-f787-4972-a118-73dbd380de55",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

BIN
gameRes/gameChineseSeme/26354/guide/audio.mp3


+ 1 - 1
gameRes/gameChineseSeme/26354/guide/audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "251f7d31-b7bc-4b88-bfa9-45d6c6d4eaf9",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 31.32,
+  "duration": 38.7,
   "subMetas": {}
 }

+ 25 - 25
gameRes/gameChineseSeme/26354/guide/guide_26354.json

@@ -17,9 +17,9 @@
                   "y": 1.2,
                   "z": 0
                 },
-                "runTime": 1.5,
+                "runTime": 2,
                 "isSequence": true,
-                "repeat": 4
+                "repeat": 3
               },
               {
                 "actionType": 4,
@@ -56,8 +56,8 @@
               },
               {
                 "actionType": 4,
-                "runTime": 1.5,
-                "startDelay": 1,
+                "runTime": 2,
+                "startDelay": 2.5,
                 "isSequence": true
               }
             ]
@@ -77,8 +77,8 @@
             "actions": [
               {
                 "actionType": 3,
-                "runTime": 1.5,
-                "startDelay": 9.5,
+                "runTime": 2.5,
+                "startDelay": 11,
                 "isSequence": true
               }
             ]
@@ -107,13 +107,13 @@
                 "actionType": 6,
                 "opacity": 255,
                 "runTime": 1.5,
-                "startDelay": 3.5,
+                "startDelay": 5.5,
                 "isSequence": true
               },
               {
                 "actionType": 4,
-                "runTime": 1.5,
-                "startDelay": 1,
+                "runTime": 2,
+                "startDelay": 2,
                 "isSequence": true
               }
             ]
@@ -133,8 +133,8 @@
             "actions": [
               {
                 "actionType": 3,
-                "runTime": 1.5,
-                "startDelay": 13.5,
+                "runTime": 2.5,
+                "startDelay": 17.5,
                 "isSequence": true
               }
             ]
@@ -163,13 +163,13 @@
                 "actionType": 6,
                 "opacity": 255,
                 "runTime": 1.5,
-                "startDelay": 9,
+                "startDelay": 11.5,
                 "isSequence": true
               },
               {
                 "actionType": 4,
                 "runTime": 1.5,
-                "startDelay": 1,
+                "startDelay": 2,
                 "isSequence": true
               }
             ]
@@ -189,8 +189,8 @@
             "actions": [
               {
                 "actionType": 3,
-                "runTime": 1.5,
-                "startDelay": 20.5,
+                "runTime": 2,
+                "startDelay": 23.5,
                 "isSequence": true
               }
             ]
@@ -219,13 +219,13 @@
                 "actionType": 6,
                 "opacity": 255,
                 "runTime": 1.5,
-                "startDelay": 13,
+                "startDelay": 17.5,
                 "isSequence": true
               },
               {
                 "actionType": 4,
                 "runTime": 1.5,
-                "startDelay": 1,
+                "startDelay": 2,
                 "isSequence": true
               }
             ]
@@ -246,7 +246,7 @@
               {
                 "actionType": 3,
                 "runTime": 1.5,
-                "startDelay": 23.5,
+                "startDelay": 29.5,
                 "isSequence": true
               }
             ]
@@ -275,13 +275,13 @@
                 "actionType": 6,
                 "opacity": 255,
                 "runTime": 1.5,
-                "startDelay": 16,
+                "startDelay": 23,
                 "isSequence": true
               },
               {
                 "actionType": 4,
                 "runTime": 1.5,
-                "startDelay": 1,
+                "startDelay": 2,
                 "isSequence": true
               }
             ]
@@ -301,8 +301,8 @@
             "actions": [
               {
                 "actionType": 3,
-                "runTime": 1.5,
-                "startDelay": 27.5,
+                "runTime": 2,
+                "startDelay": 35,
                 "isSequence": true
               }
             ]
@@ -331,13 +331,13 @@
                 "actionType": 6,
                 "opacity": 255,
                 "runTime": 1.5,
-                "startDelay": 20,
+                "startDelay": 29,
                 "isSequence": true
               },
               {
                 "actionType": 4,
                 "runTime": 1.5,
-                "startDelay": 1,
+                "startDelay": 2,
                 "isSequence": true
               }
             ]
@@ -358,7 +358,7 @@
               {
                 "actionType": 3,
                 "runTime": 1.5,
-                "startDelay": 31.5,
+                "startDelay": 39.5,
                 "isSequence": true
               }
             ]

BIN
gameRes/gameChineseSeme/26377/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/26377/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "98439950-476b-4125-98c0-f2a6d43b6c5c",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 2.376,
+  "duration": 2.34,
   "subMetas": {}
 }

BIN
gameRes/gameChineseSeme/26465/ani4.png


+ 38 - 0
gameRes/gameChineseSeme/26465/ani4.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "1acb97c5-4684-4817-bbc3-80fcfbe65754",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 129,
+  "height": 149,
+  "platformSettings": {},
+  "subMetas": {
+    "ani4": {
+      "ver": "1.0.6",
+      "uuid": "6884f3ae-c541-4629-805b-bf2537debc9d",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "1acb97c5-4684-4817-bbc3-80fcfbe65754",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 129,
+      "height": 149,
+      "rawWidth": 129,
+      "rawHeight": 149,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
gameRes/gameChineseSeme/26539/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/26539/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "8aee6128-9c16-4b36-8f7d-696d9e715979",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 3.888,
+  "duration": 3.708,
   "subMetas": {}
 }

+ 12 - 12
gameRes/gameChineseSeme/26539/guide/guide_26539.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": -110.33,
-        "y": -4.525,
+        "x": -103.32,
+        "y": 1.811,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,8 +66,8 @@
         "isGraphics": false
       },
       {
-        "x": 31.157,
-        "y": -0.455,
+        "x": 70.483,
+        "y": -7.159,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": -109.682,
-        "y": -4.144,
+        "x": -100.783,
+        "y": -3.002,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": 29.346,
-        "y": -0.441,
+        "x": 72.449,
+        "y": -6.345,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": -109.926,
-        "y": -4.527,
+        "x": -101.027,
+        "y": -3.385,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": 29.346,
-        "y": -0.441,
+        "x": 72.449,
+        "y": -6.345,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

+ 12 - 12
gameRes/gameChineseSeme/26550/guide/guide_26550.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": 0.36,
-        "y": 91.863,
+        "x": 0.045,
+        "y": 96.661,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,8 +66,8 @@
         "isGraphics": false
       },
       {
-        "x": -0.56,
-        "y": -73.508,
+        "x": 4.995,
+        "y": -74.357,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": 1.369,
-        "y": 91.832,
+        "x": -10.54,
+        "y": 101.141,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": -0.362,
-        "y": -73.686,
+        "x": 5.193,
+        "y": -64.718,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": 1.369,
-        "y": 91.832,
+        "x": -10.54,
+        "y": 101.141,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": -0.362,
-        "y": -73.686,
+        "x": 5.193,
+        "y": -64.718,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

+ 21 - 21
gameRes/gameChineseSeme/26641/guide/guide_26641.json

@@ -121,27 +121,6 @@
         "isGraphics": false
       },
       {
-        "x": 106.59,
-        "y": -12.665,
-        "nodeName": "03",
-        "opacity": 0,
-        "tex": "03",
-        "actions": [
-          {
-            "isSequence": false,
-            "startDelay": 25,
-            "actions": [
-              {
-                "actionType": 3,
-                "runTime": 1,
-                "isSequence": true
-              }
-            ]
-          }
-        ],
-        "isGraphics": false
-      },
-      {
         "x": -7.46,
         "y": -36.545,
         "nodeName": "22",
@@ -323,6 +302,27 @@
           }
         ],
         "isGraphics": false
+      },
+      {
+        "x": 106.59,
+        "y": -12.665,
+        "nodeName": "03",
+        "opacity": 0,
+        "tex": "03",
+        "actions": [
+          {
+            "isSequence": false,
+            "startDelay": 25,
+            "actions": [
+              {
+                "actionType": 3,
+                "runTime": 1,
+                "isSequence": true
+              }
+            ]
+          }
+        ],
+        "isGraphics": false
       }
     ]
   ]

BIN
gameRes/gameChineseSeme/26790/audio3.mp3


+ 1 - 1
gameRes/gameChineseSeme/26790/audio3.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "8a3e3087-bf45-4d50-90c3-c787471ebb3d",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 3.636,
+  "duration": 3.492,
   "subMetas": {}
 }

+ 12 - 12
gameRes/gameChineseSeme/26790/guide/guide_26790.json

@@ -39,8 +39,8 @@
         "isGraphics": false
       },
       {
-        "x": -101.107,
-        "y": 0.095,
+        "x": 0.23,
+        "y": 70.249,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -66,8 +66,8 @@
         "isGraphics": false
       },
       {
-        "x": 60.92,
-        "y": 2.66,
+        "x": -27.045,
+        "y": -77.598,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -100,8 +100,8 @@
         "isGraphics": false
       },
       {
-        "x": -110.331,
-        "y": 0.095,
+        "x": 0.045,
+        "y": 72.919,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -127,8 +127,8 @@
         "isGraphics": false
       },
       {
-        "x": 59.974,
-        "y": -0.098,
+        "x": -39.744,
+        "y": -84.943,
         "nodeName": "12",
         "opacity": 0,
         "tex": "12",
@@ -154,8 +154,8 @@
         "isGraphics": false
       },
       {
-        "x": -110.331,
-        "y": 0.095,
+        "x": 0.045,
+        "y": 72.919,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -175,8 +175,8 @@
         "isGraphics": false
       },
       {
-        "x": 59.974,
-        "y": -0.098,
+        "x": -39.744,
+        "y": -84.943,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

+ 12 - 12
gameRes/gameChineseSeme/27743/guide/guide_27743.json

@@ -44,8 +44,8 @@
         "isGraphics": false
       },
       {
-        "x": -126.089,
-        "y": -14.243,
+        "x": -99.244,
+        "y": -0.075,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -76,8 +76,8 @@
         "isGraphics": false
       },
       {
-        "x": -126.391,
-        "y": -8.679,
+        "x": -97.873,
+        "y": -5.397,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -108,8 +108,8 @@
         "isGraphics": false
       },
       {
-        "x": -126.519,
-        "y": -9.345,
+        "x": -97.92,
+        "y": -5.635,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -129,8 +129,8 @@
         "isGraphics": false
       },
       {
-        "x": 32.161,
-        "y": 2.313,
+        "x": 50.149,
+        "y": -25.954,
         "nodeName": "22",
         "opacity": 0,
         "tex": "22",
@@ -174,8 +174,8 @@
         "isGraphics": false
       },
       {
-        "x": 20.829,
-        "y": 0.429,
+        "x": 50.809,
+        "y": -23.555,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -206,8 +206,8 @@
         "isGraphics": false
       },
       {
-        "x": 20.906,
-        "y": 1.009,
+        "x": 50.029,
+        "y": -24.688,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác