diff --git a/Assets/Prefabs/Projectiles.meta b/Assets/Prefabs/Projectiles.meta new file mode 100644 index 0000000..4231e1e --- /dev/null +++ b/Assets/Prefabs/Projectiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c74c95d23f35f756a981f6e7704adca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Arrow.prefab b/Assets/Prefabs/Projectiles/Arrow.prefab similarity index 100% rename from Assets/Prefabs/Arrow.prefab rename to Assets/Prefabs/Projectiles/Arrow.prefab diff --git a/Assets/Prefabs/Arrow.prefab.meta b/Assets/Prefabs/Projectiles/Arrow.prefab.meta similarity index 100% rename from Assets/Prefabs/Arrow.prefab.meta rename to Assets/Prefabs/Projectiles/Arrow.prefab.meta diff --git a/Assets/Prefabs/HealthPotion.prefab b/Assets/Prefabs/Projectiles/HealthPotion.prefab similarity index 98% rename from Assets/Prefabs/HealthPotion.prefab rename to Assets/Prefabs/Projectiles/HealthPotion.prefab index bbd195b..54134e9 100644 --- a/Assets/Prefabs/HealthPotion.prefab +++ b/Assets/Prefabs/Projectiles/HealthPotion.prefab @@ -77,7 +77,7 @@ MonoBehaviour: m_EditorClassIdentifier: _lifeSpan: 8 healthAdd: 100 - healthPotionEffectArea: {fileID: 1079864639964228445} + healthPotionEffectArea: {fileID: 7930232572283191225} explodeMesh: {fileID: 173966350544600092, guid: 4a740d83829a3f11b83abbd4acadc611, type: 3} exploseMeshTime: 0 --- !u!1 &3333242642527957384 @@ -261,14 +261,14 @@ SphereCollider: m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 m_ExcludeLayers: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 + m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 - m_Radius: 5 + m_Radius: 20 m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/HealthPotion.prefab.meta b/Assets/Prefabs/Projectiles/HealthPotion.prefab.meta similarity index 100% rename from Assets/Prefabs/HealthPotion.prefab.meta rename to Assets/Prefabs/Projectiles/HealthPotion.prefab.meta diff --git a/Assets/Prefabs/Units/Bars.meta b/Assets/Prefabs/Units/Bars.meta new file mode 100644 index 0000000..85da468 --- /dev/null +++ b/Assets/Prefabs/Units/Bars.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3269af7c6e818a46699c775465af5b59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Bars/HealthBar.prefab b/Assets/Prefabs/Units/Bars/HealthBar.prefab new file mode 100644 index 0000000..4b55abd --- /dev/null +++ b/Assets/Prefabs/Units/Bars/HealthBar.prefab @@ -0,0 +1,504 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &861408379211491263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083076275566959294} + - component: {fileID: 8376020004981839670} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1083076275566959294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861408379211491263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7094976348637752250} + - {fileID: 2143662330552863385} + - {fileID: 8334409092280511961} + m_Father: {fileID: 251478950249740293} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8376020004981839670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861408379211491263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1793179975343681215} + m_FillRect: {fileID: 8389022106454257342} + m_HandleRect: {fileID: 7569267696780610688} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &1084138189341927244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 251478950249740293} + - component: {fileID: 4775103653133752509} + - component: {fileID: 3520480680803290255} + - component: {fileID: 5571869179874451231} + - component: {fileID: 3927986585294242205} + m_Layer: 5 + m_Name: HealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &251478950249740293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1083076275566959294} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4775103653133752509 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3520480680803290255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &5571869179874451231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &3927986585294242205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da56039456f5041c88cca65308f23ca0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2049441015259139320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8334409092280511961} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8334409092280511961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049441015259139320} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7569267696780610688} + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3421812680594404186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143662330552863385} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2143662330552863385 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421812680594404186} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8389022106454257342} + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3843045240682157814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7094976348637752250} + - component: {fileID: 7672505682461341403} + - component: {fileID: 3259013440714796371} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7094976348637752250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7672505682461341403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_CullTransparentMesh: 1 +--- !u!114 &3259013440714796371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8651218065553062854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8389022106454257342} + - component: {fileID: 3346226749441119292} + - component: {fileID: 5206638171316935036} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8389022106454257342 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2143662330552863385} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3346226749441119292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_CullTransparentMesh: 1 +--- !u!114 &5206638171316935036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8850258546268858415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7569267696780610688} + - component: {fileID: 4409966489178585009} + - component: {fileID: 1793179975343681215} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7569267696780610688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8334409092280511961} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4409966489178585009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_CullTransparentMesh: 1 +--- !u!114 &1793179975343681215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/Units/Bars/HealthBar.prefab.meta b/Assets/Prefabs/Units/Bars/HealthBar.prefab.meta new file mode 100644 index 0000000..5eb5137 --- /dev/null +++ b/Assets/Prefabs/Units/Bars/HealthBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e72e1a908ea62c6eaae386ea76ae70e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Bars/ManaBar.prefab b/Assets/Prefabs/Units/Bars/ManaBar.prefab new file mode 100644 index 0000000..1b5baf3 --- /dev/null +++ b/Assets/Prefabs/Units/Bars/ManaBar.prefab @@ -0,0 +1,506 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &861408379211491263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083076275566959294} + - component: {fileID: 8376020004981839670} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1083076275566959294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861408379211491263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7094976348637752250} + - {fileID: 2143662330552863385} + - {fileID: 8334409092280511961} + m_Father: {fileID: 251478950249740293} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8376020004981839670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861408379211491263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1793179975343681215} + m_FillRect: {fileID: 8389022106454257342} + m_HandleRect: {fileID: 7569267696780610688} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &1084138189341927244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 251478950249740293} + - component: {fileID: 4775103653133752509} + - component: {fileID: 3520480680803290255} + - component: {fileID: 5571869179874451231} + - component: {fileID: 4109558889072125172} + m_Layer: 5 + m_Name: ManaBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &251478950249740293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1083076275566959294} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4775103653133752509 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3520480680803290255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5571869179874451231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &4109558889072125172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084138189341927244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc83878e8ee5d68b2b4f5622c7100b52, type: 3} + m_Name: + m_EditorClassIdentifier: + capacity: {fileID: 0} + manaSlider: {fileID: 0} +--- !u!1 &2049441015259139320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8334409092280511961} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8334409092280511961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049441015259139320} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7569267696780610688} + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3421812680594404186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143662330552863385} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2143662330552863385 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421812680594404186} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8389022106454257342} + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3843045240682157814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7094976348637752250} + - component: {fileID: 7672505682461341403} + - component: {fileID: 3259013440714796371} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7094976348637752250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1083076275566959294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7672505682461341403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_CullTransparentMesh: 1 +--- !u!114 &3259013440714796371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3843045240682157814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8651218065553062854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8389022106454257342} + - component: {fileID: 3346226749441119292} + - component: {fileID: 5206638171316935036} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8389022106454257342 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2143662330552863385} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3346226749441119292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_CullTransparentMesh: 1 +--- !u!114 &5206638171316935036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8651218065553062854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8850258546268858415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7569267696780610688} + - component: {fileID: 4409966489178585009} + - component: {fileID: 1793179975343681215} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7569267696780610688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8334409092280511961} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4409966489178585009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_CullTransparentMesh: 1 +--- !u!114 &1793179975343681215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8850258546268858415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/Units/Bars/ManaBar.prefab.meta b/Assets/Prefabs/Units/Bars/ManaBar.prefab.meta new file mode 100644 index 0000000..461a8d3 --- /dev/null +++ b/Assets/Prefabs/Units/Bars/ManaBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ca687959388054b8a5c4dd95dc48e2a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Base/BaseCreeper.prefab b/Assets/Prefabs/Units/Base/BaseCreeper.prefab index 8ed092f..d2b42d7 100644 --- a/Assets/Prefabs/Units/Base/BaseCreeper.prefab +++ b/Assets/Prefabs/Units/Base/BaseCreeper.prefab @@ -92,6 +92,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 50 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7841837150169133400, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} - {fileID: 1284886913308718791, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} diff --git a/Assets/Prefabs/Units/Base/BaseGolem.prefab b/Assets/Prefabs/Units/Base/BaseGolem.prefab index 994bf72..8d199a1 100644 --- a/Assets/Prefabs/Units/Base/BaseGolem.prefab +++ b/Assets/Prefabs/Units/Base/BaseGolem.prefab @@ -20,6 +20,22 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 1347853180693178842, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1347853180693178842, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1377656129870373027, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1377656129870373027, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2074347425566192522, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_Size.x value: 2 @@ -136,6 +152,10 @@ PrefabInstance: propertyPath: knockbackTime value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 7323465142549462881, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.324 + objectReference: {fileID: 0} - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: maxHealth value: 200 @@ -144,6 +164,18 @@ PrefabInstance: propertyPath: currentHealth value: 200 objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 150 + objectReference: {fileID: 0} - target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: damage value: 50 diff --git a/Assets/Prefabs/Units/Base/BaseSkeleton.prefab b/Assets/Prefabs/Units/Base/BaseSkeleton.prefab index 7ce4117..3a428ac 100644 --- a/Assets/Prefabs/Units/Base/BaseSkeleton.prefab +++ b/Assets/Prefabs/Units/Base/BaseSkeleton.prefab @@ -139,6 +139,14 @@ PrefabInstance: propertyPath: speed value: 3 objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 50 + objectReference: {fileID: 0} - target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: attackShape value: diff --git a/Assets/Prefabs/Units/Base/BaseWitch.prefab b/Assets/Prefabs/Units/Base/BaseWitch.prefab index b648436..dd8932c 100644 --- a/Assets/Prefabs/Units/Base/BaseWitch.prefab +++ b/Assets/Prefabs/Units/Base/BaseWitch.prefab @@ -99,6 +99,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 75 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} m_RemovedGameObjects: diff --git a/Assets/Prefabs/Units/Base/BaseZombie.prefab b/Assets/Prefabs/Units/Base/BaseZombie.prefab index 1fcc823..2d30456 100644 --- a/Assets/Prefabs/Units/Base/BaseZombie.prefab +++ b/Assets/Prefabs/Units/Base/BaseZombie.prefab @@ -80,6 +80,18 @@ PrefabInstance: propertyPath: m_ObstacleAvoidanceType value: 2 objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 100 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7841837150169133400, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} - {fileID: 1284886913308718791, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} diff --git a/Assets/Prefabs/Units/Base/VeryBase/BaseUnit.prefab b/Assets/Prefabs/Units/Base/VeryBase/BaseUnit.prefab index 44272f6..b10a947 100644 --- a/Assets/Prefabs/Units/Base/VeryBase/BaseUnit.prefab +++ b/Assets/Prefabs/Units/Base/VeryBase/BaseUnit.prefab @@ -19,6 +19,7 @@ GameObject: - component: {fileID: 8213395333053285225} - component: {fileID: 8908285060348773052} - component: {fileID: 6587310683195830629} + - component: {fileID: 5894882180728040511} m_Layer: 6 m_Name: BaseUnit m_TagString: Unit @@ -41,6 +42,7 @@ Transform: m_Children: - {fileID: 5142912027960738922} - {fileID: 3230378027333185902} + - {fileID: 7323465142549462881} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1284886913308718791 @@ -137,6 +139,7 @@ MonoBehaviour: m_EditorClassIdentifier: pathFps: 1 attackFps: 5 + distanceGoal: 0 --- !u!195 &5811210244409818000 NavMeshAgent: m_ObjectHideFlags: 0 @@ -201,6 +204,8 @@ MonoBehaviour: k__BackingField: {fileID: 8213395333053285225} k__BackingField: {fileID: 8908285060348773052} k__BackingField: {fileID: 6587310683195830629} + k__BackingField: {fileID: 5894882180728040511} + k__BackingField: {fileID: 0} --- !u!114 &8213395333053285225 MonoBehaviour: m_ObjectHideFlags: 0 @@ -213,9 +218,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8511709ac7cfc1d05bee202fa8b8b095, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 - currentHealth: 100 - armor: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 --- !u!114 &8908285060348773052 MonoBehaviour: m_ObjectHideFlags: 0 @@ -247,7 +252,22 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 5 agent: {fileID: 5811210244409818000} - defaultMoveTarget: {fileID: 0} + followEnemy: 1 + knockbackTime: 1.2 +--- !u!114 &5894882180728040511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2076979688870881298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adbf6613bee8e8088b3389c62d61b845, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 100 + k__BackingField: 0 --- !u!1 &3380792937898646976 GameObject: m_ObjectHideFlags: 0 @@ -442,3 +462,414 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &7412716608537364324 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3092074377783379531} + m_Modifications: + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalPosition.z + value: -0.14786214 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.37 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1084138189341927244, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Name + value: HealthBar + objectReference: {fileID: 0} + - target: {fileID: 3259013440714796371, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.a + value: 0.105882354 + objectReference: {fileID: 0} + - target: {fileID: 3259013440714796371, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259013440714796371, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259013440714796371, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3520480680803290255, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3927986585294242205, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: healthSlider + value: + objectReference: {fileID: 1360891561482653778} + - target: {fileID: 3927986585294242205, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: healthHandler + value: + objectReference: {fileID: 8213395333053285225} + - target: {fileID: 5206638171316935036, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.a + value: 0.59607846 + objectReference: {fileID: 0} + - target: {fileID: 5206638171316935036, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.b + value: 0.27058828 + objectReference: {fileID: 0} + - target: {fileID: 5206638171316935036, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5206638171316935036, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Color.r + value: 0.4646574 + objectReference: {fileID: 0} + - target: {fileID: 7569267696780610688, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569267696780610688, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569267696780610688, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Value + value: 0.665 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_HandleRect + value: + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8389022106454257342, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8389022106454257342, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 8850258546268858415, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + insertIndex: -1 + addedObject: {fileID: 7208238931456128536} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} +--- !u!114 &1360891561482653778 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8376020004981839670, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + m_PrefabInstance: {fileID: 7412716608537364324} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7323465142549462881 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 251478950249740293, guid: e72e1a908ea62c6eaae386ea76ae70e0, type: 3} + m_PrefabInstance: {fileID: 7412716608537364324} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7455042723902049821 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7323465142549462881} + m_Modifications: + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_SizeDelta.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.381 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.095 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1084138189341927244, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Name + value: ManaBar + objectReference: {fileID: 0} + - target: {fileID: 3259013440714796371, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Color.a + value: 0.105882354 + objectReference: {fileID: 0} + - target: {fileID: 3520480680803290255, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4109558889072125172, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: capacity + value: + objectReference: {fileID: 5894882180728040511} + - target: {fileID: 4109558889072125172, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: manaSlider + value: + objectReference: {fileID: 1389422104319416619} + - target: {fileID: 5206638171316935036, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Color.b + value: 0.8451094 + objectReference: {fileID: 0} + - target: {fileID: 5206638171316935036, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Color.g + value: 0.4156863 + objectReference: {fileID: 0} + - target: {fileID: 5206638171316935036, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Color.r + value: 0.9254902 + objectReference: {fileID: 0} + - target: {fileID: 7569267696780610688, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Value + value: 0.272 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_HandleRect + value: + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8376020004981839670, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 0} + - target: {fileID: 8389022106454257342, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8389022106454257342, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 2049441015259139320, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} +--- !u!114 &1389422104319416619 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8376020004981839670, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + m_PrefabInstance: {fileID: 7455042723902049821} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7208238931456128536 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 251478950249740293, guid: 1ca687959388054b8a5c4dd95dc48e2a, type: 3} + m_PrefabInstance: {fileID: 7455042723902049821} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Units/CreeperA.prefab b/Assets/Prefabs/Units/CreeperA.prefab index f48b803..1ff4f3f 100644 --- a/Assets/Prefabs/Units/CreeperA.prefab +++ b/Assets/Prefabs/Units/CreeperA.prefab @@ -24,6 +24,10 @@ PrefabInstance: propertyPath: m_Name value: CreeperA objectReference: {fileID: 0} + - target: {fileID: 6692798459895282066, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6798516945552372515, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: diff --git a/Assets/Prefabs/VisualEffects.meta b/Assets/Prefabs/VisualEffects.meta new file mode 100644 index 0000000..b744c86 --- /dev/null +++ b/Assets/Prefabs/VisualEffects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 753f0983d327f962484a9b98c78b2440 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ExplodingMesh.prefab b/Assets/Prefabs/VisualEffects/ExplodingMesh.prefab similarity index 100% rename from Assets/Prefabs/ExplodingMesh.prefab rename to Assets/Prefabs/VisualEffects/ExplodingMesh.prefab diff --git a/Assets/Prefabs/ExplodingMesh.prefab.meta b/Assets/Prefabs/VisualEffects/ExplodingMesh.prefab.meta similarity index 100% rename from Assets/Prefabs/ExplodingMesh.prefab.meta rename to Assets/Prefabs/VisualEffects/ExplodingMesh.prefab.meta diff --git a/Assets/Prefabs/HealthExplode.prefab b/Assets/Prefabs/VisualEffects/HealthExplode.prefab similarity index 100% rename from Assets/Prefabs/HealthExplode.prefab rename to Assets/Prefabs/VisualEffects/HealthExplode.prefab diff --git a/Assets/Prefabs/HealthExplode.prefab.meta b/Assets/Prefabs/VisualEffects/HealthExplode.prefab.meta similarity index 100% rename from Assets/Prefabs/HealthExplode.prefab.meta rename to Assets/Prefabs/VisualEffects/HealthExplode.prefab.meta diff --git a/Assets/Scenes/Clement 1.unity b/Assets/Scenes/Clement 1.unity index 31b6c05..6df94fb 100644 --- a/Assets/Scenes/Clement 1.unity +++ b/Assets/Scenes/Clement 1.unity @@ -10878,7 +10878,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &985930955 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UnitScripts/AbstractUnit.cs b/Assets/Scripts/UnitScripts/AbstractUnit.cs index 83698d3..cd81a82 100644 --- a/Assets/Scripts/UnitScripts/AbstractUnit.cs +++ b/Assets/Scripts/UnitScripts/AbstractUnit.cs @@ -16,6 +16,8 @@ public abstract class AbstractUnit : MonoBehaviour public abstract void TakeDamage(float damage); public abstract void Heal(float heal); + public abstract void AddArmor(float armor); + public abstract void RemoveArmor(float armor); void Awake() { diff --git a/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs b/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs index fd392be..4fa7706 100644 --- a/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs +++ b/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs @@ -44,12 +44,13 @@ public class AttackHandler : MonoBehaviour if (targetUnit.IsTeamA == _minecraftUnit.IsTeamA) continue; targetUnit.TakeDamage(damage); + _minecraftUnit.Capacity.AddMana(damage); hasHit = true; Vector3 knockbackVector = knockbackHorizontalForce * (target.transform.position - transform.position).normalized + knockbackVerticalForce * Vector3.up; - // Knockback logic specific to MinecraftUnit (can't force other team to do our weird impl) + // logic specific if targetUnit is MinecraftUnit if (targetUnit is MinecraftUnit) { MinecraftUnit minecraftTarget = (MinecraftUnit)targetUnit; diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs index 4418174..fbf5f1f 100644 --- a/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs @@ -17,6 +17,7 @@ public class Arrow : ProjectileHandler minecraftUnit.StartCoroutine(minecraftUnit.MovementHandler.TakeImpulse(knockback)); } unit.TakeDamage(baseDamage); + _minecraftUnitOrigin.Capacity.AddMana(baseDamage); } Destroy(this.gameObject); diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs index 4b2e852..8a1ce1e 100644 --- a/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs @@ -26,7 +26,7 @@ public class AttackProjectile : AttackHandler Vector3 diffVector = Vector3.ProjectOnPlane(targetUnit.transform.position - spawnPos.position, Vector3.up); Vector3 launchVectorNormalized = (localLaunchVector.x * diffVector.normalized + localLaunchVector.y * Vector3.up).normalized; - projectileHandler.LaunchProjectile(launchVectorNormalized * arrowBaseSpeed, _minecraftUnit.IsTeamA); + projectileHandler.LaunchProjectile(launchVectorNormalized * arrowBaseSpeed, _minecraftUnit.IsTeamA, _minecraftUnit); return true; } diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs index aba5ea8..f74666f 100644 --- a/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs @@ -22,7 +22,7 @@ public class HealthPotion : ProjectileHandler if (targetUnit.IsTeamA != FromTeamA) continue; targetUnit.Heal(healthAdd); - + _minecraftUnitOrigin.Capacity.AddMana(healthAdd); } CoroutineManager.Instance.StartCoroutine(ExplodeVisual()); Destroy(gameObject); diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs index 3388a7a..76d0d5c 100644 --- a/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs @@ -10,6 +10,7 @@ public class ProjectileHandler : MonoBehaviour [SerializeField] protected float _lifeSpan = 8.0f; protected Rigidbody RigidBody; protected bool FromTeamA; + protected MinecraftUnit _minecraftUnitOrigin; void Awake() { @@ -28,10 +29,12 @@ public class ProjectileHandler : MonoBehaviour if (RigidBody.linearVelocity.magnitude >= 1f) transform.forward = RigidBody.linearVelocity.normalized; } - public void LaunchProjectile(Vector3 baseSpeed, bool fromTeamA) + public void LaunchProjectile(Vector3 baseSpeed, bool fromTeamA, MinecraftUnit minecraftUnit) { RigidBody.linearVelocity = baseSpeed; FromTeamA = fromTeamA; + _minecraftUnitOrigin = minecraftUnit; } + } diff --git a/Assets/Scripts/UnitScripts/Bars.meta b/Assets/Scripts/UnitScripts/Bars.meta new file mode 100644 index 0000000..ef5aee5 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Bars.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a9e2d1e9e9f8774395ab8c8b44e8dba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UnitScripts/Bars/HealthBars.cs b/Assets/Scripts/UnitScripts/Bars/HealthBars.cs new file mode 100644 index 0000000..a9561ee --- /dev/null +++ b/Assets/Scripts/UnitScripts/Bars/HealthBars.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using UnityEngine.UI; + +public class HealthBar : MonoBehaviour +{ + [SerializeField] private HealthHandler healthHandler; + [SerializeField] private Slider healthSlider; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + healthSlider.maxValue = healthHandler.MaxHealth; + } + void Update() + { + healthSlider.value = healthHandler.CurrentHealth; + } + + // Update is called once per frame + void LateUpdate() + { + transform.LookAt(Camera.main.transform); + } +} diff --git a/Assets/Scripts/UnitScripts/Bars/HealthBars.cs.meta b/Assets/Scripts/UnitScripts/Bars/HealthBars.cs.meta new file mode 100644 index 0000000..0de64c4 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Bars/HealthBars.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: da56039456f5041c88cca65308f23ca0 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Bars/ManaBars.cs b/Assets/Scripts/UnitScripts/Bars/ManaBars.cs new file mode 100644 index 0000000..4dc9c82 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Bars/ManaBars.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +public class ManaBars : MonoBehaviour +{ + [SerializeField] private BaseCapacity capacity; + [SerializeField] private Slider manaSlider; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + manaSlider.maxValue = capacity.MaxMana; + } + void Update() + { + manaSlider.value = capacity.Mana; + } + // Child of healthbar, rotation is handled by healthbar + + +} diff --git a/Assets/Scripts/UnitScripts/Bars/ManaBars.cs.meta b/Assets/Scripts/UnitScripts/Bars/ManaBars.cs.meta new file mode 100644 index 0000000..cf4931e --- /dev/null +++ b/Assets/Scripts/UnitScripts/Bars/ManaBars.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bc83878e8ee5d68b2b4f5622c7100b52 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Capacities.meta b/Assets/Scripts/UnitScripts/Capacities.meta new file mode 100644 index 0000000..9c732be --- /dev/null +++ b/Assets/Scripts/UnitScripts/Capacities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d76dce105c83372aebd5f8d8f33ee08b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs b/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs new file mode 100644 index 0000000..1fd3d46 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs @@ -0,0 +1,39 @@ +using UnityEngine; + +public class BaseCapacity : MonoBehaviour +{ + [field: SerializeField] public float MaxMana { get; private set; } + [field: SerializeField] public float Mana { get; private set; } + protected float ManaCost; + protected AbstractUnit _unit; + + + + // Called every frame + protected virtual bool CapacityCall() + { + return true; + } + + public void AddMana(float manaAdd) + { + Mana = Mathf.Max(Mana + manaAdd, MaxMana); + } + + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + _unit = GetComponent(); + } + + // Update is called once per frame + void Update() + { + if (Mana >= ManaCost) + { + bool capacityLaunched = CapacityCall(); + if (capacityLaunched) Mana -= ManaCost; + } + } +} diff --git a/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs.meta b/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs.meta new file mode 100644 index 0000000..f8f525c --- /dev/null +++ b/Assets/Scripts/UnitScripts/Capacities/BaseCapacity.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: adbf6613bee8e8088b3389c62d61b845 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs b/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs new file mode 100644 index 0000000..c91f8c4 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs @@ -0,0 +1,33 @@ +using UnityEngine; +using System.Collections; + +public class GolemDefense : BaseCapacity +{ + [SerializeField] private float armorGain; + [SerializeField] private float buffTime; + [SerializeField] private SphereCollider buffArea; + + protected override bool CapacityCall() + { + Collider[] hitColliders = Physics.OverlapSphere(transform.position, buffArea.radius, buffArea.includeLayers); + foreach (Collider target in hitColliders) + { + if (!target.CompareTag("Unit")) continue; + AbstractUnit targetUnit = target.GetComponent(); + if (targetUnit.IsTeamA == _unit.IsTeamA) + { + CoroutineManager.Instance.StartCoroutine(AddThenRemoveArmor(targetUnit)); + } + } + return hitColliders.Length > 0; + } + + private IEnumerator AddThenRemoveArmor(AbstractUnit targetUnit) + { + targetUnit.AddArmor(armorGain); + yield return new WaitForSeconds(buffTime); + targetUnit.RemoveArmor(armorGain); + } +} + + diff --git a/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs.meta b/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs.meta new file mode 100644 index 0000000..779a5cb --- /dev/null +++ b/Assets/Scripts/UnitScripts/Capacities/GolemDefense.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1ca640aad27b1da9d87fdc4302aa0cd3 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/HealthHandler.cs b/Assets/Scripts/UnitScripts/HealthHandler.cs index c24b6da..1fb005d 100644 --- a/Assets/Scripts/UnitScripts/HealthHandler.cs +++ b/Assets/Scripts/UnitScripts/HealthHandler.cs @@ -3,9 +3,9 @@ using UnityEngine; [RequireComponent(typeof(MinecraftUnit))] public class HealthHandler : MonoBehaviour { - [SerializeField] private float maxHealth; - [SerializeField] private float currentHealth; - [SerializeField] private float armor; + [field: SerializeField] public float MaxHealth{ get; private set; } + [field: SerializeField] public float CurrentHealth{ get; private set; } + [field: SerializeField] public float Armor{ get; private set; } private MinecraftUnit _minecraftUnit; @@ -17,31 +17,27 @@ public class HealthHandler : MonoBehaviour public void TakeDamage(float damage) { Debug.Assert(damage >= 0, "Damage cannot be negative, use Heal if you want to heal"); - currentHealth -= Mathf.Max(0, damage-armor); - if (currentHealth <= 0) Death(); + CurrentHealth -= Mathf.Max(0, damage-Armor); + _minecraftUnit.Capacity.AddMana(damage); + if (CurrentHealth <= 0) Death(); } public void Heal(float value) { Debug.Assert(value >= 0, "value can't be less than zero"); - currentHealth = Mathf.Min(currentHealth + value, maxHealth); + CurrentHealth = Mathf.Min(CurrentHealth + value, MaxHealth); } - public float GetArmor() + public void AddArmor(float armorBoost) { - return armor; + Debug.Assert(armorBoost >= 0, "armorBoost can't be less than zero, use RemoveArmor instead"); + Armor += armorBoost; } - public void EquipArmor(float armorBoost) + public void RemoveArmor(float armorBoost) { - Debug.Assert(armorBoost >= 0, "armorBoost can't be less than zero, use UnEquipArmor instead"); - armor += armorBoost; - } - - public void UnEquipArmor(float armorBoost) - { - Debug.Assert(armorBoost >= 0, "armorBoost can't be less than zero, use EquipArmor instead"); - armor -= armorBoost; + Debug.Assert(armorBoost >= 0, "armorBoost can't be less than zero, use AddArmor instead"); + Armor -= armorBoost; } public void Death(float delay = 0) diff --git a/Assets/Scripts/UnitScripts/MinecraftUnit.cs b/Assets/Scripts/UnitScripts/MinecraftUnit.cs index 32d5453..3b47adf 100644 --- a/Assets/Scripts/UnitScripts/MinecraftUnit.cs +++ b/Assets/Scripts/UnitScripts/MinecraftUnit.cs @@ -6,16 +6,18 @@ using UnityEngine.AI; [DisallowMultipleComponent] [RequireComponent(typeof(Rigidbody), typeof(HealthHandler), typeof(AttackHandler))] -[RequireComponent(typeof(MovementHandler))] +[RequireComponent(typeof(MovementHandler), typeof(BaseCapacity))] public class MinecraftUnit : AbstractUnit { [field: SerializeField] public Rigidbody Body { get; private set; } [field: SerializeField] public HealthHandler HealthHandler { get; private set; } [field: SerializeField] public AttackHandler AttackHandler { get; private set; } [field: SerializeField] public MovementHandler MovementHandler { get; private set; } + [field: SerializeField] public BaseCapacity Capacity { get; private set; } // Not required [field: SerializeField] public Animator Animator { get; private set; } + @@ -34,4 +36,15 @@ public class MinecraftUnit : AbstractUnit { HealthHandler.Heal(heal); } + + public override void AddArmor(float armor) + { + HealthHandler.AddArmor(armor); + } + + public override void RemoveArmor(float armor) + { + HealthHandler.RemoveArmor(armor); + } + }