xx 1 rok pred
rodič
commit
957cd342d5
88 zmenil súbory, kde vykonal 4287 pridanie a 1403 odobranie
  1. BIN
      assets/resources/ddz/2.png
  2. 33 33
      assets/resources/ddz/2.png.meta
  3. BIN
      assets/resources/ddz/3.png
  4. 34 34
      assets/resources/ddz/3.png.meta
  5. BIN
      assets/resources/ddz/4.png
  6. 34 34
      assets/resources/ddz/4.png.meta
  7. BIN
      assets/resources/ddz/5.png
  8. 32 32
      assets/resources/ddz/5.png.meta
  9. BIN
      assets/resources/ddz/6.png
  10. 35 35
      assets/resources/ddz/6.png.meta
  11. BIN
      assets/resources/ddz/7.png
  12. 36 36
      assets/resources/ddz/7.png.meta
  13. BIN
      assets/resources/ddz/8.png
  14. 35 35
      assets/resources/ddz/8.png.meta
  15. BIN
      assets/resources/ddz/9.png
  16. 35 35
      assets/resources/ddz/9.png.meta
  17. BIN
      assets/resources/ddz/A.png
  18. 33 33
      assets/resources/ddz/A.png.meta
  19. BIN
      assets/resources/ddz/D.png
  20. BIN
      assets/resources/ddz/J.png
  21. 36 36
      assets/resources/ddz/J.png.meta
  22. BIN
      assets/resources/ddz/K.png
  23. 34 34
      assets/resources/ddz/K.png.meta
  24. BIN
      assets/resources/ddz/Q.png
  25. 36 36
      assets/resources/ddz/Q.png.meta
  26. BIN
      assets/resources/ddz/T.png
  27. 36 36
      assets/resources/ddz/T.png.meta
  28. BIN
      assets/resources/ddz/X.png
  29. BIN
      assets/resources/ddz/card_bg.png
  30. 34 34
      assets/resources/ddz/card_bg.png.meta
  31. 20 20
      assets/resources/ddz/d.png.meta
  32. BIN
      assets/resources/ddz/img_black.png
  33. 28 28
      assets/resources/ddz/img_black.png.meta
  34. BIN
      assets/resources/ddz/img_hua.png
  35. 28 28
      assets/resources/ddz/img_hua.png.meta
  36. BIN
      assets/resources/ddz/img_pian.png
  37. 20 20
      assets/resources/ddz/img_pian.png.meta
  38. BIN
      assets/resources/ddz/img_red.png
  39. 28 28
      assets/resources/ddz/img_red.png.meta
  40. 20 20
      assets/resources/ddz/x.png.meta
  41. 21 18
      assets/resources/prefabs/ddz_card.prefab
  42. 4 4
      assets/resources/prefabs/ddz_tip_item.prefab
  43. 371 79
      assets/resources/prefabs/fail.prefab
  44. 438 101
      assets/resources/prefabs/game_play_dou_di_zhu.prefab
  45. 5 5
      assets/resources/prefabs/game_play_han_zi_zhao_bu_tong.prefab
  46. 10 10
      assets/resources/prefabs/game_play_ji_yi_li.prefab
  47. 5 5
      assets/resources/prefabs/game_play_mei_nv_zhao_xi_jie.prefab
  48. 5 5
      assets/resources/prefabs/game_play_shuang_tu_zhao_bu_tong.prefab
  49. 8 8
      assets/resources/prefabs/game_play_shuang_tu_zhao_xiang_tong.prefab
  50. 9 9
      assets/resources/prefabs/game_play_zhao_bu_tong.prefab
  51. 793 123
      assets/resources/prefabs/play_list_item.prefab
  52. 112 18
      assets/resources/prefabs/question_item.prefab
  53. 2 2
      assets/resources/prefabs/setting.prefab
  54. 424 74
      assets/resources/prefabs/win.prefab
  55. 141 141
      assets/scene/game.scene
  56. 3 0
      assets/script/data/server_play_list_data.ts
  57. 35 1
      assets/script/dialog/fail.ts
  58. 24 1
      assets/script/dialog/win.ts
  59. 47 21
      assets/script/gameManager.ts
  60. 22 5
      assets/script/homepage/homepage.ts
  61. 87 12
      assets/script/homepage/play_list_item.ts
  62. 21 18
      assets/script/launch/view_launch.ts
  63. 31 9
      assets/script/play_list/base_view.ts
  64. 11 2
      assets/script/play_list/ddz/ddz_ai.ts
  65. 14 12
      assets/script/play_list/ddz/ddz_card.ts
  66. 88 20
      assets/script/play_list/ddz/game_play_dou_di_zhu.ts
  67. 19 1
      assets/script/play_list/ddz/tip_layer.ts
  68. 3 1
      assets/script/play_list/ji_yi_li/question_item.ts
  69. 9 1
      assets/script/play_list/ji_yi_li/view_game_play_ji_yi_li.ts
  70. 0 1
      assets/script/play_list/zhaocha_xiang_tong/view_game_play_shuang_tu_zhao_xiang_tong.ts
  71. 16 0
      assets/script/tools.ts
  72. 134 0
      assets/textrue/home/img_ddz_btn_buchu.png.meta
  73. BIN
      assets/textrue/home/img_ddz_btn_yellow.png
  74. 134 0
      assets/textrue/home/img_ddz_btn_yellow.png.meta
  75. BIN
      assets/textrue/home/img_home_coin_bg.png
  76. 34 34
      assets/textrue/home/img_home_coin_bg.png.meta
  77. BIN
      assets/textrue/home/img_home_video_reward.png
  78. 35 35
      assets/textrue/home/img_home_video_reward.png.meta
  79. BIN
      assets/textrue/home/img_new_level_bg.png
  80. 134 0
      assets/textrue/home/img_new_level_bg.png.meta
  81. BIN
      assets/textrue/home/img_play_video_bg.png
  82. 134 0
      assets/textrue/home/img_play_video_bg.png.meta
  83. BIN
      assets/textrue/home/img_wanfa_jiyi.png
  84. BIN
      assets/textrue/home/jjy_select.png
  85. 134 0
      assets/textrue/home/jjy_select.png.meta
  86. BIN
      assets/textrue/home/jjy_unselect.png
  87. 134 0
      assets/textrue/home/jjy_unselect.png.meta
  88. 9 0
      settings/v2/packages/information.json

BIN
assets/resources/ddz/2.png


+ 33 - 33
assets/resources/ddz/2.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": -0.5,
-        "offsetY": -0.5,
-        "trimX": 17,
-        "trimY": 11,
-        "width": 25,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetY": -1,
+        "trimX": 24,
+        "trimY": 12,
+        "width": 56,
+        "height": 83,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12.5,
-            -19.5,
+            -28,
+            -41.5,
             0,
-            12.5,
-            -19.5,
+            28,
+            -41.5,
             0,
-            -12.5,
-            19.5,
+            -28,
+            41.5,
             0,
-            12.5,
-            19.5,
+            28,
+            41.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            49,
-            42,
-            49,
-            17,
+            24,
+            93,
+            80,
+            93,
+            24,
             10,
-            42,
+            80,
             10
           ],
           "nuv": [
-            0.2833333333333333,
-            0.16666666666666666,
-            0.7,
-            0.16666666666666666,
-            0.2833333333333333,
-            0.8166666666666667,
-            0.7,
-            0.8166666666666667
+            0.22857142857142856,
+            0.09523809523809523,
+            0.7619047619047619,
+            0.09523809523809523,
+            0.22857142857142856,
+            0.8857142857142857,
+            0.7619047619047619,
+            0.8857142857142857
           ],
           "minPos": [
-            -12.5,
-            -19.5,
+            -28,
+            -41.5,
             0
           ],
           "maxPos": [
-            12.5,
-            19.5,
+            28,
+            41.5,
             0
           ]
         },

BIN
assets/resources/ddz/3.png


+ 34 - 34
assets/resources/ddz/3.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1.5,
-        "offsetY": -0.5,
-        "trimX": 16,
-        "trimY": 11,
-        "width": 25,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": -0.5,
+        "offsetY": 0,
+        "trimX": 24,
+        "trimY": 10,
+        "width": 56,
+        "height": 85,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12.5,
-            -19.5,
+            -28,
+            -42.5,
             0,
-            12.5,
-            -19.5,
+            28,
+            -42.5,
             0,
-            -12.5,
-            19.5,
+            -28,
+            42.5,
             0,
-            12.5,
-            19.5,
+            28,
+            42.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            16,
-            49,
-            41,
-            49,
-            16,
+            24,
+            95,
+            80,
+            95,
+            24,
             10,
-            41,
+            80,
             10
           ],
           "nuv": [
-            0.26666666666666666,
-            0.16666666666666666,
-            0.6833333333333333,
-            0.16666666666666666,
-            0.26666666666666666,
-            0.8166666666666667,
-            0.6833333333333333,
-            0.8166666666666667
+            0.22857142857142856,
+            0.09523809523809523,
+            0.7619047619047619,
+            0.09523809523809523,
+            0.22857142857142856,
+            0.9047619047619048,
+            0.7619047619047619,
+            0.9047619047619048
           ],
           "minPos": [
-            -12.5,
-            -19.5,
+            -28,
+            -42.5,
             0
           ],
           "maxPos": [
-            12.5,
-            19.5,
+            28,
+            42.5,
             0
           ]
         },

BIN
assets/resources/ddz/4.png


+ 34 - 34
assets/resources/ddz/4.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
-        "offsetY": 0,
-        "trimX": 16,
-        "trimY": 11,
-        "width": 27,
-        "height": 38,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": -1.5,
+        "offsetY": -0.5,
+        "trimX": 21,
+        "trimY": 12,
+        "width": 60,
+        "height": 82,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -13.5,
-            -19,
+            -30,
+            -41,
             0,
-            13.5,
-            -19,
+            30,
+            -41,
             0,
-            -13.5,
-            19,
+            -30,
+            41,
             0,
-            13.5,
-            19,
+            30,
+            41,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            16,
-            49,
-            43,
-            49,
-            16,
+            21,
+            93,
+            81,
+            93,
+            21,
             11,
-            43,
+            81,
             11
           ],
           "nuv": [
-            0.26666666666666666,
-            0.18333333333333332,
-            0.7166666666666667,
-            0.18333333333333332,
-            0.26666666666666666,
-            0.8166666666666667,
-            0.7166666666666667,
-            0.8166666666666667
+            0.2,
+            0.10476190476190476,
+            0.7714285714285715,
+            0.10476190476190476,
+            0.2,
+            0.8857142857142857,
+            0.7714285714285715,
+            0.8857142857142857
           ],
           "minPos": [
-            -13.5,
-            -19,
+            -30,
+            -41,
             0
           ],
           "maxPos": [
-            13.5,
-            19,
+            30,
+            41,
             0
           ]
         },

BIN
assets/resources/ddz/5.png


+ 32 - 32
assets/resources/ddz/5.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
+        "offsetX": 0.5,
         "offsetY": 0,
-        "trimX": 17,
+        "trimX": 25,
         "trimY": 11,
-        "width": 25,
-        "height": 38,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "width": 56,
+        "height": 83,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12.5,
-            -19,
+            -28,
+            -41.5,
             0,
-            12.5,
-            -19,
+            28,
+            -41.5,
             0,
-            -12.5,
-            19,
+            -28,
+            41.5,
             0,
-            12.5,
-            19,
+            28,
+            41.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            49,
-            42,
-            49,
-            17,
+            25,
+            94,
+            81,
+            94,
+            25,
             11,
-            42,
+            81,
             11
           ],
           "nuv": [
-            0.2833333333333333,
-            0.18333333333333332,
-            0.7,
-            0.18333333333333332,
-            0.2833333333333333,
-            0.8166666666666667,
-            0.7,
-            0.8166666666666667
+            0.23809523809523808,
+            0.10476190476190476,
+            0.7714285714285715,
+            0.10476190476190476,
+            0.23809523809523808,
+            0.8952380952380953,
+            0.7714285714285715,
+            0.8952380952380953
           ],
           "minPos": [
-            -12.5,
-            -19,
+            -28,
+            -41.5,
             0
           ],
           "maxPos": [
-            12.5,
-            19,
+            28,
+            41.5,
             0
           ]
         },

BIN
assets/resources/ddz/6.png


+ 35 - 35
assets/resources/ddz/6.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": -0.5,
-        "trimX": 18,
+        "offsetX": 1,
+        "offsetY": -1,
+        "trimX": 26,
         "trimY": 11,
-        "width": 24,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "width": 55,
+        "height": 85,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12,
-            -19.5,
+            -27.5,
+            -42.5,
             0,
-            12,
-            -19.5,
+            27.5,
+            -42.5,
             0,
-            -12,
-            19.5,
+            -27.5,
+            42.5,
             0,
-            12,
-            19.5,
+            27.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            18,
-            49,
-            42,
-            49,
-            18,
-            10,
-            42,
-            10
+            26,
+            94,
+            81,
+            94,
+            26,
+            9,
+            81,
+            9
           ],
           "nuv": [
-            0.3,
-            0.16666666666666666,
-            0.7,
-            0.16666666666666666,
-            0.3,
-            0.8166666666666667,
-            0.7,
-            0.8166666666666667
+            0.24761904761904763,
+            0.08571428571428572,
+            0.7714285714285715,
+            0.08571428571428572,
+            0.24761904761904763,
+            0.8952380952380953,
+            0.7714285714285715,
+            0.8952380952380953
           ],
           "minPos": [
-            -12,
-            -19.5,
+            -27.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            12,
-            19.5,
+            27.5,
+            42.5,
             0
           ]
         },

BIN
assets/resources/ddz/7.png


