future 1 year ago
parent
commit
07007ac678

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

@@ -4021,7 +4021,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 177
         "__id__": 177

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

@@ -465,7 +465,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.8984375,
+      "width": 8.897215886701618,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -504,7 +504,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 16,
+    "_actualFontSize": 22.463054187192117,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1148,8 +1148,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 25.2
+      "width": 179.94342281943875,
+      "height": 25.199999999999996
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1187,7 +1187,7 @@
     "_string": "请记下图中全部细节",
     "_string": "请记下图中全部细节",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
+    "_actualFontSize": 28.078817733990146,
     "_fontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_lineHeight": 20,
@@ -1690,8 +1690,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 240,
-      "height": 25.2
+      "width": 239.92456375925164,
+      "height": 25.199999999999996
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1729,7 +1729,7 @@
     "_string": "问:图中有几个圣诞老人?",
     "_string": "问:图中有几个圣诞老人?",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
+    "_actualFontSize": 28.078817733990146,
     "_fontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_lineHeight": 20,
@@ -3828,7 +3828,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 165
         "__id__": 165
@@ -4091,7 +4091,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 177
         "__id__": 177

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

@@ -462,7 +462,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.8984375,
+      "width": 8.897215886701618,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -501,7 +501,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 16,
+    "_actualFontSize": 22.463054187192117,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1139,8 +1139,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 188.90380859375,
-      "height": 31.5
+      "width": 188.85791968630073,
+      "height": 31.500000000000004
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1178,7 +1178,7 @@
     "_string": "找出图中5处细节",
     "_string": "找出图中5处细节",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 25,
+    "_actualFontSize": 35.09852216748769,
     "_fontSize": 25,
     "_fontSize": 25,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 25,
     "_lineHeight": 25,
@@ -3722,7 +3722,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 163
         "__id__": 163

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

@@ -465,7 +465,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.8984375,
+      "width": 8.897215886701618,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -504,7 +504,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 16,
+    "_actualFontSize": 22.463054187192117,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1148,8 +1148,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 63.90380859375,
-      "height": 31.5
+      "width": 63.88828360574288,
+      "height": 31.500000000000004
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1187,7 +1187,7 @@
     "_string": "第1关",
     "_string": "第1关",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 25,
+    "_actualFontSize": 35.09852216748769,
     "_fontSize": 25,
     "_fontSize": 25,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 25,
     "_lineHeight": 25,
@@ -4576,7 +4576,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 201
         "__id__": 201
@@ -4839,7 +4839,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 213
         "__id__": 213

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

@@ -465,7 +465,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.8984375,
+      "width": 8.897215886701618,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -504,7 +504,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 16,
+    "_actualFontSize": 22.463054187192117,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1148,8 +1148,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 322.275390625,
-      "height": 25.2
+      "width": 322.1741604989035,
+      "height": 25.199999999999996
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1187,7 +1187,7 @@
     "_string": "99%的人不能再30秒内找出五处相同",
     "_string": "99%的人不能再30秒内找出五处相同",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
+    "_actualFontSize": 28.078817733990146,
     "_fontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_lineHeight": 20,
@@ -4576,7 +4576,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 201
         "__id__": 201
@@ -4839,7 +4839,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 213
         "__id__": 213

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

@@ -465,7 +465,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.896250229473262,
+      "width": 8.897215886701618,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -504,7 +504,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20.334975369458128,
+    "_actualFontSize": 22.463054187192117,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1142,8 +1142,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 139.95191287255102,
-      "height": 25.2
+      "width": 139.95599552623014,
+      "height": 25.199999999999996
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -1181,7 +1181,7 @@
     "_string": "找出谁没戴口罩",
     "_string": "找出谁没戴口罩",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 25.418719211822662,
+    "_actualFontSize": 28.078817733990146,
     "_fontSize": 20,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_lineHeight": 20,
@@ -3295,7 +3295,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 141
         "__id__": 141
@@ -3558,7 +3558,7 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 153
         "__id__": 153

