From e2e413fd3ee5cf0c146607957fb6fffaf8ffa450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=88=9A?= Date: Thu, 30 Dec 2021 16:23:12 +0800 Subject: [PATCH] . --- assets/cinestation/examples/FPS.scene | 22 ++- assets/scene/main.scene | 198 ++++---------------------- assets/script/Main.ts | 8 +- 3 files changed, 52 insertions(+), 176 deletions(-) diff --git a/assets/cinestation/examples/FPS.scene b/assets/cinestation/examples/FPS.scene index 3143dfa..b252c16 100644 --- a/assets/cinestation/examples/FPS.scene +++ b/assets/cinestation/examples/FPS.scene @@ -1631,7 +1631,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 401.67364016736406, + "_orthoHeight": 422.44224422442244, "_near": 1, "_far": 2000, "_color": { @@ -3360,6 +3360,9 @@ }, "fog": { "__id__": 255 + }, + "octree": { + "__id__": 256 } }, { @@ -3476,5 +3479,22 @@ "_fogTop": 1.5, "_fogRange": 1.2, "_accurate": false + }, + { + "__type__": "cc.OctreeInfo", + "_enabled": false, + "_minPos": { + "__type__": "cc.Vec3", + "x": -1024, + "y": -1024, + "z": -1024 + }, + "_maxPos": { + "__type__": "cc.Vec3", + "x": 1024, + "y": 1024, + "z": 1024 + }, + "_depth": 8 } ] \ No newline at end of file diff --git a/assets/scene/main.scene b/assets/scene/main.scene index f6c0f10..fa98704 100644 --- a/assets/scene/main.scene +++ b/assets/scene/main.scene @@ -21,11 +21,11 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 116 + "__id__": 111 }, "autoReleaseAssets": false, "_globals": { - "__id__": 117 + "__id__": 112 }, "_id": "ba0b085f-f8d5-40b0-9964-2fd25728d707" }, @@ -47,7 +47,7 @@ "_active": true, "_components": [ { - "__id__": 115 + "__id__": 110 } ], "_prefab": null, @@ -3327,22 +3327,19 @@ "__id__": 95 }, { - "__id__": 100 - }, - { - "__id__": 102 + "__id__": 97 } ], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 104 }, { - "__id__": 111 + "__id__": 106 }, { - "__id__": 113 + "__id__": 108 } ], "_prefab": null, @@ -3374,147 +3371,6 @@ }, "_id": "d8HjHAgVdE8puxYskBih1N" }, - { - "__type__": "cc.Node", - "_name": "huaxian", - "_objFlags": 0, - "_parent": { - "__id__": 94 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 96 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -184.251, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "94c4UTwqJDEpnL+GVkGgf+" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 95 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 256, - "height": 256 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "b3txB6zNhOC7g4mX0LGbRd" - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 95 - }, - "_enabled": true, - "__prefab": null, - "_visFlags": 0, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "loop": true, - "_premultipliedAlpha": true, - "_timeScale": 1, - "_useTint": false, - "_preCacheMode": 0, - "_cacheMode": 0, - "_defaultCacheMode": 0, - "_debugBones": false, - "_debugSlots": false, - "_skeletonData": { - "__uuid__": "bccbd7aa-4908-42ed-9518-45a5824e9362", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "default", - "defaultAnimation": "huaxian/positiveRun", - "_sockets": [], - "_debugMesh": false, - "_id": "e3Bb0l1vpPvaTB8oDCysJN" - }, - { - "__type__": "cc.animation.AnimationController", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 95 - }, - "_enabled": true, - "__prefab": null, - "graph": { - "__uuid__": "986922ff-74f1-4ffe-9c70-ff65910341ae", - "__expectedType__": "cc.animation.AnimationGraph" - }, - "_id": "cbrlfW0MpNsrf8F9qj4M+2" - }, - { - "__type__": "fd3d4cyuChK7Yh2zpy/PX3E", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 95 - }, - "_enabled": true, - "__prefab": null, - "ac": { - "__id__": 98 - }, - "_id": "e9rO8YGvFNx5wmjRkGdF4r" - }, { "__type__": "cc.Node", "_name": "UICamera", @@ -3526,7 +3382,7 @@ "_active": true, "_components": [ { - "__id__": 101 + "__id__": 96 } ], "_prefab": null, @@ -3563,7 +3419,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 100 + "__id__": 95 }, "_enabled": true, "__prefab": null, @@ -3610,13 +3466,13 @@ "_active": true, "_components": [ { - "__id__": 103 + "__id__": 98 }, { - "__id__": 105 + "__id__": 100 }, { - "__id__": 107 + "__id__": 102 } ], "_prefab": null, @@ -3653,11 +3509,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -3680,11 +3536,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 101 }, "_visFlags": 0, "_customMaterial": null, @@ -3724,12 +3580,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 97 }, "_enabled": true, "__prefab": null, "movement": { - "__id__": 108 + "__id__": 103 }, "_id": "fakFE2p7BAeqFlPCvlFVr3" }, @@ -3759,7 +3615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -3786,10 +3642,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 107 }, "_cameraComponent": { - "__id__": 101 + "__id__": 96 }, "_alignCanvasWithScreen": true, "_id": "7acBC/yU9N05fc6HGd8fZS" @@ -3807,7 +3663,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 109 }, "_alignFlags": 45, "_target": null, @@ -3857,19 +3713,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 118 + "__id__": 113 }, "shadows": { - "__id__": 119 + "__id__": 114 }, "_skybox": { - "__id__": 120 + "__id__": 115 }, "fog": { - "__id__": 121 + "__id__": 116 }, "octree": { - "__id__": 122 + "__id__": 117 } }, { diff --git a/assets/script/Main.ts b/assets/script/Main.ts index 690a38a..676c926 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2021-07-03 16:13:17 * @LastEditors: dgflash - * @LastEditTime: 2021-11-30 15:51:42 + * @LastEditTime: 2021-12-30 16:22:27 */ import { game, setDisplayStats, _decorator } from 'cc'; import { DEBUG } from 'cc/env'; @@ -42,10 +42,10 @@ export class Main extends Root { } protected run() { - // engine.gui.init(UICF); - // engine.gui.open(UIID.UILoading); + engine.gui.init(UICF); + engine.gui.open(UIID.UILoading); - // this.ecs_demo(); + this.ecs_demo(); } /** 通过ECS设计通用业务组件来复用 */