From 6961e48c15c61d3ea97292980019dbbd2383b7e0 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 2 Jan 2023 10:56:41 +0100 Subject: [PATCH] app root changes --- assets/Media/Prefabs/AppRoot.prefab | 1204 ++++++++++++++++++- assets/Scenes/Game.scene | 1096 +++-------------- assets/Scenes/Menu.scene | 500 ++------ assets/Scripts/AppRoot/AppRoot.ts | 24 +- assets/Scripts/AppRoot/AppRootUtils.ts | 13 + assets/Scripts/AppRoot/AppRootUtils.ts.meta | 9 + assets/Scripts/Game/Game.ts | 29 +- assets/Scripts/Menu/Menu.ts | 17 +- 8 files changed, 1516 insertions(+), 1376 deletions(-) create mode 100644 assets/Scripts/AppRoot/AppRootUtils.ts create mode 100644 assets/Scripts/AppRoot/AppRootUtils.ts.meta diff --git a/assets/Media/Prefabs/AppRoot.prefab b/assets/Media/Prefabs/AppRoot.prefab index 5840b79..6eeac05 100644 --- a/assets/Media/Prefabs/AppRoot.prefab +++ b/assets/Media/Prefabs/AppRoot.prefab @@ -20,16 +20,19 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 14 } ], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 70 } ], "_prefab": { - "__id__": 16 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,1192 @@ }, "fileId": "5eL70HILtD6oNB7UetCf7j" }, + { + "__type__": "cc.Node", + "_name": "Canvas", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 15 + } + ], + "_active": true, + "_components": [ + { + "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 + } + ], + "_prefab": { + "__id__": 69 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 320, + "y": 480.00000000000006, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Camera", + "_objFlags": 0, + "_parent": { + "__id__": 14 + }, + "_children": [ + { + "__id__": 16 + }, + { + "__id__": 22 + }, + { + "__id__": 50 + } + ], + "_active": true, + "_components": [ + { + "__id__": 60 + } + ], + "_prefab": { + "__id__": 62 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "ModalWindowManager", + "_objFlags": 0, + "_parent": { + "__id__": 15 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 17 + }, + { + "__id__": 19 + } + ], + "_prefab": { + "__id__": 21 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 640, + "height": 960 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d5wUnKe2hHcqUB+AGf397x" + }, + { + "__type__": "c623fhj2b5Cyau8MBXLOmVF", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "availableWindows": [ + { + "__uuid__": "663674aa-da1c-44b0-8049-49db9b020973", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "9f66fba0-82b2-481c-835d-41cb87f38d87", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "cc259578-1eb4-4dd3-87b0-fd42c11668b1", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "d07d3ad3-88c1-4b8e-af61-05f53a405d59", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "0b35c4ba-253d-4316-ad01-0ba40a2612fc", + "__expectedType__": "cc.Prefab" + } + ], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e6zKXmavdBWKrOQv2kMKAs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7et/guhnJLfZz7EEW01zHe" + }, + { + "__type__": "cc.Node", + "_name": "Overlap", + "_objFlags": 0, + "_parent": { + "__id__": 15 + }, + "_children": [ + { + "__id__": 23 + }, + { + "__id__": 29 + }, + { + "__id__": 35 + }, + { + "__id__": 41 + } + ], + "_active": true, + "_components": [ + { + "__id__": 47 + } + ], + "_prefab": { + "__id__": 49 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 22 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 24 + }, + { + "__id__": 26 + } + ], + "_prefab": { + "__id__": 28 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -420, + "y": 0, + "z": -2000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 23 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 1200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2WT8yB45H6bbp4OAhgF0h" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 23 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fQSL2P5ZLKY+/KpkgKGLh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "04xQQWRi9L24BgNT0Ki8T2" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-001", + "_objFlags": 0, + "_parent": { + "__id__": 22 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 420, + "y": 0, + "z": -2000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 1200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6fmadnjyZOD42aM1FT3USn" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3bJVTqkUVI1pFrwVwRfQxD" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a4Q1zB2rRPLJKs8SqUujSR" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-002", + "_objFlags": 0, + "_parent": { + "__id__": 22 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 36 + }, + { + "__id__": 38 + } + ], + "_prefab": { + "__id__": 40 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 580, + "z": -2000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 37 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1050, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "84odXUbwNKZp1F/54d5z21" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "17zxvKxXlDR4uTMy6q932u" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "44TIKBnqVCUKnzMEJXxf+7" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-003", + "_objFlags": 0, + "_parent": { + "__id__": 22 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 42 + }, + { + "__id__": 44 + } + ], + "_prefab": { + "__id__": 46 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -580, + "z": -2000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 41 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1050, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a4Q9bUMHtBhasBeUoxV9nJ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 41 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "adfU/ciXRPsJIcjEQebjJp" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a4ohXJNMlKYIzy0TerDYfG" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 22 + }, + "_enabled": true, + "__prefab": { + "__id__": 48 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 640, + "height": 960 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "46xxu25MRKxJLAuxMMsf57" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f9c0nAyY1AEY+29CNy1WVz" + }, + { + "__type__": "cc.Node", + "_name": "ScreenFader", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 15 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 + }, + { + "__id__": 57 + } + ], + "_prefab": { + "__id__": 59 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -1000 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 8388608, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 640, + "height": 960 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7bzTWH09FA4oZ0VugCpmQ3" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdmu4EBtJM6rWXHQdGNEN0" + }, + { + "__type__": "f9bdcLpmMdIgqWNOgetdMv1", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 56 + }, + "animation": { + "__id__": 57 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bBTtYUmtAGoBYF+/lNGeL" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 58 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "62a2bbe7-81e3-4f5d-85a7-e6ed018e783a", + "__expectedType__": "cc.AnimationClip" + }, + { + "__uuid__": "03c7a83d-bc15-48b9-b343-7c930ab88d2c", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6cOISS7ZBL7ZILXit/Dlrm" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "71qF2ggGpMcLF94AUlql0u" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 15 + }, + "_enabled": true, + "__prefab": { + "__id__": 61 + }, + "_projection": 0, + "_priority": 1073741824, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 480.00000000000006, + "_near": 0, + "_far": 2000, + "_color": { + "__type__": "cc.Color", + "r": 75, + "g": 109, + "b": 59, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 7, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 41943040, + "_targetTexture": null, + "_cameraType": -1, + "_trackingType": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3aDUqkoGlDu4aozlhke/vm" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "34fqr+u0xAhoDyxDcRDzU9" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 64 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 640, + "height": 960 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3cU8u+g/ZHqZh/QeLhRGlh" + }, + { + "__type__": "cc.Canvas", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "_cameraComponent": { + "__id__": 60 + }, + "_alignCanvasWithScreen": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fd3Aoc16ZH5qbLp0cYLjrD" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 68 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 5.684341886080802e-14, + "_bottom": 5.684341886080802e-14, + "_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": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "59KNwSaIFM7bzb3zyVXbob" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f6cwwQmx9G2qaYOpNATP9o" + }, { "__type__": "4943dSvt9FBvLizJ1HhFOzg", "_name": "", @@ -308,7 +1497,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 71 }, "audio": { "__id__": 11 @@ -325,6 +1514,15 @@ "__uuid__": "bc8c3fb4-28d9-472e-aa3d-947f8a7fa037", "__expectedType__": "cc.Prefab" }, + "mainCamera": { + "__id__": 60 + }, + "modalWindowManager": { + "__id__": 19 + }, + "screenFader": { + "__id__": 55 + }, "_id": "" }, { diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index 21b9a0c..d4053e9 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -27,11 +27,11 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 124 + "__id__": 104 }, "autoReleaseAssets": false, "_globals": { - "__id__": 129 + "__id__": 109 }, "_id": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f" }, @@ -238,31 +238,28 @@ "__id__": 34 }, { - "__id__": 42 + "__id__": 44 }, { - "__id__": 56 + "__id__": 58 }, { - "__id__": 60 - }, - { - "__id__": 115 + "__id__": 62 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 100 }, { - "__id__": 121 + "__id__": 101 }, { - "__id__": 122 + "__id__": 102 }, { - "__id__": 123 + "__id__": 103 } ], "_prefab": null, @@ -834,6 +831,9 @@ }, { "__id__": 41 + }, + { + "__id__": 42 } ], "removedComponents": [] @@ -900,6 +900,25 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 43 + }, + "propertyPath": [ + "_defaultClip" + ], + "value": { + "__uuid__": "4cc17fff-7876-4922-b371-2fe1cec77c14", + "__expectedType__": "cc.AnimationClip" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bcNAmPNOJFZYoGb/Jkt49+" + ] + }, { "__type__": "cc.Node", "_name": "ItemManager", @@ -908,9 +927,6 @@ "__id__": 12 }, "_children": [ - { - "__id__": 43 - }, { "__id__": 45 }, @@ -925,12 +941,15 @@ }, { "__id__": 53 + }, + { + "__id__": 55 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 57 } ], "_prefab": null, @@ -967,13 +986,13 @@ "_name": "XPSpawner", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 44 + "__id__": 46 } ], "_prefab": null, @@ -1010,7 +1029,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1025,13 +1044,13 @@ "_name": "GoldSpawner", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 48 } ], "_prefab": null, @@ -1068,7 +1087,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -1083,13 +1102,13 @@ "_name": "HealthPotionSpawner", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 50 } ], "_prefab": null, @@ -1126,7 +1145,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 47 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1141,13 +1160,13 @@ "_name": "MagnetSpawner", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 52 } ], "_prefab": null, @@ -1184,7 +1203,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1199,13 +1218,13 @@ "_name": "ChestSpawner", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 54 } ], "_prefab": null, @@ -1242,7 +1261,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 51 + "__id__": 53 }, "_enabled": true, "__prefab": null, @@ -1257,13 +1276,13 @@ "_name": "PickupEffectManager", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 56 } ], "_prefab": null, @@ -1300,7 +1319,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -1315,28 +1334,28 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 42 + "__id__": 44 }, "_enabled": true, "__prefab": null, "xpSpawner": { - "__id__": 44 - }, - "goldSpawner": { "__id__": 46 }, - "healthPotionSpawner": { + "goldSpawner": { "__id__": 48 }, - "magnetSpawner": { + "healthPotionSpawner": { "__id__": 50 }, - "chestSpawner": { + "magnetSpawner": { "__id__": 52 }, - "pickupEffectManager": { + "chestSpawner": { "__id__": 54 }, + "pickupEffectManager": { + "__id__": 56 + }, "_id": "98EDpSoeBKp7eDmPXKNFJ0" }, { @@ -1348,13 +1367,13 @@ }, "_children": [ { - "__id__": 57 + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 61 } ], "_prefab": null, @@ -1391,13 +1410,13 @@ "_name": "EnemySpawner", "_objFlags": 0, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 60 } ], "_prefab": null, @@ -1434,7 +1453,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -1487,46 +1506,34 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": null, "enemySpawner": { - "__id__": 58 + "__id__": 60 }, "_id": "1ffjazmm5IkZwKInsSIULY" }, { "__type__": "cc.Node", - "_name": "Camera", + "_name": "GameUI", "_objFlags": 0, "_parent": { "__id__": 12 }, "_children": [ { - "__id__": 61 + "__id__": 63 }, { - "__id__": 99 - }, - { - "__id__": 102 - }, - { - "__id__": 105 - }, - { - "__id__": 108 - }, - { - "__id__": 111 + "__id__": 90 } ], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 99 } ], "_prefab": null, @@ -1556,56 +1563,6 @@ "y": 0, "z": 0 }, - "_id": "ebFwiq8gBFaYpqYbdoDODe" - }, - { - "__type__": "cc.Node", - "_name": "GameUI", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [ - { - "__id__": 62 - }, - { - "__id__": 89 - } - ], - "_active": true, - "_components": [ - { - "__id__": 98 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, "_id": "7dvgYzw4JMhrK3PYjGRkdq" }, { @@ -1613,26 +1570,26 @@ "_name": "TopUI", "_objFlags": 0, "_parent": { - "__id__": 61 + "__id__": 62 }, "_children": [ { - "__id__": 63 + "__id__": 64 }, { - "__id__": 75 + "__id__": 76 }, { - "__id__": 78 + "__id__": 79 } ], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 88 }, { - "__id__": 88 + "__id__": 89 } ], "_prefab": null, @@ -1669,26 +1626,26 @@ "_name": "XpBar", "_objFlags": 0, "_parent": { - "__id__": 62 + "__id__": 63 }, "_children": [ { - "__id__": 64 + "__id__": 65 }, { - "__id__": 67 + "__id__": 68 }, { - "__id__": 70 + "__id__": 71 } ], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 74 }, { - "__id__": 74 + "__id__": 75 } ], "_prefab": null, @@ -1725,16 +1682,16 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 63 + "__id__": 64 }, "_children": [], "_active": false, "_components": [ { - "__id__": 65 + "__id__": 66 }, { - "__id__": 66 + "__id__": 67 } ], "_prefab": null, @@ -1771,7 +1728,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1792,7 +1749,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1830,16 +1787,16 @@ "_name": "Background-001", "_objFlags": 0, "_parent": { - "__id__": 63 + "__id__": 64 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 69 }, { - "__id__": 69 + "__id__": 70 } ], "_prefab": null, @@ -1876,7 +1833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 67 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -1897,7 +1854,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 67 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -1935,16 +1892,16 @@ "_name": "MovableBar", "_objFlags": 0, "_parent": { - "__id__": 63 + "__id__": 64 }, "_children": [], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 72 }, { - "__id__": 72 + "__id__": 73 } ], "_prefab": null, @@ -1981,7 +1938,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -2002,7 +1959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -2040,7 +1997,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2061,12 +2018,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 64 }, "_enabled": true, "__prefab": null, "_barSprite": { - "__id__": 72 + "__id__": 73 }, "_mode": 0, "_totalLength": 284, @@ -2079,16 +2036,16 @@ "_name": "TimeAliveText", "_objFlags": 0, "_parent": { - "__id__": 62 + "__id__": 63 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 77 }, { - "__id__": 77 + "__id__": 78 } ], "_prefab": null, @@ -2125,7 +2082,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2146,7 +2103,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2187,18 +2144,15 @@ "_name": "PauseBtn", "_objFlags": 0, "_parent": { - "__id__": 62 + "__id__": 63 }, "_children": [ { - "__id__": 79 + "__id__": 80 } ], "_active": true, "_components": [ - { - "__id__": 82 - }, { "__id__": 83 }, @@ -2210,6 +2164,9 @@ }, { "__id__": 86 + }, + { + "__id__": 87 } ], "_prefab": null, @@ -2246,16 +2203,16 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 78 + "__id__": 79 }, "_children": [], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 81 }, { - "__id__": 81 + "__id__": 82 } ], "_prefab": null, @@ -2292,7 +2249,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 79 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -2313,7 +2270,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 79 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -2354,7 +2311,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 79 }, "_enabled": true, "__prefab": null, @@ -2375,7 +2332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 79 }, "_enabled": true, "__prefab": null, @@ -2413,7 +2370,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 79 }, "_enabled": true, "__prefab": null, @@ -2467,7 +2424,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 78 + "__id__": 79 }, "_id": "44V8O8mzZKQZv5NNhU9U2X" }, @@ -2476,7 +2433,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 79 }, "_enabled": true, "__prefab": null, @@ -2487,12 +2444,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 79 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 85 + "__id__": 86 }, "_id": "19CfluWQpOB4qddmLDK5n9" }, @@ -2501,7 +2458,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -2522,7 +2479,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -2551,17 +2508,17 @@ "_name": "UI", "_objFlags": 0, "_parent": { - "__id__": 61 + "__id__": 62 }, "_children": [ { - "__id__": 90 + "__id__": 91 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 98 } ], "_prefab": null, @@ -2598,23 +2555,23 @@ "_name": "VirtualJoystic", "_objFlags": 0, "_parent": { - "__id__": 89 + "__id__": 90 }, "_children": [ { - "__id__": 91 + "__id__": 92 } ], "_active": true, "_components": [ - { - "__id__": 94 - }, { "__id__": 95 }, { "__id__": 96 + }, + { + "__id__": 97 } ], "_prefab": null, @@ -2651,16 +2608,16 @@ "_name": "Knob", "_objFlags": 0, "_parent": { - "__id__": 90 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 93 }, { - "__id__": 93 + "__id__": 94 } ], "_prefab": null, @@ -2697,7 +2654,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 91 + "__id__": 92 }, "_enabled": true, "__prefab": null, @@ -2718,7 +2675,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 91 + "__id__": 92 }, "_enabled": true, "__prefab": null, @@ -2756,7 +2713,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -2777,7 +2734,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -2815,13 +2772,13 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 91 }, "_enabled": true, "__prefab": null, "maxDistance": 50, "knob": { - "__id__": 91 + "__id__": 92 }, "_id": "50ceZG62tGlYXvZWEvSDKl" }, @@ -2830,7 +2787,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 90 }, "_enabled": true, "__prefab": null, @@ -2851,732 +2808,21 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 62 }, "_enabled": true, "__prefab": null, "xpBar": { - "__id__": 74 + "__id__": 75 }, "timeAliveText": { - "__id__": 77 + "__id__": 78 }, "pauseBtn": { - "__id__": 85 + "__id__": 86 }, "_id": "bau/7eItRFrKKoAZZb/uYL" }, - { - "__type__": "cc.Node", - "_name": "ModalWindowManager", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": "ddppxPynFF26nHKQloDmA6" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 99 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 640, - "height": 960 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "e6NGPUIRhA1YDaEW8zPdfq" - }, - { - "__type__": "c623fhj2b5Cyau8MBXLOmVF", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 99 - }, - "_enabled": true, - "__prefab": null, - "availableWindows": [ - { - "__uuid__": "663674aa-da1c-44b0-8049-49db9b020973", - "__expectedType__": "cc.Prefab" - }, - { - "__uuid__": "9f66fba0-82b2-481c-835d-41cb87f38d87", - "__expectedType__": "cc.Prefab" - }, - { - "__uuid__": "cc259578-1eb4-4dd3-87b0-fd42c11668b1", - "__expectedType__": "cc.Prefab" - }, - { - "__uuid__": "d07d3ad3-88c1-4b8e-af61-05f53a405d59", - "__expectedType__": "cc.Prefab" - } - ], - "_id": "1afHrrV8tIPrYb4xymz6bQ" - }, - { - "__type__": "cc.Node", - "_name": "Sprite", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 103 - }, - { - "__id__": 104 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": -420, - "y": 0, - "z": -1000 - }, - "_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": "eciG5PXBZIYakPww8N1gdA" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 102 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 1200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "24LCHUZX1BGqhU98TXdgIG" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 102 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "abWXBojhNGrqL4z7N5ErXT" - }, - { - "__type__": "cc.Node", - "_name": "Sprite-001", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 420, - "y": 0, - "z": -1000 - }, - "_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": "1a8DeB92RKpZ2bWNscXEm5" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 105 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 1200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "4df7zo0uFDlbvRnKR5oiIZ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 105 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "c4ZyiqWnBOoZ9iaNG7+wGL" - }, - { - "__type__": "cc.Node", - "_name": "Sprite-002", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 580, - "z": -1000 - }, - "_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": "a8uRtS0PNJTqnGQMv7Zvew" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 108 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 1050, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "955ruGeIhCLLGKefvVKFrQ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 108 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "0cgBSMsjRMoqF8HhSLG7RU" - }, - { - "__type__": "cc.Node", - "_name": "Sprite-003", - "_objFlags": 0, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 112 - }, - { - "__id__": 113 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -580, - "z": -1000 - }, - "_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": "b9a0rFzsNBuLH0JPOdIIKi" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 111 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 1050, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "5eJBTwkANIVasmYlrnfRL3" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 111 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "19tgsETE1COLWNZIXGAS1N" - }, - { - "__type__": "cc.Camera", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 60 - }, - "_enabled": true, - "__prefab": null, - "_projection": 0, - "_priority": 1073741824, - "_fov": 45, - "_fovAxis": 0, - "_orthoHeight": 480.00000000000006, - "_near": 0, - "_far": 2000, - "_color": { - "__type__": "cc.Color", - "r": 75, - "g": 109, - "b": 59, - "a": 255 - }, - "_depth": 1, - "_stencil": 0, - "_clearFlags": 7, - "_rect": { - "__type__": "cc.Rect", - "x": 0, - "y": 0, - "width": 1, - "height": 1 - }, - "_aperture": 19, - "_shutter": 7, - "_iso": 0, - "_screenScale": 1, - "_visibility": 41943040, - "_targetTexture": null, - "_cameraType": -1, - "_trackingType": 0, - "_id": "63WIch3o5BEYRlXzTT0oWc" - }, - { - "__type__": "cc.Node", - "_name": "ScreenFader", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 12 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 116 - }, - { - "__id__": 117 - }, - { - "__id__": 118 - }, - { - "__id__": 119 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 8388608, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "216gAM+7NOIJYva3wm2GR4" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 115 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 640, - "height": 960 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "52N4jnMHlOvoV/K03D6Uja" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 115 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "779DLAb3ZAL5JKWJfxp7F3" - }, - { - "__type__": "f9bdcLpmMdIgqWNOgetdMv1", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 115 - }, - "_enabled": true, - "__prefab": null, - "animation": { - "__id__": 119 - }, - "_id": "27V5fDDRZFBoMDbhP1iFO6" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 115 - }, - "_enabled": true, - "__prefab": null, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "62a2bbe7-81e3-4f5d-85a7-e6ed018e783a", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "03c7a83d-bc15-48b9-b343-7c930ab88d2c", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": null, - "_id": "a2TKXTESlJfLW4cwYpnrNl" - }, { "__type__": "cc.UITransform", "_name": "", @@ -3607,9 +2853,7 @@ }, "_enabled": true, "__prefab": null, - "_cameraComponent": { - "__id__": 114 - }, + "_cameraComponent": null, "_alignCanvasWithScreen": true, "_id": "12O/ljcVlEqLmVm3U2gEOQ" }, @@ -3652,7 +2896,7 @@ "_enabled": true, "__prefab": null, "virtualJoystic": { - "__id__": 96 + "__id__": 97 }, "player": null, "haloProjectileLauncherComponent": { @@ -3671,27 +2915,21 @@ "__id__": 33 }, "enemyManager": { - "__id__": 59 + "__id__": 61 }, "itemManager": { - "__id__": 55 - }, - "camera": { - "__id__": 114 + "__id__": 57 }, "gameUI": { - "__id__": 98 + "__id__": 99 + }, + "gameCanvas": { + "__id__": 101 }, "background": { "__id__": 23 }, - "modalWindowManager": { - "__id__": 101 - }, "gameAudioAdapter": null, - "screenFader": { - "__id__": 118 - }, "_id": "3a9z1bqlFCGL4/WyDwU4L5" }, { @@ -3699,10 +2937,10 @@ "fileId": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f", "targetOverrides": [ { - "__id__": 125 + "__id__": 105 }, { - "__id__": 127 + "__id__": 107 } ], "nestedPrefabInstanceRoots": [ @@ -3720,7 +2958,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 123 + "__id__": 103 }, "sourceInfo": null, "propertyPath": [ @@ -3730,7 +2968,7 @@ "__id__": 34 }, "targetInfo": { - "__id__": 126 + "__id__": 106 } }, { @@ -3742,7 +2980,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 123 + "__id__": 103 }, "sourceInfo": null, "propertyPath": [ @@ -3752,7 +2990,7 @@ "__id__": 13 }, "targetInfo": { - "__id__": 128 + "__id__": 108 } }, { @@ -3764,19 +3002,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 130 + "__id__": 110 }, "shadows": { - "__id__": 131 + "__id__": 111 }, "_skybox": { - "__id__": 132 + "__id__": 112 }, "fog": { - "__id__": 133 + "__id__": 113 }, "octree": { - "__id__": 134 + "__id__": 114 } }, { diff --git a/assets/Scenes/Menu.scene b/assets/Scenes/Menu.scene index d96cf04..2fe7e9f 100644 --- a/assets/Scenes/Menu.scene +++ b/assets/Scenes/Menu.scene @@ -24,11 +24,11 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 83 + "__id__": 73 }, "autoReleaseAssets": false, "_globals": { - "__id__": 84 + "__id__": 74 }, "_id": "1a3bccb5-bbb7-4058-846c-ed41b52415b0" }, @@ -173,44 +173,35 @@ "__id__": 41 }, { - "__id__": 43 + "__id__": 50 }, { - "__id__": 52 - }, - { - "__id__": 61 - }, - { - "__id__": 70 - }, - { - "__id__": 73 + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 68 }, { - "__id__": 79 + "__id__": 69 }, { - "__id__": 80 + "__id__": 70 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 320, - "y": 479.99999999999994, + "y": 480.00000000000006, "z": 0 }, "_lrot": { @@ -1297,92 +1288,6 @@ "_atlas": null, "_id": "0bDo10DWhJ3Krfu8M+q41D" }, - { - "__type__": "cc.Node", - "_name": "Camera", - "_objFlags": 0, - "_parent": { - "__id__": 10 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 42 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 1000 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "00gMEox2dKs5OZF6dNq6Ph" - }, - { - "__type__": "cc.Camera", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 41 - }, - "_enabled": true, - "__prefab": null, - "_projection": 0, - "_priority": 1073741824, - "_fov": 45, - "_fovAxis": 0, - "_orthoHeight": 480, - "_near": 1, - "_far": 2000, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_depth": 1, - "_stencil": 0, - "_clearFlags": 6, - "_rect": { - "__type__": "cc.Rect", - "x": 0, - "y": 0, - "width": 1, - "height": 1 - }, - "_aperture": 19, - "_shutter": 7, - "_iso": 0, - "_screenScale": 1, - "_visibility": 41943040, - "_targetTexture": null, - "_cameraType": -1, - "_trackingType": 0, - "_id": "31ELbgwJ1B7oQPudIYOXn5" - }, { "__type__": "cc.Node", "_name": "PlayBtn", @@ -1392,11 +1297,17 @@ }, "_children": [ { - "__id__": 44 + "__id__": 42 } ], "_active": true, "_components": [ + { + "__id__": 45 + }, + { + "__id__": 46 + }, { "__id__": 47 }, @@ -1405,12 +1316,6 @@ }, { "__id__": 49 - }, - { - "__id__": 50 - }, - { - "__id__": 51 } ], "_prefab": null, @@ -1447,16 +1352,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 43 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 43 }, { - "__id__": 46 + "__id__": 44 } ], "_prefab": null, @@ -1493,7 +1398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 42 }, "_enabled": true, "__prefab": null, @@ -1514,7 +1419,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 42 }, "_enabled": true, "__prefab": null, @@ -1555,7 +1460,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1576,7 +1481,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1614,7 +1519,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1668,7 +1573,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 43 + "__id__": 41 }, "_id": "abjYBOPMJCK7GsAsqNfoj3" }, @@ -1677,7 +1582,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1688,12 +1593,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 41 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 50 + "__id__": 48 }, "_id": "3f/GLS2YxHJI360Fym4+Nl" }, @@ -1706,11 +1611,17 @@ }, "_children": [ { - "__id__": 53 + "__id__": 51 } ], "_active": true, "_components": [ + { + "__id__": 54 + }, + { + "__id__": 55 + }, { "__id__": 56 }, @@ -1719,12 +1630,6 @@ }, { "__id__": 58 - }, - { - "__id__": 59 - }, - { - "__id__": 60 } ], "_prefab": null, @@ -1761,16 +1666,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 52 + "__id__": 50 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 52 }, { - "__id__": 55 + "__id__": 53 } ], "_prefab": null, @@ -1807,7 +1712,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1828,7 +1733,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1869,7 +1774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -1890,7 +1795,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -1928,7 +1833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -1982,7 +1887,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 52 + "__id__": 50 }, "_id": "02km9/CjtM4LntV5ZcaVeR" }, @@ -1991,7 +1896,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -2002,12 +1907,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 50 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 59 + "__id__": 57 }, "_id": "adNyH1o7lEPoaiPeZSxUCn" }, @@ -2020,11 +1925,17 @@ }, "_children": [ { - "__id__": 62 + "__id__": 60 } ], "_active": true, "_components": [ + { + "__id__": 63 + }, + { + "__id__": 64 + }, { "__id__": 65 }, @@ -2033,12 +1944,6 @@ }, { "__id__": 67 - }, - { - "__id__": 68 - }, - { - "__id__": 69 } ], "_prefab": null, @@ -2075,16 +1980,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 61 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 61 }, { - "__id__": 64 + "__id__": 62 } ], "_prefab": null, @@ -2121,7 +2026,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2142,7 +2047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2183,7 +2088,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -2204,7 +2109,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -2242,7 +2147,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -2296,7 +2201,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 61 + "__id__": 59 }, "_id": "83MUZ70BBPoqpCJzA3nVTN" }, @@ -2305,7 +2210,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -2316,255 +2221,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 59 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 68 + "__id__": 66 }, "_id": "6bWmS+us9G55ZQR94w+B3i" }, - { - "__type__": "cc.Node", - "_name": "ModalWindowManager", - "_objFlags": 0, - "_parent": { - "__id__": 10 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 71 - }, - { - "__id__": 72 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": "01wdX287REE6Gr0JKdC+pi" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 640, - "height": 960 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "cfwsr07o9Od6unAYhU9sZV" - }, - { - "__type__": "c623fhj2b5Cyau8MBXLOmVF", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "availableWindows": [ - { - "__uuid__": "0b35c4ba-253d-4316-ad01-0ba40a2612fc", - "__expectedType__": "cc.Prefab" - }, - { - "__uuid__": "9f66fba0-82b2-481c-835d-41cb87f38d87", - "__expectedType__": "cc.Prefab" - } - ], - "_id": "16B4Ez0O1Ob7mNngLSL2Y/" - }, - { - "__type__": "cc.Node", - "_name": "ScreenFader", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 10 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 74 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 8388608, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "71qF2ggGpMcLF94AUlql0u" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 73 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 640, - "height": 960 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "7bzTWH09FA4oZ0VugCpmQ3" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 73 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "cdmu4EBtJM6rWXHQdGNEN0" - }, - { - "__type__": "f9bdcLpmMdIgqWNOgetdMv1", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 73 - }, - "_enabled": true, - "__prefab": null, - "animation": { - "__id__": 77 - }, - "_id": "0bBTtYUmtAGoBYF+/lNGeL" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 73 - }, - "_enabled": true, - "__prefab": null, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "62a2bbe7-81e3-4f5d-85a7-e6ed018e783a", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "03c7a83d-bc15-48b9-b343-7c930ab88d2c", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": null, - "_id": "6cOISS7ZBL7ZILXit/Dlrm" - }, { "__type__": "cc.UITransform", "_name": "", @@ -2595,9 +2260,7 @@ }, "_enabled": true, "__prefab": null, - "_cameraComponent": { - "__id__": 42 - }, + "_cameraComponent": null, "_alignCanvasWithScreen": true, "_id": "eeGIEoaYNDCIMhXubllIM7" }, @@ -2614,8 +2277,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": -5.684341886080802e-14, - "_bottom": -5.684341886080802e-14, + "_top": 5.684341886080802e-14, + "_bottom": 5.684341886080802e-14, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2640,19 +2303,16 @@ "_enabled": true, "__prefab": null, "playBtn": { - "__id__": 50 + "__id__": 48 }, "upgradeBtn": { - "__id__": 59 + "__id__": 57 }, "audioSettingsBtn": { - "__id__": 68 + "__id__": 66 }, - "modalWindowManager": { - "__id__": 72 - }, - "screenFader": { - "__id__": 76 + "menuCanvas": { + "__id__": 69 }, "_id": "4cQFnvx1xB65sFsTPGRrB7" }, @@ -2690,19 +2350,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 85 + "__id__": 75 }, "shadows": { - "__id__": 86 + "__id__": 76 }, "_skybox": { - "__id__": 87 + "__id__": 77 }, "fog": { - "__id__": 88 + "__id__": 78 }, "octree": { - "__id__": 89 + "__id__": 79 } }, { diff --git a/assets/Scripts/AppRoot/AppRoot.ts b/assets/Scripts/AppRoot/AppRoot.ts index a88d978..3a6189d 100644 --- a/assets/Scripts/AppRoot/AppRoot.ts +++ b/assets/Scripts/AppRoot/AppRoot.ts @@ -1,10 +1,12 @@ -import { Component, director, instantiate, JsonAsset, Prefab, _decorator } from "cc"; +import { Camera, Component, director, instantiate, JsonAsset, Prefab, _decorator } from "cc"; import { GameSettings } from "../Game/Data/GameSettings"; import { GameAssets } from "../Game/Data/Assets/GameAssets"; import { TranslationData } from "../Game/Data/TranslationData"; import { UserData } from "../Game/Data/UserData"; import { AudioPlayer } from "../Services/AudioPlayer/AudioPlayer"; import { SaveSystem } from "./SaveSystem"; +import { ModalWindowManager } from "../Services/ModalWindowSystem/ModalWindowManager"; +import { OpenCloseAnimator } from "../Utils/OpenCloseAnimator"; const { ccclass, property } = _decorator; @ccclass("AppRoot") @@ -13,6 +15,9 @@ export class AppRoot extends Component { @property(JsonAsset) private settingsAsset: JsonAsset; @property(JsonAsset) private engTranslationAsset: JsonAsset; @property(Prefab) private gameAssetsPrefab: Prefab; + @property(Camera) private mainCamera: Camera; + @property(ModalWindowManager) private modalWindowManager: ModalWindowManager; + @property(OpenCloseAnimator) private screenFader: OpenCloseAnimator; private static instance: AppRoot; private saveSystem: SaveSystem; @@ -44,6 +49,18 @@ export class AppRoot extends Component { return this.engTranslationAsset.json; } + public get ModalWindowManager(): ModalWindowManager { + return this.modalWindowManager; + } + + public get MainCamera(): Camera { + return this.mainCamera; + } + + public get ScreenFader(): OpenCloseAnimator { + return this.screenFader; + } + public saveUserData(): void { this.saveSystem.save(this.liveUserData); } @@ -54,7 +71,7 @@ export class AppRoot extends Component { director.addPersistRootNode(this.node); this.init(); } else { - this.destroy(); + this.node.destroy(); } } @@ -68,5 +85,8 @@ export class AppRoot extends Component { this.gameAssets.init(); this.audio.init(this.LiveUserData.soundVolume, this.LiveUserData.musicVolume); + + this.screenFader.init(); + this.screenFader.node.active = false; } } diff --git a/assets/Scripts/AppRoot/AppRootUtils.ts b/assets/Scripts/AppRoot/AppRootUtils.ts new file mode 100644 index 0000000..bdfb112 --- /dev/null +++ b/assets/Scripts/AppRoot/AppRootUtils.ts @@ -0,0 +1,13 @@ +import { delay } from "../Services/Utils/AsyncUtils"; +import { AppRoot } from "./AppRoot"; + +export async function requireAppRootAsync(): Promise { + console.log("Waiting for app root"); + while (AppRoot.Instance == null) await delay(10); + + AppRoot.Instance.node.setSiblingIndex(1000); // render on top + AppRoot.Instance.node.active = false; // forces engine to reorder by hierarchy + AppRoot.Instance.node.active = true; + + console.log("App root ready"); +} diff --git a/assets/Scripts/AppRoot/AppRootUtils.ts.meta b/assets/Scripts/AppRoot/AppRootUtils.ts.meta new file mode 100644 index 0000000..ff43ecc --- /dev/null +++ b/assets/Scripts/AppRoot/AppRootUtils.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "43cfb543-4c62-4c36-bb28-f307b2e1d280", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Game/Game.ts b/assets/Scripts/Game/Game.ts index efe41db..6438865 100644 --- a/assets/Scripts/Game/Game.ts +++ b/assets/Scripts/Game/Game.ts @@ -1,7 +1,7 @@ -import { Camera, Component, KeyCode, Prefab, Vec2, _decorator } from "cc"; -import { ModalWindowManager } from "../Services/ModalWindowSystem/ModalWindowManager"; +import { Canvas, Component, KeyCode, Vec2, _decorator } from "cc"; +import { AppRoot } from "../AppRoot/AppRoot"; +import { requireAppRootAsync } from "../AppRoot/AppRootUtils"; import { delay } from "../Services/Utils/AsyncUtils"; -import { OpenCloseAnimator } from "../Utils/OpenCloseAnimator"; import { GameAudioAdapter } from "./Audio/GameAudioAdapter"; import { Background } from "./Background/Background"; import { MagnetCollisionSystem } from "./Collision/MagnetCollisionSystem"; @@ -46,12 +46,10 @@ export class Game extends Component { @property(ProjectileLauncher) private enemyMagicOrbProjectileLauncherComponent: ProjectileLauncher; @property(EnemyManager) private enemyManager: EnemyManager; @property(ItemManager) private itemManager: ItemManager; - @property(Camera) private camera: Camera; @property(GameUI) private gameUI: GameUI; + @property(Canvas) private gameCanvas: Canvas; @property(Background) private background: Background; - @property(ModalWindowManager) private modalWindowManager: ModalWindowManager; @property(GameAudioAdapter) private gameAudioAdapter: GameAudioAdapter; - @property(OpenCloseAnimator) private screenFader: OpenCloseAnimator; private playerCollisionSystem: PlayerCollisionSystem; private haloProjectileLauncher: HaloProjectileLauncher; @@ -72,12 +70,12 @@ export class Game extends Component { return this.instance; } - public start(): void { - Game.instance = this; + public async start(): Promise { this.gamePauser.pause(); - - this.screenFader.init(); - this.screenFader.node.active = true; + this.node.active = false; // make sure that nothing is rendered until the app root is ready + await requireAppRootAsync(); + this.node.active = true; + Game.instance = this; } public async playGame( @@ -86,6 +84,8 @@ export class Game extends Component { translationData: TranslationData, testValues?: TestValues ): Promise { + this.gameCanvas.cameraComponent = AppRoot.Instance.MainCamera; + this.gameResult = new GameResult(); const metaUpgrades = new MetaUpgrades(userData.game.metaUpgrades, settings.metaUpgrades); @@ -154,7 +154,7 @@ export class Game extends Component { this.diagonalProjectileLauncher, settings.upgrades ); - const modalLauncher = new GameModalLauncher(this.modalWindowManager, this.player, this.gamePauser, upgrader, translationData); + const modalLauncher = new GameModalLauncher(AppRoot.Instance.ModalWindowManager, this.player, this.gamePauser, upgrader, translationData); this.itemManager.init(this.enemyManager, this.player, this.gameResult, modalLauncher, settings.items); this.gameUI.init(this.player, modalLauncher); @@ -174,7 +174,7 @@ export class Game extends Component { this.haloProjectileLauncher ); this.gamePauser.resume(); - this.screenFader.playClose(); + AppRoot.Instance.ScreenFader.playClose(); while (!this.gameResult.hasExitManually && this.player.Health.IsAlive) await delay(100); if (!this.gameResult.hasExitManually) { @@ -207,7 +207,8 @@ export class Game extends Component { this.timeAlive += deltaTime; this.gameUI.updateTimeAlive(this.timeAlive); - this.camera.node.worldPosition = this.player.node.worldPosition; + AppRoot.Instance.MainCamera.node.setWorldPosition(this.player.node.worldPosition); + this.gameUI.node.setWorldPosition(this.player.node.worldPosition); } private createPlayerData(settings: PlayerSettings, metaUpgrades: MetaUpgrades): PlayerData { diff --git a/assets/Scripts/Menu/Menu.ts b/assets/Scripts/Menu/Menu.ts index efdea7b..678c0c1 100644 --- a/assets/Scripts/Menu/Menu.ts +++ b/assets/Scripts/Menu/Menu.ts @@ -1,4 +1,6 @@ -import { Component, _decorator } from "cc"; +import { Canvas, Component, _decorator } from "cc"; +import { AppRoot } from "../AppRoot/AppRoot"; +import { requireAppRootAsync } from "../AppRoot/AppRootUtils"; import { ModalWindowManager } from "../Services/ModalWindowSystem/ModalWindowManager"; import { UIButton } from "../Services/UI/Button/UIButton"; import { OpenCloseAnimator } from "../Utils/OpenCloseAnimator"; @@ -12,24 +14,23 @@ export class Menu extends Component { @property(UIButton) private playBtn: UIButton; @property(UIButton) private upgradeBtn: UIButton; @property(UIButton) private audioSettingsBtn: UIButton; - @property(ModalWindowManager) private modalWindowManager: ModalWindowManager; - @property(OpenCloseAnimator) private screenFader: OpenCloseAnimator; + @property(Canvas) private menuCanvas: Canvas; private menuModalLauncher: MenuModalLauncher; public async start(): Promise { + requireAppRootAsync(); + this.menuCanvas.cameraComponent = AppRoot.Instance.MainCamera; + this.playBtn.InteractedEvent.on(this.startGame, this); this.upgradeBtn.InteractedEvent.on(this.openUpgradesWindow, this); this.audioSettingsBtn.InteractedEvent.on(this.openAudioSettingsWindow, this); - this.menuModalLauncher = new MenuModalLauncher(this.modalWindowManager); - - this.screenFader.init(); - this.screenFader.node.active = false; + this.menuModalLauncher = new MenuModalLauncher(AppRoot.Instance.ModalWindowManager); } private startGame(): void { - this.screenFader.playOpen(); + AppRoot.Instance.ScreenFader.playOpen(); GameRunner.Instance.playGame(); }