+ 136 - 121
assets/scene/game.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_active": true,
     "_components": [],
     "_components": [],
     "_prefab": {
     "_prefab": {
-      "__id__": 105
+      "__id__": 106
     },
     },
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     },
     "autoReleaseAssets": false,
     "autoReleaseAssets": false,
     "_globals": {
     "_globals": {
-      "__id__": 106
+      "__id__": 107
     },
     },
     "_id": "2cda1207-8d01-49d0-a583-3839ec2fef5b"
     "_id": "2cda1207-8d01-49d0-a583-3839ec2fef5b"
   },
   },
@@ -77,26 +77,23 @@
         "__id__": 8
         "__id__": 8
       },
       },
       {
       {
-        "__id__": 56
+        "__id__": 57
       },
       },
       {
       {
-        "__id__": 59
+        "__id__": 60
       },
       },
       {
       {
-        "__id__": 85
+        "__id__": 86
       },
       },
       {
       {
-        "__id__": 53
+        "__id__": 54
       },
       },
       {
       {
-        "__id__": 88
+        "__id__": 89
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 101
-      },
       {
       {
         "__id__": 102
         "__id__": 102
       },
       },
@@ -105,12 +102,15 @@
       },
       },
       {
       {
         "__id__": 104
         "__id__": 104
+      },
+      {
+        "__id__": 105
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
-      "x": 187.49999999999997,
+      "x": 187.50000000000003,
       "y": 405.99999999999994,
       "y": 405.99999999999994,
       "z": 0
       "z": 0
     },
     },
@@ -334,9 +334,6 @@
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 49
-      },
       {
       {
         "__id__": 50
         "__id__": 50
       },
       },
@@ -345,6 +342,9 @@
       },
       },
       {
       {
         "__id__": 52
         "__id__": 52
+      },
+      {
+        "__id__": 53
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -717,7 +717,7 @@
     "__prefab": null,
     "__prefab": null,
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 8.897215886701618,
+      "width": 8.89651150173611,
       "height": 20.16
       "height": 20.16
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -750,7 +750,7 @@
     "_string": "0",
     "_string": "0",
     "_horizontalAlign": 0,
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 22.463054187192117,
+    "_actualFontSize": 22.344827586206897,
     "_fontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 16,
     "_lineHeight": 16,
@@ -1737,6 +1737,9 @@
       },
       },
       {
       {
         "__id__": 48
         "__id__": 48
+      },
+      {
+        "__id__": 49
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -1883,6 +1886,18 @@
     "_target": null,
     "_target": null,
     "_id": "16nr7lXjZF3b7GR+B20mOK"
     "_id": "16nr7lXjZF3b7GR+B20mOK"
   },
   },
+  {
+    "__type__": "17d73e2Ap9E1J8r58rA45Cw",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 45
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_id": "69zphLmERA2ItjZj/JNDRd"
+  },
   {
   {
     "__type__": "cc.UITransform",
     "__type__": "cc.UITransform",
     "_name": "",
     "_name": "",
@@ -2037,7 +2052,7 @@
       "__id__": 9
       "__id__": 9
     },
     },
     "action_node": {
     "action_node": {
-      "__id__": 53
+      "__id__": 54
     },
     },
     "item_prefab": {
     "item_prefab": {
       "__uuid__": "b426aee1-f11c-4484-a0a7-bc11b6e1b0a5",
       "__uuid__": "b426aee1-f11c-4484-a0a7-bc11b6e1b0a5",
@@ -2060,10 +2075,10 @@
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 54
+        "__id__": 55
       },
       },
       {
       {
-        "__id__": 55
+        "__id__": 56
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2102,7 +2117,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 53
+      "__id__": 54
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2124,7 +2139,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 53
+      "__id__": 54
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2160,10 +2175,10 @@
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 57
+        "__id__": 58
       },
       },
       {
       {
-        "__id__": 58
+        "__id__": 59
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2202,7 +2217,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 56
+      "__id__": 57
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2224,7 +2239,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 56
+      "__id__": 57
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2258,31 +2273,31 @@
     },
     },
     "_children": [
     "_children": [
       {
       {
-        "__id__": 60
+        "__id__": 61
       },
       },
       {
       {
-        "__id__": 64
+        "__id__": 65
       },
       },
       {
       {
-        "__id__": 72
+        "__id__": 73
       },
       },
       {
       {
-        "__id__": 75
+        "__id__": 76
       },
       },
       {
       {
-        "__id__": 78
+        "__id__": 79
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 82
-      },
       {
       {
         "__id__": 83
         "__id__": 83
       },
       },
       {
       {
         "__id__": 84
         "__id__": 84
+      },
+      {
+        "__id__": 85
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2321,19 +2336,19 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 61
-      },
       {
       {
         "__id__": 62
         "__id__": 62
       },
       },
       {
       {
         "__id__": 63
         "__id__": 63
+      },
+      {
+        "__id__": 64
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2372,7 +2387,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2394,7 +2409,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2433,7 +2448,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2463,23 +2478,23 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_children": [
     "_children": [
       {
       {
-        "__id__": 65
+        "__id__": 66
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 69
-      },
       {
       {
         "__id__": 70
         "__id__": 70
       },
       },
       {
       {
         "__id__": 71
         "__id__": 71
+      },
+      {
+        "__id__": 72
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2518,19 +2533,19 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 64
+      "__id__": 65
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 66
-      },
       {
       {
         "__id__": 67
         "__id__": 67
       },
       },
       {
       {
         "__id__": 68
         "__id__": 68
+      },
+      {
+        "__id__": 69
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2569,7 +2584,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 65
+      "__id__": 66
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2591,7 +2606,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 65
+      "__id__": 66
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2630,7 +2645,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 65
+      "__id__": 66
     },
     },
     "_enabled": false,
     "_enabled": false,
     "__prefab": null,
     "__prefab": null,
@@ -2660,7 +2675,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2682,7 +2697,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2721,12 +2736,12 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
     "_barSprite": {
     "_barSprite": {
-      "__id__": 67
+      "__id__": 68
     },
     },
     "_mode": 0,
     "_mode": 0,
     "_totalLength": 300,
     "_totalLength": 300,
@@ -2740,16 +2755,16 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 73
+        "__id__": 74
       },
       },
       {
       {
-        "__id__": 74
+        "__id__": 75
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2788,14 +2803,14 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 72
+      "__id__": 73
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 87.48645105194628,
-      "height": 25.200000000000003
+      "width": 87.48974910783178,
+      "height": 25.2
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -2810,7 +2825,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 72
+      "__id__": 73
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2827,7 +2842,7 @@
     "_string": "加载中50%...",
     "_string": "加载中50%...",
     "_horizontalAlign": 1,
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 21.05911330049261,
+    "_actualFontSize": 20.948275862068964,
     "_fontSize": 15,
     "_fontSize": 15,
     "_fontFamily": "Arial",
     "_fontFamily": "Arial",
     "_lineHeight": 20,
     "_lineHeight": 20,
@@ -2849,16 +2864,16 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 76
+        "__id__": 77
       },
       },
       {
       {
-        "__id__": 77
+        "__id__": 78
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -2897,7 +2912,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 75
+      "__id__": 76
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2919,7 +2934,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 75
+      "__id__": 76
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -2958,19 +2973,19 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 79
-      },
       {
       {
         "__id__": 80
         "__id__": 80
       },
       },
       {
       {
         "__id__": 81
         "__id__": 81
+      },
+      {
+        "__id__": 82
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -3009,7 +3024,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 78
+      "__id__": 79
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3031,7 +3046,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 78
+      "__id__": 79
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3070,7 +3085,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 78
+      "__id__": 79
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3100,7 +3115,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3122,7 +3137,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3152,15 +3167,15 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
     "progress": {
     "progress": {
-      "__id__": 64
+      "__id__": 65
     },
     },
     "lab_progress": {
     "lab_progress": {
-      "__id__": 72
+      "__id__": 73
     },
     },
     "_id": "d4ZGsTLulMmLasTBdgs7/d"
     "_id": "d4ZGsTLulMmLasTBdgs7/d"
   },
   },
@@ -3176,10 +3191,10 @@
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 86
+        "__id__": 87
       },
       },
       {
       {
-        "__id__": 87
+        "__id__": 88
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -3218,7 +3233,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 85
+      "__id__": 86
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3240,7 +3255,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 85
+      "__id__": 86
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3274,22 +3289,22 @@
     },
     },
     "_children": [
     "_children": [
       {
       {
-        "__id__": 89
+        "__id__": 90
       },
       },
       {
       {
-        "__id__": 95
+        "__id__": 96
       }
       }
     ],
     ],
     "_active": false,
     "_active": false,
     "_components": [
     "_components": [
-      {
-        "__id__": 98
-      },
       {
       {
         "__id__": 99
         "__id__": 99
       },
       },
       {
       {
         "__id__": 100
         "__id__": 100
+      },
+      {
+        "__id__": 101
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -3328,14 +3343,11 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_children": [],
     "_children": [],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
-      {
-        "__id__": 90
-      },
       {
       {
         "__id__": 91
         "__id__": 91
       },
       },
@@ -3347,6 +3359,9 @@
       },
       },
       {
       {
         "__id__": 94
         "__id__": 94
+      },
+      {
+        "__id__": 95
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -3385,7 +3400,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3407,7 +3422,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3446,7 +3461,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3476,7 +3491,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3488,7 +3503,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3501,16 +3516,16 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "_parent": {
     "_parent": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_children": [],
     "_children": [],
     "_active": false,
     "_active": false,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 96
+        "__id__": 97
       },
       },
       {
       {
-        "__id__": 97
+        "__id__": 98
       }
       }
     ],
     ],
     "_prefab": null,
     "_prefab": null,
@@ -3549,7 +3564,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 95
+      "__id__": 96
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3571,7 +3586,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 95
+      "__id__": 96
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3610,7 +3625,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3632,7 +3647,7 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
@@ -3662,15 +3677,15 @@
     "_objFlags": 0,
     "_objFlags": 0,
     "__editorExtras__": {},
     "__editorExtras__": {},
     "node": {
     "node": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_enabled": true,
     "_enabled": true,
     "__prefab": null,
     "__prefab": null,
     "img_mask": {
     "img_mask": {
-      "__id__": 89
+      "__id__": 90
     },
     },
     "lab_text": {
     "lab_text": {
-      "__id__": 95
+      "__id__": 96
     },
     },
     "_id": "07rXQrN4tA2oyWKwaJVjhf"
     "_id": "07rXQrN4tA2oyWKwaJVjhf"
   },
   },
@@ -3724,8 +3739,8 @@
     "__prefab": null,
     "__prefab": null,
     "_alignFlags": 45,
     "_alignFlags": 45,
     "_target": null,
     "_target": null,
-    "_left": -2.842170943040401e-14,
-    "_right": -2.842170943040401e-14,
+    "_left": 2.842170943040401e-14,
+    "_right": 2.842170943040401e-14,
     "_top": -5.684341886080802e-14,
     "_top": -5.684341886080802e-14,
     "_bottom": -5.684341886080802e-14,
     "_bottom": -5.684341886080802e-14,
     "_horizontalCenter": 0,
     "_horizontalCenter": 0,
@@ -3756,13 +3771,13 @@
       "__id__": 3
       "__id__": 3
     },
     },
     "uiLayer": {
     "uiLayer": {
-      "__id__": 56
+      "__id__": 57
     },
     },
     "topLayer": {
     "topLayer": {
-      "__id__": 85
+      "__id__": 86
     },
     },
     "waitLayer": {
     "waitLayer": {
-      "__id__": 88
+      "__id__": 89
     },
     },
     "_id": "f7O5J2e1NPdIkcALDc+ile"
     "_id": "f7O5J2e1NPdIkcALDc+ile"
   },
   },
@@ -3777,25 +3792,25 @@
   {
   {
     "__type__": "cc.SceneGlobals",
     "__type__": "cc.SceneGlobals",
     "ambient": {
     "ambient": {
-      "__id__": 107
+      "__id__": 108
     },
     },
     "shadows": {
     "shadows": {
-      "__id__": 108
+      "__id__": 109
     },
     },
     "_skybox": {
     "_skybox": {
-      "__id__": 109
+      "__id__": 110
     },
     },
     "fog": {
     "fog": {
-      "__id__": 110
+      "__id__": 111
     },
     },
     "octree": {
     "octree": {
-      "__id__": 111
+      "__id__": 112
     },
     },
     "skin": {
     "skin": {
-      "__id__": 112
+      "__id__": 113
     },
     },
     "lightProbeInfo": {
     "lightProbeInfo": {
-      "__id__": 113
+      "__id__": 114
     },
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false
     "bakedWithHighpLightmap": false

+ 1 - 1
assets/script/config.ts

@@ -2,7 +2,7 @@ import { _decorator, Component, Node } from 'cc';
 const { ccclass, property } = _decorator;
 const { ccclass, property } = _decorator;
 
 
 export class config {
 export class config {
-    static debug = true;
+    static debug = false;
     static domain = config.debug ? "https://zcapi.xwrun.com" : "https://zcapi.hainanmlwl.com";
     static domain = config.debug ? "https://zcapi.xwrun.com" : "https://zcapi.hainanmlwl.com";
     static static_domain = config.debug ? "https://zcapi.xwrun.com" : "https://zaoca.oss-cn-beijing.aliyuncs.com";
     static static_domain = config.debug ? "https://zcapi.xwrun.com" : "https://zaoca.oss-cn-beijing.aliyuncs.com";
     static statistics_domain = config.debug ? "http://logads.xwrun.com" : "https://logads.hainanmlwl.com";
     static statistics_domain = config.debug ? "http://logads.xwrun.com" : "https://logads.hainanmlwl.com";

+ 5 - 2
assets/script/framework/sdkUtil.ts

@@ -178,7 +178,10 @@ export class SdkUtil {
             tt.onShow((res) => {
             tt.onShow((res) => {
                 console.log('tt.onShow =', res)
                 console.log('tt.onShow =', res)
                 // console.log('res=',res)
                 // console.log('res=',res)
-                if(res.scene == '021036') {
+                if(res.scene == '021036' || res.scene == '101036') {
+                    SdkUtil.tt_isToEnterFromSidebar = true
+                }
+                if(res.scene.launch_from == 'homepage' && res.scene.location == 'sidebar_card') {
                     SdkUtil.tt_isToEnterFromSidebar = true
                     SdkUtil.tt_isToEnterFromSidebar = true
                 }
                 }
             });
             });
@@ -198,7 +201,7 @@ export class SdkUtil {
 
 
             let options = tt.getLaunchOptionsSync()
             let options = tt.getLaunchOptionsSync()
             console.log('getLaunchOptionsSync=', options)
             console.log('getLaunchOptionsSync=', options)
-            if(options.scene == '021036') {
+            if(options.scene == '021036' || options.scene == '101036') {
                 SdkUtil.tt_isToEnterFromSidebar = true
                 SdkUtil.tt_isToEnterFromSidebar = true
             }
             }
         }
         }

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

@@ -1,4 +1,4 @@
-import { _decorator, Component, Director, director, Enum, Game, game, instantiate, Label, log, Node, Prefab, resources, SpriteFrame, sys, tween, UITransform, Vec3 } from 'cc';
+import { _decorator, Component, Director, director, Enum, Game, game, instantiate, Label, log, Node, Prefab, resources, SpriteFrame, sys, tween, UITransform, Vec2, Vec3 } from 'cc';
 import { config } from '../config';
 import { config } from '../config';
 import { gameManager } from '../gameManager';
 import { gameManager } from '../gameManager';
 import { play_list_item } from './play_list_item';
 import { play_list_item } from './play_list_item';
@@ -21,6 +21,7 @@ import { view_game_play_ji_yi_li } from '../play_list/ji_yi_li/view_game_play_ji
 import { view_game_play_zhao_bu_tong } from '../play_list/zhao_bu_tong/view_game_play_zhao_bu_tong';
 import { view_game_play_zhao_bu_tong } from '../play_list/zhao_bu_tong/view_game_play_zhao_bu_tong';
 import { StatisticsManager } from '../framework/statisticsManager';
 import { StatisticsManager } from '../framework/statisticsManager';
 import { reward_box_page } from './reward_box_page';
 import { reward_box_page } from './reward_box_page';
+import { reward_box } from './reward_box';
 const { ccclass, property } = _decorator;
 const { ccclass, property } = _decorator;
 export enum ETest {
 export enum ETest {
     None = 0,
     None = 0,
@@ -81,9 +82,10 @@ export class homepage extends Component {
         ClientEvent.on(config.EVENT_MSG.ON_SHOW_REWARD_VIEW,this.onShowRewardView.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_SHOW_REWARD_VIEW,this.onShowRewardView.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_USER_LOGIN_SUCCESS,this.onUserLoginSuccess.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_USER_LOGIN_SUCCESS,this.onUserLoginSuccess.bind(this),this);
     }
     }
-    onUserLoginSuccess() {
+    onUserLoginSuccess() {        
         if(SdkUtil.ttCheckSceneShowRewards()&&gameManager.get_user_is_sign()==false) {
         if(SdkUtil.ttCheckSceneShowRewards()&&gameManager.get_user_is_sign()==false) {
             this.reward_box.active = true
             this.reward_box.active = true
+            this.reward_box.getComponent(reward_box).playShake()
             let self = this
             let self = this
             this.reward_box.on(Node.EventType.TOUCH_END, ()=> {
             this.reward_box.on(Node.EventType.TOUCH_END, ()=> {
                 gameManager.addTopView(config.PREFAB_PATH.reward_box_page, (node:Node)=> {
                 gameManager.addTopView(config.PREFAB_PATH.reward_box_page, (node:Node)=> {
@@ -97,6 +99,7 @@ export class homepage extends Component {
                         },500)
                         },500)
                         self.showCoinAni()
                         self.showCoinAni()
                         reward_box_page.close()
                         reward_box_page.close()
+                        this.reward_box.getComponent(reward_box).stopShake()
                         this.reward_box.active = false
                         this.reward_box.active = false
                     })
                     })
                 })
                 })

+ 26 - 0
assets/script/homepage/reward_box.ts

@@ -0,0 +1,26 @@
+import { _decorator, Component, Node, tween } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('reward_box')
+export class reward_box extends Component {
+    
+    protected m_interval:any = null
+
+    playShake() {
+        let angle_number:number = 15
+        var shake_angle:number = angle_number;
+        this.m_interval = setInterval(()=> {
+            tween(this.node).to(0.5, { angle: shake_angle }).start()
+            if(shake_angle == angle_number) {
+                shake_angle = -angle_number
+            } else {
+                shake_angle = angle_number
+            }
+        }, 300)
+    }
+
+    stopShake() {
+        clearInterval(this.m_interval)
+    }
+}
+

+ 9 - 0
assets/script/homepage/reward_box.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "17d737b6-029f-44d4-9f2b-e7cac0e390b0",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 2 - 2
assets/script/homepage/reward_box_page.ts

@@ -24,7 +24,7 @@ export class reward_box_page extends Component {
         this.lab_coin.getComponent(Label).string = '+' + coin_number + '金币'
         this.lab_coin.getComponent(Label).string = '+' + coin_number + '金币'
 
 
         if(this.m_isToEnterFromSidebar) {
         if(this.m_isToEnterFromSidebar) {
-            if(sign_status == 0) {
+            if(sign_status == config.SIGN_STATUS_TYPE.GET) {
                 this.btn_enter.getComponent(Sprite).spriteFrame = this.sf_getReward
                 this.btn_enter.getComponent(Sprite).spriteFrame = this.sf_getReward
             } else {
             } else {
                 // this.btn_enter.children[0].getComponent(Label).string = '今日已领取'
                 // this.btn_enter.children[0].getComponent(Label).string = '今日已领取'
@@ -39,7 +39,7 @@ export class reward_box_page extends Component {
         })
         })
         this.btn_enter.on(Node.EventType.TOUCH_END, ()=> {
         this.btn_enter.on(Node.EventType.TOUCH_END, ()=> {
             if(self.m_isToEnterFromSidebar) {
             if(self.m_isToEnterFromSidebar) {
-                if(sign_status == 0) {
+                if(sign_status == config.SIGN_STATUS_TYPE.GET) {
                     // 领取奖励
                     // 领取奖励
                     if(sys.platform == sys.Platform.BYTEDANCE_MINI_GAME) {
                     if(sys.platform == sys.Platform.BYTEDANCE_MINI_GAME) {
                         gameManager.request_sign_status(config.SIGN_STATUS_TYPE.SYNC, (data)=> {
                         gameManager.request_sign_status(config.SIGN_STATUS_TYPE.SYNC, (data)=> {

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

@@ -235,6 +235,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends base_view {
             //
             //
             let parent = item.node.parent.name ==="img1"?this.img_1:this.img_2;
             let parent = item.node.parent.name ==="img1"?this.img_1:this.img_2;
             let new_node:Node = instantiate(this.effect);
             let new_node:Node = instantiate(this.effect);
+            new_node.active = true
             let start_pos = new Vec3()
             let start_pos = new Vec3()
             parent.getComponent(UITransform).convertToWorldSpaceAR(item.node.position,start_pos)
             parent.getComponent(UITransform).convertToWorldSpaceAR(item.node.position,start_pos)
 
 

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

@@ -199,6 +199,7 @@ export class view_game_play_shuang_tu_zhao_xiang_tong extends  base_view  {
             //
             //
             let parent = item.node.parent.name ==="img1"?this.img_1:this.img_2;
             let parent = item.node.parent.name ==="img1"?this.img_1:this.img_2;
             let new_node:Node = instantiate(this.effect);
             let new_node:Node = instantiate(this.effect);
+            new_node.active = true
             let start_pos = new Vec3()
             let start_pos = new Vec3()
             parent.getComponent(UITransform).convertToWorldSpaceAR(item.node.position,start_pos)
             parent.getComponent(UITransform).convertToWorldSpaceAR(item.node.position,start_pos)
 
 

+ 2 - 1
build-templates/templates-version.json

@@ -1,3 +1,4 @@
 {
 {
-    "bytedance-mini-game": "1.0.0"
+    "bytedance-mini-game": "1.0.0",
+    "web-mobile": "1.0.0"
 }
 }

+ 47 - 0
build-templates/web-mobile/index.ejs

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+
+  <title>Cocos Creator | <%= projectName %></title>
+
+  <!--http://www.html5rocks.com/en/mobile/mobifying/-->
+  <meta name="viewport"
+        content="width=device-width,user-scalable=no,initial-scale=1,minimum-scale=1,maximum-scale=1,minimal-ui=true"/>
+
+  <!--https://developer.apple.com/library/safari/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/MetaTags.html-->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <meta name="format-detection" content="telephone=no">
+
+  <!-- force webkit on 360 -->
+  <meta name="renderer" content="webkit"/>
+  <meta name="force-rendering" content="webkit"/>
+  <!-- force edge on IE -->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="msapplication-tap-highlight" content="no">
+
+  <!-- force full screen on some browser -->
+  <meta name="full-screen" content="yes"/>
+  <meta name="x5-fullscreen" content="true"/>
+  <meta name="360-fullscreen" content="true"/>
+
+  <!--fix fireball/issues/3568 -->
+  <!--<meta name="browsermode" content="application">-->
+  <meta name="x5-page-mode" content="app">
+
+  <!--<link rel="apple-touch-icon" href=".png" />-->
+  <!--<link rel="apple-touch-icon-precomposed" href=".png" />-->
+
+  <link rel="stylesheet" type="text/css" href="<%= cssUrl %>"/>
+
+</head>
+<body>
+  <div id="GameDiv" cc_exact_fit_screen="true">
+      <div id="Cocos3dGameContainer">
+        <canvas id="GameCanvas" oncontextmenu="event.preventDefault()" tabindex="99"></canvas>
+      </div>
+    </div>
+  <%- include(cocosTemplate, {}) %>
+</body>
+</html>

+ 1 - 1
settings/v2/packages/project.json

@@ -5,7 +5,7 @@
       "width": 375,
       "width": 375,
       "height": 812,
       "height": 812,
       "fitHeight": true,
       "fitHeight": true,
-      "fitWidth": false
+      "fitWidth": true
     }
     }
   },
   },
   "custom_joint_texture_layouts": []
   "custom_joint_texture_layouts": []