Skip to content

M
MingSnake_241120
Commit c04ad07c authored by 陈子煜's avatar 陈子煜
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	assets/Bundles/MainGame/MainGame.scene
parents 6aafc61d 6a5972ed
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 110 deletions
assets/Bundles/MainGame/MainGame.scene
View file @ c04ad07c
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 358 "__id__": 364
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 362 "__id__": 368
}, },
"_id": "53947ca7-3484-4b53-800d-509405063d68" "_id": "53947ca7-3484-4b53-800d-509405063d68"
}, },
...@@ -98,16 +98,16 @@ ...@@ -98,16 +98,16 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 354 "__id__": 360
}, },
{ {
"__id__": 355 "__id__": 361
}, },
{ {
"__id__": 356 "__id__": 362
}, },
{ {
"__id__": 357 "__id__": 363
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
"_priority": 40000, "_priority": 40000,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 850.9565217391305, "_orthoHeight": 596.5439469320066,
"_near": 0, "_near": 0,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
...@@ -2233,10 +2233,10 @@ ...@@ -2233,10 +2233,10 @@
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"handle": { "handle": {
"__id__": 348 "__id__": 354
}, },
"bg": { "bg": {
"__id__": 352 "__id__": 358
}, },
"normalSp": { "normalSp": {
"__uuid__": "7f413237-4b73-4bae-bca7-7ab9e9742ebc@f9941", "__uuid__": "7f413237-4b73-4bae-bca7-7ab9e9742ebc@f9941",
...@@ -2258,22 +2258,22 @@ ...@@ -2258,22 +2258,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 348 "__id__": 354
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 351 "__id__": 357
}, },
{ {
"__id__": 352 "__id__": 358
}, },
{ {
"__id__": 58 "__id__": 58
}, },
{ {
"__id__": 353 "__id__": 359
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2346,13 +2346,13 @@ ...@@ -2346,13 +2346,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 345 "__id__": 351
}, },
{ {
"__id__": 346 "__id__": 352
}, },
{ {
"__id__": 347 "__id__": 353
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2444,7 +2444,7 @@ ...@@ -2444,7 +2444,7 @@
"_priority": 50000, "_priority": 50000,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 850.9565217391305, "_orthoHeight": 596.5439469320066,
"_near": 1, "_near": 1,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
...@@ -9286,19 +9286,19 @@ ...@@ -9286,19 +9286,19 @@
"__id__": 293 "__id__": 293
}, },
{ {
"__id__": 336 "__id__": 342
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 342 "__id__": 348
}, },
{ {
"__id__": 343 "__id__": 349
}, },
{ {
"__id__": 344 "__id__": 350
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10989,19 +10989,19 @@ ...@@ -10989,19 +10989,19 @@
"__id__": 310 "__id__": 310
}, },
{ {
"__id__": 318 "__id__": 321
}, },
{ {
"__id__": 326 "__id__": 332
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 334 "__id__": 340
}, },
{ {
"__id__": 335 "__id__": 341
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11292,7 +11292,7 @@ ...@@ -11292,7 +11292,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "67v4StSWtD+ZPJgDl1ko6W" "_id": "15ntahYuBOlI9axsLvmVn4"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -11314,7 +11314,7 @@ ...@@ -11314,7 +11314,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "3eHPSG6nlLLqW2xWCcDUdn" "_id": "29mpQoZeRDIILvvM0XrIyd"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -11350,7 +11350,7 @@ ...@@ -11350,7 +11350,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "e23ZEySBRDXrCtFeGP9+ix" "_id": "a4d7Pfm5pBg76Fz5VRrIym"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -11398,7 +11398,7 @@ ...@@ -11398,7 +11398,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "6fIkTxythDv6wSpcB19h7l" "_id": "aa5tYYkoFLUohaYXtyytDH"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -11420,7 +11420,7 @@ ...@@ -11420,7 +11420,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "979uCnjSZCqp7ED/BnMogk" "_id": "37hRnGP1NAXJYZ2CY+mVU/"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -11456,7 +11456,7 @@ ...@@ -11456,7 +11456,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "babgtEO65OHaYyHYSTN9Be" "_id": "c8YUQpN19KG6QnOuYWicKk"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -11504,7 +11504,7 @@ ...@@ -11504,7 +11504,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "b8eyJOXTpPVLksWziKN1tg" "_id": "8e1P/3v3RJ8JfxfGdiKfUh"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -11526,7 +11526,7 @@ ...@@ -11526,7 +11526,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "feuF8wLUNAZrjlCL/VqpCI" "_id": "6cQsM4oEpHkrdmgpuqttul"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -11562,7 +11562,7 @@ ...@@ -11562,7 +11562,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "5d03BqnmFAULVsft5QqpEz" "_id": "3cdoeEB6dJ24D6ITZZ//0X"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -11619,12 +11619,15 @@ ...@@ -11619,12 +11619,15 @@
}, },
{ {
"__id__": 314 "__id__": 314
},
{
"__id__": 317
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 317 "__id__": 320
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11901,6 +11904,141 @@ ...@@ -11901,6 +11904,141 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "c7P34IDjtDYrGlXLbB0uQU" "_id": "c7P34IDjtDYrGlXLbB0uQU"
}, },
{
"__type__": "cc.Node",
"_name": "txt-001",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 310
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 318
},
{
"__id__": 319
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -120.44200000000001,
"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": "b94UZPzUlN07rk/b6tdHc3"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 317
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 390.5919189453125,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": "9f+Am8FKJGgL+1FUkgwFoV"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 317
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_string": "完成目标可获得 银福袋x1",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 32,
"_overflow": 0,
"_enableWrapText": true,
"_font": {
"__uuid__": "51c12289-a516-4991-8323-ac98cee8b520",
"__expectedType__": "cc.TTFFont"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_isItalic": false,
"_isBold": false,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 1,
"_enableOutline": false,
"_outlineColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_outlineWidth": 2,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": "9eDUVKCc9HgKvo6BEGPAiQ"
},
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
"_name": "", "_name": "",
...@@ -11933,16 +12071,19 @@ ...@@ -11933,16 +12071,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 319 "__id__": 322
}, },
{ {
"__id__": 322 "__id__": 325
},
{
"__id__": 328
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 325 "__id__": 331
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11981,16 +12122,16 @@ ...@@ -11981,16 +12122,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 318 "__id__": 321
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 320 "__id__": 323
}, },
{ {
"__id__": 321 "__id__": 324
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12029,7 +12170,7 @@ ...@@ -12029,7 +12170,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 319 "__id__": 322
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12051,7 +12192,7 @@ ...@@ -12051,7 +12192,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 319 "__id__": 322
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12090,16 +12231,16 @@ ...@@ -12090,16 +12231,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 318 "__id__": 321
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 323 "__id__": 326
}, },
{ {
"__id__": 324 "__id__": 327
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12138,7 +12279,7 @@ ...@@ -12138,7 +12279,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 322 "__id__": 325
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12160,7 +12301,7 @@ ...@@ -12160,7 +12301,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 322 "__id__": 325
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12219,13 +12360,148 @@ ...@@ -12219,13 +12360,148 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "23dt36GURCoJSXX8TKMI80" "_id": "23dt36GURCoJSXX8TKMI80"
}, },
{
"__type__": "cc.Node",
"_name": "txt-001",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 321
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 329
},
{
"__id__": 330
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -120.44200000000001,
"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": "1121e9rQhPsphRKsyL9dKF"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 328
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 396.991943359375,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": "96al6CPodOuZ19PY8ZTPxP"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 328
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_string": "完成目标可获得 银福袋x2",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 32,
"_overflow": 0,
"_enableWrapText": true,
"_font": {
"__uuid__": "51c12289-a516-4991-8323-ac98cee8b520",
"__expectedType__": "cc.TTFFont"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_isItalic": false,
"_isBold": false,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 1,
"_enableOutline": false,
"_outlineColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_outlineWidth": 2,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": "b4kAQah1FKlImJMMSR+Vbb"
},
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 318 "__id__": 321
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12251,16 +12527,16 @@ ...@@ -12251,16 +12527,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 327 "__id__": 333
}, },
{ {
"__id__": 330 "__id__": 336
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 333 "__id__": 339
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12299,16 +12575,16 @@ ...@@ -12299,16 +12575,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 326 "__id__": 332
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 328 "__id__": 334
}, },
{ {
"__id__": 329 "__id__": 335
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12347,7 +12623,7 @@ ...@@ -12347,7 +12623,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 327 "__id__": 333
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12369,7 +12645,7 @@ ...@@ -12369,7 +12645,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 327 "__id__": 333
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12408,16 +12684,16 @@ ...@@ -12408,16 +12684,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 326 "__id__": 332
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 331 "__id__": 337
}, },
{ {
"__id__": 332 "__id__": 338
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12456,7 +12732,7 @@ ...@@ -12456,7 +12732,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 330 "__id__": 336
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12478,7 +12754,7 @@ ...@@ -12478,7 +12754,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 330 "__id__": 336
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12543,7 +12819,7 @@ ...@@ -12543,7 +12819,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 326 "__id__": 332
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12606,19 +12882,19 @@ ...@@ -12606,19 +12882,19 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 337 "__id__": 343
}, },
{ {
"__id__": 338 "__id__": 344
}, },
{ {
"__id__": 339 "__id__": 345
}, },
{ {
"__id__": 340 "__id__": 346
}, },
{ {
"__id__": 341 "__id__": 347
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12657,7 +12933,7 @@ ...@@ -12657,7 +12933,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 336 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12679,7 +12955,7 @@ ...@@ -12679,7 +12955,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 336 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12718,7 +12994,7 @@ ...@@ -12718,7 +12994,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 336 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12741,7 +13017,7 @@ ...@@ -12741,7 +13017,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 336 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12754,7 +13030,7 @@ ...@@ -12754,7 +13030,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 336 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -12850,7 +13126,7 @@ ...@@ -12850,7 +13126,7 @@
"__id__": 272 "__id__": 272
}, },
"cdFlicker": { "cdFlicker": {
"__id__": 336 "__id__": 342
}, },
"mask": { "mask": {
"__id__": 288 "__id__": 288
...@@ -12869,12 +13145,18 @@ ...@@ -12869,12 +13145,18 @@
"__id__": 310 "__id__": 310
}, },
{ {
"__id__": 318 "__id__": 321
}, },
{ {
"__id__": 326 "__id__": 332
} }
], ],
"top": {
"__id__": 250
},
"topCard": {
"__id__": 276
},
"_id": "dfl2fX641H3qOpggystLiY" "_id": "dfl2fX641H3qOpggystLiY"
}, },
{ {
...@@ -12957,10 +13239,10 @@ ...@@ -12957,10 +13239,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 349 "__id__": 355
}, },
{ {
"__id__": 350 "__id__": 356
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12999,7 +13281,7 @@ ...@@ -12999,7 +13281,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 348 "__id__": 354
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -13021,7 +13303,7 @@ ...@@ -13021,7 +13303,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 348 "__id__": 354
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -13258,7 +13540,7 @@ ...@@ -13258,7 +13540,7 @@
"instance": null, "instance": null,
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 359 "__id__": 365
} }
], ],
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
...@@ -13273,7 +13555,7 @@ ...@@ -13273,7 +13555,7 @@
"__id__": 38 "__id__": 38
}, },
"sourceInfo": { "sourceInfo": {
"__id__": 360 "__id__": 366
}, },
"propertyPath": [ "propertyPath": [
"head" "head"
...@@ -13282,7 +13564,7 @@ ...@@ -13282,7 +13564,7 @@
"__id__": 38 "__id__": 38
}, },
"targetInfo": { "targetInfo": {
"__id__": 361 "__id__": 367
} }
}, },
{ {
...@@ -13300,28 +13582,28 @@ ...@@ -13300,28 +13582,28 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 363 "__id__": 369
}, },
"shadows": { "shadows": {
"__id__": 364 "__id__": 370
}, },
"_skybox": { "_skybox": {
"__id__": 365 "__id__": 371
}, },
"fog": { "fog": {
"__id__": 366 "__id__": 372
}, },
"octree": { "octree": {
"__id__": 367 "__id__": 373
}, },
"skin": { "skin": {
"__id__": 368 "__id__": 374
}, },
"lightProbeInfo": { "lightProbeInfo": {
"__id__": 369 "__id__": 375
}, },
"postSettings": { "postSettings": {
"__id__": 370 "__id__": 376
}, },
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
......
assets/Scripts/Scenes/MainGame/Components/Target.ts
View file @ c04ad07c
...@@ -30,6 +30,10 @@ export class Target extends Component { ...@@ -30,6 +30,10 @@ export class Target extends Component {
@property([Node]) bannerArr: Node[] = []; @property([Node]) bannerArr: Node[] = [];
@property(Node) top: Node = null;
@property(Node) topCard: Node = null;
constructor() { constructor() {
super(); super();
Target._ins = this; Target._ins = this;
...@@ -92,10 +96,12 @@ export class Target extends Component { ...@@ -92,10 +96,12 @@ export class Target extends Component {
} }
async showTarget3() { async showTarget3() {
this.showTopCard()
await this.showBanner(this.bannerArr[2]); await this.showBanner(this.bannerArr[2]);
} }
async showTarget2() { async showTarget2() {
this.showTop()
const { time, length } = Global.stageConfig[1]; const { time, length } = Global.stageConfig[1];
this.goalTxt.string = `${time}秒长度达到${length}`; this.goalTxt.string = `${time}秒长度达到${length}`;
...@@ -106,6 +112,7 @@ export class Target extends Component { ...@@ -106,6 +112,7 @@ export class Target extends Component {
} }
async showTarget1() { async showTarget1() {
this.showTop()
const { time } = Global.stageConfig[0]; const { time } = Global.stageConfig[0];
this.goalTxt.string = `存活${time}秒`; this.goalTxt.string = `存活${time}秒`;
this.bannerArr[0].getChildByName("txt") this.bannerArr[0].getChildByName("txt")
...@@ -114,6 +121,15 @@ export class Target extends Component { ...@@ -114,6 +121,15 @@ export class Target extends Component {
await this.showBanner(this.bannerArr[0]); await this.showBanner(this.bannerArr[0]);
} }
showTopCard() {
this.topCard.active = true;
this.top.active = false;
}
showTop() {
this.top.active = true;
this.topCard.active = false
}
private _cd = 0; private _cd = 0;
...@@ -137,7 +153,7 @@ export class Target extends Component { ...@@ -137,7 +153,7 @@ export class Target extends Component {
cdTween: Tween<Target> = null; cdTween: Tween<Target> = null;
startCd(cd: number, onComplete = () => {}) { startCd(cd: number, onComplete = () => { }) {
this.graphics.node.active = true; this.graphics.node.active = true;
this.cd = this.totalCd = cd; this.cd = this.totalCd = cd;
this.cdTween = tween(this as Target) this.cdTween = tween(this as Target)
......
assets/Scripts/Scenes/MainGame/MainGame.ts
View file @ c04ad07c
...@@ -212,8 +212,6 @@ export class MainGame extends Scene { ...@@ -212,8 +212,6 @@ export class MainGame extends Scene {
async initStage() { async initStage() {
let { currentStage } = gameStore.startInfo; let { currentStage } = gameStore.startInfo;
currentStage = 3
// 初始化玩家 // 初始化玩家
this.player.init({ this.player.init({
// initEnergy: 10000 // initEnergy: 10000
......
build/web-mobile/index.html
View file @ c04ad07c
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
</style> </style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/zepto.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/declare-process.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/jszip.min.v3.10.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/rem.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/rem.min.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/style.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/custom.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/custom.css" />-->
<!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>--> <!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
<!-- <script>eruda.init()</script>--> <!-- <script>eruda.init()</script>-->
...@@ -118,20 +118,20 @@ ...@@ -118,20 +118,20 @@
</div> </div>
<!-- Polyfills bundle. --> <!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/polyfills.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. --> <!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/system.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map --> <!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>--> <!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<script type="systemjs-importmap" charset="utf-8"> <script type="systemjs-importmap" charset="utf-8">
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/cocos-js/cc.js"}} {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/cocos-js/cc.js"}}
</script> </script>
<script> <script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/index.js').catch(function (err) { System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/index.js').catch(function (err) {
console.error(err); console.error(err);
}) })
</script> </script>
......
preview-template/mock/game/startGame.do.json
View file @ c04ad07c
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
"success": true, "success": true,
"code": "", "code": "",
"message": "", "message": "",
"data": "Dn22D8mkVmDOfP4ajNWcqtUT2BWK7hLAEHSofRAnITI23/h6M5dk9MJ+cY56DvHjlsXFGC8q3BgSsz56SCAcO6LiZx8tbmrjStn4UcGZq6/W+ZIm0IEma+v0iYkjGBT6bqBnMhA+9JKPvWXKnFJiNR2b8kEDC1Mjt2MH2penAaujIPcM6SAvaaZuTB04+JtkJ98NCKq1ib5v/FUMmokJ2ofNdGPeuPZSIUN8ahCVVm0LEiJd9siI+wzg1thOd0KJQZW9YxHsu0HWY/jI/1JmUbQLqULqipVEC3e9okEe0ha7326T45Erlu0hVtbzzK6VvSIqosm8iwVaiI8PKZkxRtGZRbU7NRiG9E1bE3qr7BBcbrwC4DzLpeRVxZM3SeycegMncfxDX59mZqGYE6274++7czNkS2xHJBg5dTQFdHYFMGDAZM1l4853kvIKUkUexSfaG7mWLEYynXdF/jfosCEDLUNCBBzjHRPWEvLBL7PDUDi1vMW1y3TeOKUpkxYWGmZYkMROFK3+4vJOA7LnNM9Z4l51nolXIqTL3L9SbcttLGZMjBs1Dehz1AAJDLOXZG2Lj0q8njFRKxrG/2dNarOwKEIUt9cjXYvmZ+WkHMnqgv8RnSWnwOGkOAIlEGm2N/9heEukf+6pNxZAUkh+UQ==" "data": "Dn22D8mkVmDOfP4ajNWcqtUT2BWK7hLAEHSofRAnITI23/h6M5dk9MJ+cY56DvHjlsXFGC8q3BgSsz56SCAcO6LiZx8tbmrjStn4UcGZq6/W+ZIm0IEma+v0iYkjGBT6bqBnMhA+9JKPvWXKnFJiNR2b8kEDC1Mjt2MH2penAaujIPcM6SAvaaZuTB04+Jtk5VSYZXauvq4KmXW3GGRumeiiyEIA+ZXAopsUzjcknsRY6nZmKVj0NjiFtVGF84qiZnISqNrmwNrdHOQONlI0TLVPx0Bzlpich1zyMUMMkZ/7cV2CeMi6Sm84oR/risQdMtm7d9EPsIDnoL6i0TO+JLCfvbc2r4yxr3qVSjSnK8A2DqxrtTBtXV8BLNwPLVjtZLVP0MnLPT6PXS5TNsD/jRswCJPga523j5LQgkXjJLlRl83WRQ8/SrcECSAoTF0gHG0+rm8WuFVrvQadxzK8kWZertwqJhAKkAlaj5rOJIgfS7rfoxrqPFSG7JvnMFNyCJ5Z8e4SSC6R/G8pBB1js45fXO6HvLg1QrYCZp+yxNAhcvDgXSPMIHVQns9RFNrw5cC0a4gSW8qIqzNbbl12pfq/OYvV0TjVFIZuGGYAlDrmSifBtQbh3yuT4pd6NH/inb/RXr6U3M6zCet4l0foaQ=="
} }
\ No newline at end of file
profiles/v2/packages/builder.json
View file @ c04ad07c
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
"progress": 1, "progress": 1,
"state": "success", "state": "success",
"stage": "build", "stage": "build",
"message": "2024-12-12 10:36:13 build success in 56 s!", "message": "2024-12-12 10:54:03 build success in 45 s!",
"detailMessage": "%c兑吧发布插件 >> 版本号:1733970917185\rcolor: green\r", "detailMessage": "%c兑吧发布插件 >> 版本号:1733971997849\rcolor: green\r",
"options": { "options": {
"name": "cocos-template-3d", "name": "cocos-template-3d",
"server": "", "server": "",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"__version__": "1.3.8", "__version__": "1.3.8",
"logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log" "logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
}, },
"time": "2024-12-12 10:35:16", "time": "2024-12-12 10:53:17",
"dirty": false "dirty": false
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment