From 38c417ecd4069a8621bf98cff17f8e99bf96f584 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Mon, 26 Apr 2021 23:40:20 -0500 Subject: [PATCH] Boss Sprites Implemented --- .../Assets/Animations/Daisy Boss_0.controller | 72 +++ .../Animations/Daisy Boss_0.controller.meta | 8 + MuseumGame/Assets/Animations/DaisyBoss.anim | 77 +++ .../Assets/Animations/DaisyBoss.anim.meta | 8 + .../Animations/Dog Boss Idle_0.controller | 72 +++ .../Dog Boss Idle_0.controller.meta | 8 + MuseumGame/Assets/Animations/DogBoss.anim | 89 +++ .../Assets/Animations/DogBoss.anim.meta | 8 + MuseumGame/Assets/Prefabs/FHWater.prefab | 2 +- .../Assets/Scenes/DemoLevels/BossRoom.unity | 540 ++++++++++++------ .../Assets/Scenes/DogLevel/DogBoss.unity | 119 +++- .../Assets/Sprites/Bosses/Daisy Boss.png.meta | 134 ++++- .../Sprites/Bosses/Dog Boss Idle.png.meta | 224 +++++++- .../Sprites/Bosses/Dog Boss Run.png.meta | 96 ++++ .../UserSettings/EditorUserSettings.asset | 16 +- 15 files changed, 1264 insertions(+), 209 deletions(-) create mode 100644 MuseumGame/Assets/Animations/Daisy Boss_0.controller create mode 100644 MuseumGame/Assets/Animations/Daisy Boss_0.controller.meta create mode 100644 MuseumGame/Assets/Animations/DaisyBoss.anim create mode 100644 MuseumGame/Assets/Animations/DaisyBoss.anim.meta create mode 100644 MuseumGame/Assets/Animations/Dog Boss Idle_0.controller create mode 100644 MuseumGame/Assets/Animations/Dog Boss Idle_0.controller.meta create mode 100644 MuseumGame/Assets/Animations/DogBoss.anim create mode 100644 MuseumGame/Assets/Animations/DogBoss.anim.meta create mode 100644 MuseumGame/Assets/Sprites/Bosses/Dog Boss Run.png.meta diff --git a/MuseumGame/Assets/Animations/Daisy Boss_0.controller b/MuseumGame/Assets/Animations/Daisy Boss_0.controller new file mode 100644 index 0000000..5eb53fc --- /dev/null +++ b/MuseumGame/Assets/Animations/Daisy Boss_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Daisy Boss_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1176527710175286843} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &641581954808086580 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DaisyBoss + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5b646e92cb1ea024794eee215534122e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1176527710175286843 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 641581954808086580} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 641581954808086580} diff --git a/MuseumGame/Assets/Animations/Daisy Boss_0.controller.meta b/MuseumGame/Assets/Animations/Daisy Boss_0.controller.meta new file mode 100644 index 0000000..aaee0d5 --- /dev/null +++ b/MuseumGame/Assets/Animations/Daisy Boss_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70dd30fa3008a9b409f58129c1a823fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/DaisyBoss.anim b/MuseumGame/Assets/Animations/DaisyBoss.anim new file mode 100644 index 0000000..7edfc38 --- /dev/null +++ b/MuseumGame/Assets/Animations/DaisyBoss.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DaisyBoss + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 9123106053774572691, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - time: 0.083333336 + value: {fileID: 6119868812401284032, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - time: 0.16666667 + value: {fileID: -2532233504094259804, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - time: 0.25 + value: {fileID: 3170058250209494968, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 9123106053774572691, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - {fileID: 6119868812401284032, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - {fileID: -2532233504094259804, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + - {fileID: 3170058250209494968, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/MuseumGame/Assets/Animations/DaisyBoss.anim.meta b/MuseumGame/Assets/Animations/DaisyBoss.anim.meta new file mode 100644 index 0000000..f2b0c7d --- /dev/null +++ b/MuseumGame/Assets/Animations/DaisyBoss.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b646e92cb1ea024794eee215534122e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller b/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller new file mode 100644 index 0000000..e8079c9 --- /dev/null +++ b/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8688601100770857149 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DogBoss + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 86108e00832e6f84db91298169354110, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dog Boss Idle_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 961392013664616776} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &961392013664616776 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8688601100770857149} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8688601100770857149} diff --git a/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller.meta b/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller.meta new file mode 100644 index 0000000..04d65d3 --- /dev/null +++ b/MuseumGame/Assets/Animations/Dog Boss Idle_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a325c1e8fa940bf4c8056cfc4a06bda7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/DogBoss.anim b/MuseumGame/Assets/Animations/DogBoss.anim new file mode 100644 index 0000000..76bd376 --- /dev/null +++ b/MuseumGame/Assets/Animations/DogBoss.anim @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DogBoss + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1483135834651543230, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.083333336 + value: {fileID: 2296841969334252212, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.16666667 + value: {fileID: 8236451639184560443, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.25 + value: {fileID: -2860991110786748246, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.33333334 + value: {fileID: 3773999125032857804, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.41666666 + value: {fileID: -1221032743702185835, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.5 + value: {fileID: -2140581969999711501, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - time: 0.5833333 + value: {fileID: 5304879379996758030, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1483135834651543230, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: 2296841969334252212, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: 8236451639184560443, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: -2860991110786748246, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: 3773999125032857804, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: -1221032743702185835, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: -2140581969999711501, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + - {fileID: 5304879379996758030, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/MuseumGame/Assets/Animations/DogBoss.anim.meta b/MuseumGame/Assets/Animations/DogBoss.anim.meta new file mode 100644 index 0000000..f3c37ca --- /dev/null +++ b/MuseumGame/Assets/Animations/DogBoss.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86108e00832e6f84db91298169354110 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/FHWater.prefab b/MuseumGame/Assets/Prefabs/FHWater.prefab index ed227e2..4aba855 100644 --- a/MuseumGame/Assets/Prefabs/FHWater.prefab +++ b/MuseumGame/Assets/Prefabs/FHWater.prefab @@ -75,7 +75,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -2413806693520163455, guid: 4adeaf2d2b1c7417e89f026626d8264f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.18245067, g: 0.15720895, b: 0.9056604, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index ee0b3cf..3ff93b8 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -1435,6 +1435,381 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &453535359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 453535364} + - component: {fileID: 453535363} + - component: {fileID: 453535362} + - component: {fileID: 453535361} + - component: {fileID: 453535360} + m_Layer: 0 + m_Name: Daisy Boss_0 + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &453535360 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453535359} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 8, y: 2.453125} + newSize: {x: 8, y: 2.453125} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.515625, y: -0.9609375} + - {x: 1.703125, y: -0.8203125} + - {x: 1.828125, y: -0.6015625} + - {x: 2.046875, y: -0.3828125} + - {x: 2.078125, y: -0.1796875} + - {x: 2.09375, y: 0.1171875} + - {x: 2.078125, y: 0.3046875} + - {x: 2.28125, y: 0.2109375} + - {x: 2.75, y: 0.2578125} + - {x: 2.875, y: 0.2890625} + - {x: 3.046875, y: 0.3515625} + - {x: 3.671875, y: 0.3359375} + - {x: 3.90625, y: 0.4140625} + - {x: 4, y: 0.4921875} + - {x: 4, y: 0.7109375} + - {x: 3.96875, y: 0.7109375} + - {x: 3.8125, y: 0.5546875} + - {x: 3.359375, y: 0.4765625} + - {x: 3.375, y: 0.6171875} + - {x: 3.359375, y: 0.8828125} + - {x: 3.1875, y: 1.0859375} + - {x: 2.8125, y: 1.0546875} + - {x: 2.671875, y: 0.9140625} + - {x: 2.71875, y: 0.6484375} + - {x: 2.84375, y: 0.5390625} + - {x: 2.9375, y: 0.4765625} + - {x: 2.46875, y: 0.3515625} + - {x: 2.46875, y: 0.5234375} + - {x: 2.390625, y: 0.6953125} + - {x: 2.25, y: 1.0078125} + - {x: 3.15625, y: 1.1484375} + - {x: 3.5, y: 1.1640625} + - {x: 3.53125, y: 1.1953125} + - {x: 3.53125, y: 1.2265625} + - {x: 2.484375, y: 1.2265625} + - {x: 2.234375, y: 1.1796875} + - {x: 1.6875, y: 0.9765625} + - {x: 1.296875, y: 0.8203125} + - {x: 0.96875, y: 0.9765625} + - {x: 1.234375, y: 1.1640625} + - {x: 1.21875, y: 1.2265625} + - {x: 1.03125, y: 1.2265625} + - {x: 0.953125, y: 1.1796875} + - {x: 0.671875, y: 0.9453125} + - {x: 0.46875, y: 0.9453125} + - {x: 0.609375, y: 1.1796875} + - {x: 0.609375, y: 1.2265625} + - {x: 0.4375, y: 1.2265625} + - {x: 0.21875, y: 0.9296875} + - {x: 0.203125, y: 1.2265625} + - {x: 0.078125, y: 1.2265625} + - {x: 0.0625, y: 0.8828125} + - {x: -0.0625, y: 0.9765625} + - {x: -0.078125, y: 1.2265625} + - {x: -0.203125, y: 1.2265625} + - {x: -0.25, y: 0.9140625} + - {x: -0.359375, y: 1.1171875} + - {x: -0.46875, y: 1.2265625} + - {x: -0.609375, y: 1.2265625} + - {x: -0.609375, y: 1.1796875} + - {x: -0.546875, y: 1.0703125} + - {x: -0.46875, y: 0.9453125} + - {x: -0.6875, y: 0.9296875} + - {x: -0.953125, y: 1.1796875} + - {x: -1.03125, y: 1.2265625} + - {x: -1.21875, y: 1.2265625} + - {x: -1.25, y: 1.1640625} + - {x: -0.953125, y: 0.9140625} + - {x: -1.078125, y: 0.8984375} + - {x: -1.296875, y: 0.8203125} + - {x: -1.75, y: 1.0234375} + - {x: -2.375, y: 1.2109375} + - {x: -2.53125, y: 1.2265625} + - {x: -3.53125, y: 1.2265625} + - {x: -3.578125, y: 1.1796875} + - {x: -2.75, y: 1.0546875} + - {x: -2.21875, y: 0.9609375} + - {x: -2.40625, y: 0.6796875} + - {x: -2.609375, y: 0.3671875} + - {x: -2.71875, y: 0.6484375} + - {x: -2.6875, y: 0.9140625} + - {x: -2.8125, y: 1.0546875} + - {x: -3.1875, y: 1.0703125} + - {x: -3.28125, y: 0.9921875} + - {x: -3.375, y: 0.7421875} + - {x: -3.359375, y: 0.5703125} + - {x: -3.328125, y: 0.4765625} + - {x: -3.609375, y: 0.4765625} + - {x: -3.890625, y: 0.6796875} + - {x: -4, y: 0.6953125} + - {x: -4, y: 0.5234375} + - {x: -3.984375, y: 0.4765625} + - {x: -3.765625, y: 0.3359375} + - {x: -3.1875, y: 0.3515625} + - {x: -2.75, y: 0.2421875} + - {x: -2.28125, y: 0.2265625} + - {x: -2.015625, y: 0.3203125} + - {x: -2.125, y: 0.1171875} + - {x: -2.078125, y: -0.1796875} + - {x: -2.03125, y: -0.3828125} + - {x: -1.875, y: -0.5703125} + - {x: -1.734375, y: -0.6953125} + - {x: -1.703125, y: -0.8515625} + - {x: -1.515625, y: -0.9609375} + - {x: -1.28125, y: -0.9609375} + - {x: -1.0625, y: -1.1328125} + - {x: -0.765625, y: -1.1484375} + - {x: -0.59375, y: -1.2109375} + - {x: -0.46875, y: -1.2265625} + - {x: 0.265625, y: -1.2265625} + - {x: 0.578125, y: -1.1953125} + - {x: 1.09375, y: -1.1171875} + - {x: 1.28125, y: -0.9453125} + - - {x: -2.046875, y: 0.5546875} + - {x: -2.03125, y: 0.6484375} + - {x: -2, y: 0.6953125} + - {x: -2.015625, y: 0.9296875} + - {x: -2, y: 0.9140625} + - {x: -1.953125, y: 0.9140625} + - {x: -1.90625, y: 0.8828125} + - {x: -1.828125, y: 0.8671875} + - {x: -1.78125, y: 0.8359375} + - {x: -1.75, y: 0.8359375} + - {x: -1.640625, y: 0.7734375} + - {x: -1.59375, y: 0.7421875} + - {x: -1.53125, y: 0.7265625} + - {x: -1.515625, y: 0.7109375} + - {x: -1.515625, y: 0.7265625} + - {x: -1.546875, y: 0.6953125} + - {x: -1.65625, y: 0.6953125} + - {x: -1.71875, y: 0.6484375} + - {x: -1.734375, y: 0.6484375} + - {x: -1.8125, y: 0.5703125} + - {x: -1.859375, y: 0.5390625} + - {x: -1.90625, y: 0.5390625} + - {x: -1.953125, y: 0.4921875} + - {x: -1.984375, y: 0.4921875} + - {x: -2.03125, y: 0.4765625} + - {x: -2.0625, y: 0.4453125} + - {x: -2.125, y: 0.4453125} + - {x: -2.140625, y: 0.4140625} + - {x: -2.109375, y: 0.4140625} + - - {x: 2.0625, y: 0.4453125} + - {x: 2.03125, y: 0.4765625} + - {x: 1.953125, y: 0.4921875} + - {x: 1.90625, y: 0.5390625} + - {x: 1.859375, y: 0.5390625} + - {x: 1.8125, y: 0.5703125} + - {x: 1.703125, y: 0.6796875} + - {x: 1.65625, y: 0.6953125} + - {x: 1.546875, y: 0.6953125} + - {x: 1.515625, y: 0.7265625} + - {x: 1.515625, y: 0.7109375} + - {x: 1.53125, y: 0.7265625} + - {x: 1.5625, y: 0.7265625} + - {x: 1.640625, y: 0.7734375} + - {x: 1.75, y: 0.8359375} + - {x: 1.78125, y: 0.8359375} + - {x: 1.828125, y: 0.8671875} + - {x: 1.859375, y: 0.8671875} + - {x: 1.90625, y: 0.8828125} + - {x: 1.953125, y: 0.9140625} + - {x: 2, y: 0.9140625} + - {x: 2.015625, y: 0.9296875} + - {x: 2, y: 0.6953125} + - {x: 2.03125, y: 0.6484375} + - {x: 2.046875, y: 0.5546875} + - {x: 2.125, y: 0.4296875} + - {x: 2.125, y: 0.4453125} + - - {x: -3.21875, y: 0.6640625} + - {x: -3.234375, y: 0.6953125} + - {x: -3.203125, y: 0.7578125} + - {x: -3.203125, y: 0.8203125} + - {x: -3.171875, y: 0.8359375} + - {x: -3.125, y: 0.9296875} + - {x: -2.921875, y: 0.9296875} + - {x: -2.84375, y: 0.8515625} + - {x: -2.828125, y: 0.7890625} + - {x: -2.90625, y: 0.6640625} + - {x: -2.921875, y: 0.6640625} + - {x: -2.984375, y: 0.6015625} + - {x: -3.03125, y: 0.6015625} + - {x: -3.125, y: 0.5546875} + - {x: -3.125, y: 0.5703125} + - - {x: 3.03125, y: 0.6015625} + - {x: 2.984375, y: 0.6015625} + - {x: 2.875, y: 0.7109375} + - {x: 2.828125, y: 0.7890625} + - {x: 2.84375, y: 0.8515625} + - {x: 2.921875, y: 0.9296875} + - {x: 3.125, y: 0.9296875} + - {x: 3.15625, y: 0.8828125} + - {x: 3.171875, y: 0.8359375} + - {x: 3.203125, y: 0.8203125} + - {x: 3.203125, y: 0.7578125} + - {x: 3.234375, y: 0.6796875} + - {x: 3.15625, y: 0.5859375} + - {x: 3.109375, y: 0.5546875} + - {x: 3.109375, y: 0.5703125} + - - {x: -1.015625, y: 0.7890625} + - {x: -1.015625, y: 0.7734375} + - {x: -0.96875, y: 0.7734375} + - {x: -0.953125, y: 0.7890625} + - {x: -0.78125, y: 0.8046875} + - {x: -0.78125, y: 0.8203125} + - {x: -0.828125, y: 0.7890625} + - {x: -0.859375, y: 0.7890625} + - {x: -0.890625, y: 0.7578125} + - {x: -0.9375, y: 0.7734375} + - - {x: 0.859375, y: 0.7890625} + - {x: 0.828125, y: 0.7890625} + - {x: 0.78125, y: 0.8203125} + - {x: 0.78125, y: 0.8046875} + - {x: 0.859375, y: 0.8046875} + - {x: 0.875, y: 0.7890625} + - {x: 1.015625, y: 0.7734375} + - {x: 1.015625, y: 0.7890625} + - {x: 0.984375, y: 0.7890625} + - {x: 0.96875, y: 0.7734375} + - {x: 0.890625, y: 0.7578125} + - {x: 0.890625, y: 0.7734375} + - - {x: -0.5, y: 0.8203125} + - {x: -0.40625, y: 0.8046875} + - {x: -0.421875, y: 0.7890625} + - {x: -0.453125, y: 0.8046875} + - - {x: 0.40625, y: 0.8046875} + - {x: 0.5, y: 0.8203125} + - {x: 0.453125, y: 0.7890625} + - {x: 0.421875, y: 0.7890625} + - {x: 0.421875, y: 0.8046875} +--- !u!114 &453535361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453535359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3681934fcb029d0499a5ec39d30f5e06, type: 3} + m_Name: + m_EditorClassIdentifier: + numProjectiles: 5 + projectile: {fileID: 5836429411335034028, guid: 67bd739b3855bf4449e02e4b83c1d984, type: 3} + projSpeed: 8 + timeBetween: 4 +--- !u!95 &453535362 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453535359} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 70dd30fa3008a9b409f58129c1a823fc, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &453535363 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453535359} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 9123106053774572691, guid: 42c2a1a79daa7d84c8ec4c616a424736, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8, y: 2.453125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &453535364 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453535359} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 6.3, z: 0} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &563510750 GameObject: m_ObjectHideFlags: 0 @@ -1533,171 +1908,6 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 ---- !u!1 &601273749 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 601273752} - - component: {fileID: 601273751} - - component: {fileID: 601273750} - - component: {fileID: 601273753} - m_Layer: 0 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &601273750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601273749} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3681934fcb029d0499a5ec39d30f5e06, type: 3} - m_Name: - m_EditorClassIdentifier: - numProjectiles: 10 - projectile: {fileID: 5836429411335034028, guid: 67bd739b3855bf4449e02e4b83c1d984, type: 3} - projSpeed: 10 - timeBetween: 3 ---- !u!212 &601273751 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601273749} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: 4adeaf2d2b1c7417e89f026626d8264f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &601273752 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601273749} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 6.35, z: 0} - m_LocalScale: {x: 9.4007, y: 3.2855, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!60 &601273753 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601273749} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0.296875, y: -0.4140625} - - {x: 0.3984375, y: -0.3125} - - {x: 0.43359375, y: -0.26171875} - - {x: 0.46875, y: -0.1875} - - {x: 0.48828125, y: -0.14453125} - - {x: 0.5, y: -0.07421875} - - {x: 0.5, y: 0.08203125} - - {x: 0.4921875, y: 0.11328125} - - {x: 0.46875, y: 0.1953125} - - {x: 0.42578125, y: 0.2734375} - - {x: 0.3984375, y: 0.3125} - - {x: 0.33984375, y: 0.375} - - {x: 0.26171875, y: 0.43359375} - - {x: 0.17578125, y: 0.4765625} - - {x: 0.1328125, y: 0.4921875} - - {x: 0.0859375, y: 0.5} - - {x: -0.07421875, y: 0.5} - - {x: -0.11328125, y: 0.49609375} - - {x: -0.1953125, y: 0.46875} - - {x: -0.2734375, y: 0.4296875} - - {x: -0.33984375, y: 0.375} - - {x: -0.37890625, y: 0.33984375} - - {x: -0.43359375, y: 0.26171875} - - {x: -0.4765625, y: 0.1796875} - - {x: -0.5, y: 0.09765625} - - {x: -0.5, y: -0.08203125} - - {x: -0.484375, y: -0.14453125} - - {x: -0.46484375, y: -0.1953125} - - {x: -0.42578125, y: -0.2734375} - - {x: -0.3984375, y: -0.3125} - - {x: -0.33984375, y: -0.37890625} - - {x: -0.26171875, y: -0.43359375} - - {x: -0.1953125, y: -0.46484375} - - {x: -0.15625, y: -0.484375} - - {x: -0.09375, y: -0.49609375} - - {x: -0.078125, y: -0.5} - - {x: 0.0703125, y: -0.5} - - {x: 0.09375, y: -0.49609375} - - {x: 0.14453125, y: -0.484375} - - {x: 0.19921875, y: -0.46875} --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity index 7cc67b8..8e7dafd 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity @@ -1015,7 +1015,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1857265015 +--- !u!1 &942069606 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1023,25 +1023,26 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1857265020} - - component: {fileID: 1857265019} - - component: {fileID: 1857265018} - - component: {fileID: 1857265017} - - component: {fileID: 1857265016} + - component: {fileID: 942069612} + - component: {fileID: 942069611} + - component: {fileID: 942069610} + - component: {fileID: 942069608} + - component: {fileID: 942069607} + - component: {fileID: 942069609} m_Layer: 0 - m_Name: DogBoss + m_Name: Dog Boss Idle_0 m_TagString: Dog m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1857265016 +--- !u!114 &942069607 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857265015} + m_GameObject: {fileID: 942069606} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8fe661d69c47dd74db5744aae6815da7, type: 3} @@ -1050,14 +1051,14 @@ MonoBehaviour: dogSpeed: 4 runTime: 2 waitTime: 2 ---- !u!50 &1857265017 +--- !u!50 &942069608 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857265015} + m_GameObject: {fileID: 942069606} m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 @@ -1071,13 +1072,13 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!61 &1857265018 -BoxCollider2D: +--- !u!60 &942069609 +PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857265015} + m_GameObject: {fileID: 942069606} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -1088,22 +1089,86 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} + oldSize: {x: 4, y: 4} + newSize: {x: 4, y: 4} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1857265019 + m_Points: + m_Paths: + - - {x: -0.359375, y: -0.859375} + - {x: 0.171875, y: -0.828125} + - {x: 0.328125, y: -0.8125} + - {x: 0.390625, y: -1.09375} + - {x: 0.484375, y: -1.640625} + - {x: 0.5, y: -1.703125} + - {x: 0.765625, y: -1.703125} + - {x: 1.0625, y: -1.671875} + - {x: 0.9375, y: -1.40625} + - {x: 0.734375, y: -1.390625} + - {x: 0.75, y: -0.625} + - {x: 0.90625, y: -0.4375} + - {x: 1, y: -0.1875} + - {x: 1.109375, y: 0.28125} + - {x: 1.359375, y: 0.21875} + - {x: 1.390625, y: 0.390625} + - {x: 1.390625, y: 0.640625} + - {x: 1.359375, y: 0.6875} + - {x: 1.171875, y: 0.796875} + - {x: 1.046875, y: 0.96875} + - {x: 0.78125, y: 1.25} + - {x: 0.75, y: 1.296875} + - {x: 0.65625, y: 1.296875} + - {x: 0.609375, y: 1.28125} + - {x: 0.546875, y: 1.03125} + - {x: 0.53125, y: 0.5} + - {x: 0.140625, y: 0.109375} + - {x: -0.109375, y: 0.09375} + - {x: -0.296875, y: 0.046875} + - {x: -0.875, y: -0.15625} + - {x: -1.046875, y: 0.0625} + - {x: -0.90625, y: 0.625} + - {x: -0.921875, y: 0.75} + - {x: -1.265625, y: 0.515625} + - {x: -1.3125, y: 0.3125} + - {x: -1.3125, y: -0.234375} + - {x: -1.046875, y: -0.53125} + - {x: -1.015625, y: -0.625} + - {x: -0.859375, y: -0.953125} + - {x: -1.03125, y: -1.09375} + - {x: -1, y: -1.34375} + - {x: -0.734375, y: -1.703125} + - {x: -0.375, y: -1.703125} + - {x: -0.296875, y: -1.65625} + - {x: -0.296875, y: -1.453125} + - {x: -0.578125, y: -1.25} +--- !u!95 &942069610 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 942069606} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a325c1e8fa940bf4c8056cfc4a06bda7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &942069611 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857265015} + m_GameObject: {fileID: 942069606} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1137,27 +1202,27 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: db750325989564987a34393247d883b4, type: 3} + m_Sprite: {fileID: -1483135834651543230, guid: ee8b21bf7c9ae6140b21c141b66daba3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 4, y: 4} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1857265020 +--- !u!4 &942069612 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857265015} + m_GameObject: {fileID: 942069606} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7, y: -0.3, z: 0} - m_LocalScale: {x: 4, y: 3, z: 1} + m_LocalPosition: {x: 7, y: -0.2, z: 0} + m_LocalScale: {x: -1, y: 1, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 diff --git a/MuseumGame/Assets/Sprites/Bosses/Daisy Boss.png.meta b/MuseumGame/Assets/Sprites/Bosses/Daisy Boss.png.meta index d51279e..0886c8c 100644 --- a/MuseumGame/Assets/Sprites/Bosses/Daisy Boss.png.meta +++ b/MuseumGame/Assets/Sprites/Bosses/Daisy Boss.png.meta @@ -1,7 +1,25 @@ fileFormatVersion: 2 guid: 42c2a1a79daa7d84c8ec4c616a424736 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 9123106053774572691 + second: Daisy Boss_0 + - first: + 213: 1309392422446180552 + second: Daisy Boss_1 + - first: + 213: 6119868812401284032 + second: Daisy Boss_2 + - first: + 213: 5893358566785739783 + second: Daisy Boss_3 + - first: + 213: -2532233504094259804 + second: Daisy Boss_4 + - first: + 213: 3170058250209494968 + second: Daisy Boss_6 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,12 +59,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 64 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,9 +93,117 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Daisy Boss_0 + rect: + serializedVersion: 2 + x: 0 + y: 867 + width: 512 + height: 157 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 39cf27f9e98cb9e70800000000000000 + internalID: 9123106053774572691 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Daisy Boss_2 + rect: + serializedVersion: 2 + x: 0 + y: 610 + width: 512 + height: 157 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0c39b2ba2442ee450800000000000000 + internalID: 6119868812401284032 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Daisy Boss_4 + rect: + serializedVersion: 2 + x: 0 + y: 355 + width: 512 + height: 157 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4a57e1c5b03bbdcd0800000000000000 + internalID: -2532233504094259804 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Daisy Boss_6 + rect: + serializedVersion: 2 + x: 0 + y: 98 + width: 512 + height: 157 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8b78801de2f4efb20800000000000000 + internalID: 3170058250209494968 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/MuseumGame/Assets/Sprites/Bosses/Dog Boss Idle.png.meta b/MuseumGame/Assets/Sprites/Bosses/Dog Boss Idle.png.meta index 80d8f24..b18dcc4 100644 --- a/MuseumGame/Assets/Sprites/Bosses/Dog Boss Idle.png.meta +++ b/MuseumGame/Assets/Sprites/Bosses/Dog Boss Idle.png.meta @@ -1,7 +1,31 @@ fileFormatVersion: 2 guid: ee8b21bf7c9ae6140b21c141b66daba3 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -1483135834651543230 + second: Dog Boss Idle_0 + - first: + 213: 2296841969334252212 + second: Dog Boss Idle_1 + - first: + 213: 8236451639184560443 + second: Dog Boss Idle_2 + - first: + 213: -2860991110786748246 + second: Dog Boss Idle_3 + - first: + 213: 3773999125032857804 + second: Dog Boss Idle_4 + - first: + 213: -1221032743702185835 + second: Dog Boss Idle_5 + - first: + 213: -2140581969999711501 + second: Dog Boss Idle_6 + - first: + 213: 5304879379996758030 + second: Dog Boss Idle_7 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,12 +65,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 64 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,9 +99,201 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Dog Boss Idle_0 + rect: + serializedVersion: 2 + x: 0 + y: 512 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 24931fdf0d7da6be0800000000000000 + internalID: -1483135834651543230 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_1 + rect: + serializedVersion: 2 + x: 256 + y: 512 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b270671a9500ef10800000000000000 + internalID: 2296841969334252212 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_2 + rect: + serializedVersion: 2 + x: 512 + y: 512 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b3197439021cd4270800000000000000 + internalID: 8236451639184560443 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_3 + rect: + serializedVersion: 2 + x: 0 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aa071003eb7bb48d0800000000000000 + internalID: -2860991110786748246 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_4 + rect: + serializedVersion: 2 + x: 256 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cc0f73e6530ff5430800000000000000 + internalID: 3773999125032857804 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_5 + rect: + serializedVersion: 2 + x: 512 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 598b28c50350e0fe0800000000000000 + internalID: -1221032743702185835 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_6 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3f2bf812a002b42e0800000000000000 + internalID: -2140581969999711501 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Dog Boss Idle_7 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e00500d80b7be9940800000000000000 + internalID: 5304879379996758030 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/MuseumGame/Assets/Sprites/Bosses/Dog Boss Run.png.meta b/MuseumGame/Assets/Sprites/Bosses/Dog Boss Run.png.meta new file mode 100644 index 0000000..b434376 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Bosses/Dog Boss Run.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 9bf84f615bcacbc42b88203903889752 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index cf15f32..829b5e8 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650