Skip to content

T
TNGD_CaveCruiser
Commit 924ad669 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge remote-tracking branch 'origin/daily_20241109_fit' 

# Conflicts:
#	assets/Bundles/HomeScene/HomeScene.scene
#	profiles/v2/packages/reference-image.json
parents ce69965c a8b31e34
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 94 deletions
assets/Bundles/GuideScene/GuideScene.scene
View file @ 924ad669
...@@ -205,14 +205,14 @@ ...@@ -205,14 +205,14 @@
"_far": 2000, "_far": 2000,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 11,
"g": 0, "g": 5,
"b": 0, "b": 79,
"a": 255 "a": 255
}, },
"_depth": 1, "_depth": 1,
"_stencil": 0, "_stencil": 0,
"_clearFlags": 6, "_clearFlags": 7,
"_rect": { "_rect": {
"__type__": "cc.Rect", "__type__": "cc.Rect",
"x": 0, "x": 0,
......
assets/Bundles/HomeScene/HomeScene.scene
View file @ 924ad669
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 67 "__id__": 68
}, },
"_id": "04224ebd-adcd-4112-8010-da14ed5ea48a" "_id": "04224ebd-adcd-4112-8010-da14ed5ea48a"
}, },
...@@ -80,9 +80,6 @@ ...@@ -80,9 +80,6 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 63
},
{ {
"__id__": 64 "__id__": 64
}, },
...@@ -91,13 +88,16 @@ ...@@ -91,13 +88,16 @@
}, },
{ {
"__id__": 66 "__id__": 66
},
{
"__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 375, "x": 375,
"y": 812, "y": 812.0000000000001,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -182,19 +182,19 @@ ...@@ -182,19 +182,19 @@
"_priority": 1073741824, "_priority": 1073741824,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 812, "_orthoHeight": 812.0000000000001,
"_near": 1, "_near": 1,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 12,
"g": 0, "g": 7,
"b": 0, "b": 105,
"a": 255 "a": 255
}, },
"_depth": 1, "_depth": 1,
"_stencil": 0, "_stencil": 0,
"_clearFlags": 6, "_clearFlags": 7,
"_rect": { "_rect": {
"__type__": "cc.Rect", "__type__": "cc.Rect",
"x": 0, "x": 0,
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 649.6, "y": 649.6000000000001,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -1401,7 +1401,7 @@ ...@@ -1401,7 +1401,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 41, "_alignFlags": 17,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
...@@ -1434,16 +1434,16 @@ ...@@ -1434,16 +1434,16 @@
"__id__": 38 "__id__": 38
}, },
{ {
"__id__": 41 "__id__": 42
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 62
}, },
{ {
"__id__": 62 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1492,12 +1492,15 @@ ...@@ -1492,12 +1492,15 @@
}, },
{ {
"__id__": 40 "__id__": 40
},
{
"__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 14, "x": 0,
"y": 42, "y": 42,
"z": 0 "z": 0
}, },
...@@ -1585,6 +1588,36 @@ ...@@ -1585,6 +1588,36 @@
"_atlas": null, "_atlas": null,
"_id": "387o2E+xVBD4zCyVl0YC8E" "_id": "387o2E+xVBD4zCyVl0YC8E"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 38
},
"_enabled": true,
"__prefab": null,
"_alignFlags": 16,
"_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": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": "8d+zfGet1Ggqa/9WsRokuQ"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "start", "_name": "start",
...@@ -1595,29 +1628,29 @@ ...@@ -1595,29 +1628,29 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 42 "__id__": 43
}, },
{ {
"__id__": 55 "__id__": 56
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 58
},
{ {
"__id__": 59 "__id__": 59
}, },
{ {
"__id__": 60 "__id__": 60
},
{
"__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 13, "x": 0,
"y": -108, "y": 0,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -1649,20 +1682,20 @@ ...@@ -1649,20 +1682,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 41 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 43 "__id__": 44
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 54
}, },
{ {
"__id__": 54 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1701,17 +1734,17 @@ ...@@ -1701,17 +1734,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 42 "__id__": 43
}, },
"_children": [ "_children": [
{ {
"__id__": 44 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 48
}, },
{ {
"__id__": 50 "__id__": 51
} }
], ],
"_active": true, "_active": true,
...@@ -1752,16 +1785,16 @@ ...@@ -1752,16 +1785,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 43 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 46
}, },
{ {
"__id__": 46 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1792,7 +1825,7 @@ ...@@ -1792,7 +1825,7 @@
"y": -180, "y": -180,
"z": -19.35996391123362 "z": -19.35996391123362
}, },
"_id": "26AaghC3ZLQoivi8IPLLx6" "_id": "35WyWsczVKRI2V/y/XeIgz"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -1800,7 +1833,7 @@ ...@@ -1800,7 +1833,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 44 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1814,7 +1847,7 @@ ...@@ -1814,7 +1847,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "4awsrLTDZPupNEWNUynBR3" "_id": "d5S4O235RIVqd8MW6vgRv6"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1822,7 +1855,7 @@ ...@@ -1822,7 +1855,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 44 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1850,7 +1883,7 @@ ...@@ -1850,7 +1883,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "b8gMWkSXRMxK5hFXrZOP9g" "_id": "8fh0D89UZHLYaRFDd/Mr3l"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1858,16 +1891,16 @@ ...@@ -1858,16 +1891,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 43 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 49
}, },
{ {
"__id__": 49 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1898,7 +1931,7 @@ ...@@ -1898,7 +1931,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "8d9MTuN+hJCqWfWMTAH874" "_id": "0dCk6NeB9FyLeiJUfpi5eX"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -1906,7 +1939,7 @@ ...@@ -1906,7 +1939,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1920,7 +1953,7 @@ ...@@ -1920,7 +1953,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "13L7gQxkVEMLNT/oINPmvT" "_id": "d6G/GhUvFGyoAqlNFvblJM"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1928,7 +1961,7 @@ ...@@ -1928,7 +1961,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1956,7 +1989,7 @@ ...@@ -1956,7 +1989,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "6cx/20SspPX4lorFO9bDOT" "_id": "802DqhXCFC4ZiYk92q9dQy"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1964,16 +1997,16 @@ ...@@ -1964,16 +1997,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 43 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 52
}, },
{ {
"__id__": 52 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2004,7 +2037,7 @@ ...@@ -2004,7 +2037,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "23YQ0ruDNFKIjEUCfs6Dy7" "_id": "19cE5w1ZZE1bnTFyub7Vu1"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -2012,7 +2045,7 @@ ...@@ -2012,7 +2045,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2026,7 +2059,7 @@ ...@@ -2026,7 +2059,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "97LgeXPmZExbhqMi3/Fimf" "_id": "c7V9dyxd5Is50mEU8FnEhk"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -2034,7 +2067,7 @@ ...@@ -2034,7 +2067,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2062,7 +2095,7 @@ ...@@ -2062,7 +2095,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "5cwgvd7XlMSZ1mLwH6+aVv" "_id": "49E4V5xWZG4528jFRoUvNb"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -2070,7 +2103,7 @@ ...@@ -2070,7 +2103,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2092,7 +2125,7 @@ ...@@ -2092,7 +2125,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2111,16 +2144,16 @@ ...@@ -2111,16 +2144,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 41 "__id__": 42
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 57
}, },
{ {
"__id__": 57 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2159,7 +2192,7 @@ ...@@ -2159,7 +2192,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 55 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2181,7 +2214,7 @@ ...@@ -2181,7 +2214,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 55 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2220,7 +2253,7 @@ ...@@ -2220,7 +2253,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 41 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2242,15 +2275,15 @@ ...@@ -2242,15 +2275,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 41 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 9, "_alignFlags": 17,
"_target": null, "_target": null,
"_left": 190, "_left": 190,
"_right": 0, "_right": 0,
"_top": -90, "_top": -198,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -2272,7 +2305,7 @@ ...@@ -2272,7 +2305,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 41 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2328,7 +2361,7 @@ ...@@ -2328,7 +2361,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 100,
"height": 0 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2348,10 +2381,10 @@ ...@@ -2348,10 +2381,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 42, "_alignFlags": 18,
"_target": null, "_target": null,
"_left": 0, "_left": 325,
"_right": 0, "_right": 325,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -2381,7 +2414,7 @@ ...@@ -2381,7 +2414,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 750,
"height": 1624 "height": 1624.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2448,7 +2481,7 @@ ...@@ -2448,7 +2481,7 @@
"__prefab": null, "__prefab": null,
"uiLayer": null, "uiLayer": null,
"startBtn": { "startBtn": {
"__id__": 41 "__id__": 42
}, },
"ruleBtn": { "ruleBtn": {
"__id__": 24 "__id__": 24
...@@ -2464,28 +2497,28 @@ ...@@ -2464,28 +2497,28 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 68 "__id__": 69
}, },
"shadows": { "shadows": {
"__id__": 69 "__id__": 70
}, },
"_skybox": { "_skybox": {
"__id__": 70 "__id__": 71
}, },
"fog": { "fog": {
"__id__": 71 "__id__": 72
}, },
"octree": { "octree": {
"__id__": 72 "__id__": 73
}, },
"skin": { "skin": {
"__id__": 73 "__id__": 74
}, },
"lightProbeInfo": { "lightProbeInfo": {
"__id__": 74 "__id__": 75
}, },
"postSettings": { "postSettings": {
"__id__": 75 "__id__": 76
}, },
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
......
assets/Bundles/MainGame/MainGame.scene
View file @ 924ad669
...@@ -192,14 +192,14 @@ ...@@ -192,14 +192,14 @@
"_far": 2000, "_far": 2000,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 11,
"g": 0, "g": 5,
"b": 0, "b": 79,
"a": 255 "a": 255
}, },
"_depth": 1, "_depth": 1,
"_stencil": 0, "_stencil": 0,
"_clearFlags": 6, "_clearFlags": 7,
"_rect": { "_rect": {
"__type__": "cc.Rect", "__type__": "cc.Rect",
"x": 0, "x": 0,
......
assets/Start/Start.scene
View file @ 924ad669
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
"_far": 2000, "_far": 2000,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 11,
"g": 0, "g": 5,
"b": 0, "b": 79,
"a": 255 "a": 255
}, },
"_depth": 1, "_depth": 1,
......
build-templates/web-mobile/index.ejs
View file @ 924ad669
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
-ms-user-select: none; -ms-user-select: none;
-khtml-user-select: none; -khtml-user-select: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
background-color: #0b054f;
} }
/* Remove spin of input type number */ /* Remove spin of input type number */
......
preview-template/index.ejs
View file @ 924ad669
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="https://appx/web-view.min.js"></script> <script type="text/javascript" src="https://appx/web-view.min.js"></script>
</head> </head>
<body style="overflow: hidden;"> <body style="overflow: hidden; background-color: #0b054f;">
<%- include(cocosToolBar, {config: config}) %> <%- include(cocosToolBar, {config: config}) %>
<div id="content" class="content" style="overflow: hidden;"> <div id="content" class="content" style="overflow: hidden;">
<div class="contentWrap"> <div class="contentWrap">
......
profiles/v2/packages/reference-image.json
View file @ 924ad669
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"config": { "config": {
"images": [], "images": [],
"sceneUUID": {}, "sceneUUID": {},
"scene": "7b5de2a0-8504-46ba-9019-37a3548ce8e1" "scene": "9e293cde-e27b-4902-808b-e884f3e9da32"
}, },
"show": false "show": 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