xx 1 rok temu
rodzic
commit
2d6fd40d85
44 zmienionych plików z 1896 dodań i 475 usunięć
  1. 240 0
      assets/animation/show_font_animation.anim
  2. 13 0
      assets/animation/show_font_animation.anim.meta
  3. 7 7
      assets/resources/prefabs/Lack.prefab
  4. 17 15
      assets/resources/prefabs/fail.prefab
  5. 70 31
      assets/resources/prefabs/font_grid_item.prefab
  6. 426 153
      assets/resources/prefabs/game_play_han_zi_zhao_bu_tong.prefab
  7. 2 2
      assets/resources/prefabs/game_play_mei_nv_zhao_xi_jie.prefab
  8. 2 2
      assets/resources/prefabs/game_play_shuang_tu_zhao_bu_tong.prefab
  9. 8 8
      assets/resources/prefabs/guid.prefab
  10. 263 0
      assets/resources/prefabs/lab_font.prefab
  11. 13 0
      assets/resources/prefabs/lab_font.prefab.meta
  12. 63 63
      assets/resources/prefabs/setting.prefab
  13. 8 8
      assets/resources/prefabs/win.prefab
  14. 5 1
      assets/scene/game.scene
  15. 2 2
      assets/script/addCoinAni.ts
  16. 3 1
      assets/script/config.ts
  17. 2 2
      assets/script/data/server_play_list_data.ts
  18. 2 3
      assets/script/dialog/fail.ts
  19. 2 1
      assets/script/dialog/win.ts
  20. 35 7
      assets/script/framework/poolManager.ts
  21. 5 3
      assets/script/game.ts
  22. 28 6
      assets/script/gameManager.ts
  23. 27 19
      assets/script/homepage/homepage.ts
  24. 1 0
      assets/script/homepage/play_list_item.ts
  25. 12 0
      assets/script/lab_font.ts
  26. 9 0
      assets/script/lab_font.ts.meta
  27. 12 6
      assets/script/launch/view_launch.ts
  28. 35 18
      assets/script/play_list/base_view.ts
  29. 3 1
      assets/script/play_list/zhaocha_component/view_game_play_mei_nv_zhao_xi_jie.ts
  30. 8 3
      assets/script/play_list/zhaocha_font/font_grid_item.ts
  31. 114 59
      assets/script/play_list/zhaocha_font/view_game_play_han_zi_zhao_bu_tong.ts
  32. 3 0
      assets/script/play_list/zhaocha_up_down/view_game_play_shuang_tu_zhao_bu_tong.ts
  33. BIN
      assets/textrue/home/img_home_video_reward.png
  34. 134 0
      assets/textrue/home/img_new_video.jpg.meta
  35. BIN
      assets/textrue/home/img_setting_bg.png
  36. 20 20
      assets/textrue/home/img_setting_bg.png.meta
  37. BIN
      assets/textrue/home/img_settingdb_bg.png
  38. 134 0
      assets/textrue/home/img_settingdb_bg.png.meta
  39. BIN
      assets/textrue/home/img_tip_btn.png
  40. 12 12
      assets/textrue/home/img_tip_btn.png.meta
  41. BIN
      assets/textrue/home/microapp.png
  42. 134 0
      assets/textrue/home/microapp.png.meta
  43. BIN
      assets/textrue/pro.png
  44. 22 22
      assets/textrue/pro.png.meta

+ 240 - 0
assets/animation/show_font_animation.anim

@@ -0,0 +1,240 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "show_font_animation",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 15,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 1,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "position"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.6666666865348816,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 600,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 160,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 187.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.6666666865348816,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -570,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -570,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -570,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.6666666865348816,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/animation/show_font_animation.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "7ad8fecb-8d93-41bc-9149-90410109033a",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "show_font_animation"
+  }
+}

+ 7 - 7
assets/resources/prefabs/Lack.prefab

@@ -1266,7 +1266,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 99.873,
+      "x": -113.17,
       "y": 0,
       "z": 0
     },
@@ -1279,8 +1279,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 3,
-      "y": 3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1307,8 +1307,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 23,
-      "height": 21
+      "width": 66,
+      "height": 49
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1344,7 +1344,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "037effe8-6cba-4ce1-a26f-21f620ef555b@f9941",
+      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1402,7 +1402,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -127.54,
+      "x": -57.69,
       "y": 0,
       "z": 0
     },

+ 17 - 15
assets/resources/prefabs/fail.prefab

@@ -618,7 +618,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 10.806,
-      "y": -25.2,
+      "y": -25.200000000000003,
       "z": 0
     },
     "_lrot": {
@@ -726,6 +726,8 @@
       "__id__": 0
     },
     "fileId": "faviXVhK1CXrdziCJ35gEb",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -998,7 +1000,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 109.893,
+      "x": -107.733,
       "y": 0.001,
       "z": 0
     },
@@ -1011,8 +1013,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 3,
-      "y": 3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1039,8 +1041,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 23,
-      "height": 21
+      "width": 66,
+      "height": 49
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1076,7 +1078,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "037effe8-6cba-4ce1-a26f-21f620ef555b@f9941",
+      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1134,7 +1136,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -142.723,
+      "x": -58.903,
       "y": 0.001,
       "z": 0
     },
@@ -1413,7 +1415,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -123.503,
+      "x": -64.753,
       "y": 0.001,
       "z": 0
     },
@@ -1549,7 +1551,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 109.893,
+      "x": -107.733,
       "y": 0.001,
       "z": 0
     },
@@ -1562,8 +1564,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 3,
-      "y": 3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1590,8 +1592,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 23,
-      "height": 21
+      "width": 66,
+      "height": 49
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1627,7 +1629,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "037effe8-6cba-4ce1-a26f-21f620ef555b@f9941",
+      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

+ 70 - 31
assets/resources/prefabs/font_grid_item.prefab

@@ -22,26 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 8
+        "__id__": 10
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 24
-      },
       {
         "__id__": 26
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -88,10 +88,13 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -195,6 +198,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "31onnQ/WNJsq+MKTX8yMof"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 30,
+    "_originalHeight": 30,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c3+BThOPlCx5ZzTkfq1smf"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -220,14 +259,14 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 11
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -264,11 +303,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -292,11 +331,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 14
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -355,9 +394,6 @@
     "_children": [],
     "_active": false,
     "_components": [
-      {
-        "__id__": 15
-      },
       {
         "__id__": 17
       },
@@ -366,10 +402,13 @@
       },
       {
         "__id__": 21
+      },
+      {
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -406,11 +445,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -434,11 +473,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -479,11 +518,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 16
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_alignFlags": 45,
     "_target": null,
@@ -515,11 +554,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "playOnLoad": true,
     "_clips": [
@@ -561,7 +600,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -589,20 +628,20 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "img": {
       "__id__": 2
     },
     "spr_icon_anim": {
-      "__id__": 14
+      "__id__": 16
     },
     "green_sf": {
       "__uuid__": "b01cd5c6-4741-4012-8cb2-4173b9931159@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "img_touch_err": {
-      "__id__": 8
+      "__id__": 10
     },
     "_id": ""
   },
@@ -620,7 +659,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "clickEvents": [],
     "_interactable": true,

Plik diff jest za duży
+ 426 - 153
assets/resources/prefabs/game_play_han_zi_zhao_bu_tong.prefab


+ 2 - 2
assets/resources/prefabs/game_play_mei_nv_zhao_xi_jie.prefab

@@ -2279,7 +2279,7 @@
       "__id__": 92
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 94
@@ -2370,7 +2370,7 @@
       "b": 88,
       "a": 255
     },
-    "_string": "180s",
+    "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 20,

+ 2 - 2
assets/resources/prefabs/game_play_shuang_tu_zhao_bu_tong.prefab

@@ -2926,7 +2926,7 @@
       "__id__": 122
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 124
@@ -3017,7 +3017,7 @@
       "b": 88,
       "a": 255
     },