+ 36 - 36
assets/resources/ddz/7.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
-        "offsetY": 0,
-        "trimX": 17,
-        "trimY": 11,
-        "width": 25,
-        "height": 38,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": 0,
+        "offsetY": -1.5,
+        "trimX": 25,
+        "trimY": 13,
+        "width": 55,
+        "height": 82,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12.5,
-            -19,
+            -27.5,
+            -41,
             0,
-            12.5,
-            -19,
+            27.5,
+            -41,
             0,
-            -12.5,
-            19,
+            -27.5,
+            41,
             0,
-            12.5,
-            19,
+            27.5,
+            41,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            49,
-            42,
-            49,
-            17,
-            11,
-            42,
-            11
+            25,
+            92,
+            80,
+            92,
+            25,
+            10,
+            80,
+            10
           ],
           "nuv": [
-            0.2833333333333333,
-            0.18333333333333332,
-            0.7,
-            0.18333333333333332,
-            0.2833333333333333,
-            0.8166666666666667,
-            0.7,
-            0.8166666666666667
+            0.23809523809523808,
+            0.09523809523809523,
+            0.7619047619047619,
+            0.09523809523809523,
+            0.23809523809523808,
+            0.8761904761904762,
+            0.7619047619047619,
+            0.8761904761904762
           ],
           "minPos": [
-            -12.5,
-            -19,
+            -27.5,
+            -41,
             0
           ],
           "maxPos": [
-            12.5,
-            19,
+            27.5,
+            41,
             0
           ]
         },

BIN
assets/resources/ddz/8.png


+ 35 - 35
assets/resources/ddz/8.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
-        "offsetY": 0.5,
-        "trimX": 17,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 25,
         "trimY": 10,
-        "width": 25,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "width": 55,
+        "height": 85,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12.5,
-            -19.5,
+            -27.5,
+            -42.5,
             0,
-            12.5,
-            -19.5,
+            27.5,
+            -42.5,
             0,
-            -12.5,
-            19.5,
+            -27.5,
+            42.5,
             0,
-            12.5,
-            19.5,
+            27.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            50,
-            42,
-            50,
-            17,
-            11,
-            42,
-            11
+            25,
+            95,
+            80,
+            95,
+            25,
+            10,
+            80,
+            10
           ],
           "nuv": [
-            0.2833333333333333,
-            0.18333333333333332,
-            0.7,
-            0.18333333333333332,
-            0.2833333333333333,
-            0.8333333333333334,
-            0.7,
-            0.8333333333333334
+            0.23809523809523808,
+            0.09523809523809523,
+            0.7619047619047619,
+            0.09523809523809523,
+            0.23809523809523808,
+            0.9047619047619048,
+            0.7619047619047619,
+            0.9047619047619048
           ],
           "minPos": [
-            -12.5,
-            -19.5,
+            -27.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            12.5,
-            19.5,
+            27.5,
+            42.5,
             0
           ]
         },

BIN
assets/resources/ddz/9.png


+ 35 - 35
assets/resources/ddz/9.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
-        "offsetY": -0.5,
-        "trimX": 17,
+        "offsetX": 0,
+        "offsetY": -1,
+        "trimX": 25,
         "trimY": 11,
-        "width": 24,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "width": 55,
+        "height": 85,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -12,
-            -19.5,
+            -27.5,
+            -42.5,
             0,
-            12,
-            -19.5,
+            27.5,
+            -42.5,
             0,
-            -12,
-            19.5,
+            -27.5,
+            42.5,
             0,
-            12,
-            19.5,
+            27.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            49,
-            41,
-            49,
-            17,
-            10,
-            41,
-            10
+            25,
+            94,
+            80,
+            94,
+            25,
+            9,
+            80,
+            9
           ],
           "nuv": [
-            0.2833333333333333,
-            0.16666666666666666,
-            0.6833333333333333,
-            0.16666666666666666,
-            0.2833333333333333,
-            0.8166666666666667,
-            0.6833333333333333,
-            0.8166666666666667
+            0.23809523809523808,
+            0.08571428571428572,
+            0.7619047619047619,
+            0.08571428571428572,
+            0.23809523809523808,
+            0.8952380952380953,
+            0.7619047619047619,
+            0.8952380952380953
           ],
           "minPos": [
-            -12,
-            -19.5,
+            -27.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            12,
-            19.5,
+            27.5,
+            42.5,
             0
           ]
         },

BIN
assets/resources/ddz/A.png


+ 33 - 33
assets/resources/ddz/A.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 14,
-        "trimY": 11,
-        "width": 32,
-        "height": 38,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetY": -1,
+        "trimX": 17,
+        "trimY": 13,
+        "width": 71,
+        "height": 81,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -16,
-            -19,
+            -35.5,
+            -40.5,
             0,
-            16,
-            -19,
+            35.5,
+            -40.5,
             0,
-            -16,
-            19,
+            -35.5,
+            40.5,
             0,
-            16,
-            19,
+            35.5,
+            40.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            14,
-            49,
-            46,
-            49,
-            14,
+            17,
+            92,
+            88,
+            92,
+            17,
             11,
-            46,
+            88,
             11
           ],
           "nuv": [
-            0.23333333333333334,
-            0.18333333333333332,
-            0.7666666666666667,
-            0.18333333333333332,
-            0.23333333333333334,
-            0.8166666666666667,
-            0.7666666666666667,
-            0.8166666666666667
+            0.1619047619047619,
+            0.10476190476190476,
+            0.8380952380952381,
+            0.10476190476190476,
+            0.1619047619047619,
+            0.8761904761904762,
+            0.8380952380952381,
+            0.8761904761904762
           ],
           "minPos": [
-            -16,
-            -19,
+            -35.5,
+            -40.5,
             0
           ],
           "maxPos": [
-            16,
-            19,
+            35.5,
+            40.5,
             0
           ]
         },

BIN
assets/resources/ddz/D.png


BIN
assets/resources/ddz/J.png


+ 36 - 36
assets/resources/ddz/J.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -3,
-        "offsetY": 0.5,
-        "trimX": 16,
-        "trimY": 10,
-        "width": 22,
-        "height": 39,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": -6.5,
+        "offsetY": -1,
+        "trimX": 21,
+        "trimY": 12,
+        "width": 50,
+        "height": 83,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -11,
-            -19.5,
+            -25,
+            -41.5,
             0,
-            11,
-            -19.5,
+            25,
+            -41.5,
             0,
-            -11,
-            19.5,
+            -25,
+            41.5,
             0,
-            11,
-            19.5,
+            25,
+            41.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            16,
-            50,
-            38,
-            50,
-            16,
-            11,
-            38,
-            11
+            21,
+            93,
+            71,
+            93,
+            21,
+            10,
+            71,
+            10
           ],
           "nuv": [
-            0.26666666666666666,
-            0.18333333333333332,
-            0.6333333333333333,
-            0.18333333333333332,
-            0.26666666666666666,
-            0.8333333333333334,
-            0.6333333333333333,
-            0.8333333333333334
+            0.2,
+            0.09523809523809523,
+            0.6761904761904762,
+            0.09523809523809523,
+            0.2,
+            0.8857142857142857,
+            0.6761904761904762,
+            0.8857142857142857
           ],
           "minPos": [
-            -11,
-            -19.5,
+            -25,
+            -41.5,
             0
           ],
           "maxPos": [
-            11,
-            19.5,
+            25,
+            41.5,
             0
           ]
         },

BIN
assets/resources/ddz/K.png


+ 34 - 34
assets/resources/ddz/K.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 1.5,
-        "offsetY": 0,
-        "trimX": 17,
-        "trimY": 11,
-        "width": 29,
-        "height": 38,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": 3,
+        "offsetY": -0.5,
+        "trimX": 22,
+        "trimY": 12,
+        "width": 67,
+        "height": 82,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -14.5,
-            -19,
+            -33.5,
+            -41,
             0,
-            14.5,
-            -19,
+            33.5,
+            -41,
             0,
-            -14.5,
-            19,
+            -33.5,
+            41,
             0,
-            14.5,
-            19,
+            33.5,
+            41,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            17,
-            49,
-            46,
-            49,
-            17,
+            22,
+            93,
+            89,
+            93,
+            22,
             11,
-            46,
+            89,
             11
           ],
           "nuv": [
-            0.2833333333333333,
-            0.18333333333333332,
-            0.7666666666666667,
-            0.18333333333333332,
-            0.2833333333333333,
-            0.8166666666666667,
-            0.7666666666666667,
-            0.8166666666666667
+            0.20952380952380953,
+            0.10476190476190476,
+            0.8476190476190476,
+            0.10476190476190476,
+            0.20952380952380953,
+            0.8857142857142857,
+            0.8476190476190476,
+            0.8857142857142857
           ],
           "minPos": [
-            -14.5,
-            -19,
+            -33.5,
+            -41,
             0
           ],
           "maxPos": [
-            14.5,
-            19,
+            33.5,
+            41,
             0
           ]
         },

BIN
assets/resources/ddz/Q.png


+ 36 - 36
assets/resources/ddz/Q.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": -1.5,
-        "trimX": 13,
-        "trimY": 7,
-        "width": 34,
-        "height": 49,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": -2,
+        "offsetY": -0.5,
+        "trimX": 12,
+        "trimY": 1,
+        "width": 77,
+        "height": 104,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -17,
-            -24.5,
+            -38.5,
+            -52,
             0,
-            17,
-            -24.5,
+            38.5,
+            -52,
             0,
-            -17,
-            24.5,
+            -38.5,
+            52,
             0,
-            17,
-            24.5,
+            38.5,
+            52,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            13,
-            53,
-            47,
-            53,
-            13,
-            4,
-            47,
-            4
+            12,
+            104,
+            89,
+            104,
+            12,
+            0,
+            89,
+            0
           ],
           "nuv": [
-            0.21666666666666667,
-            0.06666666666666667,
-            0.7833333333333333,
-            0.06666666666666667,
-            0.21666666666666667,
-            0.8833333333333333,
-            0.7833333333333333,
-            0.8833333333333333
+            0.11428571428571428,
+            0,
+            0.8476190476190476,
+            0,
+            0.11428571428571428,
+            0.9904761904761905,
+            0.8476190476190476,
+            0.9904761904761905
           ],
           "minPos": [
-            -17,
-            -24.5,
+            -38.5,
+            -52,
             0
           ],
           "maxPos": [
-            17,
-            24.5,
+            38.5,
+            52,
             0
           ]
         },

BIN
assets/resources/ddz/T.png


+ 36 - 36
assets/resources/ddz/T.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
-        "offsetY": 1,
-        "trimX": 9,
-        "trimY": 11,
-        "width": 41,
-        "height": 36,
-        "rawWidth": 60,
-        "rawHeight": 60,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 10,
+        "width": 101,
+        "height": 85,
+        "rawWidth": 105,
+        "rawHeight": 105,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -20.5,
-            -18,
+            -50.5,
+            -42.5,
             0,
-            20.5,
-            -18,
+            50.5,
+            -42.5,
             0,
-            -20.5,
-            18,
+            -50.5,
+            42.5,
             0,
-            20.5,
-            18,
+            50.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            9,
-            49,
-            50,
-            49,
-            9,
-            13,
-            50,
-            13
+            2,
+            95,
+            103,
+            95,
+            2,
+            10,
+            103,
+            10
           ],
           "nuv": [
-            0.15,
-            0.21666666666666667,
-            0.8333333333333334,
-            0.21666666666666667,
-            0.15,
-            0.8166666666666667,
-            0.8333333333333334,
-            0.8166666666666667
+            0.01904761904761905,
+            0.09523809523809523,
+            0.9809523809523809,
+            0.09523809523809523,
+            0.01904761904761905,
+            0.9047619047619048,
+            0.9809523809523809,
+            0.9047619047619048
           ],
           "minPos": [
-            -20.5,
-            -18,
+            -50.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            20.5,
-            18,
+            50.5,
+            42.5,
             0
           ]
         },

BIN
assets/resources/ddz/X.png


BIN
assets/resources/ddz/card_bg.png


+ 34 - 34
assets/resources/ddz/card_bg.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 90,
-        "height": 135,
-        "rawWidth": 90,
-        "rawHeight": 135,
+        "trimX": 6,
+        "trimY": 6,
+        "width": 237,
+        "height": 342,
+        "rawWidth": 249,
+        "rawHeight": 354,
         "borderTop": 47,
         "borderBottom": 48,
         "borderLeft": 19,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -45,
-            -67.5,
+            -118.5,
+            -171,
             0,
-            45,
-            -67.5,
+            118.5,
+            -171,
             0,
-            -45,
-            67.5,
+            -118.5,
+            171,
             0,
-            45,
-            67.5,
+            118.5,
+            171,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            135,
-            90,
-            135,
-            0,
-            0,
-            90,
-            0
+            6,
+            348,
+            243,
+            348,
+            6,
+            6,
+            243,
+            6
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.024096385542168676,
+            0.01694915254237288,
+            0.9759036144578314,
+            0.01694915254237288,
+            0.024096385542168676,
+            0.9830508474576272,
+            0.9759036144578314,
+            0.9830508474576272
           ],
           "minPos": [
-            -45,
-            -67.5,
+            -118.5,
+            -171,
             0
           ],
           "maxPos": [
-            45,
-            67.5,
+            118.5,
+            171,
             0
           ]
         },

+ 20 - 20
assets/resources/ddz/d.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 27,
-        "height": 170,
-        "rawWidth": 27,
-        "rawHeight": 170,
+        "width": 35,
+        "height": 210,
+        "rawWidth": 35,
+        "rawHeight": 210,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -13.5,
-            -85,
+            -17.5,
+            -105,
             0,
