From 889a516e10b2f6eb7500835cf7eb73a06757fccf Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 22 Dec 2022 11:44:45 +0100 Subject: [PATCH] Added 2 bosses --- assets/Media/Prefabs/Game/BossOrcKing.prefab | 5 ++++- assets/Scenes/Game.scene | 12 ++++++++++-- assets/Scripts/Game/Unit/Enemy/EnemyGraphicsType.ts | 5 ++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/assets/Media/Prefabs/Game/BossOrcKing.prefab b/assets/Media/Prefabs/Game/BossOrcKing.prefab index b521736..5ed7277 100644 --- a/assets/Media/Prefabs/Game/BossOrcKing.prefab +++ b/assets/Media/Prefabs/Game/BossOrcKing.prefab @@ -306,7 +306,10 @@ "__expectedType__": "cc.AnimationClip" } ], - "_defaultClip": null, + "_defaultClip": { + "__uuid__": "f5f4561e-514f-48db-940f-d534eb6a4073", + "__expectedType__": "cc.AnimationClip" + }, "_id": "" }, { diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index c4ebf37..89292af 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -1244,6 +1244,14 @@ { "__uuid__": "b33ee875-cfd1-4f95-9f20-c2a7c3ca9ccf", "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "c7c0c42c-5d18-4101-ac1f-bd135a15b09c", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "b2c7f37e-cfe7-4633-b3a0-8bcefadc2cee", + "__expectedType__": "cc.Prefab" } ], "_id": "ebqmDEqu5OGJivYBW47skm" @@ -1405,7 +1413,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -320, - "y": 480, + "y": 479.9999999999999, "z": -1000 }, "_lrot": { @@ -3032,7 +3040,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 480, + "_orthoHeight": 479.99999999999994, "_near": 0, "_far": 2000, "_color": { diff --git a/assets/Scripts/Game/Unit/Enemy/EnemyGraphicsType.ts b/assets/Scripts/Game/Unit/Enemy/EnemyGraphicsType.ts index 607726c..a09284c 100644 --- a/assets/Scripts/Game/Unit/Enemy/EnemyGraphicsType.ts +++ b/assets/Scripts/Game/Unit/Enemy/EnemyGraphicsType.ts @@ -2,5 +2,8 @@ export enum EnemyGraphicsType { Bat = "Bat", Goblin = "Goblin", Shark = "Shark", - Skeleton = "Skeleton" + Skeleton = "Skeleton", + BossOrcKing = "BossOrcKing", + BossStoneGolem = "BossStoneGolem" + }