-    "_string": "180s",
+    "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 20,

+ 8 - 8
assets/resources/prefabs/guid.prefab

@@ -148,8 +148,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
+      "width": 50,
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -221,10 +221,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": -10,
+    "_right": -10,
+    "_top": -10,
+    "_bottom": -10,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -300,8 +300,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 61.67,
-      "y": -50.987,
+      "x": 51.17,
+      "y": -23.987,
       "z": 0
     },
     "_lrot": {

+ 263 - 0
assets/resources/prefabs/lab_font.prefab

@@ -0,0 +1,263 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "lab_font",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_font",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -15,
+      "y": 15,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "left_item",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 20,
+      "height": 18.9
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3dBHWI1a5Jy5OrFlZ4WRzj"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "A",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 15,
+    "_fontSize": 15,
+    "_fontFamily": "Arial",
+    "_lineHeight": 15,
+    "_overflow": 3,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbhZ4aD6dIko2JAUVKTuMN"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "68goi+IZtI+adOal4iGfDJ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 30,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "13LdNveA1Cfo6s9FAPzOot"
+  },
+  {
+    "__type__": "cb6cbzYiWpBEpBra0ysd2zh",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "lab_name": {
+      "__id__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "69y1Nw5ZlLOJNXAjghNTBx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "cdENoRQsZOaL2SNstv70cm",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 13 - 0
assets/resources/prefabs/lab_font.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.45",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "9d583f95-7d82-473e-8fcc-7bcdf570f84e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "lab_font"
+  }
+}

+ 63 - 63
assets/resources/prefabs/setting.prefab

@@ -317,8 +317,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -357,8 +357,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 12.708,
-      "y": -141.972,
+      "x": -1.39,
+      "y": -430.973,
       "z": 0
     },
     "_lrot": {
@@ -370,8 +370,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -565,7 +565,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 36.076,
+      "y": 124.19,
       "z": 0
     },
     "_lrot": {
@@ -614,7 +614,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -92.054,
+      "x": -250.66,
       "y": 0,
       "z": 0
     },
@@ -627,8 +627,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -750,7 +750,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -41.051,
+      "x": -41.05,
       "y": 0,
       "z": 0
     },
@@ -763,8 +763,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 3,
+      "y": 3,
       "z": 1
     },
     "_mobility": 0,
@@ -792,7 +792,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 40,
-      "height": 50.4
+      "height": 25.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -833,7 +833,7 @@
     "_actualFontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 20,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -893,7 +893,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 77.127,
+      "x": 235.733,
       "y": 0,
       "z": 0
     },
@@ -984,8 +984,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
-      "height": 23
+      "width": 156,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1026,7 +1026,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1070,8 +1070,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
-      "height": 22
+      "width": 159,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1112,7 +1112,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1222,8 +1222,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 234,
-      "height": 52
+      "width": 654,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1244,7 +1244,7 @@
     "node": {
       "__id__": 21
     },
-    "_enabled": false,
+    "_enabled": true,
     "__prefab": {
       "__id__": 51
     },
@@ -1253,18 +1253,18 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 161,
-      "g": 99,
-      "b": 1,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
+      "__uuid__": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 1,
+    "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1328,7 +1328,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -32.04,
+      "y": -99.007,
       "z": 0
     },
     "_lrot": {
@@ -1377,7 +1377,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -92.054,
+      "x": -250.66000000000008,
       "y": 0,
       "z": 0
     },
@@ -1390,8 +1390,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1513,7 +1513,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -41.051,
+      "x": -41.050000000000075,
       "y": 0,
       "z": 0
     },
@@ -1526,8 +1526,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 3,
+      "y": 3,
       "z": 1
     },
     "_mobility": 0,
@@ -1555,7 +1555,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 40,
-      "height": 50.4
+      "height": 25.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1596,7 +1596,7 @@
     "_actualFontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 20,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -1656,7 +1656,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 77.127,
+      "x": 235.733,
       "y": 0,
       "z": 0
     },
@@ -1747,8 +1747,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
-      "height": 23
+      "width": 156,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1789,7 +1789,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1833,8 +1833,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
-      "height": 22
+      "width": 159,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1875,7 +1875,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1985,8 +1985,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 234,
-      "height": 52
+      "width": 654,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2007,7 +2007,7 @@
     "node": {
       "__id__": 53
     },
-    "_enabled": false,
+    "_enabled": true,
     "__prefab": {
       "__id__": 83
     },
@@ -2016,18 +2016,18 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 161,
-      "g": 99,
-      "b": 1,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
+      "__uuid__": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 1,
+    "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2081,7 +2081,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -230.437,
+      "y": -691.66,
       "z": 0
     },
     "_lrot": {
@@ -2207,8 +2207,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 261,
-      "height": 206
+      "width": 783,
+      "height": 618
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2247,9 +2247,9 @@
       "__uuid__": "ee1bd68f-474b-4e13-b6a3-a5ba8a161ba9@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 1,
+    "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2309,7 +2309,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 187.5,
-      "y": -383.323,
+      "y": -386,
       "z": 0
     },
     "_lrot": {
@@ -2490,7 +2490,7 @@
     "__prefab": {
       "__id__": 104
     },
-    "_alignFlags": 32,
+    "_alignFlags": 36,
     "_target": null,
     "_left": 0,
     "_right": 0,

+ 8 - 8
assets/resources/prefabs/win.prefab

@@ -1625,7 +1625,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 32.153,
+      "x": -34.806,
       "y": 0,
       "z": 0
     },
@@ -1638,8 +1638,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -1666,8 +1666,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 23,
-      "height": 21
+      "width": 66,
+      "height": 49
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1703,12 +1703,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "037effe8-6cba-4ce1-a26f-21f620ef555b@f9941",
+      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1761,7 +1761,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -48.23,
+      "x": -18.858,
       "y": 0,
       "z": 0
     },

+ 5 - 1
assets/scene/game.scene

@@ -1615,6 +1615,10 @@
     "action_node": {
       "__id__": 35
     },
