From 00ef5a27cda9516fe70e5f8ed28ba9eacad659c1 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Fri, 26 Sep 2025 18:04:35 +0800 Subject: [PATCH] fix --- assets/Scenes/MainScene.scene | 146 +++++++++++++++------------------- proto_cs | 2 +- 2 files changed, 67 insertions(+), 81 deletions(-) diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index b3375ea8..4ed93589 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 82 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 87 + "__id__": 86 }, "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" }, @@ -79,15 +79,15 @@ ], "_active": true, "_components": [ + { + "__id__": 78 + }, { "__id__": 79 }, { "__id__": 80 }, - { - "__id__": 81 - }, { "__id__": 42 } @@ -1613,7 +1613,7 @@ "__id__": 43 }, "UILayerMod": { - "__id__": 59 + "__id__": 58 }, "MainCamera": { "__id__": 4 @@ -1632,10 +1632,10 @@ "_active": true, "_components": [ { - "__id__": 77 + "__id__": 76 }, { - "__id__": 78 + "__id__": 77 } ], "_prefab": null, @@ -1684,22 +1684,22 @@ "__id__": 43 }, { - "__id__": 59 + "__id__": 58 }, { - "__id__": 62 + "__id__": 61 }, { - "__id__": 65 + "__id__": 64 } ], "_active": true, "_components": [ { - "__id__": 75 + "__id__": 74 }, { - "__id__": 76 + "__id__": 75 } ], "_prefab": null, @@ -1745,22 +1745,22 @@ "__id__": 46 }, { - "__id__": 50 + "__id__": 49 }, { - "__id__": 53 + "__id__": 52 } ], "_active": true, "_components": [ + { + "__id__": 55 + }, { "__id__": 56 }, { "__id__": 57 - }, - { - "__id__": 58 } ], "_prefab": null, @@ -1884,23 +1884,9 @@ "_fullScreenOnAwake": false, "_stayOnBottom": true, "_keepAspectRatio": true, - "videoPlayerEvent": [ - { - "__id__": 49 - } - ], + "videoPlayerEvent": [], "_id": "423wj8SLdJxpHi5bzVZasX" }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 46 - }, - "component": "", - "_componentId": "72cc36txkdCsYwmehDVnUGe", - "handler": "onVideoEvent", - "customEventData": "" - }, { "__type__": "cc.Node", "_name": "DetailvideoArea", @@ -1913,10 +1899,10 @@ "_active": true, "_components": [ { - "__id__": 51 + "__id__": 50 }, { - "__id__": 52 + "__id__": 51 } ], "_prefab": null, @@ -1955,7 +1941,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1977,7 +1963,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -2013,10 +1999,10 @@ "_active": true, "_components": [ { - "__id__": 54 + "__id__": 53 }, { - "__id__": 55 + "__id__": 54 } ], "_prefab": null, @@ -2055,7 +2041,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 52 }, "_enabled": true, "__prefab": null, @@ -2077,7 +2063,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 52 }, "_enabled": true, "__prefab": null, @@ -2178,10 +2164,10 @@ "_active": true, "_components": [ { - "__id__": 60 + "__id__": 59 }, { - "__id__": 61 + "__id__": 60 } ], "_prefab": null, @@ -2220,7 +2206,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 58 }, "_enabled": true, "__prefab": null, @@ -2242,7 +2228,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 58 }, "_enabled": true, "__prefab": null, @@ -2278,10 +2264,10 @@ "_active": false, "_components": [ { - "__id__": 63 + "__id__": 62 }, { - "__id__": 64 + "__id__": 63 } ], "_prefab": null, @@ -2320,7 +2306,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -2342,7 +2328,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -2365,13 +2351,13 @@ }, "_children": [ { - "__id__": 66 + "__id__": 65 } ], "_active": false, "_components": [ { - "__id__": 74 + "__id__": 73 } ], "_prefab": null, @@ -2410,15 +2396,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 64 }, "_children": [ { - "__id__": 67 + "__id__": 66 } ], "_active": true, "_components": [ + { + "__id__": 69 + }, { "__id__": 70 }, @@ -2427,9 +2416,6 @@ }, { "__id__": 72 - }, - { - "__id__": 73 } ], "_prefab": null, @@ -2468,16 +2454,16 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 67 }, { - "__id__": 69 + "__id__": 68 } ], "_prefab": null, @@ -2516,7 +2502,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -2538,7 +2524,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -2600,7 +2586,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2622,7 +2608,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2661,7 +2647,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2715,7 +2701,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 66 + "__id__": 65 }, "_id": "f22A3TNbFMvbuNfDD/K03a" }, @@ -2725,12 +2711,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 65 }, "_enabled": true, "__prefab": null, "startTestButton": { - "__id__": 72 + "__id__": 71 }, "statusLabel": null, "resultLabel": null, @@ -2742,7 +2728,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2938,10 +2924,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 83 + "__id__": 82 }, { - "__id__": 85 + "__id__": 84 } ] }, @@ -2958,7 +2944,7 @@ "__id__": 44 }, "targetInfo": { - "__id__": 84 + "__id__": 83 } }, { @@ -2980,7 +2966,7 @@ "__id__": 44 }, "targetInfo": { - "__id__": 86 + "__id__": 85 } }, { @@ -2992,28 +2978,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 88 + "__id__": 87 }, "shadows": { - "__id__": 89 + "__id__": 88 }, "_skybox": { - "__id__": 90 + "__id__": 89 }, "fog": { - "__id__": 91 + "__id__": 90 }, "octree": { - "__id__": 92 + "__id__": 91 }, "skin": { - "__id__": 93 + "__id__": 92 }, "lightProbeInfo": { - "__id__": 94 + "__id__": 93 }, "postSettings": { - "__id__": 95 + "__id__": 94 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/proto_cs b/proto_cs index 61bae4db..2ed2ffb6 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 61bae4db5abb87f2770cf639ab0980cecc1d2c31 +Subproject commit 2ed2ffb66a1577292a77e1c0750252af3f22ef35