-            13.5,
-            -85,
+            17.5,
+            -105,
             0,
-            -13.5,
-            85,
+            -17.5,
+            105,
             0,
-            13.5,
-            85,
+            17.5,
+            105,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            170,
-            27,
-            170,
+            210,
+            35,
+            210,
             0,
             0,
-            27,
+            35,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -13.5,
-            -85,
+            -17.5,
+            -105,
             0
           ],
           "maxPos": [
-            13.5,
-            85,
+            17.5,
+            105,
             0
           ]
         },

BIN
assets/resources/ddz/img_black.png


+ 28 - 28
assets/resources/ddz/img_black.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": -0.5,
         "trimX": 0,
-        "trimY": 9,
-        "width": 100,
-        "height": 107,
-        "rawWidth": 100,
-        "rawHeight": 125,
+        "trimY": 7,
+        "width": 77,
+        "height": 83,
+        "rawWidth": 77,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -50,
-            -53.5,
+            -38.5,
+            -41.5,
             0,
-            50,
-            -53.5,
+            38.5,
+            -41.5,
             0,
-            -50,
-            53.5,
+            -38.5,
+            41.5,
             0,
-            50,
-            53.5,
+            38.5,
+            41.5,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             0,
-            116,
-            100,
-            116,
+            89,
+            77,
+            89,
             0,
-            9,
-            100,
-            9
+            6,
+            77,
+            6
           ],
           "nuv": [
             0,
-            0.072,
+            0.0625,
             1,
-            0.072,
+            0.0625,
             0,
-            0.928,
+            0.9270833333333334,
             1,
-            0.928
+            0.9270833333333334
           ],
           "minPos": [
-            -50,
-            -53.5,
+            -38.5,
+            -41.5,
             0
           ],
           "maxPos": [
-            50,
-            53.5,
+            38.5,
+            41.5,
             0
           ]
         },

BIN
assets/resources/ddz/img_hua.png


+ 28 - 28
assets/resources/ddz/img_hua.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": 0.5,
         "trimX": 0,
-        "trimY": 11,
-        "width": 100,
-        "height": 103,
-        "rawWidth": 100,
-        "rawHeight": 125,
+        "trimY": 8,
+        "width": 77,
+        "height": 79,
+        "rawWidth": 77,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -50,
-            -51.5,
+            -38.5,
+            -39.5,
             0,
-            50,
-            -51.5,
+            38.5,
+            -39.5,
             0,
-            -50,
-            51.5,
+            -38.5,
+            39.5,
             0,
-            50,
-            51.5,
+            38.5,
+            39.5,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             0,
-            114,
-            100,
-            114,
+            88,
+            77,
+            88,
             0,
-            11,
-            100,
-            11
+            9,
+            77,
+            9
           ],
           "nuv": [
             0,
-            0.088,
+            0.09375,
             1,
-            0.088,
+            0.09375,
             0,
-            0.912,
+            0.9166666666666666,
             1,
-            0.912
+            0.9166666666666666
           ],
           "minPos": [
-            -50,
-            -51.5,
+            -38.5,
+            -39.5,
             0
           ],
           "maxPos": [
-            50,
-            51.5,
+            38.5,
+            39.5,
             0
           ]
         },

BIN
assets/resources/ddz/img_pian.png


+ 20 - 20
assets/resources/ddz/img_pian.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 100,
-        "height": 125,
-        "rawWidth": 100,
-        "rawHeight": 125,
+        "width": 77,
+        "height": 96,
+        "rawWidth": 77,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -50,
-            -62.5,
+            -38.5,
+            -48,
             0,
-            50,
-            -62.5,
+            38.5,
+            -48,
             0,
-            -50,
-            62.5,
+            -38.5,
+            48,
             0,
-            50,
-            62.5,
+            38.5,
+            48,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            125,
-            100,
-            125,
+            96,
+            77,
+            96,
             0,
             0,
-            100,
+            77,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -50,
-            -62.5,
+            -38.5,
+            -48,
             0
           ],
           "maxPos": [
-            50,
-            62.5,
+            38.5,
+            48,
             0
           ]
         },

BIN
assets/resources/ddz/img_red.png


+ 28 - 28
assets/resources/ddz/img_red.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -2,
+        "offsetY": -1.5,
         "trimX": 0,
-        "trimY": 12,
-        "width": 100,
-        "height": 105,
-        "rawWidth": 100,
-        "rawHeight": 125,
+        "trimY": 9,
+        "width": 77,
+        "height": 81,
+        "rawWidth": 77,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -50,
-            -52.5,
+            -38.5,
+            -40.5,
             0,
-            50,
-            -52.5,
+            38.5,
+            -40.5,
             0,
-            -50,
-            52.5,
+            -38.5,
+            40.5,
             0,
-            50,
-            52.5,
+            38.5,
+            40.5,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             0,
-            113,
-            100,
-            113,
+            87,
+            77,
+            87,
             0,
-            8,
-            100,
-            8
+            6,
+            77,
+            6
           ],
           "nuv": [
             0,
-            0.064,
+            0.0625,
             1,
-            0.064,
+            0.0625,
             0,
-            0.904,
+            0.90625,
             1,
-            0.904
+            0.90625
           ],
           "minPos": [
-            -50,
-            -52.5,
+            -38.5,
+            -40.5,
             0
           ],
           "maxPos": [
-            50,
-            52.5,
+            38.5,
+            40.5,
             0
           ]
         },

+ 20 - 20
assets/resources/ddz/x.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 27,
-        "height": 170,
-        "rawWidth": 27,
-        "rawHeight": 170,
+        "width": 35,
+        "height": 210,
+        "rawWidth": 35,
+        "rawHeight": 210,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -13.5,
-            -85,
+            -17.5,
+            -105,
             0,
-            13.5,
-            -85,
+            17.5,
+            -105,
             0,
-            -13.5,
-            85,
+            -17.5,
+            105,
             0,
-            13.5,
-            85,
+            17.5,
+            105,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            170,
-            27,
-            170,
+            210,
+            35,
+            210,
             0,
             0,
-            27,
+            35,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -13.5,
-            -85,
+            -17.5,
+            -105,
             0
           ],
           "maxPos": [
-            13.5,
-            85,
+            17.5,
+            105,
             0
           ]
         },

+ 21 - 18
assets/resources/prefabs/ddz_card.prefab

@@ -98,8 +98,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -9.924,
-      "y": 24.591,
+      "x": -13.337,
+      "y": 23.508,
       "z": 0
     },
     "_lrot": {
@@ -111,8 +111,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 0.15,
+      "y": 0.15,
       "z": 1
     },
     "_mobility": 0,
@@ -139,12 +139,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 25,
-      "height": 39
+      "width": 105,
+      "height": 105
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 1
     },
     "_id": ""
@@ -175,7 +175,10 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "e0e1944a-e08b-4ce4-85d9-d1a781e10503@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_type": 0,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -186,7 +189,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_useGrayscale": false,
     "_atlas": null,
     "_id": ""
@@ -217,7 +220,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 9
@@ -231,8 +234,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 15.451,
-      "y": -25.666,
+      "x": 14.084,
+      "y": -16.95,
       "z": 0
     },
     "_lrot": {
@@ -314,7 +317,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -367,8 +370,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -9.919,
-      "y": 3.676,
+      "x": -4.452,
+      "y": -3.655,
       "z": 0
     },
     "_lrot": {
@@ -380,8 +383,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.1,
-      "y": 0.1,
+      "x": 0.15,
+      "y": 0.15,
       "z": 1
     },
     "_mobility": 0,
@@ -450,7 +453,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

+ 4 - 4
assets/resources/prefabs/ddz_tip_item.prefab

@@ -86,7 +86,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -47.358,
+      "x": -83.258,
       "y": 0,
       "z": 0
     },
@@ -127,7 +127,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 86.7041015625,
+      "width": 161.7626953125,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -163,7 +163,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "第1步:4,5,6",
+    "_string": "第1步:4,5,6,4,5,6,4,5,6",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 15,
@@ -213,7 +213,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 170,
       "height": 20
     },
     "_anchorPoint": {

+ 371 - 79
assets/resources/prefabs/fail.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 100
       },
       {
-        "__id__": 90
+        "__id__": 102
       },
       {
-        "__id__": 92
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -284,14 +284,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 95
       },
       {
-        "__id__": 85
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -553,17 +553,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 88
       },
       {
-        "__id__": 78
+        "__id__": 90
       },
       {
-        "__id__": 80
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -879,20 +879,23 @@
         "__id__": 35
       },
       {
-        "__id__": 53
+        "__id__": 47
+      },
+      {
+        "__id__": 65
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 83
       },
       {
-        "__id__": 73
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 87
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -925,7 +928,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_extend",
+    "_name": "btn_quit",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -934,22 +937,298 @@
     "_children": [
       {
         "__id__": 36
-      },
+      }
+    ],
+    "_active": false,
+    "_components": [
       {
         "__id__": 42
+      },
+      {
+        "__id__": 44
       }
     ],
+    "_prefab": {
+      "__id__": 46
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -161.59999999999997,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.3,
+      "y": 0.3,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 35
+    },
+    "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -64.753,
+      "y": 0.001,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 3,
+      "y": 3,
+      "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__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 38
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 30,
+      "height": 18.9
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cegTXzri9PPKLMn5Zvy/3y"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 40
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 83,
+      "b": 88,
+      "a": 255
+    },
+    "_string": "退出",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 15,
+    "_fontSize": 15,
+    "_fontFamily": "Arial",
+    "_lineHeight": 15,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbTdPTI3tAUoXG41tIJxa3"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "12Sj07YBxEUppKskHXh38f",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 372,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "84VEqO/dFFHpTNZnl/Cz9O"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "48cb939b-3138-460f-ba25-241e65f59acb@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 2,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "78UhPICHlIL7PminNoKOi/"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "60AkzKXvdAbIHCcDXs1ZWW",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_extend",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 34
+    },
+    "_children": [
       {
         "__id__": 48
       },
       {
-        "__id__": 50
+        "__id__": 54
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 60
+      },
+      {
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -986,20 +1265,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 35
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 49
       },
       {
-        "__id__": 39
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1036,11 +1315,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 50
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1064,11 +1343,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 52
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1122,20 +1401,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 35
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 55
       },
       {
-        "__id__": 45
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1172,11 +1451,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1200,11 +1479,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 58
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1258,11 +1537,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1286,11 +1565,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1348,23 +1627,23 @@
     },
     "_children": [
       {
-        "__id__": 54
+        "__id__": 66
       },
       {
-        "__id__": 60
+        "__id__": 72
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 78
       },
       {
-        "__id__": 68
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1401,20 +1680,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 53
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 67
       },
       {
-        "__id__": 57
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1451,11 +1730,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 54
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1479,11 +1758,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 54
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1537,20 +1816,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 53
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 73
       },
       {
-        "__id__": 63
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1587,11 +1866,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 74
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1615,11 +1894,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 76
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1673,11 +1952,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1701,11 +1980,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 81
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1763,7 +2042,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 84
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1791,7 +2070,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 86
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1842,7 +2121,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1870,7 +2149,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 91
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -1908,7 +2187,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 93
     },
     "_alignFlags": 40,
     "_target": null,
@@ -1957,7 +2236,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1985,7 +2264,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 86
+      "__id__": 98
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2043,7 +2322,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 101
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2071,7 +2350,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 103
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2107,29 +2386,42 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 105
     },
     "btn_back": {
       "__id__": 13
     },
     "btn_extend": {
-      "__id__": 35
+      "__id__": 47
     },
     "btn_restart": {
-      "__id__": 53
+      "__id__": 65
     },
     "lab_restart": {
-      "__id__": 54
+      "__id__": 66
     },
     "img_restart_video_icon": {
-      "__id__": 60
+      "__id__": 72
     },
     "lab_extend_time": {
-      "__id__": 42
+      "__id__": 54
     },
     "lab_title": {
       "__id__": 22
     },
+    "btn_quit": {
+      "__id__": 35
+    },
+    "img_emote": {
+      "__id__": 28
+    },
+    "bg": {
+      "__id__": 12
+    },
+    "jyl_emote": {
+      "__uuid__": "c3e9e554-ec11-4f2f-952b-38701b2bd2b2@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_id": ""
   },
   {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 438 - 101
assets/resources/prefabs/game_play_dou_di_zhu.prefab


+ 5 - 5
assets/resources/prefabs/game_play_han_zi_zhao_bu_tong.prefab

@@ -600,7 +600,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -726,8 +726,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -926,8 +926,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 10 - 10
assets/resources/prefabs/game_play_ji_yi_li.prefab

@@ -425,7 +425,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -551,8 +551,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -751,8 +751,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1229,7 +1229,7 @@
       "__id__": 39
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 47
@@ -4331,13 +4331,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 167,
-      "g": 167,
-      "b": 167,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0f0e5fde-d002-49e9-92dd-78af94a95c04@f9941",
+      "__uuid__": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,

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

@@ -422,7 +422,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -548,8 +548,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -748,8 +748,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

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

@@ -425,7 +425,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -551,8 +551,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -751,8 +751,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

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

@@ -425,7 +425,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -551,8 +551,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -751,8 +751,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5080,12 +5080,12 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 172,
-      "b": 172,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0f0e5fde-d002-49e9-92dd-78af94a95c04@f9941",
+      "__uuid__": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,

+ 9 - 9
assets/resources/prefabs/game_play_zhao_bu_tong.prefab

@@ -425,7 +425,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -551,8 +551,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -751,8 +751,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3798,13 +3798,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 167,
-      "g": 167,
-      "b": 167,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "0f0e5fde-d002-49e9-92dd-78af94a95c04@f9941",
+      "__uuid__": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 793 - 123
assets/resources/prefabs/play_list_item.prefab


+ 112 - 18
assets/resources/prefabs/question_item.prefab

@@ -23,19 +23,22 @@
       },
       {
         "__id__": 16
+      },
+      {
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 26
       },
       {
-        "__id__": 24
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 30
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -96,7 +99,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -74.993,
+      "x": -54.405,
       "y": 0,
       "z": 0
     },
@@ -109,8 +112,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.3,
+      "y": 0.3,
       "z": 1
     },
     "_mobility": 0,
@@ -187,8 +190,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 26,
-      "height": 26
+      "width": 54,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -224,12 +227,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941",
+      "__uuid__": "329547b2-4ace-440a-8c07-e7eceaa3ac89@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -273,8 +276,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 28,
-      "height": 28
+      "width": 54,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -310,12 +313,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+      "__uuid__": "feac5985-2a7d-417f-9f46-61be2407031f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -345,7 +348,7 @@
       "__id__": 14
     },
     "clickEvents": [],
-    "_interactable": true,
+    "_interactable": false,
     "_transition": 0,
     "_normalColor": {
       "__type__": "cc.Color",
@@ -376,7 +379,7 @@
       "a": 255
     },
     "_normalSprite": {
-      "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+      "__uuid__": "feac5985-2a7d-417f-9f46-61be2407031f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_hoverSprite": null,
@@ -547,6 +550,94 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_check",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_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__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 24
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b56rPb+1BMH6dRchdeuCow"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02WkIprOVNG5SHKn3m/24C",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -557,7 +648,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 27
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -585,7 +676,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 29
     },
     "lab_question_item": {
       "__id__": 16
@@ -593,6 +684,9 @@
     "check_box": {
       "__id__": 2
     },
+    "btn_check": {
+      "__id__": 22
+    },
     "_id": ""
   },
   {

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

@@ -2093,8 +2093,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 3,
+      "y": 3,
       "z": 1
     },
     "_mobility": 0,

+ 424 - 74
assets/resources/prefabs/win.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 118
       },
       {
-        "__id__": 106
+        "__id__": 120
       },
       {
-        "__id__": 108
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 124
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -284,14 +284,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 113
       },
       {
-        "__id__": 101
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 117
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -559,17 +559,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 92
+        "__id__": 106
       },
       {
-        "__id__": 94
+        "__id__": 108
       },
       {
-        "__id__": 96
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1158,16 +1158,19 @@
       },
       {
         "__id__": 61
+      },
+      {
+        "__id__": 75
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 105
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1200,7 +1203,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_ordinary",
+    "_name": "btn_next_level",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1211,7 +1214,7 @@
         "__id__": 48
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 54
@@ -1228,7 +1231,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -72.878,
+      "x": 9.862,
       "y": 0,
       "z": 0
     },
@@ -1319,7 +1322,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 45,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -1331,7 +1334,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "04IOvJDSdC07iaFmFeZlWT"
+    "fileId": "5bFKjG/O1H978Do4E2rgm4"
   },
   {
     "__type__": "cc.Label",
@@ -1355,7 +1358,7 @@
       "b": 88,
       "a": 255
     },
-    "_string": "普通领取",
+    "_string": "下一关",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 15,
@@ -1376,7 +1379,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "76AfNOvYFIHqtGYYHavjFU"
+    "fileId": "d8O+MOns5EEaV1qfWvAe4e"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1386,7 +1389,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "1ayhamKclG0IxMEnGne0a3",
+    "fileId": "18ClbaHVdHqK2jkRBUOiq3",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1417,7 +1420,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e3joifqK5MV5LmNvMlPliR"
+    "fileId": "07EWsWjApEs6CqP4Ze8I9l"
   },
   {
     "__type__": "cc.Sprite",
@@ -1462,7 +1465,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fbQBkPQaBMCqjre3kYh0vH"
+    "fileId": "daj6l/Gz1LfZKvLLw/vl5H"
   },
   {
     "__type__": "cc.Button",
@@ -1519,6 +1522,344 @@
     "_target": null,
     "_id": ""
   },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c0fl2DuGJNBr9yNjqZO0wF"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d1S42EPVFC0a/CZGr0A8Wv",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_ordinary",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 46
+    },
+    "_children": [
+      {
+        "__id__": 62
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 68
+      },
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 72
+      }
+    ],
+    "_prefab": {
+      "__id__": 74
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -72.878,
+      "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.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 67
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -1.566,
+      "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__": 62
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 64
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 60,
+      "height": 25.2
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "04IOvJDSdC07iaFmFeZlWT"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 62
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 66
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 83,
+      "b": 88,
+      "a": 255
+    },
+    "_string": "普通领取",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 15,
+    "_fontSize": 15,
+    "_fontFamily": "Arial",
+    "_lineHeight": 20,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "76AfNOvYFIHqtGYYHavjFU"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1ayhamKclG0IxMEnGne0a3",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 69
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 124,
+      "height": 34
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e3joifqK5MV5LmNvMlPliR"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 71
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "48cb939b-3138-460f-ba25-241e65f59acb@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fbQBkPQaBMCqjre3kYh0vH"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": {
+      "__uuid__": "48cb939b-3138-460f-ba25-241e65f59acb@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.1,
+    "_target": null,
+    "_id": ""
+  },
   {
     "__type__": "cc.CompPrefabInfo",
     "fileId": "264iUCFnNIEK8XJDnfv1Ls"
@@ -1546,32 +1887,32 @@
     },
     "_children": [
       {
-        "__id__": 62
+        "__id__": 76
       },
       {
-        "__id__": 68
+        "__id__": 82
       },
       {
-        "__id__": 74
+        "__id__": 88
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 94
       },
       {
-        "__id__": 82
+        "__id__": 96
       },
       {
-        "__id__": 84
+        "__id__": 98
       },
       {
-        "__id__": 86
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1608,20 +1949,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 77
       },
       {
-        "__id__": 65
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 81
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1658,11 +1999,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1686,11 +2027,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 80
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1744,20 +2085,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 83
       },
       {
-        "__id__": 71
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 87
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1794,11 +2135,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 68
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 84
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1822,11 +2163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 68
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 86
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1880,20 +2221,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 75
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 89
       },
       {
-        "__id__": 77
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 93
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1930,11 +2271,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 90
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1958,11 +2299,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 92
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2016,11 +2357,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 95
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2044,11 +2385,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 97
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2089,11 +2430,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 99
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2148,11 +2489,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 101
     },
     "playOnLoad": true,
     "_clips": [
@@ -2194,7 +2535,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 104
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2235,7 +2576,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 107
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2263,7 +2604,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 109
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -2301,7 +2642,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 111
     },
     "_alignFlags": 40,
     "_target": null,
@@ -2350,7 +2691,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 114
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2378,7 +2719,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 102
+      "__id__": 116
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2436,7 +2777,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 119
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2464,7 +2805,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 121
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2500,16 +2841,16 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 123
     },
     "btn_back": {
       "__id__": 13
     },
     "btn_ordinary": {
-      "__id__": 47
+      "__id__": 61
     },
     "btn_double": {
-      "__id__": 61
+      "__id__": 75
     },
     "lab_reward_number": {
       "__id__": 40
@@ -2520,6 +2861,15 @@
     "img_emote": {
       "__id__": 28
     },
+    "btn_next_level": {
+      "__id__": 47
+    },
+    "lab_title_1": {
+      "__id__": 34
+    },
+    "bg": {
+      "__id__": 12
+    },
     "spr_reward_sf": {
       "__uuid__": "f394e2b1-ce02-483e-a271-1c065cfb3348@f9941",
       "__expectedType__": "cc.SpriteFrame"

+ 141 - 141
assets/scene/game.scene

@@ -85,6 +85,9 @@
       {
         "__id__": 81
       },
+      {
+        "__id__": 49
+      },
       {
         "__id__": 84
       }
@@ -324,24 +327,21 @@
       },
       {
         "__id__": 31
-      },
-      {
-        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 45
       },
       {
-        "__id__": 49
+        "__id__": 46
       },
       {
-        "__id__": 50
+        "__id__": 47
       },
       {
-        "__id__": 51
+        "__id__": 48
       }
     ],
     "_prefab": null,
@@ -676,7 +676,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 17,
-      "y": -3,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -775,8 +775,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 265,
-      "height": 90
+      "width": 297,
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -942,8 +942,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 279,
-      "height": 90
+      "width": 306,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1240,106 +1240,6 @@
     "_lockFlags": 0,
     "_id": "4caDgo4mRL55ZwFS3m4OIW"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "action_node",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 8
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 33
-      }
-    ],
-    "_prefab": null,
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -187.5,
-      "y": -406,
-      "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": "39P0jeGNBMLKZ4+t/5miHq"
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 31
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 375,
-      "height": 812
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_id": "4bpEArUQxB9aNe+UEARN8d"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 31
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_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": 100,
-    "_originalHeight": 100,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "a0PpnJpDtAqo4o8NoDO8dN"
-  },
   {
     "__type__": "cc.Node",
     "_name": "ScrollView",
@@ -1350,22 +1250,22 @@
     },
     "_children": [
       {
-        "__id__": 35
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 41
       },
       {
-        "__id__": 45
+        "__id__": 42
       },
       {
-        "__id__": 46
+        "__id__": 43
       },
       {
-        "__id__": 47
+        "__id__": 44
       }
     ],
     "_prefab": null,
@@ -1404,26 +1304,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 34
+      "__id__": 31
     },
     "_children": [
       {
-        "__id__": 36
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 37
       },
       {
-        "__id__": 41
+        "__id__": 38
       },
       {
-        "__id__": 42
+        "__id__": 39
       },
       {
-        "__id__": 43
+        "__id__": 40
       }
     ],
     "_prefab": null,
@@ -1462,19 +1362,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 35
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 34
       },
       {
-        "__id__": 38
+        "__id__": 35
       },
       {
-        "__id__": 39
+        "__id__": 36
       }
     ],
     "_prefab": null,
@@ -1513,7 +1413,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1535,7 +1435,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1565,7 +1465,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1597,7 +1497,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1619,7 +1519,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1635,7 +1535,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1675,7 +1575,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1705,7 +1605,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 31
     },
     "_enabled": true,
     "__prefab": null,
@@ -1727,7 +1627,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 31
     },
     "_enabled": false,
     "__prefab": null,
@@ -1766,7 +1666,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 31
     },
     "_enabled": true,
     "__prefab": null,
@@ -1779,7 +1679,7 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 36
+      "__id__": 33
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": null,
@@ -1791,7 +1691,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 31
     },
     "_enabled": true,
     "__prefab": null,