+    "item_prefab": {
+      "__uuid__": "b426aee1-f11c-4484-a0a7-bc11b6e1b0a5",
+      "__expectedType__": "cc.Prefab"
+    },
     "_id": "6cRFfbHNlClrQgA8IBA7gj"
   },
   {
@@ -2078,7 +2082,7 @@
       "__uuid__": "d98f4d29-e32d-4343-b593-b40af9e380f2@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 2,
+    "_type": 1,
     "_fillType": 0,
     "_sizeMode": 0,
     "_fillCenter": {

+ 2 - 2
assets/script/addCoinAni.ts

@@ -14,12 +14,12 @@ export class addCoinAni extends Component {
 
     onNormalPlayFinish(){
         // this.getComponent(Animation).clips[0].wrapMode = AnimationClip.WrapMode.LoopReverse
-        this.scheduleOnce(()=>{
+        tween(this.node).delay(0.2).call(()=>{
             this.getComponent(Animation).play('add_coin_animation_reverse');
             if(this.m_reverse_call!=null){
                 this.m_reverse_call()
             }
-        },0.2)
+        }).start()
      
     }
 }

+ 3 - 1
assets/script/config.ts

@@ -3,7 +3,7 @@ const { ccclass, property } = _decorator;
 
 export class config {
     static domain = "https://zcapi.hainanmlwl.com";
-    static static_domain = "https://zcapi.hainanmlwl.com";
+    static static_domain = "https://zaoca.oss-cn-beijing.aliyuncs.com";
     static version = "v1.0.0";
     static static_url = {
         category:"/zcstatic/category.json", //玩法静态接口
@@ -58,6 +58,8 @@ export class config {
 
     static ABCD_LIST = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
 
+    static USER_ID = "USER_ID"
+    static POOL_KEY = "font_item"
     static MP3_PATH = {
         BGM_MUSIC:"bg_music",
         SOUND_BTN:"sound_btn",

+ 2 - 2
assets/script/data/server_play_list_data.ts

@@ -69,7 +69,7 @@ export class server_shuang_tu_zhao_bu_tong_data_item {
     "img1": "http://0.0.0.0:8000/upload/c3/9daf67c29eaa3ffcf78663aec8ad96.jpeg";
     "img2": "http://0.0.0.0:8000/upload/35/00321f5927ad36db650df498269854.jpeg";
     "content": "";
-    "s_time": 180;
+    "s_time": 0;
     "answer_number": 5;
     "reward": "8,16";
     "ads_fold": "30,80";
@@ -87,7 +87,7 @@ export class server_han_zi_zhao_bu_tong_data_item {
     "content": "[{\"row\":3,\"col\":4}]";
     "row": 11;
     "col": 11;
-    "s_time": 180;
+    "s_time": 0;
     "answer_number": 1;
     "reward": "8,16";
     "ads_fold": "30,80";

+ 2 - 3
assets/script/dialog/fail.ts

@@ -37,12 +37,11 @@ export class fail extends Component {
         this.lab_extend_time.getComponent(Label).string = `延长${extend_time}秒`;
         if(is_show_restart_video===1){
             this.img_restart_video_icon.active = true;
-            this.lab_restart.position = new Vec3(-15,0,this.lab_restart.position.z);
+            this.lab_restart.position = new Vec3(-64,0,this.lab_restart.position.z);
         }else{
             this.img_restart_video_icon.active = false;
-            this.lab_restart.position = new Vec3(0,0,this.lab_restart.position.z);
+            this.lab_restart.position = new Vec3(-94,0,this.lab_restart.position.z);
         }
-      
     }
 
 }

+ 2 - 1
assets/script/dialog/win.ts

@@ -43,7 +43,8 @@ export class win extends Component {
 
     public showDoubleCoin(doubel_reward,call_back){
         let reward = this.m_reward_number
-        gameManager.instance.addCoinNumber(doubel_reward,this.lab_reward_number.getComponent(Label),reward,()=>{
+        let obj = new Component
+        gameManager.instance.addCoinNumber(obj,doubel_reward,this.lab_reward_number.getComponent(Label),reward,()=>{
             call_back()
         },"+ ")
         this.hideAllBtn()

+ 35 - 7
assets/script/framework/poolManager.ts

@@ -2,7 +2,7 @@ import { _decorator, Prefab, Node, instantiate, NodePool } from "cc";
 const { ccclass, property } = _decorator;
 @ccclass("PoolManager")
 export class PoolManager {
-    private _dictPool: any = {}//对象池字典
+    private _dictPool: Map<string,NodePool> = new Map()//对象池字典
     private _dictPrefab: any = {}//预制体字典
 
     static _instance: PoolManager;
@@ -16,8 +16,7 @@ export class PoolManager {
         return this._instance;
     }
 
-    public isHavePool(prefab: Prefab):boolean{
-        let name = prefab.name;
+    public isHavePool(name: string):boolean{
         if(this._dictPrefab[name]){
             return true;
         }
@@ -37,7 +36,7 @@ export class PoolManager {
 
         this._dictPrefab[name] = prefab;
         let node: Node = null!;
-        if (this._dictPool.hasOwnProperty(name)) {
+        if (this._dictPool.get(name)) {
             //已有对应的对象池
             let pool = this._dictPool[name];
             if (pool.size() > 0) {
@@ -62,13 +61,12 @@ export class PoolManager {
     /**
      * 将对应节点放回对象池中
      */
-    public putNode(node: Node) {
+    public putNode(name:string,node: Node) {
         if (!node) {
             return;
         }
-        let name = node.name;
         let pool = null;
-        if (this._dictPool.hasOwnProperty(name)) {
+        if (this._dictPool.get(name)) {
             //已有对应的对象池
             pool = this._dictPool[name];
         } else {
@@ -121,4 +119,34 @@ export class PoolManager {
             pool.put(node);
         }
     }
+
+
+    public getNodeByPoolName(name:string) {
+        let node: Node = null!;
+        let pool = this._dictPool.get(name);
+        console.log("pool.size()",pool.size())
+        if (pool.size() > 0) {
+            console.log("is get pool?")
+            node = pool.get();
+        } 
+        return node;
+    }
+
+
+    public preloadPoolByName(name:string, num: number,prefab:Prefab) {
+        let pool: NodePool = null;
+        if (this._dictPool.get(name)) {
+            // 已有对应的对象池
+            pool = this._dictPool[name];
+        } else {
+            // 没有对应对象池,创建他!
+            pool = new NodePool();
+            this._dictPool.set(name,pool);
+        }         
+
+        for (let i = 0; i < num; i++) {
+            let node = instantiate(prefab);
+            pool.put(node);
+        }
+    }
 }

+ 5 - 3
assets/script/game.ts

@@ -14,9 +14,11 @@ export class game extends Component {
         gameManager.setTopLayer(this.topLayer);
         gameManager.setWaitLayer(this.waitLayer);
         this.schedule(()=>{
-            gameManager.PreloadingLevelImg(()=>{
-                console.log("新关卡资源加载完成")
-            })
+            if(gameManager.isFinishLoad){
+                gameManager.PreloadingLevelImg(()=>{
+                    console.log("新关卡资源加载完成")
+                })
+            }
         },2);
     }
     

+ 28 - 6
assets/script/gameManager.ts

@@ -30,6 +30,7 @@ export class gameManager extends Component {
     public static mp3_cache:Map<string,AudioClip> = new Map();
     public static test_user_list:string[] = [];
     public static _instance: gameManager;
+    public static isFinishLoad:boolean = false;
 
     public static get instance () {
         if (this._instance) {
@@ -128,7 +129,7 @@ export class gameManager extends Component {
                 let c__data = JSON.parse(c_data);
                 console.log("c__data",c__data)
                 if(c__data.code==config.MSG_CODE.SUCCESS){
-                    ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
+                    // ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
                     call_back(true)
                 }
             }else{
@@ -575,22 +576,21 @@ export class gameManager extends Component {
         })
     }
 
-    public addCoinNumber(addnum:number,lab_number:Label,cur_num:number,call_back,Spacer=""){
+    public addCoinNumber(obj:Component,addnum:number,lab_number:Label,cur_num:number,call_back,Spacer=""){
         let _num = 0;
         let multiple = (addnum/100)<1?1:addnum/100;
         let schedule_num = 0.01/multiple; 
-        let schedule_hand = ()=>{
+        obj.schedule( ()=>{
             _num+=(1*multiple);
             _num = Math.floor(_num);
             if(_num>=addnum){
                 lab_number.string = Spacer+ (cur_num+_num);
-                this.unschedule(schedule_hand)
+                obj.unscheduleAllCallbacks()
                 call_back();
                 return
             }
             lab_number.string =  Spacer + (cur_num+_num);
-        }
-        this.schedule(schedule_hand,schedule_num)
+        },schedule_num)
     }
 
     public static get_reward_number():number{
@@ -623,6 +623,28 @@ export class gameManager extends Component {
     //     gameManager.g_server_mei_nv_zhao_xi_jie_data.list = data;
     //     console.log("set_server_mei_nv_zhao_xi_jie_data::",data);
     // }
+
+    public static getUserId(){
+        let user_id ="";
+        try{
+            if(sys.platform==sys.Platform.BYTEDANCE_MINI_GAME){
+                user_id = tt.getStorageSync(config.USER_ID)
+            }else{
+                user_id = sys.localStorage.getItem(config.USER_ID)
+            }
+        }catch(e){
+            console.log("sss")
+        }
+        return user_id;
+    }
+
+    public static setUserId(userid:string){
+        if(sys.platform==sys.Platform.BYTEDANCE_MINI_GAME){
+            tt.setStorageSync(config.USER_ID,userid)
+        }else{
+            sys.localStorage.setItem(config.USER_ID,userid)
+        }
+    }
 }
 
 

+ 27 - 19
assets/script/homepage/homepage.ts

@@ -14,6 +14,7 @@ import { SdkUtil } from '../framework/sdkUtil';
 import { win } from '../dialog/win';
 import { addCoinAni } from '../addCoinAni';
 import { Util } from '../framework/util';
+import { PoolManager } from '../framework/poolManager';
 const { ccclass, property } = _decorator;
 export enum ETest {
     None = 0,
@@ -31,6 +32,7 @@ export class homepage extends Component {
     @property(Prefab) addCoinAni:Prefab = null;
     @property(Node) top_node:Node = null;
     @property(Node) action_node:Node = null;
+    @property(Prefab) item_prefab;
     protected coin_ani:Node;
     protected old_coin_number:number = 0;
     protected start(): void {
@@ -45,6 +47,9 @@ export class homepage extends Component {
                 }
             })
         })
+        if(!PoolManager.instance.isHavePool(config.POOL_KEY)){
+            PoolManager.instance.preloadPoolByName(config.POOL_KEY,11*15,this.item_prefab)
+        }
         ClientEvent.on(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER,this.onChangeCoinNumber.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_INIT_GAME_LIST,this.initPlayList.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_BACK_HOME_VIEW,this.onBackHomeView.bind(this),this);
@@ -76,14 +81,11 @@ export class homepage extends Component {
     onChangeCoinNumber(){
         let self = this;
         let num:number = this.old_coin_number;
-        if(gameManager.getUiLayer().children.length<0){
-            self.scheduleOnce(()=>{
-                gameManager.instance.addCoinNumber( gameManager.get_user_coin() - num ,self.lab_coin.getComponent(Label),num,()=>{
-                    this.old_coin_number = gameManager.get_user_coin();
-                    this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
-                })
-            },0.5);
-        }
+        let obj = new Component
+        gameManager.instance.addCoinNumber( obj,gameManager.get_user_coin() - num ,self.lab_coin.getComponent(Label),num,()=>{
+            this.old_coin_number = gameManager.get_user_coin();
+            this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
+        })
 
     }
 
@@ -108,21 +110,23 @@ export class homepage extends Component {
             let reward = gameManager.get_reward_number();
             node.getComponent(win).showVideoAddCoinView(reward,null,(win_view:win)=>{
                 gameManager.add_coin(reward)
-                ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
+                setTimeout(()=>{
+                    ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
+                },500)
                 self.showCoinAni()
                 win_view.close()
             },(win_view:win)=>{
                 SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                     if(res.isEnded){
-                        self.scheduleOnce(()=>{
+                        tween(self.btn_setting).delay(0.5).call(()=>{
                             reward = gameManager.get_deouble_reward_number();
                             gameManager.add_coin(reward)
-                            ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
                             win_view.showDoubleCoin(reward,()=>{
                                 self.showCoinAni()
                                 win_view.close()
+                                ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
                             })
-                        },0.5)
+                        }).start()
                 
                     }
                 })
@@ -173,7 +177,7 @@ export class homepage extends Component {
             {
                 let categoryid = config.PLAY_TYPE.YI_QI_ZHAO_CHA;
                 let levels_item = gameManager.get_cur_level_by_categoryid(categoryid);
-                gameManager.showLoading();
+                // gameManager.showLoading();
                 http.get(config.static_url.levels_info(categoryid,levels_item.level),(err,data)=>{
 
                     if(!err){
@@ -191,17 +195,21 @@ export class homepage extends Component {
             }
             case config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG:
             {
-
                 let categoryid = config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG;
                 let levels_item = gameManager.get_cur_level_by_categoryid(categoryid);
-                gameManager.showLoading();
+                // gameManager.showLoading();
                 http.get(config.static_url.levels_info(categoryid,levels_item.level),(err,data)=>{
                     if(!err){
                         let _data = JSON.parse(data)
                         if(_data.code===config.MSG_CODE.SUCCESS){
-                            gameManager.addUiView(config.PREFAB_PATH.game_play_han_zi_zhao_bu_tong,(node)=>{
-                                node.getComponent(view_game_play_han_zi_zhao_bu_tong).initView(_data.content);
-                            })
+                            if(gameManager.uiViewList.get(config.PREFAB_PATH.game_play_han_zi_zhao_bu_tong)){
+                                gameManager.uiViewList.get(config.PREFAB_PATH.game_play_han_zi_zhao_bu_tong).getComponent(view_game_play_han_zi_zhao_bu_tong).initView(_data.content);
+                            }else{
+                                gameManager.addUiView(config.PREFAB_PATH.game_play_han_zi_zhao_bu_tong,(node)=>{
+                                    node.getComponent(view_game_play_han_zi_zhao_bu_tong).initView(_data.content);
+                                })
+                            }
+                           
                         }
                     }
         
@@ -215,7 +223,7 @@ export class homepage extends Component {
 
                 let categoryid = config.PLAY_TYPE.MEI_NV_ZHAO_XI_JIE;
                 let levels_item = gameManager.get_cur_level_by_categoryid(categoryid);
-                gameManager.showLoading();
+                // gameManager.showLoading();
                 http.get(config.static_url.levels_info(categoryid,levels_item.level),(err,data)=>{
                     if(!err){
                         let _data = JSON.parse(data)

+ 1 - 0
assets/script/homepage/play_list_item.ts

@@ -78,6 +78,7 @@ export class play_list_item extends Component {
     }
 
     public hide(){
+        this.unscheduleAllCallbacks()
         this.node.position = new Vec3(-500,this.node.position.y,this.node.position.z)
         this.node.getComponent(Animation).stop()
     }

+ 12 - 0
assets/script/lab_font.ts

@@ -0,0 +1,12 @@
+import { _decorator, Component, Label, Node } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('lab_font')
+export class lab_font extends Component {
+    @property(Node) lab_name:Node;
+    public initLab(text:string){
+        this.lab_name.getComponent(Label).string = text;
+    }
+}
+
+

+ 9 - 0
assets/script/lab_font.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "cb6cbcd8-896a-4112-906b-6b4cac776ce1",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 12 - 6
assets/script/launch/view_launch.ts

@@ -55,22 +55,27 @@ export class launch_view extends Component {
                 })
             }
             let formData = null;
+            let user_id =gameManager.getUserId();
             if(sys.platform==sys.Platform.BYTEDANCE_MINI_GAME){
-                if(StorageManager.instance.getUserId()==""){
+                if(user_id==""||user_id==null||user_id==undefined){
+                    console.log("本地没有数据")
                     tt.login({
                         force: true,
                         success(res) {
                             let code = res.code;
                             let anonymousCode = res.anonymousCode;
-                        //   console.log(`login 调用成功${res.code} ${res.anonymousCode}`);
+                            console.log(`login 调用成功${res.code} ${res.anonymousCode}`);
                             // console.log("code==",code);
                             // console.log("anonymousCode==",anonymousCode);
+        
+                            
                             http.post(config.api_url.get_open_id,{"code":code,"anonymous_code":anonymousCode},(err,data)=>{
                                 if(!err){
                                     let _data = JSON.parse(data);
                                     if(_data.code==config.MSG_CODE.SUCCESS){
-                                        StorageManager.instance.setUserId(_data.content.openid);
-                                        formData = {"openid":StorageManager.instance.getUserId(),"avatarUrl": ""}
+                                        gameManager.setUserId( _data.content.openid)
+                                        // StorageManager.instance.setUserId(_data.content.openid);
+                                        formData = {"openid":gameManager.getUserId(),"avatarUrl": ""}
                                         login_call_back();
                                         // console.log("_data.content.data.openid",_data.content.openid)
                                     }
@@ -85,7 +90,8 @@ export class launch_view extends Component {
                         },
                       });
                 }else{
-                    formData = {"openid":StorageManager.instance.getUserId(),"avatarUrl": ""}
+                    console.log("本地有数据")
+                    formData = {"openid":gameManager.getUserId(),"avatarUrl": ""}
                     login_call_back();
                 }
             }else{
@@ -95,7 +101,6 @@ export class launch_view extends Component {
                 login_call_back();
             }
     
-    
         }
 
         if(progress_number===30){
@@ -248,6 +253,7 @@ export class launch_view extends Component {
             this.finishLoading();
             this.unschedule(this.setupLoading)
             progress_number = 100;
+            gameManager.isFinishLoad = true;
         }
 
         this.lab_progress.getComponent(Label).string = `加载中... ${progress_number} %`;

+ 35 - 18
assets/script/play_list/base_view.ts

@@ -12,6 +12,7 @@ import { setting } from '../homepage/setting';
 import { addCoinAni } from '../addCoinAni';
 import { clock_angle } from '../clock_angle';
 import { guid } from '../guid/guid';
+import { PoolManager } from '../framework/poolManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('base_view')
@@ -77,6 +78,9 @@ export class base_view extends Component {
         ClientEvent.on(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER,this.onChangeCoinNumber.bind(this),this);
     }
     protected onDestroy(): void {
+        // if(this.categoryid===config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG){
+        //     PoolManager.instance.clearPool("font_item")
+        // }
         ClientEvent.off(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER,this.onChangeCoinNumber.bind(this),this);
     }
     close(){
@@ -87,7 +91,8 @@ export class base_view extends Component {
     onChangeCoinNumber(){
         let num:number = this.old_coin_number;
         let add_coin = gameManager.get_user_coin() - num;
-        gameManager.instance.addCoinNumber(add_coin,this.lab_coin.getComponent(Label),num,()=>{
+        let obj = new Component
+        gameManager.instance.addCoinNumber(obj,add_coin,this.lab_coin.getComponent(Label),num,()=>{
             this.old_coin_number= gameManager.get_user_coin();
             this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
         })
@@ -96,12 +101,13 @@ export class base_view extends Component {
         下一关 start
      */
     nextLevel(){
+        this.lab_time_count.getComponent(Label).string = ""
         let is_have_next = gameManager.next_level(this.categoryid,(is_sync:boolean)=>{
             if(is_sync){
                 let levels_item = gameManager.get_cur_level_by_categoryid(this.categoryid);
                 // gameManager.showLoading();
                 gameManager.add_coin(this.reward);
-                // ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
+                ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
                 http.get(config.static_url.levels_info(this.categoryid,levels_item.level),(err,data)=>{
                     if(!err){
                         let _data = JSON.parse(data)
@@ -156,7 +162,6 @@ export class base_view extends Component {
                 self.showFail()
                 self.stop_time_count();
             }
-            
         },1)
     }
     error_sub_time(){
@@ -174,10 +179,12 @@ export class base_view extends Component {
         计时api end 
      */
     showFail(){
-        gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
-            gameManager.playFailSoundByCategoryId(this.categoryid)
-            node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
-        })
+        if(!this.isShowWin){
+            gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
+                gameManager.playFailSoundByCategoryId(this.categoryid)
+                node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
+            })
+        }
     }
     showWin(){
         gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
@@ -193,20 +200,25 @@ export class base_view extends Component {
             let reward = gameManager.get_reward_number();
             node.getComponent(win).showVideoAddCoinView(reward,this.m_data,(win_view:win)=>{
                 gameManager.add_coin(reward)
-                ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
+                self.showCoinAni()
+                tween(self.node).delay(0.5).call(()=>{
+                    ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
+                }).start()
                 win_view.close()
             },(win_view:win)=>{
                 SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                     if(res.isEnded){
-                        self.scheduleOnce(()=>{
+                        tween(self.node).delay(0.5).call(()=>{
                             reward = gameManager.get_deouble_reward_number();
                             gameManager.add_coin(reward)
-                            ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
                             win_view.showDoubleCoin(reward,()=>{
                                 self.showCoinAni()
                                 win_view.close()
+                                tween(self.node).delay(0.5).call(()=>{
+                                    ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
+                                }).start()
                             })
-                        },0.5)
+                        }).start()
                     }
                 })
             });
@@ -215,10 +227,11 @@ export class base_view extends Component {
     onWinOrdinaryClick(win_view:win){
         let self = this;
         gameManager.playBtnSound()
-        self.scheduleOnce(()=>{
+        tween(self.node).delay(0.5).call(()=>{
             self.nextLevel();
-        },0.5)
+        }).start()
         win_view.close()
+        win_view.hideAllBtn()
         this.showCoinAni()
     }
 
@@ -228,14 +241,16 @@ export class base_view extends Component {
         let list = this.m_data.ads_fold.split(",");
         let start = parseInt(list[0]);
         let end = parseInt(list[1]);
-        this.reward *=  Util.getRandomInt(start,end);
+        let reward = this.reward;
+        reward*=  Util.getRandomInt(start,end);
         SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Super_double_AdUnitId,(res)=>{
             if(res.isEnded){
-                win_view.showDoubleCoin(this.reward,()=>{
+                win_view.showDoubleCoin(reward,()=>{
                     self.showCoinAni()
-                    self.scheduleOnce(()=>{
+                    self.reward = reward;
+                    tween(self.node).delay(0.5).call(()=>{
                         self.nextLevel();
-                    },0.5)
+                    }).start()
                     win_view.close()
                 })
             }
@@ -275,8 +290,9 @@ export class base_view extends Component {
         lab_err_number.addComponent(Label);
         lab_err_number.getComponent(Label).string = `-${this.m_data.wrong_time}`
         lab_err_number.parent = parent;
-        lab_err_number.getComponent(Label).color = Color.YELLOW;
+        lab_err_number.getComponent(Label).color = Color.RED;
         lab_err_number.getComponent(Label).fontSize = 25;
+        lab_err_number.position = new Vec3(lab_err_number.position.x,30,lab_err_number.position.z)
         lab_err_number.getComponent(Label).isBold = true;
         this.clock_ani.getComponent(clock_angle).play()
         let end_pos = new Vec3(lab_err_number.position.x,lab_err_number.position.y+20,lab_err_number.position.z)
@@ -298,6 +314,7 @@ export class base_view extends Component {
     }
     showGuid(v3:Vec3,call_back,size:Size){
         if(this.guid_view===null){
+            size = new Size(50,50)
             resources.load(config.PREFAB_PATH.guid, Prefab, (err, prefab) => {
                 if(err){
                     return;

+ 3 - 1
assets/script/play_list/zhaocha_component/view_game_play_mei_nv_zhao_xi_jie.ts

@@ -55,7 +55,9 @@ export class view_game_play_mei_nv_zhao_xi_jie extends base_view {
         let self  = this;
         let tip_call = ()=>{
             let item = this.getTipItem()
-            item.blinkShow();
+            if(item){
+                item.blinkShow();
+            }
         }
     
         if(gameManager.isTestUser()){

+ 8 - 3
assets/script/play_list/zhaocha_font/font_grid_item.ts

@@ -20,19 +20,19 @@ export class font_grid_item extends Component {
             this.img.getComponent(Sprite).spriteFrame = sf;
         }
         this._Right = isRight;
-        
+        this._isFinish = false;
         this.right_font_sf = sf1;
         this.m_row = row;
         this.m_col = col;
         this.m_call_back = call_back;
+        this.node.off(Node.EventType.TOUCH_START)
         this.node.on(Node.EventType.TOUCH_START,()=>{
             // console.log("font_grid_item!!",this.m_row,this.m_col)
             if(!this._isFinish){
                 this.m_call_back(this);
             }
         },this);
-
-
+        this.hide();
     }
 
     public Finish(sf:SpriteFrame){
@@ -70,6 +70,11 @@ export class font_grid_item extends Component {
         this.spr_icon_anim.getComponent(Animation).play();
     }
 
+    public hide(){
+        this.spr_icon_anim.active = false;
+        this.spr_icon_anim.getComponent(Animation).stop();
+    }
+
     public rewardShow(){
         this.spr_icon_anim.active = true;
         this.spr_icon_anim.getComponent(Sprite).spriteFrame = this.green_sf;

+ 114 - 59
assets/script/play_list/zhaocha_font/view_game_play_han_zi_zhao_bu_tong.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Director, director, instantiate, Label, Layout, Node, Prefab, ProgressBar, Sprite, SpriteFrame, UITransform, Vec3 } from 'cc';
+import { _decorator, Animation, Canvas, Component, Director, director, instantiate, Label, Layout, Node, Prefab, ProgressBar, Size, Sprite, SpriteFrame, UIOpacity, UITransform, Vec3, view, Widget } from 'cc';
 import { config } from '../../config';
 import { font_grid_pos, server_han_zi_zhao_bu_tong_data_item } from '../../data/server_play_list_data';
 import { gameManager } from '../../gameManager';
@@ -9,6 +9,8 @@ import { Util } from '../../framework/util';
 import { PoolManager } from '../../framework/poolManager';
 import { SdkUtil } from '../../framework/sdkUtil';
 import { base_view } from '../base_view';
+import { lab_font } from '../../lab_font';
+import { ClientEvent } from '../../framework/clientEvent';
 const { ccclass, property } = _decorator;
 
 @ccclass('view_game_play_han_zi_zhao_bu_tong')
@@ -16,20 +18,20 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
     @property(Node) font_grid:Node;
     @property(Node) left_pos:Node;
     @property(Node) bottom_pos:Node;
-    @property(Prefab) item_prefab;
-    @property(Node) bottom_item:Node;
-    @property(Node) left_item:Node;
+    // @property(Prefab) item_prefab;
+    @property(Prefab) lab_font:Prefab;
+    @property(Animation) show_ani:Animation;
+
     private answer:font_grid_pos[];
     private default_img:SpriteFrame;
     private find_img:SpriteFrame;
     private d_img:SpriteFrame;
     initUI() {
-        if(!PoolManager.instance.isHavePool(this.item_prefab)){
-            PoolManager.instance.preloadPool(this.item_prefab,this.m_data.col*this.m_data.row)
-        }
+
     }
 
     public initView(data:server_han_zi_zhao_bu_tong_data_item,isUpdate=false){
+        this.stop_time_count()
         this.categoryid = config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG;
         this.m_data = data;
         let count = 0;
@@ -129,6 +131,12 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
                 }
                 tip_call()
                 self.scheduleOnce(()=>{
+                    for (let index = 0; index < self.font_grid.children.length; index++) {
+                        const element = self.font_grid.children[index];
+                        if(element.getComponent(font_grid_item).isRight()){
+                            element.getComponent(font_grid_item).hide()
+                        }
+                    }
                     this.showWin();
                 },2)
             }
@@ -166,58 +174,97 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
         return false;
     }
 
-    initGrid(){
-
+    initFontList(){
+        return new Promise((resolve, reject)=>{
+            this.bottom_pos.removeAllChildren()
+            this.left_pos.removeAllChildren()
+            let k = this.font_grid.parent.getComponent(Widget).left +this.font_grid.getComponent(Widget).right;
+            let width = view.getVisibleSize().width-k;
+            let height = Math.floor((width-10)/11); 
+            let cell_size = new Size(height,height);
+            for (let index = this.m_data.row; index > 0; index--) {
+                let item = instantiate(this.lab_font);
+                item.parent = this.left_pos;
+                item.getComponent(UITransform).contentSize  = cell_size
+                item.getComponent(lab_font).initLab(index  + "")
+            }
     
-        this.font_grid.getComponent(Layout).constraintNum = this.m_data.col;
-        this.old_coin_number = gameManager.get_user_coin();
-        this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
-        this.font_grid.removeAllChildren()
-        this.bottom_pos.removeAllChildren()
-        this.left_pos.removeAllChildren()
-        this.lab_title.getComponent(Label).string = this.m_data.name;
-        let list = this.m_data.reward.split(",");
-        let start = parseInt(list[0]);
-        let end = parseInt(list[1]);
-        this.reward =  Util.getRandomInt(start,end);
-        if(this.m_data.content.length<=0){
-            tools.showToast("关卡未配置数据!")
-            return
-        }
-
-        this.answer = JSON.parse(this.m_data.content);
-        for (let index = 0; index <this.m_data.col*this.m_data.row; index++) {
-            let col = index%this.m_data.col;
-            let row = Math.floor(index/this.m_data.col);
-            let item = PoolManager.instance.getNode(this.item_prefab,this.font_grid)
-            item.getComponent(font_grid_item).initView(this.default_img,this.find_img,row,col,this.onGridItemClick.bind(this),this.isRight(row,col));
-        }
-  
-        for (let index = this.m_data.row; index > 0; index--) {
-            let item = instantiate(this.left_item);
-            item.parent = this.left_pos;
-            item.getComponent(Label).string = index  + "";
-        }
+            for (let index = 0; index < this.m_data.col; index++) {
+                let item = instantiate(this.lab_font);
+                item.parent = this.bottom_pos;
+                item.getComponent(UITransform).contentSize  = cell_size
+                item.getComponent(lab_font).initLab(config.ABCD_LIST[index])
+            }
+        })
+    }
 
-        for (let index = 0; index < this.m_data.col; index++) {
-            let item = instantiate(this.bottom_item);
-            item.parent = this.bottom_pos;
-            item.getComponent(Label).string = config.ABCD_LIST[index]
-        }
-        this.start_time_count(this.m_data.s_time)
-        gameManager.hideLoading();
-        if(this.checkShowGuid()){
-            this.scheduleOnce(()=>{
-                let item  = this.getTipItem();
-                let v3 = item.node.position;
-                let start_pos = new Vec3()
-                this.font_grid.getComponent(UITransform).convertToWorldSpaceAR(v3,start_pos)
-                this.showGuid(start_pos,()=>{
-                    // this.hideGuid()
-                    // this.onGridItemClick(this.font_grid.children[0].getComponent(font_grid_item))
-                },item.getComponent(UITransform).contentSize)
-            },0.5)
-        }
+    initGrid(){
+        this.initFontList()
+        return new Promise((resolve, reject)=>{
+            this.font_grid.getComponent(Layout).constraintNum = this.m_data.col;
+            this.old_coin_number = gameManager.get_user_coin();
+            this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
+            // this.font_grid.removeAllChildren()
+            this.lab_title.getComponent(Label).string = this.m_data.name;
+            let list = this.m_data.reward.split(",");
+            let start = parseInt(list[0]);
+            let end = parseInt(list[1]);
+            this.reward =  Util.getRandomInt(start,end);
+            if(this.m_data.content.length<=0){
+                tools.showToast("关卡未配置数据!")
+                return
+            }
+    
+            this.answer = JSON.parse(this.m_data.content);
+            let k = this.font_grid.parent.getComponent(Widget).left +this.font_grid.getComponent(Widget).right;
+            let width = view.getVisibleSize().width-k;
+            let height = Math.floor((width-10)/11); 
+            let cell_size = new Size(height,height);
+            this.font_grid.getComponent(Layout).cellSize = cell_size
+            this.font_grid.parent.getComponent(UITransform).contentSize = new Size(this.font_grid.parent.getComponent(UITransform).contentSize.width,height*15+10)
+            if(this.font_grid.children.length>0){
+                for (let index = 0; index <this.m_data.col*this.m_data.row; index++) {
+                    let col = index%this.m_data.col;
+                    let row = Math.floor(index/this.m_data.col);
+                    let item = this.font_grid.children[index];
+                    item.getComponent(font_grid_item).initView(this.default_img,this.find_img,row,col,this.onGridItemClick.bind(this),this.isRight(row,col));
+                }
+            }else{
+                for (let index = 0; index <this.m_data.col*this.m_data.row; index++) {
+                    let col = index%this.m_data.col;
+                    let row = Math.floor(index/this.m_data.col);
+                   
+                    // let item =  instantiate(this.item_prefab)
+                    let item = PoolManager.instance.getNodeByPoolName(config.POOL_KEY)
+                    item.parent = this.font_grid;
+                    // item.getComponent(UITransform).contentSize = new Size(height,height)
+                    // item.position = new Vec3(-col*height-(height*0.5)-spacX,row*height+(height*0.5),item.position.z)
+                    item.getComponent(font_grid_item).initView(this.default_img,this.find_img,row,col,this.onGridItemClick.bind(this),this.isRight(row,col));
+                }
+            }
+            this.start_time_count(this.m_data.s_time)
+            gameManager.hideLoading();
+            if(this.checkShowGuid()){
+                this.show_ani.node.getComponent(UIOpacity).opacity = 255;
+                this.show_ani.node.position = new Vec3(600,this.show_ani.node.position.y,this.show_ani.node.position.z)
+                this.show_ani.play()
+                this.scheduleOnce(()=>{
+                    let item  = this.getTipItem();
+                    let v3 = item.node.position;
+                    let start_pos = new Vec3()
+                    this.font_grid.getComponent(UITransform).convertToWorldSpaceAR(v3,start_pos)
+                    this.showGuid(start_pos,()=>{
+                        // this.hideGuid()
+                        // this.onGridItemClick(this.font_grid.children[0].getComponent(font_grid_item))
+                    },item.getComponent(UITransform).contentSize)
+                },1)
+            }else{
+                this.show_ani.node.getComponent(UIOpacity).opacity = 255;
+                this.show_ani.node.position = new Vec3(600,this.show_ani.node.position.y,this.show_ani.node.position.z)
+                this.show_ani.play()
+            }
+            resolve && resolve(true);
+        })
 
     }
     onFailReStartClick(fail_view:fail){
@@ -226,15 +273,23 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
         if(this.m_data.ads_restart==1){
             SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Resume_AdUnitId,(res)=>{
                 if(res.isEnded){
-                    self.initGrid()
+                    self.initGrid().then()
                     fail_view.close()
                 }
             })
         }else{
-            self.initGrid()
+            self.initGrid().then()
             fail_view.close()
         }
     }
+
+    close(): void {
+        this.stop_time_count()
+        this.lab_time_count.getComponent(Label).string = ""
+        this.lab_time_count.active = false;
+        this.node.active = false;
+        ClientEvent.dispatchEvent(config.EVENT_MSG.ON_BACK_HOME_VIEW)
+    }
 }
 
 

+ 3 - 0
assets/script/play_list/zhaocha_up_down/view_game_play_shuang_tu_zhao_bu_tong.ts

@@ -114,6 +114,9 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends base_view {
                 self.updateAmplifyStatus();
             }
             let item = this.getTipItem();
+            if(!item){
+                return;
+            }
             item.blinkShow();
             item.get_relative_node().blinkShow();
         }

BIN
assets/textrue/home/img_home_video_reward.png


+ 134 - 0
assets/textrue/home/img_new_video.jpg.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "41e57ac8-66cc-431c-9296-410480bc7dfd",
+  "files": [
+    ".jpg",
+    ".json"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "41e57ac8-66cc-431c-9296-410480bc7dfd@6c48a",
+      "displayName": "img_new_video",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "41e57ac8-66cc-431c-9296-410480bc7dfd",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "41e57ac8-66cc-431c-9296-410480bc7dfd@f9941",
+      "displayName": "img_new_video",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 158,
+        "height": 118,
+        "rawWidth": 158,
+        "rawHeight": 118,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -79,
+            -59,
+            0,
+            79,
+            -59,
+            0,
+            -79,
+            59,
+            0,
+            79,
+            59,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            118,
+            158,
+            118,
+            0,
+            0,
+            158,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -79,
+            -59,
+            0
+          ],
+          "maxPos": [
+            79,
+            59,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "41e57ac8-66cc-431c-9296-410480bc7dfd@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": false,
+    "redirect": "41e57ac8-66cc-431c-9296-410480bc7dfd@f9941"
+  }
+}

BIN
assets/textrue/home/img_setting_bg.png


+ 20 - 20
assets/textrue/home/img_setting_bg.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 786,
-        "height": 504,
-        "rawWidth": 786,
-        "rawHeight": 504,
+        "width": 783,
+        "height": 618,
+        "rawWidth": 783,
+        "rawHeight": 618,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -393,
-            -252,
+            -391.5,
+            -309,
             0,
-            393,
-            -252,
+            391.5,
+            -309,
             0,
-            -393,
-            252,
+            -391.5,
+            309,
             0,
-            393,
-            252,
+            391.5,
+            309,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            504,
-            786,
-            504,
+            618,
+            783,
+            618,
             0,
             0,
-            786,
+            783,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -393,
-            -252,
+            -391.5,
+            -309,
             0
           ],
           "maxPos": [
-            393,
-            252,
+            391.5,
+            309,
             0
           ]
         },

BIN
assets/textrue/home/img_settingdb_bg.png


+ 134 - 0
assets/textrue/home/img_settingdb_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@6c48a",
+      "displayName": "img_settingdb_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941",
+      "displayName": "img_settingdb_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 654,
+        "height": 150,
+        "rawWidth": 654,
+        "rawHeight": 150,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -327,
+            -75,
+            0,
+            327,
+            -75,
+            0,
+            -327,
+            75,
+            0,
+            327,
+            75,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            150,
+            654,
+            150,
+            0,
+            0,
+            654,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -327,
+            -75,
+            0
+          ],
+          "maxPos": [
+            327,
+            75,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "f35fc7ae-69ee-4ddb-875a-f2eed17c77f2@f9941"
+  }
+}

BIN
assets/textrue/home/img_tip_btn.png


+ 12 - 12
assets/textrue/home/img_tip_btn.png.meta

@@ -43,11 +43,11 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 1,
+        "offsetY": 0.5,
         "trimX": 2,
         "trimY": 0,
         "width": 293,
-        "height": 139,
+        "height": 140,
         "rawWidth": 297,
         "rawHeight": 141,
         "borderTop": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -146.5,
-            -69.5,
+            -70,
             0,
             146.5,
-            -69.5,
+            -70,
             0,
             -146.5,
-            69.5,
+            70,
             0,
             146.5,
-            69.5,
+            70,
             0
           ],
           "indexes": [
@@ -88,15 +88,15 @@
             295,
             141,
             2,
-            2,
+            1,
             295,
-            2
+            1
           ],
           "nuv": [
             0.006734006734006734,
-            0.014184397163120567,
+            0.0070921985815602835,
             0.9932659932659933,
-            0.014184397163120567,
+            0.0070921985815602835,
             0.006734006734006734,
             1,
             0.9932659932659933,
@@ -104,12 +104,12 @@
           ],
           "minPos": [
             -146.5,
-            -69.5,
+            -70,
             0
           ],
           "maxPos": [
             146.5,
-            69.5,
+            70,
             0
           ]
         },

BIN
assets/textrue/home/microapp.png


+ 134 - 0
assets/textrue/home/microapp.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "7bc83ddb-4f77-40bd-9b25-6ffeed332694",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@6c48a",
+      "displayName": "microapp",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "7bc83ddb-4f77-40bd-9b25-6ffeed332694",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
+      "displayName": "microapp",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 66,
+        "height": 49,
+        "rawWidth": 66,
+        "rawHeight": 49,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -33,
+            -24.5,
+            0,
+            33,
+            -24.5,
+            0,
+            -33,
+            24.5,
+            0,
+            33,
+            24.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            49,
+            66,
+            49,
+            0,
+            0,
+            66,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -33,
+            -24.5,
+            0
+          ],
+          "maxPos": [
+            33,
+            24.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941"
+  }
+}

BIN
assets/textrue/pro.png


+ 22 - 22
assets/textrue/pro.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 271,
-        "height": 25,
-        "rawWidth": 271,
-        "rawHeight": 25,
+        "width": 1944,
+        "height": 75,
+        "rawWidth": 1944,
+        "rawHeight": 75,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 110,
-        "borderRight": 105,
+        "borderLeft": 912,
+        "borderRight": 896,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -135.5,
-            -12.5,
+            -972,
+            -37.5,
             0,
-            135.5,
-            -12.5,
+            972,
+            -37.5,
             0,
-            -135.5,
-            12.5,
+            -972,
+            37.5,
             0,
-            135.5,
-            12.5,
+            972,
+            37.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            25,
-            271,
-            25,
+            75,
+            1944,
+            75,
             0,
             0,
-            271,
+            1944,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -135.5,
-            -12.5,
+            -972,
+            -37.5,
             0
           ],
           "maxPos": [
-            135.5,
-            12.5,
+            972,
+            37.5,
             0
           ]
         },

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików