Commit ce69965c authored by haiyoucuv's avatar haiyoucuv

Revert "daily_20241109_fit"

This reverts commit 1d2f60d0
parent 8f3af8bf
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 68 "__id__": 67
}, },
"_id": "04224ebd-adcd-4112-8010-da14ed5ea48a" "_id": "04224ebd-adcd-4112-8010-da14ed5ea48a"
}, },
...@@ -80,6 +80,9 @@ ...@@ -80,6 +80,9 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 63
},
{ {
"__id__": 64 "__id__": 64
}, },
...@@ -88,16 +91,13 @@ ...@@ -88,16 +91,13 @@
}, },
{ {
"__id__": 66 "__id__": 66
},
{
"__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 375, "x": 375,
"y": 812.0000000000001, "y": 812,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
"_priority": 1073741824, "_priority": 1073741824,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 812.0000000000001, "_orthoHeight": 812,
"_near": 1, "_near": 1,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 649.6000000000001, "y": 649.6,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -1401,7 +1401,7 @@ ...@@ -1401,7 +1401,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 17, "_alignFlags": 41,
"_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__": 42 "__id__": 41
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 61
}, },
{ {
"__id__": 63 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1492,15 +1492,12 @@ ...@@ -1492,15 +1492,12 @@
}, },
{ {
"__id__": 40 "__id__": 40
},
{
"__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 14,
"y": 42, "y": 42,
"z": 0 "z": 0
}, },
...@@ -1588,36 +1585,6 @@ ...@@ -1588,36 +1585,6 @@
"_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",
...@@ -1628,29 +1595,29 @@ ...@@ -1628,29 +1595,29 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 43 "__id__": 42
}, },
{ {
"__id__": 56 "__id__": 55
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 58
}, },
{ {
"__id__": 60 "__id__": 59
}, },
{ {
"__id__": 61 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 13,
"y": 0, "y": -108,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -1682,20 +1649,20 @@ ...@@ -1682,20 +1649,20 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 42 "__id__": 41
}, },
"_children": [ "_children": [
{ {
"__id__": 44 "__id__": 43
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 53
}, },
{ {
"__id__": 55 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1734,17 +1701,17 @@ ...@@ -1734,17 +1701,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 43 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 44
}, },
{ {
"__id__": 48 "__id__": 47
}, },
{ {
"__id__": 51 "__id__": 50
} }
], ],
"_active": true, "_active": true,
...@@ -1785,16 +1752,16 @@ ...@@ -1785,16 +1752,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 44 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1825,7 +1792,7 @@ ...@@ -1825,7 +1792,7 @@
"y": -180, "y": -180,
"z": -19.35996391123362 "z": -19.35996391123362
}, },
"_id": "ben2VFBBZEo4in8SIsKJv/" "_id": "26AaghC3ZLQoivi8IPLLx6"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -1833,7 +1800,7 @@ ...@@ -1833,7 +1800,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 45 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1847,7 +1814,7 @@ ...@@ -1847,7 +1814,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "d2mrT17fdNe6tbp/OORdrQ" "_id": "4awsrLTDZPupNEWNUynBR3"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1855,7 +1822,7 @@ ...@@ -1855,7 +1822,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 45 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1883,7 +1850,7 @@ ...@@ -1883,7 +1850,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "eaOnv7lOxIG4O51NzpJuj8" "_id": "b8gMWkSXRMxK5hFXrZOP9g"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1891,16 +1858,16 @@ ...@@ -1891,16 +1858,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 44 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 48
}, },
{ {
"__id__": 50 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1931,7 +1898,7 @@ ...@@ -1931,7 +1898,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "c6qW1UstBMaJkW8UHwtvVr" "_id": "8d9MTuN+hJCqWfWMTAH874"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -1939,7 +1906,7 @@ ...@@ -1939,7 +1906,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 48 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1953,7 +1920,7 @@ ...@@ -1953,7 +1920,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "1cDbWCHKxD7YpCm+RpQL12" "_id": "13L7gQxkVEMLNT/oINPmvT"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1961,7 +1928,7 @@ ...@@ -1961,7 +1928,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 48 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -1989,7 +1956,7 @@ ...@@ -1989,7 +1956,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "240+2tKf9AnqUeU3Gs7bVO" "_id": "6cx/20SspPX4lorFO9bDOT"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1997,16 +1964,16 @@ ...@@ -1997,16 +1964,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 44 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 51
}, },
{ {
"__id__": 53 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2037,7 +2004,7 @@ ...@@ -2037,7 +2004,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "06x6cAoDtNApS4yYk+P8RL" "_id": "23YQ0ruDNFKIjEUCfs6Dy7"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -2045,7 +2012,7 @@ ...@@ -2045,7 +2012,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 51 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2059,7 +2026,7 @@ ...@@ -2059,7 +2026,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "ddXG+ZuR1ESJw013PgYV5a" "_id": "97LgeXPmZExbhqMi3/Fimf"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -2067,7 +2034,7 @@ ...@@ -2067,7 +2034,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 51 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2095,7 +2062,7 @@ ...@@ -2095,7 +2062,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "6eldcUx9xNNLZsFYAuZyIU" "_id": "5cwgvd7XlMSZ1mLwH6+aVv"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -2103,7 +2070,7 @@ ...@@ -2103,7 +2070,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 43 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2125,7 +2092,7 @@ ...@@ -2125,7 +2092,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 43 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2144,16 +2111,16 @@ ...@@ -2144,16 +2111,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 42 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 56
}, },
{ {
"__id__": 58 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2192,7 +2159,7 @@ ...@@ -2192,7 +2159,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 56 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2214,7 +2181,7 @@ ...@@ -2214,7 +2181,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 56 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2253,7 +2220,7 @@ ...@@ -2253,7 +2220,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2275,15 +2242,15 @@ ...@@ -2275,15 +2242,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 17, "_alignFlags": 9,
"_target": null, "_target": null,
"_left": 190, "_left": 190,
"_right": 0, "_right": 0,
"_top": -198, "_top": -90,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -2305,7 +2272,7 @@ ...@@ -2305,7 +2272,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
...@@ -2361,7 +2328,7 @@ ...@@ -2361,7 +2328,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 750,
"height": 0 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2381,10 +2348,10 @@ ...@@ -2381,10 +2348,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_alignFlags": 18, "_alignFlags": 42,
"_target": null, "_target": null,
"_left": 325, "_left": 0,
"_right": 325, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -2414,7 +2381,7 @@ ...@@ -2414,7 +2381,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 750,
"height": 1624.0000000000002 "height": 1624
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2481,7 +2448,7 @@ ...@@ -2481,7 +2448,7 @@
"__prefab": null, "__prefab": null,
"uiLayer": null, "uiLayer": null,
"startBtn": { "startBtn": {
"__id__": 42 "__id__": 41
}, },
"ruleBtn": { "ruleBtn": {
"__id__": 24 "__id__": 24
...@@ -2497,28 +2464,28 @@ ...@@ -2497,28 +2464,28 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 69 "__id__": 68
}, },
"shadows": { "shadows": {
"__id__": 70 "__id__": 69
}, },
"_skybox": { "_skybox": {
"__id__": 71 "__id__": 70
}, },
"fog": { "fog": {
"__id__": 72 "__id__": 71
}, },
"octree": { "octree": {
"__id__": 73 "__id__": 72
}, },
"skin": { "skin": {
"__id__": 74 "__id__": 73
}, },
"lightProbeInfo": { "lightProbeInfo": {
"__id__": 75 "__id__": 74
}, },
"postSettings": { "postSettings": {
"__id__": 76 "__id__": 75
}, },
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
......
import { _decorator, assetManager, Component, Label, Node, Prefab, ProgressBar, ResolutionPolicy, resources, screen, view, } from 'cc'; import { _decorator, assetManager, Component, Label, Node, Prefab, ProgressBar, resources, } from 'cc';
import { PREVIEW } from 'cc/env'; import { PREVIEW } from 'cc/env';
import { UIMgr } from "../Module/UIMgr"; import { UIMgr } from "../Module/UIMgr";
import { changeScene, showPanel, showToast } from "db://assets/Module/UIFast"; import { changeScene, showPanel, showToast } from "db://assets/Module/UIFast";
...@@ -32,7 +32,6 @@ export class Start extends Component { ...@@ -32,7 +32,6 @@ export class Start extends Component {
onLoad() { onLoad() {
// game.frameRate = _FPS; // game.frameRate = _FPS;
// 预览调试时,显示性能统计面板 // 预览调试时,显示性能统计面板
if (PREVIEW) { if (PREVIEW) {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"config": { "config": {
"images": [], "images": [],
"sceneUUID": {}, "sceneUUID": {},
"scene": "53947ca7-3484-4b53-800d-509405063d68" "scene": "7b5de2a0-8504-46ba-9019-37a3548ce8e1"
}, },
"show": false "show": false
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"enable": true, "enable": true,
"customSplash": { "customSplash": {
"complete": true, "complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=c8b0f711bb162e709b868ea0782d22de" "form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
} }
}, },
"removeSplash": { "removeSplash": {
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"enable": true, "enable": true,
"removeSplash": { "removeSplash": {
"complete": true, "complete": true,
"form": "https://creator-api.cocos.com/api/form/show?sid=c8b0f711bb162e709b868ea0782d22de" "form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
} }
} }
} }
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
"general": { "general": {
"designResolution": { "designResolution": {
"width": 750, "width": 750,
"height": 1624, "height": 1624
"fitHeight": false
}, },
"downloadMaxConcurrency": 20, "downloadMaxConcurrency": 20,
"renderPipeline": "c7e748e8-be82-4f6f-b2c0-085b604e40e5" "renderPipeline": "c7e748e8-be82-4f6f-b2c0-085b604e40e5"
......
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