@@ -1917,7 +1817,7 @@
     "_enabled": true,
     "__prefab": null,
     "content": {
-      "__id__": 36
+      "__id__": 33
     },
     "sfList": [
       {
@@ -1969,7 +1869,7 @@
       "__id__": 9
     },
     "action_node": {
-      "__id__": 31
+      "__id__": 49
     },
     "item_prefab": {
       "__uuid__": "b426aee1-f11c-4484-a0a7-bc11b6e1b0a5",
@@ -1977,6 +1877,106 @@
     },
     "_id": "6cRFfbHNlClrQgA8IBA7gj"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "action_node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 50
+      },
+      {
+        "__id__": 51
+      }
+    ],
+    "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -187.5,
+      "y": -406,
+      "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": "39P0jeGNBMLKZ4+t/5miHq"
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 375,
+      "height": 812
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_id": "4bpEArUQxB9aNe+UEARN8d"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_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": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": "a0PpnJpDtAqo4o8NoDO8dN"
+  },
   {
     "__type__": "cc.Node",
     "_name": "ui_layer",

+ 3 - 0
assets/script/data/server_play_list_data.ts

@@ -48,6 +48,8 @@ export class server_play_list_data_item {
     "wf_fail_music": "";
     "wf_wrong_click_music": "";
     "wf_right_click_music": "";
+    "unlock_ads_number":0;
+    "consume_coin":0;
 }
 
 export class server_user_info {
@@ -123,6 +125,7 @@ export class unlock_levels_item{
     public id:number = 1;
     public level:number = 1;
     public is_lock_game_play: number = 0; //0 未解锁,1 解锁
+    public look_video_number :number = 0;
 }
 
 export class unlock_levels{

+ 35 - 1
assets/script/dialog/fail.ts

@@ -1,4 +1,5 @@
-import { _decorator, Component, Label, Node, Vec3 } from 'cc';
+import { _decorator, Component, Label, Node, Sprite, SpriteFrame, Vec3 } from 'cc';
+import { config } from '../config';
 const { ccclass, property } = _decorator;
 @ccclass('fail')
 export class fail extends Component {
@@ -9,8 +10,13 @@ export class fail extends Component {
     @property(Node) img_restart_video_icon:Node;
     @property(Node) lab_extend_time:Node;
     @property(Node) lab_title:Node;
+    @property(Node) btn_quit:Node;
+    @property(Node) img_emote:Node;
+    @property(Node) bg:Node;
+    @property(SpriteFrame) jyl_emote:SpriteFrame;
     private m_extend_call:any = null;
     private m_restart_call:any = null;
+    private m_quit_call:any = null;
     start() {
         let self = this;
         this.btn_back.on(Node.EventType.TOUCH_START,()=>{
@@ -26,6 +32,12 @@ export class fail extends Component {
                 this.m_restart_call(this)
             }
         },this);
+
+        this.btn_quit.on(Node.EventType.TOUCH_START,()=>{
+            if(this.m_quit_call!=null){
+                this.m_quit_call(this)
+            }
+        },this);
     }
     public close(){
         this.node.removeFromParent();
@@ -58,6 +70,28 @@ export class fail extends Component {
         }
     }
 
+    public showJYLView(restart,is_show_restart_video,quit,categoryid){
+        this.m_restart_call = restart;
+        this.m_quit_call = quit;
+        this.btn_extend.active = false;
+        this.btn_quit.active = true;
+        this.img_emote.getComponent(Sprite).spriteFrame = this.jyl_emote;
+        if(categoryid===config.PLAY_TYPE.JI_YI_LI){
+            this.lab_title.getComponent(Label).string = "很遗憾,回答错误"
+        }else{
+            this.bg.angle = -90;
+            this.bg.position = new Vec3(this.bg.position.x+40,this.bg.position.y,this.bg.position.z)
+            this.lab_title.getComponent(Label).string = "很遗憾,闯关失败"
+        }
+       
+        if(is_show_restart_video===1){
+            this.img_restart_video_icon.active = true;
+            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(-94,0,this.lab_restart.position.z);
+        }
+    }
 }
 
 

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

@@ -1,7 +1,8 @@
-import { _decorator, Component, Label, Node, Sprite, SpriteFrame } from 'cc';
+import { _decorator, Component, Label, Node, Sprite, SpriteFrame, Vec3 } from 'cc';
 import { server_han_zi_zhao_bu_tong_data_item, server_mei_nv_zhao_xi_jie_data_item, server_shuang_tu_zhao_bu_tong_data_item } from '../data/server_play_list_data';
 import { Util } from '../framework/util';
 import { gameManager } from '../gameManager';
+import { config } from '../config';
 const { ccclass, property } = _decorator;
 
 @ccclass('win')
@@ -12,6 +13,9 @@ export class win extends Component {
     @property(Node) lab_reward_number:Node;
     @property(Node) lab_title:Node;
     @property(Node) img_emote:Node;
+    @property(Node) btn_next_level:Node;
+    @property(Node) lab_title_1:Node;
+    @property(Node) bg:Node;
     @property(SpriteFrame) spr_reward_sf:SpriteFrame;
     private m_reward_number:number;
     private m_ordinary_call:any = null;
@@ -31,6 +35,11 @@ export class win extends Component {
                 this.m_double_call(this)
             }
         },this);   
+        this.btn_next_level.on(Node.EventType.TOUCH_START,()=>{
+            if(this.m_ordinary_call!=null){
+                this.m_ordinary_call(this)
+            }
+        },this);   
     }
     public close(){
         this.node.removeFromParent();
@@ -57,6 +66,20 @@ export class win extends Component {
         this.lab_reward_number.getComponent(Label).string = "+ " +reward+"";
     }
 
+    public showJYLView(ordinary_call,categoryid){
+        if(categoryid===config.PLAY_TYPE.DOU_DI_ZHU){
+            this.bg.angle = -90;
+            this.bg.position = new Vec3(this.bg.position.x-40,this.bg.position.y,this.bg.position.z)
+        }else{
+
+        }
+        this.hideAllBtn()
+        this.m_ordinary_call = ordinary_call;
+        this.btn_next_level.active = true;
+        this.lab_reward_number.active = false;
+        this.lab_title_1.active = false;
+    }
+
     public showVideoAddCoinView(reward:number,data:server_mei_nv_zhao_xi_jie_data_item,ordinary_call,double_call){
         this.m_double_call = double_call;
         this.m_ordinary_call = ordinary_call;

+ 47 - 21
assets/script/gameManager.ts

@@ -68,7 +68,7 @@ export class gameManager extends Component {
             if(gameManager.user_level_data.list[element.id]){
 
             }else{
-                if(item.id===config.PLAY_TYPE.YI_QI_ZHAO_CHA){
+                if(item.id===config.PLAY_TYPE.YI_QI_ZHAO_CHA||item.id===config.PLAY_TYPE.JI_YI_LI||item.id===config.PLAY_TYPE.DOU_DI_ZHU){
                     item.is_lock_game_play = 1;
                 }else{
                     item.is_lock_game_play = 0;
@@ -79,6 +79,16 @@ export class gameManager extends Component {
         }
         
     }
+
+    public static update_unlock_levels(){
+        for (let index = 0; index < gameManager.g_server_play_list_data.list.length; index++) {
+            const element = gameManager.g_server_play_list_data.list[index];
+            if(element.id===config.PLAY_TYPE.YI_QI_ZHAO_CHA||element.id===config.PLAY_TYPE.JI_YI_LI||element.id===config.PLAY_TYPE.DOU_DI_ZHU){
+                gameManager.user_level_data.list[element.id].is_lock_game_play = 1;
+            }
+       
+        }
+    }
     public static isFinishAllLevel(categoryid:number):boolean{
         let item = gameManager.get_cur_level_by_categoryid(categoryid)
         if(item.level===gameManager.get_play_level_number(categoryid)){
@@ -108,7 +118,24 @@ export class gameManager extends Component {
     }
 
     public static set_unlock_levels(unlock_levels:string){
-        gameManager.user_level_data.list = JSON.parse(unlock_levels);
+        gameManager.user_level_data.list = [];
+        let temp = JSON.parse(unlock_levels);
+        for (let index = 0; index < temp.length; index++) {
+            const element = temp[index];
+            if(element!=null&&element!=undefined){
+                let item = new unlock_levels_item()
+                item.id = element.id;
+                if(item.id===config.PLAY_TYPE.YI_QI_ZHAO_CHA||item.id===config.PLAY_TYPE.JI_YI_LI){
+                    item.is_lock_game_play = 1;
+                }else{
+                    item.is_lock_game_play = element.is_lock_game_play;
+                }
+                item.level = element.level;
+                item.look_video_number = element.look_video_number!=undefined?element.look_video_number:0;
+                gameManager.user_level_data.list[item.id] = item;
+            }
+        }
+
     }
 
     public static set_unlock_levels_data(item:unlock_levels_item){
@@ -119,32 +146,29 @@ export class gameManager extends Component {
         gameManager.waitLayer = node;
     }
 
-    public static sync_data(call_back,sync_data_type:number = 0){
+    public static sync_data(call_back,sync_data_type:number = config.sync_data_type.ALL){
         let form_Data = null;
         if(sys.platform===sys.Platform.BYTEDANCE_MINI_GAME){
-            if(sync_data_type===0){
+            if(sync_data_type===config.sync_data_type.ALL){
                 form_Data = {"coin": gameManager.userInfo.coin+"","unlock_levels": gameManager.get_unlock_levels()}
-            }else if(sync_data_type===1){
+            }else if(sync_data_type===config.sync_data_type.COIN){
                 form_Data = {"coin": gameManager.userInfo.coin+""}
-            }else if(sync_data_type===2){
+            }else if(sync_data_type===config.sync_data_type.LEVELS){
                 form_Data = {"unlock_levels": gameManager.get_unlock_levels()}
             }
             
         }else{
             form_Data = new FormData();
-            if(sync_data_type===0){
+            if(sync_data_type===config.sync_data_type.ALL){
                 form_Data.append("coin", gameManager.userInfo.coin+"");
                 form_Data.append("unlock_levels", gameManager.get_unlock_levels());
-            }else if(sync_data_type===1){
+            }else if(sync_data_type===config.sync_data_type.COIN){
                 form_Data.append("coin", gameManager.userInfo.coin+"");
-            }else if(sync_data_type===2){
+            }else if(sync_data_type===config.sync_data_type.LEVELS){
                 form_Data.append("unlock_levels", gameManager.get_unlock_levels());
             }
         }
 
-        form_Data.forEach((v,k)=>{
-            console.log("sync_data",v,k)
-        })
         http.post(config.api_url.sync_data,form_Data,(_err,c_data)=>{
             if(!_err){
                 let c__data = JSON.parse(c_data);
@@ -211,7 +235,7 @@ export class gameManager extends Component {
     public static next_level(categoryid:number,call_back):boolean{
         let item = gameManager.get_cur_level_by_categoryid(categoryid);
         let play_item = gameManager.get_play_list_item_by_categoryid(categoryid);
-        if(item.level<=play_item.barrier_number){
+        if( (item.level+1) <= play_item.barrier_number ){
             item.level+=1;
             gameManager.sync_data((is_sync)=>{
                 if(is_sync){
@@ -333,15 +357,17 @@ export class gameManager extends Component {
                     finish_call_back()
                 }
             }
-            for (let index = 0; index < 3; index++) {
+            for (let index = 0; index < gameManager.g_server_play_list_data.list.length; index++) {
                 const element = gameManager.g_server_play_list_data.list[index];
-                let item = gameManager.get_cur_level_by_categoryid(element.id);
-                if((item.level+1)<=element.barrier_number){
-                    let key = `${element.id}_${item.level+1}`;
-                    // let str = StorageManager.instance.getGlobalData(key);
-                    if(!gameManager.cache.get(`${item.level+1}_${element.id}`)){
-                        gameManager.PreloadingLevelImgNumber++;
-                        gameManager.loadLevelImg(element.id,item.level+1,call_back)
+                if(element.id===config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG||element.id===config.PLAY_TYPE.YI_QI_ZHAO_CHA){
+                    let item = gameManager.get_cur_level_by_categoryid(element.id);
+                    if((item.level+1)<=element.barrier_number){
+                        let key = `${element.id}_${item.level+1}`;
+                        // let str = StorageManager.instance.getGlobalData(key);
+                        if(!gameManager.cache.get(`${item.level+1}_${element.id}`)){
+                            gameManager.PreloadingLevelImgNumber++;
+                            gameManager.loadLevelImg(element.id,item.level+1,call_back)
+                        }
                     }
                 }
            

+ 22 - 5
assets/script/homepage/homepage.ts

@@ -39,7 +39,15 @@ export class homepage extends Component {
     @property(Prefab) item_prefab;
     protected coin_ani:Node;
     protected old_coin_number:number = 0;
+    private sp_map:Map<number,SpriteFrame> = new Map();
     protected start(): void {
+        this.sp_map.set(config.PLAY_TYPE.YI_QI_ZHAO_CHA,this.sfList[0])
+        this.sp_map.set(config.PLAY_TYPE.HAN_ZI_ZHAO_BU_TONG,this.sfList[1])
+        this.sp_map.set(config.PLAY_TYPE.MEI_NV_ZHAO_XI_JIE,this.sfList[2])
+        this.sp_map.set(config.PLAY_TYPE.ZHAO_XIANG_TONG,this.sfList[3])
+        this.sp_map.set(config.PLAY_TYPE.ZHAO_BU_TONG,this.sfList[4])
+        this.sp_map.set(config.PLAY_TYPE.DOU_DI_ZHU,this.sfList[5])
+        this.sp_map.set(config.PLAY_TYPE.JI_YI_LI,this.sfList[6])
         this.btn_setting.on(Node.EventType.TOUCH_START,()=>{
             gameManager.playBtnSound()
             gameManager.addTopView(config.PREFAB_PATH.setting,()=>{});
@@ -90,7 +98,9 @@ export class homepage extends Component {
             this.old_coin_number = gameManager.get_user_coin();
             this.lab_coin.getComponent(Label).string = Util.coinNumberToK(this.old_coin_number);
         })
-
+        for (let index = 0; index < self.content.children.length; index++) {
+            self.content.children[index].getComponent(play_list_item).updateView();
+        }
     }
 
     showCoinAni(){
@@ -150,10 +160,9 @@ export class homepage extends Component {
             let list = gameManager.g_server_play_list_data.list;
             for (let index = 0; index < list.length; index++) {
                 // if(list[index].id<=3){
-                    console.log("list[index]",list[index])
                     let newNode:Node = instantiate(prefab);
                     newNode.parent = self.content;
-                    newNode.getComponent(play_list_item).initView(list[index],self.sfList[index],this.onItemClick.bind(this));
+                    newNode.getComponent(play_list_item).initView(list[index],this.sp_map.get(list[index].id),this.onItemClick.bind(this));
                 // }
             }
         }
@@ -175,7 +184,6 @@ export class homepage extends Component {
     }
 
     onItemClick(data:server_play_list_data_item){
-        console.log("data",data)
         gameManager.playBtnSound()
         this.hideAllItem()
         switch(data.id){
@@ -304,7 +312,16 @@ export class homepage extends Component {
                 {
                     let categoryid = config.PLAY_TYPE.JI_YI_LI;
                     let levels_item = gameManager.get_cur_level_by_categoryid(categoryid);
-                    // gameManager.showLoading();
+                    const element = gameManager.get_play_list_item_by_categoryid(config.PLAY_TYPE.JI_YI_LI);
+                    if(element.barrier_number<levels_item.level){
+                        levels_item.level = 1;
+                        gameManager.set_unlock_levels_data(levels_item)
+                        gameManager.sync_data(()=>{},config.sync_data_type.LEVELS)
+                    }
+                    if(levels_item.level<=0){
+                        levels_item.level = 1;
+                        gameManager.set_unlock_levels_data(levels_item)
+                    }
                     http.get(config.static_url.levels_info(categoryid,levels_item.level),(err,data)=>{
                         if(!err){
                             let _data = JSON.parse(data)

+ 87 - 12
assets/script/homepage/play_list_item.ts

@@ -16,6 +16,12 @@ export class play_list_item extends Component {
     @property(Node) mask_layer;
     @property(Node) btn_lock_coin;
     @property(Node) lab_coin_number;
+
+    @property(Node) btn_lock_video:Node;
+    @property(Node) lab_video_number:Node;
+
+    @property(Node) btn_sub_coin:Node;
+    @property(Node) lab_consume_coin:Node;
     private m_data:server_play_list_data_item = null;
     private m_call_back = null;
     public initView(data:server_play_list_data_item,sf:SpriteFrame,call_back){
@@ -23,10 +29,40 @@ export class play_list_item extends Component {
         this.node.getComponent(Sprite).spriteFrame = sf;
         this.node.on(Node.EventType.TOUCH_END,()=>{
             if(this.m_call_back!=null){
-                this.m_call_back(this.m_data);
+
+                if(this.m_data.id===config.PLAY_TYPE.JI_YI_LI||this.m_data.id===config.PLAY_TYPE.DOU_DI_ZHU){
+                    this.btn_sub_coin.active = true;
+                    if(gameManager.get_user_coin()>=this.m_data.consume_coin){
+                        gameManager.sub_coin(this.m_data.consume_coin)
+                        this.m_call_back(this.m_data);
+                    }else{
+                        this.showViewLack()
+                    }
+                }else{
+                    this.m_call_back(this.m_data);
+                }
+
             }
         },this);
 
+        this.btn_sub_coin.on(Node.EventType.TOUCH_END,()=>{
+            if(this.m_call_back!=null){
+
+                if(this.m_data.id===config.PLAY_TYPE.JI_YI_LI||this.m_data.id===config.PLAY_TYPE.DOU_DI_ZHU){
+                    this.btn_sub_coin.active = true;
+                    if(gameManager.get_user_coin()>=this.m_data.consume_coin){
+                        gameManager.sub_coin(this.m_data.consume_coin)
+                        this.m_call_back(this.m_data);
+                    }else{
+                        this.showViewLack()
+                    }
+                }else{
+                    this.m_call_back(this.m_data);
+                }
+
+            }
+        })
+        this.btn_sub_coin.active = false;
         this.btn_lock_coin.on(Node.EventType.TOUCH_START,()=>{
             gameManager.playBtnSound()
             if(gameManager.get_user_coin()>=this.m_data.coin_number){
@@ -39,29 +75,50 @@ export class play_list_item extends Component {
                     ClientEvent.dispatchEvent(config.EVENT_MSG.ON_UPDATE_HOME_VIEW)
                 })
             }else{
-                gameManager.addTopView(config.PREFAB_PATH.Lack,(node:Node)=>{
-                    node.getComponent(Lack).initView(null,(lack:Lack)=>{
-                        SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
-                            if(res.isEnded){
-                                lack.close()
-                                ClientEvent.dispatchEvent(config.EVENT_MSG.ON_SHOW_REWARD_VIEW)
-                            }
-                        })
-                    });
-                })
+                this.showViewLack()
             }
 
       
         },this);
+        this.btn_lock_video.on(Node.EventType.TOUCH_END,()=>{
+            SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
+                if(res.isEnded){
+                    let data = gameManager.get_cur_level_by_categoryid(this.m_data.id);
+                    data.look_video_number+=1;
+                    if(data.look_video_number>=this.m_data.unlock_ads_number){
+                        data.is_lock_game_play = 1;
+                    }
+                    gameManager.set_unlock_levels_data(data);
+                    gameManager.sync_data((is_sync)=>{},config.sync_data_type.LEVELS)
+                    if(data.is_lock_game_play===1){
+                        ClientEvent.dispatchEvent(config.EVENT_MSG.ON_UPDATE_HOME_VIEW)
+                    }else{
+                        this.updateView()
+                    }
+                }
+            })
+        })
         this.m_data = data;
         this.updateView();
         this.hide();
     }
 
+    public showViewLack(){
+        gameManager.addTopView(config.PREFAB_PATH.Lack,(node:Node)=>{
+            node.getComponent(Lack).initView(null,(lack:Lack)=>{
+                SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
+                    if(res.isEnded){
+                        lack.close()
+                        ClientEvent.dispatchEvent(config.EVENT_MSG.ON_SHOW_REWARD_VIEW)
+                    }
+                })
+            });
+        })
+    }
+
     public updateView(){
         let data = gameManager.get_cur_level_by_categoryid(this.m_data.id);
         if(data!=null){
-            console.log("data.is_lock_game_play",data.is_lock_game_play)
             if(data.is_lock_game_play===1){
                 this.mask_layer.active = false;
             }else{
@@ -72,8 +129,26 @@ export class play_list_item extends Component {
             }else{
                 this.btn_lock_coin.getComponent(Sprite).grayscale = true;
             }
+            if(this.m_data.unlock_ads_number>0){
+                this.btn_lock_video.active = true;
+                this.lab_video_number.getComponent(Label).string = `${data.look_video_number}/${this.m_data.unlock_ads_number}`
+            }else{
+                this.btn_lock_video.active = false;
+            }
             this.lab_coin_number.getComponent(Label).string = this.m_data.coin_number+"";
             this.lab_cur_level.getComponent(Label).string = `${data.level}/${this.m_data.barrier_number}` 
+            
+            if(this.m_data.id===config.PLAY_TYPE.JI_YI_LI||this.m_data.id===config.PLAY_TYPE.DOU_DI_ZHU){
+                this.btn_sub_coin.active = true;
+                this.item_bg.active = false;
+                this.lab_consume_coin.getComponent(Label).string = `-${this.m_data.consume_coin}`
+                if(gameManager.get_user_coin()>=this.m_data.consume_coin){
+                    this.btn_sub_coin.getComponent(Sprite).grayscale = false;
+                }else{
+                    this.btn_sub_coin.getComponent(Sprite).grayscale = true;
+                }
+            }
+
         }
     }
 

+ 21 - 18
assets/script/launch/view_launch.ts

@@ -104,6 +104,7 @@ export class launch_view extends Component {
         }
 
         if(progress_number===30){
+            
             if(gameManager.userInfo.unlock_levels==""){
                 gameManager.init_unlock_levels();
                 this.isStop = true;
@@ -126,28 +127,30 @@ export class launch_view extends Component {
                     }
                  
                 })
+            }else{
+                gameManager.update_unlock_levels()
             }
         }
 
         if(progress_number==40){
-            this.isStop = true;
-            let all = 0;
-            const element = gameManager.get_play_list_item_by_categoryid(config.PLAY_TYPE.MEI_NV_ZHAO_XI_JIE);
-            let item = gameManager.get_cur_level_by_categoryid(element.id);
-            let key = `${element.id}_${item.level}`;
-            let str = StorageManager.instance.getGlobalData(key);
-            if(str===""||str===undefined||str===null){
-                all++;
-                gameManager.loadLevelImg(element.id,item.level,()=>{
-                    this.isStop = false;
-                })
-            }
-            if(all===0){
-                this.isStop = false;
-            }
-            gameManager.loadLevelImg(element.id,item.level,()=>{
-                this.isStop = false;
-            })
+            // this.isStop = true;
+            // let all = 0;
+            // const element = gameManager.get_play_list_item_by_categoryid(config.PLAY_TYPE.MEI_NV_ZHAO_XI_JIE);
+            // let item = gameManager.get_cur_level_by_categoryid(element.id);
+            // let key = `${element.id}_${item.level}`;
+            // let str = StorageManager.instance.getGlobalData(key);
+            // if(str===""||str===undefined||str===null){
+            //     all++;
+            //     gameManager.loadLevelImg(element.id,item.level,()=>{
+            //         this.isStop = false;
+            //     })
+            // }
+            // if(all===0){
+            //     this.isStop = false;
+            // }
+            // gameManager.loadLevelImg(element.id,item.level,()=>{
+            //     this.isStop = false;
+            // })
         }
 
         if(progress_number==50){

+ 31 - 9
assets/script/play_list/base_view.ts

@@ -53,9 +53,12 @@ export class base_view extends Component {
             self.close();
         },this);
         this.btn_look_video.on(Node.EventType.TOUCH_START,()=>{
+            self.isPause  = true;
             SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                 if(res.isEnded){
                     self.showLookVideoReward();
+                }else{
+                    self.isPause  = false;
                 }
             })
         })
@@ -111,8 +114,9 @@ export class base_view extends Component {
         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);
+                if(this.categoryid!==config.PLAY_TYPE.JI_YI_LI&&this.categoryid!==config.PLAY_TYPE.DOU_DI_ZHU){
+                    gameManager.add_coin(this.reward);
+                }
                 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){
@@ -131,7 +135,17 @@ export class base_view extends Component {
         })
 
         if(!is_have_next){
-            tools.showToast("当前已是最后一关,敬请期待最新版本");
+            if(this.categoryid===config.PLAY_TYPE.JI_YI_LI){
+                let categoryid = config.PLAY_TYPE.JI_YI_LI;
+                let levels_item = gameManager.get_cur_level_by_categoryid(categoryid);
+                levels_item.level = 0;
+                gameManager.set_unlock_levels_data(levels_item)
+                gameManager.sync_data(()=>{},config.sync_data_type.LEVELS)
+                this.nextLevel()
+            }else{
+                tools.showToast("当前已是最后一关,敬请期待最新版本");
+            }
+          
         }
     }
 
@@ -206,10 +220,8 @@ export class base_view extends Component {
         if(!this.isShowWin){
             gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
                 gameManager.playFailSoundByCategoryId(this.categoryid)
-                if(this.categoryid===config.PLAY_TYPE.DOU_DI_ZHU){
-                    node.getComponent(fail).showDDZView(this.onFailReStartClick.bind(this),this.m_data.ads_restart)
-                }else if(this.categoryid===config.PLAY_TYPE.JI_YI_LI){
-                    node.getComponent(fail).showDDZView(this.onFailReStartClick.bind(this),this.m_data.ads_restart)
+                if(this.categoryid===config.PLAY_TYPE.JI_YI_LI||this.categoryid===config.PLAY_TYPE.DOU_DI_ZHU){
+                    node.getComponent(fail).showJYLView(this.onFailReStartClick.bind(this),this.m_data.ads_restart,this.onFailQuitClick.bind(this),this.categoryid)
                 }
                 else{
                     node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
@@ -221,7 +233,12 @@ export class base_view extends Component {
         gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
             this.isShowWin = true;
             gameManager.playWinSoundByCategoryId(this.categoryid)
-            node.getComponent(win).showView(this.reward,this.m_data,this.onWinOrdinaryClick.bind(this),this.onWinDoubleClick.bind(this));
+            if(config.PLAY_TYPE.JI_YI_LI===this.categoryid||config.PLAY_TYPE.DOU_DI_ZHU===this.categoryid){
+                node.getComponent(win).showJYLView(this.onWinOrdinaryClick.bind(this),this.categoryid)
+            }else{
+                node.getComponent(win).showView(this.reward,this.m_data,this.onWinOrdinaryClick.bind(this),this.onWinDoubleClick.bind(this));
+            }
+            
         });
     }
 
@@ -236,6 +253,7 @@ export class base_view extends Component {
                     ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
                 }).start()
                 win_view.close()
+                self.isPause  = false;
             },(win_view:win)=>{
                 SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                     if(res.isEnded){
@@ -245,6 +263,7 @@ export class base_view extends Component {
                             win_view.showDoubleCoin(reward,()=>{
                                 self.showCoinAni()
                                 win_view.close()
+                                self.isPause  = false;
                                 tween(self.node).delay(0.5).call(()=>{
                                     ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER)
                                 }).start()
@@ -263,7 +282,9 @@ export class base_view extends Component {
         }).start()
         win_view.close()
         win_view.hideAllBtn()
-        this.showCoinAni()
+        if(this.categoryid!==config.PLAY_TYPE.JI_YI_LI&&this.categoryid!==config.PLAY_TYPE.DOU_DI_ZHU){
+            this.showCoinAni()
+        }
     }
 
     onWinDoubleClick(win_view:win){
@@ -359,6 +380,7 @@ export class base_view extends Component {
   
     }
     protected onFailReStartClick(fail_view:fail): void{}
+    protected onFailQuitClick(fail_view:fail): void{}
     protected initView(data,isUpdate=false): void{}
     protected initUI(): void{}
     protected onTipBtnClick(): void{}

+ 11 - 2
assets/script/play_list/ddz/ddz_ai.ts

@@ -1679,7 +1679,9 @@ export class ddz_ai  {
  
     
     public ai_think(player_hand_cards:any[],ai_hand_cards:any[],player_move:any[],call_back){
-
+        player_hand_cards = player_hand_cards.sort((a,b)=>{return parseInt(a)- parseInt(b)})
+        ai_hand_cards = ai_hand_cards.sort((a,b)=>{return parseInt(a)- parseInt(b)})
+        player_move = player_move.sort((a,b)=>{return parseInt(a)- parseInt(b)})
         let ai_mg = new MovesGener()
         ai_mg.init(ai_hand_cards)
         let rival_type = tools.get_move_type(player_move)
@@ -1701,9 +1703,16 @@ export class ddz_ai  {
         }
 
         let ai_out_cards=(player:any[],ai:any[],player_play:any[])=>{
-            let play_out_card = player_play.toString();
+            let play_out_card = "";
             if(player_move.length<=0){
                 play_out_card= "pass"
+            }else{
+                player_play = player_play.sort((a,b)=>{return parseInt(a)- parseInt(b)})
+                if(rival_move_type===config.TYPE_13_4_2||rival_move_type===config.TYPE_14_4_22||rival_move_type===config.TYPE_6_3_1||rival_move_type===config.TYPE_7_3_2){
+                    player_play = tools.sortByPercentage(player_play)
+                    // console.log("player_play",player_play)
+                }
+                play_out_card = player_play.toString();
             }
             console.log("player",player.toString())
             console.log("ai",ai.toString())

+ 14 - 12
assets/script/play_list/ddz/ddz_card.ts

@@ -29,7 +29,8 @@ export class ddz_card extends Component {
         switch (this.m_card) {
             case 'X': //小王
                 this.spr_card_type_1.active = false;
-                this.spr_card_number.getComponent(UITransform).contentSize = new Size(27,170)
+                this.spr_card_type.active = true;
+                this.spr_card_number.getComponent(UITransform).contentSize = new Size(35,210)
                 ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_X").then((sf:SpriteFrame)=>{
                     this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
                 })
@@ -37,33 +38,34 @@ export class ddz_card extends Component {
 
             case 'D': //大王
                 this.spr_card_type_1.active = false;
-                this.spr_card_number.getComponent(UITransform).contentSize = new Size(27,170)
+                this.spr_card_type.active = true;
+                this.spr_card_number.getComponent(UITransform).contentSize = new Size(35,210)
                 ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_D").then((sf:SpriteFrame)=>{
                     this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
                 })
             break;
 
             case 'J': //J
-            ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_J").then((sf:SpriteFrame)=>{
-                this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
-            })
+            // ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_J").then((sf:SpriteFrame)=>{
+            //     this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
+            // })
             ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+this.card_type_dic[type]).then((sf:SpriteFrame)=>{
                 this.spr_card_type_1.getComponent(Sprite).spriteFrame = sf;
             })
             break;
 
             case 'Q': //Q
-            ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_Q").then((sf:SpriteFrame)=>{
-                this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
-            })
+            // ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_Q").then((sf:SpriteFrame)=>{
+            //     this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
+            // })
             ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+this.card_type_dic[type]).then((sf:SpriteFrame)=>{
                 this.spr_card_type_1.getComponent(Sprite).spriteFrame = sf;
             })
             break;
             case 'K': //K
-            ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_K").then((sf:SpriteFrame)=>{
-                this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
-            })
+            // ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+"img_K").then((sf:SpriteFrame)=>{
+            //     this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
+            // })
             ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+this.card_type_dic[type]).then((sf:SpriteFrame)=>{
                 this.spr_card_type_1.getComponent(Sprite).spriteFrame = sf;
             })
@@ -72,7 +74,7 @@ export class ddz_card extends Component {
 
             default:
                 ResourceUtil.loadSpriteFrameRes(config.ddz_res_path+this.card_type_dic[type]).then((sf:SpriteFrame)=>{
-                    this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
+                    // this.spr_card_type.getComponent(Sprite).spriteFrame = sf;
                     this.spr_card_type_1.getComponent(Sprite).spriteFrame = sf;
                 })
                 break;

+ 88 - 20
assets/script/play_list/ddz/game_play_dou_di_zhu.ts

@@ -26,6 +26,7 @@ export class game_play_dou_di_zhu extends base_view {
     private play_move:string[] = [];
     private ai_move:string[] = [];
     private legalActions:any[] = [];
+    private is_look_answer = false;
     @property(Prefab) item_prefab:Prefab;
     @property(Node) play_hand_cards_layer:Node;
     @property(Node) play_out_cards_layer:Node;
@@ -40,6 +41,7 @@ export class game_play_dou_di_zhu extends base_view {
     @property(Node) ai_out_ani:Node;
     protected initUI(): void {
         this.btn_chu_pai.on(Node.EventType.TOUCH_END,()=>{
+            gameManager.playBtnSound()
             if(this.checkCardCanOut()){
                 this.hideBtns()
                 if(this.outCards()){
@@ -52,16 +54,20 @@ export class game_play_dou_di_zhu extends base_view {
             }
         })
         this.btn_bu_chu.on(Node.EventType.TOUCH_END,()=>{
+            gameManager.playBtnSound()
             this.play_move = []
             this.play_out_cards_layer.removeAllChildren()
             this.ai_out_cards_layer.removeAllChildren()
             this.play_out_ani.getComponent(out_ani).showPass()
+            this.hideBtns()
             this.Aithink()
         })
         this.btn_yao_bu_qi.on(Node.EventType.TOUCH_END,()=>{
+            gameManager.playBtnSound()
             this.play_move = []
             this.play_out_cards_layer.removeAllChildren()
             this.ai_out_cards_layer.removeAllChildren()
+            this.hideBtns()
             this.Aithink()
             this.play_out_ani.getComponent(out_ani).showyaoBuQi()
             this.backOut()
@@ -74,7 +80,7 @@ export class game_play_dou_di_zhu extends base_view {
         this.btn_chu_pai.active = false;
         this.btn_bu_chu.active = false;
         this.btn_yao_bu_qi.active = false;
-   
+        this.is_look_answer = false;
         this.isShowWin = false;
         this.touch_status = false;
         this.is_start_move = false;
@@ -104,12 +110,14 @@ export class game_play_dou_di_zhu extends base_view {
         this.play_out_cards_layer.removeAllChildren();
         this.ai_hand_cards_layer.removeAllChildren();
         this.ai_out_cards_layer.removeAllChildren();
-        for (let index = 0; index <  this.m_play_hand_cards.length; index++) {
+        for (let index = this.m_play_hand_cards.length-1; index >=  0; index--) {
             const card =  this.m_play_hand_cards[index];
             let item:Node = instantiate(this.item_prefab)
             item.parent = this.play_hand_cards_layer;
+            item.active = false;
             item.getComponent(ddz_card).initView(card,this.getCardType(card),index)
         }
+        this.start_play_hand_card_action()
         this.play_hand_cards_layer.off(Node.EventType.TOUCH_START)
         this.play_hand_cards_layer.on(Node.EventType.TOUCH_START,(event:EventTouch)=>{
             this.touch_pos = event.getUILocation()
@@ -121,20 +129,47 @@ export class game_play_dou_di_zhu extends base_view {
         this.play_hand_cards_layer.on(Node.EventType.TOUCH_MOVE,this.handCardTouchBegin.bind(this),this)
         this.play_hand_cards_layer.on(Node.EventType.TOUCH_END,this.handCardTouchEnd.bind(this),this)
         this.play_hand_cards_layer.on(Node.EventType.TOUCH_CANCEL,this.handCardTouchEnd.bind(this),this)
-        for (let index = 0; index <  this.m_computer_hand_cards.length; index++) {
+        for (let index = this.m_computer_hand_cards.length-1; index >=0; index--) {
             const card =  this.m_computer_hand_cards[index];
             let item:Node = instantiate(this.item_prefab)
             item.parent = this.ai_hand_cards_layer;
+            item.active = false;
             item.getComponent(ddz_card).initView(card,this.getCardType(card),index)
         }
-
+        this.start_ai_hand_card_action()
         this.showChuPaiStatus()
         this.predict();
+        gameManager.loadPlayMusicByCategoryId(this.categoryid,()=>{
+            gameManager.playGamePlayMusicByCategoryId(this.categoryid,true);
+        })
+    }
+    start_play_hand_card_action(){
+        this.scheduleOnce(()=>{
+            for (let index = 0; index < this.play_hand_cards_layer.children.length; index++) {
+                const item = this.play_hand_cards_layer.children[index];
+                let time = index*50
+                setTimeout(() => {
+                    item.active = true;
+                }, time);
+            }
+        },0.2)
+    }
+    start_ai_hand_card_action(){
+        this.scheduleOnce(()=>{
+            for (let index = 0; index < this.ai_hand_cards_layer.children.length; index++) {
+                const item = this.ai_hand_cards_layer.children[index];
+                let time = index*50
+                setTimeout(() => {
+                    item.active = true;
+                }, time);
+            }
+        },0.2)
+
     }
     predict(call_back=null){
         this.legalActions = []
         this.legalActions = ddz_ai.instance._get_legal_card_play_actions(this.m_play_hand_cards,this.ai_move);
-        console.log("this.legalActions",this.legalActions)
+        // console.log("this.legalActions",this.legalActions)
         if(call_back!=null){
             call_back()
         }
@@ -152,17 +187,25 @@ export class game_play_dou_di_zhu extends base_view {
                 if(tools.isEqualArray(this.play_move,actions)){
                     return true;
                 }
-                for (let i = 0; i < actions.length; i++) {
-                    let cards:any = actions[i];
-                    if(!Array.isArray(cards)){
-                        cards = [cards]
-                    }
-                    if(tools.isEqualArray(this.play_move,cards)){
+                if(!Array.isArray(actions[0])){
+                    if(tools.isEqualArray(this.play_move,actions)){
                         isCanOut = true;
                         return true;
                     }
-                 
+                }else{
+                    for (let i = 0; i < actions.length; i++) {
+                        let cards:any = actions[i];
+                        if(!Array.isArray(cards)){
+                            cards = [cards]
+                        }
+                        if(tools.isEqualArray(this.play_move,cards)){
+                            isCanOut = true;
+                            return true;
+                        }
+                     
+                    }
                 }
+          
             }
         }
         return isCanOut;
@@ -192,7 +235,6 @@ export class game_play_dou_di_zhu extends base_view {
     outCards(){
         let list = [];
         let ai_continue = true;
-        console.log("outCards")
         for (let index = 0; index < this.play_hand_cards_layer.children.length; index++) {
             const element = this.play_hand_cards_layer.children[index];
             if(element.getComponent(ddz_card).IsOutCard()){
@@ -200,6 +242,7 @@ export class game_play_dou_di_zhu extends base_view {
             }
         }
         if(list.length>0){
+            this.ai_out_cards_layer.removeAllChildren()
             this.play_out_cards_layer.removeAllChildren()
             for (let index = 0; index < list.length; index++) {
                 const element:Node = list[index];
@@ -209,7 +252,6 @@ export class game_play_dou_di_zhu extends base_view {
                 item.parent = this.play_out_cards_layer;
                 item.getComponent(ddz_card).initView(card,type,index)
                 element.removeFromParent()
-                console.log("outCards",card)
             }
             this.updatePlayHandCards()
             list=[]
@@ -226,17 +268,23 @@ export class game_play_dou_di_zhu extends base_view {
     }
     updateAiHandCards(){
         this.m_computer_hand_cards = []
+        let temp = []
         for (let index = 0; index < this.ai_hand_cards_layer.children.length; index++) {
             const element = this.ai_hand_cards_layer.children[index];
-            this.m_computer_hand_cards.push(element.getComponent(ddz_card).getCard())
+            temp.push(element.getComponent(ddz_card).getCard())
         }
+        temp.sort((a,b)=>{return parseInt(a)-parseInt(b)})
+        this.m_computer_hand_cards = temp;
     }
     updatePlayHandCards(){
         this.m_play_hand_cards = []
+        let temp = []
         for (let index = 0; index < this.play_hand_cards_layer.children.length; index++) {
             const element = this.play_hand_cards_layer.children[index];
-            this.m_play_hand_cards.push(element.getComponent(ddz_card).getCard())
+            temp.push(element.getComponent(ddz_card).getCard())
         }
+        temp.sort((a,b)=>{return parseInt(a)-parseInt(b)})
+        this.m_play_hand_cards = temp;
     }
 
     onEventTouch(event:EventTouch){
@@ -272,14 +320,14 @@ export class game_play_dou_di_zhu extends base_view {
             let width =  element.getComponent(UITransform).contentSize.width
             if(isLeft){
                 let offset =  this.touch_pos.y - this.first_left_pos.y;
-                if((this.first_left_pos.y+offset)<=start_pos.y&&start_pos.y<=this.first_left_pos.y){
+                if((this.first_left_pos.y+offset-width/2)<=start_pos.y&&start_pos.y<=this.first_left_pos.y){
                     element.getComponent(ddz_card).onSelect()
                 }else{
                     element.getComponent(ddz_card).unSelect()
                 }
             }else{
                 let offset =  this.touch_pos.y - this.first_right_pos.y;
-                if((this.first_right_pos.y+offset-width/2)>=start_pos.y&&start_pos.y+width>=this.first_right_pos.y){
+                if((this.first_right_pos.y+offset+width/2)>=start_pos.y&&start_pos.y+width>=this.first_right_pos.y){
                     element.getComponent(ddz_card).onSelect()
                 }else{
                     element.getComponent(ddz_card).unSelect()
@@ -307,7 +355,7 @@ export class game_play_dou_di_zhu extends base_view {
             }
         }
         tempArray  = tempArray.sort((a, b) => {
-            return b.getIndex() - a.getIndex();
+            return  a.getIndex()-b.getIndex();
         });
         return tempArray.length<=0?null:tempArray[0];
     }
@@ -387,6 +435,7 @@ export class game_play_dou_di_zhu extends base_view {
             });
         }else{
             let str_act:any = actions
+            this.play_out_cards_layer.removeAllChildren()
             console.log("str_act==",str_act)
             if(!Array.isArray(str_act)){
                 str_act = [str_act]
@@ -528,7 +577,26 @@ export class game_play_dou_di_zhu extends base_view {
     }
 
     protected onTipBtnClick(): void {
-        this.tip_layer.active = true;
+        if(gameManager.isTestUser()){
+            this.tip_layer.active = true;
+        }else{
+            if(!this.is_look_answer){
+                SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Resume_AdUnitId,(res)=>{
+                    if(res.isEnded){
+                        this.is_look_answer = true;
+                        this.tip_layer.active = true;
+                    }
+                })
+            }else{
+                this.tip_layer.active = true;
+            }
+        }
+
+    }
+
+    protected onFailQuitClick(fail_view: fail): void {
+        fail_view.close()
+        this.close()
     }
 }
 

+ 19 - 1
assets/script/play_list/ddz/tip_layer.ts

@@ -7,11 +7,15 @@ export class tip_layer extends Component {
     @property(Prefab) itemPrefab:Prefab;
     @property(Node) content:Node;
     @property(Node) btn_close:Node;
+    private card_list = {3: '3', 4: '4', 5: '5', 6: '6', 7: '7',
+    8: '8', 9: '9', 10: '10', 11: 'J', 12: 'Q',
+    13: 'K', 14: 'A', 17: '2', 20: '小王', 30: '大王','P':"过"};
     public initView(answer_content){
         let list = answer_content.split(';')
         this.content.removeAllChildren()
+
         for (let index = 0; index < list.length; index++) {
-            const str = `第${index+1}步:${list[index]}`;
+            const str = `第${index+1}步:${this.getCardStr(list[index])}`;
             let item = instantiate(this.itemPrefab)
             item.parent = this.content;
             item.getComponent(ddz_tip_item).initView(str)
@@ -22,6 +26,20 @@ export class tip_layer extends Component {
         })
       
     } 
+
+    getCardStr(str_list){
+        let list = str_list.split(',')
+        let temp = []
+        for (let index = 0; index < list.length; index++) {
+            const element = list[index];
+            if(element==="P"){
+                temp.push(this.card_list[element]) 
+            }else{
+                temp.push(this.card_list[parseInt(element)])
+            }
+        }
+        return temp.toString()
+    }
 }
 
 

+ 3 - 1
assets/script/play_list/ji_yi_li/question_item.ts

@@ -5,12 +5,14 @@ const { ccclass, property } = _decorator;
 export class question_item extends Component {
     @property(Node) lab_question_item:Node;
     @property(Node) check_box:Node;
+    @property(Node) btn_check:Node;
     private m_isRight = false;
     public initView(item_title:string,is_right,call_back){
         this.m_isRight = is_right;
         this.lab_question_item.getComponent(Label).string = item_title;
         this.check_box.getComponent(Toggle).isChecked = false;
-        this.check_box.on(Node.EventType.TOUCH_END,()=>{
+        this.btn_check.on(Node.EventType.TOUCH_END,()=>{
+            this.check_box.getComponent(Toggle).isChecked = true;
             call_back(this.m_isRight)
         })
     }

+ 9 - 1
assets/script/play_list/ji_yi_li/view_game_play_ji_yi_li.ts

@@ -29,13 +29,15 @@ export class view_game_play_ji_yi_li extends base_view {
         self.img_1.getComponent(Sprite).spriteFrame = sf;
         call_back();
     })
+    gameManager.loadPlayMusicByCategoryId(this.categoryid,()=>{
+      gameManager.playGamePlayMusicByCategoryId(this.categoryid,true);
+  })
   }
 
   showStep1(){
     this.img_1.active = true;
     this.question_node.active = false;
     this.lab_title.active = true;
-    this.lab_time_count.active = true;
   }
   showStep2(){
     this.img_1.active = false;
@@ -85,6 +87,12 @@ export class view_game_play_ji_yi_li extends base_view {
     }
   }
 
+  protected onFailQuitClick(fail_view: fail): void {
+      gameManager.playBtnSound()
+      fail_view.close()
+      this.close()
+  }
+
 }
 
 

+ 0 - 1
assets/script/play_list/zhaocha_xiang_tong/view_game_play_shuang_tu_zhao_xiang_tong.ts

@@ -114,7 +114,6 @@ export class view_game_play_shuang_tu_zhao_xiang_tong extends  base_view  {
         self.star_list.getComponent(star_list).initView(this.m_data.answer_number);
         let top_list:xiang_tong_pos[] = JSON.parse(this.m_data.content)[0];
         let bottom_list:xiang_tong_pos[] = JSON.parse(this.m_data.content)[1];
-        console.log("this.m_data",this.m_data.content)
         resources.load(config.PREFAB_PATH.circle, Prefab, (err, prefab) => {
             if(err){
                 return;

+ 16 - 0
assets/script/tools.ts

@@ -669,6 +669,22 @@ export class tools  {
         }
         return new_list;
     }
+
+    public static sortByPercentage(arr) {
+            // 计算每个元素的占比
+            const counts = {};
+            arr.forEach(element => {
+                counts[element] = (counts[element] || 0) + 1;
+            });
+            
+            // 排序数组
+            const sortedArr = arr.sort((a, b) => {
+                return counts[b] / arr.length - counts[a] / arr.length;
+            });
+            
+            // 返回排序后的元素
+            return sortedArr;
+      }
 }
 
 

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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0@6c48a",
+      "displayName": "img_ddz_btn_buchu",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0",
+        "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": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0@f9941",
+      "displayName": "img_ddz_btn_buchu",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0.5,
+        "trimX": 1,
+        "trimY": 0,
+        "width": 225,
+        "height": 110,
+        "rawWidth": 227,
+        "rawHeight": 111,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -112.5,
+            -55,
+            0,
+            112.5,
+            -55,
+            0,
+            -112.5,
+            55,
+            0,
+            112.5,
+            55,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            111,
+            226,
+            111,
+            1,
+            1,
+            226,
+            1
+          ],
+          "nuv": [
+            0.004405286343612335,
+            0.009009009009009009,
+            0.9955947136563876,
+            0.009009009009009009,
+            0.004405286343612335,
+            1,
+            0.9955947136563876,
+            1
+          ],
+          "minPos": [
+            -112.5,
+            -55,
+            0
+          ],
+          "maxPos": [
+            112.5,
+            55,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "e352ee8e-a9d7-43b1-9dbb-e73f89db99a0@f9941"
+  }
+}

BIN
assets/textrue/home/img_ddz_btn_yellow.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d@6c48a",
+      "displayName": "img_ddz_btn_yellow",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d",
+        "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": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d@f9941",
+      "displayName": "img_ddz_btn_yellow",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 1,
+        "trimX": 2,
+        "trimY": 0,
+        "width": 224,
+        "height": 109,
+        "rawWidth": 228,
+        "rawHeight": 111,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -112,
+            -54.5,
+            0,
+            112,
+            -54.5,
+            0,
+            -112,
+            54.5,
+            0,
+            112,
+            54.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            111,
+            226,
+            111,
+            2,
+            2,
+            226,
+            2
+          ],
+          "nuv": [
+            0.008771929824561403,
+            0.018018018018018018,
+            0.9912280701754386,
+            0.018018018018018018,
+            0.008771929824561403,
+            1,
+            0.9912280701754386,
+            1
+          ],
+          "minPos": [
+            -112,
+            -54.5,
+            0
+          ],
+          "maxPos": [
+            112,
+            54.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "4186bd3d-87ca-4c1d-a576-90c28bae4e5d@f9941"
+  }
+}

BIN
assets/textrue/home/img_home_coin_bg.png


+ 34 - 34
assets/textrue/home/img_home_coin_bg.png.meta

@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 265,
-        "height": 90,
-        "rawWidth": 265,
-        "rawHeight": 90,
+        "trimX": 3,
+        "trimY": 3,
+        "width": 291,
+        "height": 113,
+        "rawWidth": 297,
+        "rawHeight": 119,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -132.5,
-            -45,
+            -145.5,
+            -56.5,
             0,
-            132.5,
-            -45,
+            145.5,
+            -56.5,
             0,
-            -132.5,
-            45,
+            -145.5,
+            56.5,
             0,
-            132.5,
-            45,
+            145.5,
+            56.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            90,
-            265,
-            90,
-            0,
-            0,
-            265,
-            0
+            3,
+            116,
+            294,
+            116,
+            3,
+            3,
+            294,
+            3
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.010101010101010102,
+            0.025210084033613446,
+            0.98989898989899,
+            0.025210084033613446,
+            0.010101010101010102,
+            0.9747899159663865,
+            0.98989898989899,
+            0.9747899159663865
           ],
           "minPos": [
-            -132.5,
-            -45,
+            -145.5,
+            -56.5,
             0
           ],
           "maxPos": [
-            132.5,
-            45,
+            145.5,
+            56.5,
             0
           ]
         },

BIN
assets/textrue/home/img_home_video_reward.png


+ 35 - 35
assets/textrue/home/img_home_video_reward.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 279,
-        "height": 90,
-        "rawWidth": 279,
-        "rawHeight": 90,
+        "offsetY": 1,
+        "trimX": 3,
+        "trimY": 1,
+        "width": 300,
+        "height": 113,
+        "rawWidth": 306,
+        "rawHeight": 117,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -139.5,
-            -45,
+            -150,
+            -56.5,
             0,
-            139.5,
-            -45,
+            150,
+            -56.5,
             0,
-            -139.5,
-            45,
+            -150,
+            56.5,
             0,
-            139.5,
-            45,
+            150,
+            56.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
-            90,
-            279,
-            90,
-            0,
-            0,
-            279,
-            0
+            3,
+            116,
+            303,
+            116,
+            3,
+            3,
+            303,
+            3
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
+            0.00980392156862745,
+            0.02564102564102564,
+            0.9901960784313726,
+            0.02564102564102564,
+            0.00980392156862745,
+            0.9914529914529915,
+            0.9901960784313726,
+            0.9914529914529915
           ],
           "minPos": [
-            -139.5,
-            -45,
+            -150,
+            -56.5,
             0
           ],
           "maxPos": [
-            139.5,
-            45,
+            150,
+            56.5,
             0
           ]
         },

BIN
assets/textrue/home/img_new_level_bg.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@6c48a",
+      "displayName": "img_new_level_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14",
+        "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": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@f9941",
+      "displayName": "img_new_level_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1125,
+        "height": 2436,
+        "rawWidth": 1125,
+        "rawHeight": 2436,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -562.5,
+            -1218,
+            0,
+            562.5,
+            -1218,
+            0,
+            -562.5,
+            1218,
+            0,
+            562.5,
+            1218,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            2436,
+            1125,
+            2436,
+            0,
+            0,
+            1125,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -562.5,
+            -1218,
+            0
+          ],
+          "maxPos": [
+            562.5,
+            1218,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": false,
+    "redirect": "bb3f1062-62e2-4e1a-be37-1ad56c0deb14@f9941"
+  }
+}

BIN
assets/textrue/home/img_play_video_bg.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "78289ad7-c08b-4ed3-92e7-dc644deb5142",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "78289ad7-c08b-4ed3-92e7-dc644deb5142@6c48a",
+      "displayName": "img_play_video_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "78289ad7-c08b-4ed3-92e7-dc644deb5142",
+        "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": "78289ad7-c08b-4ed3-92e7-dc644deb5142@f9941",
+      "displayName": "img_play_video_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0.5,
+        "trimX": 1,
+        "trimY": 0,
+        "width": 348,
+        "height": 126,
+        "rawWidth": 350,
+        "rawHeight": 127,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -174,
+            -63,
+            0,
+            174,
+            -63,
+            0,
+            -174,
+            63,
+            0,
+            174,
+            63,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            127,
+            349,
+            127,
+            1,
+            1,
+            349,
+            1
+          ],
+          "nuv": [
+            0.002857142857142857,
+            0.007874015748031496,
+            0.9971428571428571,
+            0.007874015748031496,
+            0.002857142857142857,
+            1,
+            0.9971428571428571,
+            1
+          ],
+          "minPos": [
+            -174,
+            -63,
+            0
+          ],
+          "maxPos": [
+            174,
+            63,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "78289ad7-c08b-4ed3-92e7-dc644deb5142@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "78289ad7-c08b-4ed3-92e7-dc644deb5142@f9941"
+  }
+}

BIN
assets/textrue/home/img_wanfa_jiyi.png


BIN
assets/textrue/home/jjy_select.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "329547b2-4ace-440a-8c07-e7eceaa3ac89",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "329547b2-4ace-440a-8c07-e7eceaa3ac89@6c48a",
+      "displayName": "jjy_select",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "329547b2-4ace-440a-8c07-e7eceaa3ac89",
+        "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": "329547b2-4ace-440a-8c07-e7eceaa3ac89@f9941",
+      "displayName": "jjy_select",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 54,
+        "height": 54,
+        "rawWidth": 54,
+        "rawHeight": 54,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -27,
+            -27,
+            0,
+            27,
+            -27,
+            0,
+            -27,
+            27,
+            0,
+            27,
+            27,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            54,
+            54,
+            54,
+            0,
+            0,
+            54,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -27,
+            -27,
+            0
+          ],
+          "maxPos": [
+            27,
+            27,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "329547b2-4ace-440a-8c07-e7eceaa3ac89@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "329547b2-4ace-440a-8c07-e7eceaa3ac89@f9941"
+  }
+}

BIN
assets/textrue/home/jjy_unselect.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "feac5985-2a7d-417f-9f46-61be2407031f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "feac5985-2a7d-417f-9f46-61be2407031f@6c48a",
+      "displayName": "jjy_unselect",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "feac5985-2a7d-417f-9f46-61be2407031f",
+        "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": "feac5985-2a7d-417f-9f46-61be2407031f@f9941",
+      "displayName": "jjy_unselect",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 54,
+        "height": 54,
+        "rawWidth": 54,
+        "rawHeight": 54,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -27,
+            -27,
+            0,
+            27,
+            -27,
+            0,
+            -27,
+            27,
+            0,
+            27,
+            27,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            54,
+            54,
+            54,
+            0,
+            0,
+            54,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -27,
+            -27,
+            0
+          ],
+          "maxPos": [
+            27,
+            27,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "feac5985-2a7d-417f-9f46-61be2407031f@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "feac5985-2a7d-417f-9f46-61be2407031f@f9941"
+  }
+}

+ 9 - 0
settings/v2/packages/information.json

@@ -18,6 +18,15 @@
         "complete": true,
         "form": "https://creator-api.cocos.com/api/form/show?sid=0cbf549f94761a6a05b8708b7898a629"
       }
+    },
+    "build-bytedance-mini-game": {
+      "id": "build-bytedance-mini-game",
+      "label": "build-bytedance-mini-game",
+      "enable": false,
+      "build-bytedance-mini-game": {
+        "complete": false,
+        "form": "https://creator-api.cocos.com/api/form/show?"
+      }
     }
   }
 }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov