diff --git a/Assets/Animations/CandleFlicker.anim b/Assets/Animations/CandleFlicker.anim new file mode 100644 index 0000000..581349d --- /dev/null +++ b/Assets/Animations/CandleFlicker.anim @@ -0,0 +1,80 @@ +%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: CandleFlicker + 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: 21300000, guid: fae6a78c755d07443abe06a59a3c2694, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 6374b71e4cf054c468b446a951d5213a, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 2df821043bf0ca446a097443f08f988e, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 6f479eef89550eb458f5176e6b10bc9c, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: bf433c120e4d5994796695485023c289, 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: 21300000, guid: fae6a78c755d07443abe06a59a3c2694, type: 3} + - {fileID: 21300000, guid: 6374b71e4cf054c468b446a951d5213a, type: 3} + - {fileID: 21300000, guid: 2df821043bf0ca446a097443f08f988e, type: 3} + - {fileID: 21300000, guid: 6f479eef89550eb458f5176e6b10bc9c, type: 3} + - {fileID: 21300000, guid: bf433c120e4d5994796695485023c289, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4166667 + 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/Assets/Animations/CandleFlicker.anim.meta b/Assets/Animations/CandleFlicker.anim.meta new file mode 100644 index 0000000..ae67a61 --- /dev/null +++ b/Assets/Animations/CandleFlicker.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e094a677d9ff1a94d8abd53abd91f385 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/Candle.controller b/Assets/Animators/Candle.controller new file mode 100644 index 0000000..1f4022e --- /dev/null +++ b/Assets/Animators/Candle.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5361572834647221038 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CandleFlicker + 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: e094a677d9ff1a94d8abd53abd91f385, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-591791602852857799 +AnimatorStateMachine: + serializedVersion: 5 + 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: -5361572834647221038} + m_Position: {x: 250, y: 120, 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: -5361572834647221038} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Candle + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -591791602852857799} + 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} diff --git a/Assets/Animators/Candle.controller.meta b/Assets/Animators/Candle.controller.meta new file mode 100644 index 0000000..08ef375 --- /dev/null +++ b/Assets/Animators/Candle.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 854a8d399bdfc544095998da2dc4fb69 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins.meta b/Assets/Assets.meta similarity index 77% rename from Assets/Plugins.meta rename to Assets/Assets.meta index ef844f4..4eba494 100644 --- a/Assets/Plugins.meta +++ b/Assets/Assets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6c8c11e29a516e4aab4c94eeac25d0e +guid: 0460346d99d385241a6d87bbd10aceb8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/GitHub.meta b/Assets/PhysMats.meta similarity index 77% rename from Assets/Plugins/GitHub.meta rename to Assets/PhysMats.meta index 239d5bd..bc5b1b2 100644 --- a/Assets/Plugins/GitHub.meta +++ b/Assets/PhysMats.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f96f7a49236a0d4eb531555cc223480 +guid: e823a56cb429e4b49becdc740fba66b9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/GitHub/Editor.meta b/Assets/Plugins/GitHub/Editor.meta deleted file mode 100644 index fe2605c..0000000 --- a/Assets/Plugins/GitHub/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: cad92998c5182496e8b989b406d9f156 -folderAsset: yes -timeCreated: 1503666365 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/GitHub/Editor/x64.meta b/Assets/Plugins/GitHub/Editor/x64.meta deleted file mode 100644 index 6c94d82..0000000 --- a/Assets/Plugins/GitHub/Editor/x64.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a0ded7adcc817ce489fec07977f16d13 -folderAsset: yes -timeCreated: 1493304320 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll b/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll deleted file mode 100644 index b009b0f..0000000 Binary files a/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll and /dev/null differ diff --git a/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll.meta b/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll.meta deleted file mode 100644 index d8980a7..0000000 --- a/Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll.meta +++ /dev/null @@ -1,165 +0,0 @@ -fileFormatVersion: 2 -guid: fe5abeadcbe591e4fa9107fbc02f3998 -timeCreated: 1493304330 -licenseType: Pro -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - data: - first: - '': Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - OS: Windows - data: - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - data: - first: - Any: - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude WindowsStoreApps: 1 - Exclude iOS: 1 - Exclude tvOS: 1 - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - data: - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - data: - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - data: - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/GitHub/Editor/x86.meta b/Assets/Plugins/GitHub/Editor/x86.meta deleted file mode 100644 index a180157..0000000 --- a/Assets/Plugins/GitHub/Editor/x86.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 99b48d4d4f6a66340ab06bd487d70a45 -folderAsset: yes -timeCreated: 1493304320 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll b/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll deleted file mode 100644 index fcb5d9d..0000000 Binary files a/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll and /dev/null differ diff --git a/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll.meta b/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll.meta deleted file mode 100644 index ee3f3dc..0000000 --- a/Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll.meta +++ /dev/null @@ -1,165 +0,0 @@ -fileFormatVersion: 2 -guid: 151a1d946b98deb4b98445400983ba92 -timeCreated: 1493300307 -licenseType: Pro -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - data: - first: - '': Editor - second: - enabled: 0 - settings: - CPU: x86 - OS: Windows - data: - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - data: - first: - Any: - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude WindowsStoreApps: 1 - Exclude iOS: 1 - Exclude tvOS: 1 - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86 - DefaultValueInitialized: true - OS: Windows - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - data: - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - data: - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - data: - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll b/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll deleted file mode 100644 index 622f5b2..0000000 Binary files a/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll and /dev/null differ diff --git a/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll.meta b/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll.meta deleted file mode 100644 index 02ec3bd..0000000 --- a/Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll.meta +++ /dev/null @@ -1,165 +0,0 @@ -fileFormatVersion: 2 -guid: a83159a46d87d2a4f8cec651049b9231 -timeCreated: 1493304330 -licenseType: Pro -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - data: - first: - '': Editor - second: - enabled: 0 - settings: - CPU: x86 - OS: Windows - data: - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - data: - first: - Any: - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude WindowsStoreApps: 1 - Exclude iOS: 1 - Exclude tvOS: 1 - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86 - DefaultValueInitialized: true - OS: Windows - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - data: - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - data: - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - data: - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/TEST Item.prefab b/Assets/Prefabs/Damage Animation.prefab similarity index 74% rename from Assets/Prefabs/TEST Item.prefab rename to Assets/Prefabs/Damage Animation.prefab index fc955a3..649d10f 100644 --- a/Assets/Prefabs/TEST Item.prefab +++ b/Assets/Prefabs/Damage Animation.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &470211819356819165 +--- !u!1 &5896060810164205279 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,23 +8,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 470211819356819163} - - component: {fileID: 470211819356819162} - - component: {fileID: 7501912107144583665} + - component: {fileID: 1657293270566428456} + - component: {fileID: 2448759376644501955} + - component: {fileID: -3343030270992239053} m_Layer: 0 - m_Name: TEST Item + m_Name: Damage Animation m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &470211819356819163 +--- !u!4 &1657293270566428456 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470211819356819165} + m_GameObject: {fileID: 5896060810164205279} 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} @@ -32,29 +32,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &470211819356819162 +--- !u!114 &2448759376644501955 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470211819356819165} + m_GameObject: {fileID: 5896060810164205279} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfb3c44da9ebb1840b5a2bcdfd5e2730, type: 3} + m_Script: {fileID: 11500000, guid: b954ed13d7731414a8289b9fa514f604, type: 3} m_Name: m_EditorClassIdentifier: - hpMax: 1 - overlappable: 0 - hp: 0 - sprite: {fileID: 0} ---- !u!212 &7501912107144583665 + time: 0.2 +--- !u!212 &-3343030270992239053 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470211819356819165} + m_GameObject: {fileID: 5896060810164205279} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -82,15 +79,15 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1430251225 + m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5e4d29e1adc2ea0429b199b82253416c, type: 3} + m_Sprite: {fileID: 21300000, guid: 64ca65046ef482d488c2db7d09d8debd, 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: 0.4, y: 0.4} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Prefabs/TEST Item.prefab.meta b/Assets/Prefabs/Damage Animation.prefab.meta similarity index 74% rename from Assets/Prefabs/TEST Item.prefab.meta rename to Assets/Prefabs/Damage Animation.prefab.meta index 0ef57ec..368139c 100644 --- a/Assets/Prefabs/TEST Item.prefab.meta +++ b/Assets/Prefabs/Damage Animation.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1bd6e08f590fdd844854a34504aeaa4a +guid: 602b69921902efc44ab8a008655b6574 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Entities.meta b/Assets/Prefabs/Entities.meta new file mode 100644 index 0000000..21291e5 --- /dev/null +++ b/Assets/Prefabs/Entities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d293d3b9d7aed3439539c0b8ebe926c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Mage.prefab b/Assets/Prefabs/Entities/Candle.prefab similarity index 59% rename from Assets/Prefabs/Mage.prefab rename to Assets/Prefabs/Entities/Candle.prefab index 10ee6c7..49fc4ef 100644 --- a/Assets/Prefabs/Mage.prefab +++ b/Assets/Prefabs/Entities/Candle.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8555606753261108579 +--- !u!1 &7257741361926167410 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,37 +8,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7878037906136710709} - - component: {fileID: 2775676106569340423} - - component: {fileID: -5824516239549568936} + - component: {fileID: 2063116021658764253} + - component: {fileID: 6922231140714314935} + - component: {fileID: 1338841070899974392} + - component: {fileID: 3198463478055203177} m_Layer: 0 - m_Name: Mage + m_Name: Candle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7878037906136710709 +--- !u!4 &2063116021658764253 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555606753261108579} + m_GameObject: {fileID: 7257741361926167410} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.985819, y: 17.187717, z: -14.957031} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2775676106569340423 +--- !u!212 &6922231140714314935 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555606753261108579} + m_GameObject: {fileID: 7257741361926167410} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -66,36 +67,53 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 9b8da1686c6714546ba630222d4538ea, type: 3} + m_Sprite: {fileID: 21300000, guid: bf433c120e4d5994796695485023c289, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.76, y: 0.96} + m_Size: {x: 0.42, y: 0.36} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &-5824516239549568936 +--- !u!95 &1338841070899974392 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7257741361926167410} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 854a8d399bdfc544095998da2dc4fb69, 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!114 &3198463478055203177 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555606753261108579} + m_GameObject: {fileID: 7257741361926167410} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6e026a62156d22a48a47eab0fb42d877, type: 3} + m_Script: {fileID: 11500000, guid: aec5e971190b4b544a78be24566f9e6c, type: 3} m_Name: m_EditorClassIdentifier: - hpTrueMax: 25 + hpTrueMax: 10000 overlappable: 0 - hpMax: 25 - hp: 25 - moveChance: 0.5 - visionRange: 7 - attackAnimation: {fileID: 0} + hpMax: 0 + hp: 0 + monsterName: Candle diff --git a/Assets/Prefabs/Mage.prefab.meta b/Assets/Prefabs/Entities/Candle.prefab.meta similarity index 74% rename from Assets/Prefabs/Mage.prefab.meta rename to Assets/Prefabs/Entities/Candle.prefab.meta index 7d8402e..f4fac41 100644 --- a/Assets/Prefabs/Mage.prefab.meta +++ b/Assets/Prefabs/Entities/Candle.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea82c75990f3c9f4a8b0e51da8200da6 +guid: affdf13cb7fd6d14ca520499064b4380 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Heart.prefab b/Assets/Prefabs/Entities/Heart.prefab similarity index 97% rename from Assets/Prefabs/Heart.prefab rename to Assets/Prefabs/Entities/Heart.prefab index 34059e2..edc0d4e 100644 --- a/Assets/Prefabs/Heart.prefab +++ b/Assets/Prefabs/Entities/Heart.prefab @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 76c17ada1e4ed3d46bd00c95c29e3a98, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -96,4 +96,4 @@ MonoBehaviour: overlappable: 1 hpMax: 1 hp: 1 - regen: 10 + regen: 1 diff --git a/Assets/Prefabs/Heart.prefab.meta b/Assets/Prefabs/Entities/Heart.prefab.meta similarity index 100% rename from Assets/Prefabs/Heart.prefab.meta rename to Assets/Prefabs/Entities/Heart.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Entities/Player.prefab similarity index 98% rename from Assets/Prefabs/Player.prefab rename to Assets/Prefabs/Entities/Player.prefab index 3570256..4d5a080 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Entities/Player.prefab @@ -182,7 +182,6 @@ MonoBehaviour: overlappable: 0 hpMax: 10 hp: 0 - selectedItem: 0 --- !u!114 &8856581523727923621 MonoBehaviour: m_ObjectHideFlags: 0 @@ -195,7 +194,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cb881aee511ed643880a50159d731b7, type: 3} m_Name: m_EditorClassIdentifier: - damage: 4 + damage: 1 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} --- !u!95 &7684473867237801912 Animator: serializedVersion: 3 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Entities/Player.prefab.meta similarity index 100% rename from Assets/Prefabs/Player.prefab.meta rename to Assets/Prefabs/Entities/Player.prefab.meta diff --git a/Assets/Prefabs/PoisonousHeart.prefab b/Assets/Prefabs/Entities/PoisonousHeart.prefab similarity index 97% rename from Assets/Prefabs/PoisonousHeart.prefab rename to Assets/Prefabs/Entities/PoisonousHeart.prefab index 44c8f88..63fa448 100644 --- a/Assets/Prefabs/PoisonousHeart.prefab +++ b/Assets/Prefabs/Entities/PoisonousHeart.prefab @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 1de33d2a9be18a94fad5a075d29a5f81, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -96,4 +96,4 @@ MonoBehaviour: overlappable: 1 hpMax: 1 hp: 1 - damage: 10 + damage: 1 diff --git a/Assets/Prefabs/PoisonousHeart.prefab.meta b/Assets/Prefabs/Entities/PoisonousHeart.prefab.meta similarity index 100% rename from Assets/Prefabs/PoisonousHeart.prefab.meta rename to Assets/Prefabs/Entities/PoisonousHeart.prefab.meta diff --git a/Assets/Prefabs/ShortSword.prefab b/Assets/Prefabs/Entities/SHOP Rapier.prefab similarity index 93% rename from Assets/Prefabs/ShortSword.prefab rename to Assets/Prefabs/Entities/SHOP Rapier.prefab index f0d0e8d..c3bbb7f 100644 --- a/Assets/Prefabs/ShortSword.prefab +++ b/Assets/Prefabs/Entities/SHOP Rapier.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: -812928086201289980} - component: {fileID: 7711614280348628083} m_Layer: 0 - m_Name: ShortSword + m_Name: SHOP Rapier m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0b83d7efeff86e3458c4860e3760ab38, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -98,4 +98,6 @@ MonoBehaviour: hp: 1 hpChange: -1 maxHpChange: -1 - damage: 7 + damage: 3 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} diff --git a/Assets/Prefabs/ShortSword.prefab.meta b/Assets/Prefabs/Entities/SHOP Rapier.prefab.meta similarity index 100% rename from Assets/Prefabs/ShortSword.prefab.meta rename to Assets/Prefabs/Entities/SHOP Rapier.prefab.meta diff --git a/Assets/Prefabs/LongSword.prefab b/Assets/Prefabs/Entities/SHOP Sword.prefab similarity index 93% rename from Assets/Prefabs/LongSword.prefab rename to Assets/Prefabs/Entities/SHOP Sword.prefab index 785b67c..7a09832 100644 --- a/Assets/Prefabs/LongSword.prefab +++ b/Assets/Prefabs/Entities/SHOP Sword.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 4697102406538043977} - component: {fileID: -7754318986722149322} m_Layer: 0 - m_Name: LongSword + m_Name: SHOP Sword m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 29a95eeaa590c2b468ff8382fa4459f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -98,4 +98,6 @@ MonoBehaviour: hp: 0 hpChange: -1 maxHpChange: -1 - damage: 10 + damage: 5 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} diff --git a/Assets/Prefabs/LongSword.prefab.meta b/Assets/Prefabs/Entities/SHOP Sword.prefab.meta similarity index 100% rename from Assets/Prefabs/LongSword.prefab.meta rename to Assets/Prefabs/Entities/SHOP Sword.prefab.meta diff --git a/Assets/Prefabs/SkeletonSword.prefab b/Assets/Prefabs/Entities/Skeleton.prefab similarity index 82% rename from Assets/Prefabs/SkeletonSword.prefab rename to Assets/Prefabs/Entities/Skeleton.prefab index 9a901b5..42a7ded 100644 --- a/Assets/Prefabs/SkeletonSword.prefab +++ b/Assets/Prefabs/Entities/Skeleton.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: -4227728170108252613} - component: {fileID: -7336024761621732000} m_Layer: 0 - m_Name: SkeletonSword + m_Name: Skeleton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 5c2d2fa90021e444aaac3dd540becacb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -89,13 +89,19 @@ MonoBehaviour: m_GameObject: {fileID: 8811060229651695861} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a94e83806efe5f440ad4fea08a31e042, type: 3} + m_Script: {fileID: 11500000, guid: 1ce1b6adc640d6f46bbf4d7072735b7f, type: 3} m_Name: m_EditorClassIdentifier: - hpTrueMax: 20 + hpTrueMax: 6 overlappable: 0 - hpMax: 20 - hp: 20 - moveChance: 1 - visionRange: 4 - attackAnimation: {fileID: 0} + hpMax: 0 + hp: 0 + monsterName: Skeleton + moveChance: 0.9 + visionRange: 5 + attackRange: 1 + damage: 3 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} + upSprite: {fileID: 21300000, guid: 5c2d2fa90021e444aaac3dd540becacb, type: 3} + downSprite: {fileID: 21300000, guid: 5c2d2fa90021e444aaac3dd540becacb, type: 3} diff --git a/Assets/Prefabs/SkeletonSword.prefab.meta b/Assets/Prefabs/Entities/Skeleton.prefab.meta similarity index 100% rename from Assets/Prefabs/SkeletonSword.prefab.meta rename to Assets/Prefabs/Entities/Skeleton.prefab.meta diff --git a/Assets/Prefabs/Slime.prefab b/Assets/Prefabs/Entities/Slime.prefab similarity index 89% rename from Assets/Prefabs/Slime.prefab rename to Assets/Prefabs/Entities/Slime.prefab index 260a4ed..62a5378 100644 --- a/Assets/Prefabs/Slime.prefab +++ b/Assets/Prefabs/Entities/Slime.prefab @@ -92,10 +92,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ce1b6adc640d6f46bbf4d7072735b7f, type: 3} m_Name: m_EditorClassIdentifier: - hpTrueMax: 10 + hpTrueMax: 2 overlappable: 0 hpMax: 2 hp: 0 + monsterName: Slime moveChance: 0.5 visionRange: 4 - attackAnimation: {fileID: 0} + attackRange: 1 + damage: 1 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} + upSprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} + downSprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} diff --git a/Assets/Prefabs/Slime.prefab.meta b/Assets/Prefabs/Entities/Slime.prefab.meta similarity index 100% rename from Assets/Prefabs/Slime.prefab.meta rename to Assets/Prefabs/Entities/Slime.prefab.meta diff --git a/Assets/Prefabs/Stairs.prefab b/Assets/Prefabs/Entities/Stairs.prefab similarity index 95% rename from Assets/Prefabs/Stairs.prefab rename to Assets/Prefabs/Entities/Stairs.prefab index c2b0f00..b5f5798 100644 --- a/Assets/Prefabs/Stairs.prefab +++ b/Assets/Prefabs/Entities/Stairs.prefab @@ -66,10 +66,10 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 06bf72b80e8a4d745bb2c5c1140b4bbc, type: 3} + m_Sprite: {fileID: 21300000, guid: 831bed7066c807a478c9a7069bde5f13, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/Stairs.prefab.meta b/Assets/Prefabs/Entities/Stairs.prefab.meta similarity index 100% rename from Assets/Prefabs/Stairs.prefab.meta rename to Assets/Prefabs/Entities/Stairs.prefab.meta diff --git a/Assets/Prefabs/Watcher.prefab b/Assets/Prefabs/Entities/Watcher.prefab similarity index 83% rename from Assets/Prefabs/Watcher.prefab rename to Assets/Prefabs/Entities/Watcher.prefab index e81264e..e9242dd 100644 --- a/Assets/Prefabs/Watcher.prefab +++ b/Assets/Prefabs/Entities/Watcher.prefab @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -522733599 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: cf607ee3f796f0846b9fb18a2cead46a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -89,13 +89,19 @@ MonoBehaviour: m_GameObject: {fileID: 2071995852067845502} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 015c0ee5a2c534a448fb2cb42d6863be, type: 3} + m_Script: {fileID: 11500000, guid: 1ce1b6adc640d6f46bbf4d7072735b7f, type: 3} m_Name: m_EditorClassIdentifier: - hpTrueMax: 15 + hpTrueMax: 10 overlappable: 0 - hpMax: 25 - hp: 25 - moveChance: 0 + hpMax: 0 + hp: 0 + monsterName: Watcher + moveChance: 0.2 visionRange: 12 - attackAnimation: {fileID: 0} + attackRange: 1 + damage: 5 + attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, + type: 3} + upSprite: {fileID: 21300000, guid: 82bebf5d3f0f9864ea1f8f7a58b67bb7, type: 3} + downSprite: {fileID: 21300000, guid: cf607ee3f796f0846b9fb18a2cead46a, type: 3} diff --git a/Assets/Prefabs/Watcher.prefab.meta b/Assets/Prefabs/Entities/Watcher.prefab.meta similarity index 100% rename from Assets/Prefabs/Watcher.prefab.meta rename to Assets/Prefabs/Entities/Watcher.prefab.meta diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 835ca33..19c4f92 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -30,9 +30,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 8182065397885380581} - - {fileID: 1331449797751746845} - {fileID: 6763073704789207265} + - {fileID: 9068024689038202676} + - {fileID: 9068024689794909323} + - {fileID: 2174908496911848014} m_Father: {fileID: 1651829514} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -271,26 +272,35 @@ MonoBehaviour: - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} - topWallSprites: - - {fileID: 0} botWallSprites: - {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, type: 3} - leftWallSprites: - - {fileID: 0} - rightWallSprites: - - {fileID: 0} - lCornerWallSprites: - - {fileID: 0} - rCornerWallSprites: - - {fileID: 0} tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, type: 3} playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} enemyPrefabs: - - {fileID: 470211819356819165, guid: 1bd6e08f590fdd844854a34504aeaa4a, type: 3} - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 2071995852067845502, guid: ea7f7cf3dc500f84cb102a47d86a30ea, type: 3} enemiesToSpawn: 15 + curiositiesPrefabs: + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 1288417210725829930, guid: 57d866d01961d914f87c8a539cd908aa, type: 3} + - {fileID: 7257741361926167410, guid: affdf13cb7fd6d14ca520499064b4380, type: 3} + curiositiesToSpawn: 35 + stairsPrefab: {fileID: 6102638172941227538, guid: 772ce20bae1b4ee41a0f142397309d32, + type: 3} --- !u!1 &6763073704789207264 GameObject: m_ObjectHideFlags: 0 @@ -322,7 +332,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1591973061} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -384,7 +394,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: disappearanceSpeed: 0.3 ---- !u!1 &7185017849687019145 +--- !u!1 &8062251348500245978 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -392,172 +402,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1331449797751746845} - - component: {fileID: 5318808085005978312} - - component: {fileID: 6406203509107481990} - - component: {fileID: 5816643265615328278} + - component: {fileID: 2174908496911848014} + - component: {fileID: 5009307415127730587} + - component: {fileID: 6103496171817058005} m_Layer: 5 - m_Name: Filled HP Bar + m_Name: HP Bar Border m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1331449797751746845 +--- !u!224 &2174908496911848014 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185017849687019145} + m_GameObject: {fileID: 8062251348500245978} 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_Children: [] m_Father: {fileID: 1591973061} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} ---- !u!222 &5318808085005978312 +--- !u!222 &5009307415127730587 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185017849687019145} + m_GameObject: {fileID: 8062251348500245978} m_CullTransparentMesh: 0 ---- !u!114 &6406203509107481990 +--- !u!114 &6103496171817058005 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185017849687019145} + m_GameObject: {fileID: 8062251348500245978} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 1, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} + m_Sprite: {fileID: 21300000, guid: 9c22556080c471a48a14188af3c88967, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 2 m_FillAmount: 1 m_FillClockwise: 1 - m_FillOrigin: 0 + m_FillOrigin: 1 m_UseSpriteMesh: 0 ---- !u!114 &5816643265615328278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185017849687019145} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &8182065397885380578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8182065397885380581} - - component: {fileID: 8182065397885380582} - - component: {fileID: 8182065397885380583} - - component: {fileID: 8182065397885380580} - m_Layer: 5 - m_Name: Empty HP Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8182065397885380581 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065397885380578} - 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_Children: [] - m_Father: {fileID: 1591973061} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 1, y: 0} ---- !u!222 &8182065397885380582 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065397885380578} - m_CullTransparentMesh: 0 ---- !u!114 &8182065397885380583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065397885380578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 2 - m_FillAmount: 1 - m_FillClockwise: 0 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &8182065397885380580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065397885380578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8733140679003710819 GameObject: m_ObjectHideFlags: 0 @@ -601,3 +511,179 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2447171af2ad9634498f2d769d7f5200, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &9068024689038202679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9068024689038202676} + - component: {fileID: 9068024689038202683} + - component: {fileID: 9068024689038202682} + - component: {fileID: 9068024689038202677} + m_Layer: 5 + m_Name: MaxHP Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9068024689038202676 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689038202679} + 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_Children: [] + m_Father: {fileID: 1591973061} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} + m_Pivot: {x: 1, y: 0} +--- !u!222 &9068024689038202683 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689038202679} + m_CullTransparentMesh: 0 +--- !u!114 &9068024689038202682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689038202679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3962264, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ad2b5d778bd508349988ad289efdf15a, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 +--- !u!114 &9068024689038202677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689038202679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} + m_Name: + m_EditorClassIdentifier: + max: 1 +--- !u!1 &9068024689794909322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9068024689794909323} + - component: {fileID: 9068024689794909326} + - component: {fileID: 9068024689794909321} + - component: {fileID: 9068024689794909320} + m_Layer: 5 + m_Name: HP Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9068024689794909323 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689794909322} + 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_Children: [] + m_Father: {fileID: 1591973061} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} + m_Pivot: {x: 1, y: 0} +--- !u!222 &9068024689794909326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689794909322} + m_CullTransparentMesh: 0 +--- !u!114 &9068024689794909321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689794909322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ad2b5d778bd508349988ad289efdf15a, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 +--- !u!114 &9068024689794909320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068024689794909322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} + m_Name: + m_EditorClassIdentifier: + max: 0 diff --git a/Assets/Prefabs/SkeletonBow.prefab b/Assets/Prefabs/SkeletonBow.prefab deleted file mode 100644 index 762f262..0000000 --- a/Assets/Prefabs/SkeletonBow.prefab +++ /dev/null @@ -1,101 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8566687801378750732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7754137869180123917} - - component: {fileID: 3669167815117830418} - - component: {fileID: 3018912931719766939} - m_Layer: 0 - m_Name: SkeletonBow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7754137869180123917 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8566687801378750732} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.985819, y: 17.187717, z: -14.957031} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3669167815117830418 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8566687801378750732} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_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: 21300000, guid: a39db14fa2fc34f4a84101be3d2d5d35, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.88, y: 1.28} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &3018912931719766939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8566687801378750732} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb8ea1708402358498d4c6d81ed4a6f9, type: 3} - m_Name: - m_EditorClassIdentifier: - hpTrueMax: 20 - overlappable: 0 - hpMax: 20 - hp: 20 - moveChance: 0 - visionRange: 5 - attackAnimation: {fileID: 0} diff --git a/Assets/Scenes/Dead.unity b/Assets/Scenes/Dead.unity new file mode 100644 index 0000000..cfefcb1 --- /dev/null +++ b/Assets/Scenes/Dead.unity @@ -0,0 +1,399 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &90755182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 90755186} + - component: {fileID: 90755185} + - component: {fileID: 90755184} + - component: {fileID: 90755183} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &90755183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90755182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &90755184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90755182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, 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 +--- !u!223 &90755185 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90755182} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &90755186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90755182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1600518532} + m_Father: {fileID: 0} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &491815044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491815047} + - component: {fileID: 491815046} + - component: {fileID: 491815045} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &491815045 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491815044} + m_Enabled: 1 +--- !u!20 &491815046 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491815044} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &491815047 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491815044} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1600518531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1600518532} + - component: {fileID: 1600518534} + - component: {fileID: 1600518533} + - component: {fileID: 1600518535} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1600518532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600518531} + 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_Children: [] + m_Father: {fileID: 90755186} + m_RootOrder: 0 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1600518533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600518531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: feeeba28bb1da554f908645dd468e2ad, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 44 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'YOU DIED. + + + Press any key to restart.' +--- !u!222 &1600518534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600518531} + m_CullTransparentMesh: 0 +--- !u!114 &1600518535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600518531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0947a319b90138498506466b0342df3, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/Nemesis.unity.meta b/Assets/Scenes/Dead.unity.meta similarity index 74% rename from Assets/Scenes/Nemesis.unity.meta rename to Assets/Scenes/Dead.unity.meta index a567e89..e64d9a6 100644 --- a/Assets/Scenes/Nemesis.unity.meta +++ b/Assets/Scenes/Dead.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6345a5c2d415e54da9990dca6709f4a +guid: e980b8de6a02b0f4ebedd3f35b486608 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Game.unity similarity index 92% rename from Assets/Scenes/Steffo.unity rename to Assets/Scenes/Game.unity index 9f28c31..e474765 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Game.unity @@ -133,7 +133,7 @@ GameObject: - component: {fileID: 1332612187} - component: {fileID: 1332612186} m_Layer: 5 - m_Name: Filled HP Bar (1) + m_Name: HP Bar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -155,8 +155,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 139.37, y: 55.02} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} --- !u!114 &1332612186 MonoBehaviour: @@ -221,7 +221,7 @@ GameObject: - component: {fileID: 2051317736} - component: {fileID: 2051317735} m_Layer: 5 - m_Name: Filled HP Bar (2) + m_Name: MaxHP Bar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -243,8 +243,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 139.37, y: 55.02} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} --- !u!114 &2051317735 MonoBehaviour: @@ -339,7 +339,7 @@ GameObject: - component: {fileID: 4061326455747354953} - component: {fileID: 2984726599447885319} m_Layer: 5 - m_Name: Filled HP Bar + m_Name: HP Bar Border m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -372,7 +372,7 @@ MonoBehaviour: m_FillMethod: 2 m_FillAmount: 1 m_FillClockwise: 1 - m_FillOrigin: 0 + m_FillOrigin: 1 m_UseSpriteMesh: 0 --- !u!114 &3195245192869872477 MonoBehaviour: @@ -515,26 +515,35 @@ MonoBehaviour: - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} - topWallSprites: - - {fileID: 0} botWallSprites: - {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, type: 3} - leftWallSprites: - - {fileID: 0} - rightWallSprites: - - {fileID: 0} - lCornerWallSprites: - - {fileID: 0} - rCornerWallSprites: - - {fileID: 0} tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, type: 3} playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} enemyPrefabs: - - {fileID: 6102638172941227538, guid: 772ce20bae1b4ee41a0f142397309d32, type: 3} - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} + - {fileID: 2071995852067845502, guid: ea7f7cf3dc500f84cb102a47d86a30ea, type: 3} enemiesToSpawn: 15 + curiositiesPrefabs: + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 1288417210725829930, guid: 57d866d01961d914f87c8a539cd908aa, type: 3} + - {fileID: 7257741361926167410, guid: affdf13cb7fd6d14ca520499064b4380, type: 3} + curiositiesToSpawn: 35 + stairsPrefab: {fileID: 6102638172941227538, guid: 772ce20bae1b4ee41a0f142397309d32, + type: 3} --- !u!1 &4341632257663970948 GameObject: m_ObjectHideFlags: 0 @@ -599,8 +608,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 139.37, y: 55.02} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} --- !u!1 &7596450466852265825 GameObject: diff --git a/Assets/Scenes/Steffo.unity.meta b/Assets/Scenes/Game.unity.meta similarity index 100% rename from Assets/Scenes/Steffo.unity.meta rename to Assets/Scenes/Game.unity.meta diff --git a/Assets/Scenes/Nemesis.unity b/Assets/Scenes/Nemesis.unity deleted file mode 100644 index e61742c..0000000 --- a/Assets/Scenes/Nemesis.unity +++ /dev/null @@ -1,205 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_ExportTrainingData: 0 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &1150105687 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1150105690} - - component: {fileID: 1150105689} - - component: {fileID: 1150105688} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1150105688 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1150105687} - m_Enabled: 1 ---- !u!20 &1150105689 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1150105687} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1150105690 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1150105687} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/EntityItemHeart.cs b/Assets/Scripts/EntityItemHeart.cs index 13d7994..ceeceda 100644 --- a/Assets/Scripts/EntityItemHeart.cs +++ b/Assets/Scripts/EntityItemHeart.cs @@ -4,7 +4,7 @@ using UnityEngine; public class EntityItemHeart : EntityItem { - public int regen; + public float regen; public override string Name { get { @@ -13,7 +13,7 @@ public class EntityItemHeart : EntityItem } public override void OnPickup(EntityPlayer player) { - messageBar.Write("Picked up: " + Name, Color.green); + messageBar.Write("Healed " + regen.ToString("0.0") + " HP!", Color.green); player.hp += regen; if (player.hp > player.hpMax) player.hp = player.hpMax; Destroy(gameObject); diff --git a/Assets/Scripts/EntityItemPoisonHeart.cs b/Assets/Scripts/EntityItemPoisonHeart.cs index 5298abd..1d63d91 100644 --- a/Assets/Scripts/EntityItemPoisonHeart.cs +++ b/Assets/Scripts/EntityItemPoisonHeart.cs @@ -4,7 +4,7 @@ using UnityEngine; public class EntityItemPoisonHeart : EntityItem { - public int damage; + public float damage; public override string Name { get { @@ -13,7 +13,7 @@ public class EntityItemPoisonHeart : EntityItem } public override void OnPickup(EntityPlayer player) { - messageBar.Write("Picked up: " + Name, Color.yellow); + messageBar.Write("Poisoned! Took " + damage.ToString("0.0") + " damage!", Color.red); player.hp -= damage; Destroy(gameObject); } diff --git a/Assets/Scripts/EntityItemShopSword.cs b/Assets/Scripts/EntityItemShopSword.cs index 1219486..9bbcc54 100644 --- a/Assets/Scripts/EntityItemShopSword.cs +++ b/Assets/Scripts/EntityItemShopSword.cs @@ -5,10 +5,11 @@ using UnityEngine; public class EntityItemShopSword : EntityItemShop { public float damage = 3f; + public GameObject attackAnimation; public override string Name { get { - return "Sword (" + damage.ToString() + " dmg)"; + return "Sword (" + damage.ToString("0.0") + " atk)"; } } @@ -17,5 +18,6 @@ public class EntityItemShopSword : EntityItemShop { player.gameObject.AddComponent(); PlayerAttackMelee pam = player.GetComponent(); pam.damage = this.damage; + pam.attackAnimation = attackAnimation; } } \ No newline at end of file diff --git a/Assets/Scripts/EntityMonster.cs b/Assets/Scripts/EntityMonster.cs index b1a458c..599a1ef 100644 --- a/Assets/Scripts/EntityMonster.cs +++ b/Assets/Scripts/EntityMonster.cs @@ -4,19 +4,14 @@ using UnityEngine; public class EntityMonster : Entity { - public virtual string Name { - get { - Debug.LogWarning("No name given to a monster"); - return ""; - } - } + public string monsterName; public virtual void OnTurn(){ Debug.LogWarning("OnTurn() not overridden"); } public override void Die() { - messageBar.Write("Killed: " + Name, Color.red); + messageBar.Write("Killed: " + monsterName, Color.red); Destroy(gameObject); } } \ No newline at end of file diff --git a/Assets/Scripts/EntityMonsterSlime.cs b/Assets/Scripts/EntityMonsterSlime.cs index c831a0c..1797562 100644 --- a/Assets/Scripts/EntityMonsterSlime.cs +++ b/Assets/Scripts/EntityMonsterSlime.cs @@ -4,12 +4,6 @@ using UnityEngine; public class EntityMonsterSlime : EntityMonster { - public override string Name { - get { - return "Slime"; - } - } - public float moveChance = 0.5f; public float visionRange = 4f; public float attackRange = 1f; @@ -17,47 +11,61 @@ public class EntityMonsterSlime : EntityMonster public GameObject attackAnimation; protected EntityPlayer player; + [BeforeStartAttribute] + public Sprite upSprite; + + [BeforeStartAttribute] + public Sprite downSprite; + protected new void Start() { base.Start(); player = GameObject.FindGameObjectWithTag("Player").GetComponent(); } public override void OnTurn(){ - if(Random.Range(0f, 1f) < moveChance) return; + if(Random.value < moveChance) return; if (CanSeePlayer()){ Vector2Int distance = player.MapPosition - MapPosition; if(distance.magnitude <= attackRange) { float actualDamage = Random.value * damage; player.hp -= actualDamage; Instantiate(attackAnimation, player.transform); - messageBar.Write("Took damage from a slime.", Color.red); + messageBar.Write("Took " + actualDamage.ToString("0.0") + " damage!", Color.red); } else if (distance.x < 0 && map.CanMoveTo(MapPosition + Vector2Int.left)){ transform.Translate(Vector3.left); + spriteRenderer.flipX = false; } else if (distance.x > 0 && map.CanMoveTo(MapPosition + Vector2Int.right)){ transform.Translate(Vector3.right); + spriteRenderer.flipX = true; } else if (distance.y > 0 && map.CanMoveTo(MapPosition + Vector2Int.up)){ transform.Translate(Vector3.up); + spriteRenderer.sprite = upSprite; } else if (distance.y < 0 && map.CanMoveTo(MapPosition + Vector2Int.down)){ transform.Translate(Vector3.down); + spriteRenderer.sprite = downSprite; } } else { int direction = Random.Range(0, 4); if (direction == 0 && map.CanMoveTo(MapPosition + Vector2Int.left)){ transform.Translate(Vector3.left); + spriteRenderer.flipX = false; } else if (direction == 1 && map.CanMoveTo(MapPosition + Vector2Int.right)){ transform.Translate(Vector3.right); + spriteRenderer.flipX = true; } else if (direction == 2 && map.CanMoveTo(MapPosition + Vector2Int.up)){ transform.Translate(Vector3.up); + spriteRenderer.sprite = upSprite; } else if (direction == 3 && map.CanMoveTo(MapPosition + Vector2Int.down)){ transform.Translate(Vector3.down); + spriteRenderer.sprite = downSprite; } } } diff --git a/Assets/Scripts/EntityPlayer.cs b/Assets/Scripts/EntityPlayer.cs index ef2e3da..cec7c2b 100644 --- a/Assets/Scripts/EntityPlayer.cs +++ b/Assets/Scripts/EntityPlayer.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public enum ControlMode { Move, @@ -22,7 +23,8 @@ public class EntityPlayer : Entity { CheckForControlModeChange(); if(controlMode == ControlMode.Move) CheckForMovementInput(); - if(controlMode == ControlMode.Attack) CheckForAttackInput(); + if(controlMode == ControlMode.Attack) CheckForAttackInput(); + CheckForTurnSkipInput(); } protected void CheckForControlModeChange() { @@ -111,5 +113,17 @@ public class EntityPlayer : Entity } } + protected void CheckForTurnSkipInput() { + if(Input.GetKeyDown(KeyCode.Space)) { + messageBar.Write("Skipped turn.", Color.cyan); + turnHandler.OnTurn(); + } + } + + //This is not an error wtf public override void OnNewLevel() {} + + public override void Die() { + SceneManager.LoadScene("Dead", LoadSceneMode.Single); + } } diff --git a/Assets/Scripts/GameOver.cs b/Assets/Scripts/GameOver.cs new file mode 100644 index 0000000..8fcd3bf --- /dev/null +++ b/Assets/Scripts/GameOver.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class GameOver : MonoBehaviour +{ + void Update() + { + if(Input.anyKeyDown) { + SceneManager.LoadScene("Game"); + } + } +} diff --git a/Assets/Scripts/InventoryItems.cs.meta b/Assets/Scripts/GameOver.cs.meta similarity index 83% rename from Assets/Scripts/InventoryItems.cs.meta rename to Assets/Scripts/GameOver.cs.meta index 8a18415..1c78db5 100644 --- a/Assets/Scripts/InventoryItems.cs.meta +++ b/Assets/Scripts/GameOver.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afa3fa0ea759ce2459405b400b406d24 +guid: a0947a319b90138498506466b0342df3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/InventoryItems.cs b/Assets/Scripts/InventoryItems.cs deleted file mode 100644 index b1a7787..0000000 --- a/Assets/Scripts/InventoryItems.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public enum InventoryItems { - //EMPTY SHOULD ALWAYS BE THE LAST! - HealthPotion = 0, - Empty = 1 -} \ No newline at end of file diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index 328ff94..988595e 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -90,24 +90,9 @@ public class Map : MonoBehaviour [BeforeStartAttribute] public List floorSprites; - [BeforeStartAttribute] - public List topWallSprites; - [BeforeStartAttribute] public List botWallSprites; - [BeforeStartAttribute] - public List leftWallSprites; - - [BeforeStartAttribute] - public List rightWallSprites; - - [BeforeStartAttribute] - public List lCornerWallSprites; - - [BeforeStartAttribute] - public List rCornerWallSprites; - [BeforeStartAttribute] public GameObject tilePrefab; @@ -120,6 +105,15 @@ public class Map : MonoBehaviour [BeforeStartAttribute] public int enemiesToSpawn = 10; + [BeforeStartAttribute] + public List curiositiesPrefabs; + + [BeforeStartAttribute] + public int curiositiesToSpawn = 35; + + [BeforeStartAttribute] + public GameObject stairsPrefab; + private GameObject[,] tiles; private List rooms; private TurnHandler turnHandler; @@ -270,6 +264,25 @@ public class Map : MonoBehaviour } } + private void PlaceCuriosities() { + for(int i = 0; i < curiositiesToSpawn; i++) { + MapRoom room = rooms[Random.Range(0, rooms.Count)]; + Vector2Int point = room.RandomPoint(); + GameObject curiosityPrefab = curiositiesPrefabs[Random.Range(0, curiositiesPrefabs.Count)]; + GameObject curiosityObject = Instantiate(curiosityPrefab, turnHandler.transform); + curiosityObject.name = "Curiosity " + i.ToString(); + curiosityObject.transform.position = new Vector3(point.x, point.y, 0); + } + } + + private void PlaceStairs() { + MapRoom room = rooms[Random.Range(0, rooms.Count)]; + Vector2Int point = room.RandomPoint(); + GameObject curiosityObject = Instantiate(stairsPrefab, turnHandler.transform); + curiosityObject.name = "Stairs"; + curiosityObject.transform.position = new Vector3(point.x, point.y, 0); + } + public static Sprite SampleSprite(List list) { return list[Random.Range(0, list.Count)]; } @@ -281,7 +294,6 @@ public class Map : MonoBehaviour MapTile otherTile; if(tile.walkable) tile.sprite = SampleSprite(floorSprites); else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(botWallSprites); - else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(topWallSprites); //TODO: corners } } @@ -299,6 +311,12 @@ public class Map : MonoBehaviour GenerateTileSprites(); PlacePlayer(); PlaceEnemies(); + PlaceCuriosities(); + PlaceStairs(); + } + + public void OnNewLevel() { + //Suppress the error } private void Start() diff --git a/Assets/Scripts/PlayerAttackMelee.cs b/Assets/Scripts/PlayerAttackMelee.cs index 936f9da..8dbffa7 100644 --- a/Assets/Scripts/PlayerAttackMelee.cs +++ b/Assets/Scripts/PlayerAttackMelee.cs @@ -5,6 +5,7 @@ using UnityEngine; public class PlayerAttackMelee : PlayerAttack { public float damage = 1f; + public GameObject attackAnimation; public override bool Attack(Vector2Int target) { List targetEntities = turnHandler.GetEntitiesAtPosition(target); @@ -13,6 +14,7 @@ public class PlayerAttackMelee : PlayerAttack } Entity targetEntity = targetEntities[0]; targetEntity.hp -= damage; + Instantiate(attackAnimation, targetEntity.transform); return true; } } \ No newline at end of file diff --git a/Assets/Scripts/PlayerAttackMelee.cs.meta b/Assets/Scripts/PlayerAttackMelee.cs.meta index 9a4a586..e871366 100644 --- a/Assets/Scripts/PlayerAttackMelee.cs.meta +++ b/Assets/Scripts/PlayerAttackMelee.cs.meta @@ -3,7 +3,8 @@ guid: 0cb881aee511ed643880a50159d731b7 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - attackAnimation: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 0000000..5fd147f --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19c0d85909aede34bb371863f187b9e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dungeon Music.ogg.meta b/Assets/Sounds/Dungeon Music.ogg.meta new file mode 100644 index 0000000..4591dcb --- /dev/null +++ b/Assets/Sounds/Dungeon Music.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b8ebcb5d388a4a945ac05f3b15799cab +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/SquashGelatina.ogg.meta b/Assets/Sounds/SquashGelatina.ogg.meta new file mode 100644 index 0000000..40814ac --- /dev/null +++ b/Assets/Sounds/SquashGelatina.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 07e1aa87b28b6324899dc173713d6528 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/VecchioMorente.ogg.meta b/Assets/Sounds/VecchioMorente.ogg.meta new file mode 100644 index 0000000..4998bd6 --- /dev/null +++ b/Assets/Sounds/VecchioMorente.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6bd6c0ed67290d94aa5937a9a8ef3709 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/CANDLE(1).png b/Assets/Sprites/Candle1.png similarity index 100% rename from Assets/Sprites/CANDLE(1).png rename to Assets/Sprites/Candle1.png diff --git a/Assets/Sprites/PurpleWall_BOT.png.meta b/Assets/Sprites/Candle1.png.meta similarity index 95% rename from Assets/Sprites/PurpleWall_BOT.png.meta rename to Assets/Sprites/Candle1.png.meta index e258997..8d49723 100644 --- a/Assets/Sprites/PurpleWall_BOT.png.meta +++ b/Assets/Sprites/Candle1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c493dd4f06f0e6448ca0485a0aec85b +guid: fae6a78c755d07443abe06a59a3c2694 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: dcc6c86dfd11f6f469b90a928cbd95fa + spriteID: da5d40c84f8595f47b80dcea5d2deb3a internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/CANDLE(2).png b/Assets/Sprites/Candle2.png similarity index 100% rename from Assets/Sprites/CANDLE(2).png rename to Assets/Sprites/Candle2.png diff --git a/Assets/Sprites/PurpleWall_BOT2.png.meta b/Assets/Sprites/Candle2.png.meta similarity index 95% rename from Assets/Sprites/PurpleWall_BOT2.png.meta rename to Assets/Sprites/Candle2.png.meta index a48e01c..b7afd62 100644 --- a/Assets/Sprites/PurpleWall_BOT2.png.meta +++ b/Assets/Sprites/Candle2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9f7113f83f58bbc4b80539190bfc99b8 +guid: 6374b71e4cf054c468b446a951d5213a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: ece68cddb92da6c4fbecb6414f4f2178 + spriteID: b492c21463e3a0f4a9b0be683bd11dda internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/CANDLE(3).png b/Assets/Sprites/Candle3.png similarity index 100% rename from Assets/Sprites/CANDLE(3).png rename to Assets/Sprites/Candle3.png diff --git a/Assets/Sprites/PurpleWall_BOTL.png.meta b/Assets/Sprites/Candle3.png.meta similarity index 95% rename from Assets/Sprites/PurpleWall_BOTL.png.meta rename to Assets/Sprites/Candle3.png.meta index 17118dd..2906292 100644 --- a/Assets/Sprites/PurpleWall_BOTL.png.meta +++ b/Assets/Sprites/Candle3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a0ebf3d513ad28e40ab932a7cb0d40ca +guid: 2df821043bf0ca446a097443f08f988e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 179b2ee31f47de84686742014b4d4be1 + spriteID: 7c02f5004020e06428309e8025378000 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/CANDLE(4).png b/Assets/Sprites/Candle4.png similarity index 100% rename from Assets/Sprites/CANDLE(4).png rename to Assets/Sprites/Candle4.png diff --git a/Assets/Sprites/PurpleWall.png.meta b/Assets/Sprites/Candle4.png.meta similarity index 95% rename from Assets/Sprites/PurpleWall.png.meta rename to Assets/Sprites/Candle4.png.meta index 69faf9a..0c2270a 100644 --- a/Assets/Sprites/PurpleWall.png.meta +++ b/Assets/Sprites/Candle4.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30d1cdf49d7bdfe44a88c405b2d16a57 +guid: 6f479eef89550eb458f5176e6b10bc9c TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: fd8494f00cbb92b4db5c2abee06fcf88 + spriteID: 9f0d734ca5077c34f8b6bfb253e68903 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/CANDLE(5).png b/Assets/Sprites/Candle5.png similarity index 100% rename from Assets/Sprites/CANDLE(5).png rename to Assets/Sprites/Candle5.png diff --git a/Assets/Sprites/Candle5.png.meta b/Assets/Sprites/Candle5.png.meta new file mode 100644 index 0000000..d6f809d --- /dev/null +++ b/Assets/Sprites/Candle5.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: bf433c120e4d5994796695485023c289 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 554f6d8e091900346aa7a07426a523ee + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/LeftCarpet.png b/Assets/Sprites/CarpetLeft.png similarity index 100% rename from Assets/Sprites/LeftCarpet.png rename to Assets/Sprites/CarpetLeft.png diff --git a/Assets/Sprites/CarpetLeft.png.meta b/Assets/Sprites/CarpetLeft.png.meta new file mode 100644 index 0000000..32f591a --- /dev/null +++ b/Assets/Sprites/CarpetLeft.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: bd9307ceb5bb935408da6a1e8a4a99d4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 743ed6c76f1f2cb4dbba0628184c8b5e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/MiddleCarpet.png b/Assets/Sprites/CarpetMiddle.png similarity index 100% rename from Assets/Sprites/MiddleCarpet.png rename to Assets/Sprites/CarpetMiddle.png diff --git a/Assets/Sprites/CarpetMiddle.png.meta b/Assets/Sprites/CarpetMiddle.png.meta new file mode 100644 index 0000000..90748e0 --- /dev/null +++ b/Assets/Sprites/CarpetMiddle.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 98924b554aa46424da69a406909ff945 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: fa013442220555640b86310e62a6b7eb + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/RightCarpet.png b/Assets/Sprites/CarpetRight.png similarity index 100% rename from Assets/Sprites/RightCarpet.png rename to Assets/Sprites/CarpetRight.png diff --git a/Assets/Sprites/CarpetRight.png.meta b/Assets/Sprites/CarpetRight.png.meta new file mode 100644 index 0000000..9975168 --- /dev/null +++ b/Assets/Sprites/CarpetRight.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: ec9aebb292b8d3f429cde7d50a652331 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 94326d72e194ec94595f281c5d686541 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/ChDamage.png b/Assets/Sprites/ChDamage.png deleted file mode 100644 index 1432c30..0000000 --- a/Assets/Sprites/ChDamage.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b67d6341f4f989e7d9d8ccdeb3f3ba1d46c54b7fa19ec0aaf7393f51c4c419b -size 425 diff --git a/Assets/Sprites/bloodonfloorwithhand.png b/Assets/Sprites/GoreOnFloor.png similarity index 100% rename from Assets/Sprites/bloodonfloorwithhand.png rename to Assets/Sprites/GoreOnFloor.png diff --git a/Assets/Sprites/GoreOnFloor.png.meta b/Assets/Sprites/GoreOnFloor.png.meta new file mode 100644 index 0000000..a061108 --- /dev/null +++ b/Assets/Sprites/GoreOnFloor.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 83564423f353bee4c87b757b0ff61cfa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4474d022c718c144e81048b557554eca + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/HealthBar.png.meta b/Assets/Sprites/HealthBar.png.meta index 3914016..0bcf259 100644 --- a/Assets/Sprites/HealthBar.png.meta +++ b/Assets/Sprites/HealthBar.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 @@ -41,7 +41,7 @@ TextureImporter: lightmap: 0 compressionQuality: 50 spriteMode: 1 - spriteExtrude: 1 + spriteExtrude: 0 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/HealthBarLife.png.meta b/Assets/Sprites/HealthBarLife.png.meta index 11d6017..606683a 100644 --- a/Assets/Sprites/HealthBarLife.png.meta +++ b/Assets/Sprites/HealthBarLife.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 @@ -41,7 +41,7 @@ TextureImporter: lightmap: 0 compressionQuality: 50 spriteMode: 1 - spriteExtrude: 1 + spriteExtrude: 0 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/HPotion.png b/Assets/Sprites/HealthPotion.png similarity index 100% rename from Assets/Sprites/HPotion.png rename to Assets/Sprites/HealthPotion.png diff --git a/Assets/Sprites/HPotion.png.meta b/Assets/Sprites/HealthPotion.png.meta similarity index 100% rename from Assets/Sprites/HPotion.png.meta rename to Assets/Sprites/HealthPotion.png.meta diff --git a/Assets/Sprites/HITEFFEC.png b/Assets/Sprites/HitEffect.png similarity index 100% rename from Assets/Sprites/HITEFFEC.png rename to Assets/Sprites/HitEffect.png diff --git a/Assets/Sprites/HitEffect.png.meta b/Assets/Sprites/HitEffect.png.meta new file mode 100644 index 0000000..50f9b2f --- /dev/null +++ b/Assets/Sprites/HitEffect.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 64ca65046ef482d488c2db7d09d8debd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a08b9dd10b92412479320edbd8d156fe + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Maghetto(Back).png b/Assets/Sprites/MageBack.png similarity index 100% rename from Assets/Sprites/Maghetto(Back).png rename to Assets/Sprites/MageBack.png diff --git a/Assets/Sprites/Maghetto(Back).png.meta b/Assets/Sprites/MageBack.png.meta similarity index 100% rename from Assets/Sprites/Maghetto(Back).png.meta rename to Assets/Sprites/MageBack.png.meta diff --git a/Assets/Sprites/Maghetto(Front).png b/Assets/Sprites/MageFront.png similarity index 100% rename from Assets/Sprites/Maghetto(Front).png rename to Assets/Sprites/MageFront.png diff --git a/Assets/Sprites/Maghetto(Front).png.meta b/Assets/Sprites/MageFront.png.meta similarity index 100% rename from Assets/Sprites/Maghetto(Front).png.meta rename to Assets/Sprites/MageFront.png.meta diff --git a/Assets/Sprites/PurpleWall.png b/Assets/Sprites/PurpleWall.png deleted file mode 100644 index 998ad10..0000000 --- a/Assets/Sprites/PurpleWall.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:980f104be8685141cd4b0c01646b9056abe47b76a8f9f28f884c0315aef16391 -size 260 diff --git a/Assets/Sprites/PurpleWall_BOT.png b/Assets/Sprites/PurpleWall_BOT.png deleted file mode 100644 index 3fd006d..0000000 --- a/Assets/Sprites/PurpleWall_BOT.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a9f2afef01576aabf044b2dd4f02e861f4b8eb62b27a0bf1d3944c2e9feff3c -size 2557 diff --git a/Assets/Sprites/PurpleWall_BOT2.png b/Assets/Sprites/PurpleWall_BOT2.png deleted file mode 100644 index 05fecbd..0000000 --- a/Assets/Sprites/PurpleWall_BOT2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c33104bb18263ed71a745bed2def44f82cf80fa6dd2d2ec845c31a6c6c27776f -size 2810 diff --git a/Assets/Sprites/PurpleWall_BOTL.png b/Assets/Sprites/PurpleWall_BOTL.png deleted file mode 100644 index 60c8d8c..0000000 --- a/Assets/Sprites/PurpleWall_BOTL.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4a0fa7ae84e4325299d23bf5cc21dd18bf9bc7bd1afbe86082a66a392590a10 -size 1478 diff --git a/Assets/Sprites/PurpleWall_BOTR.png b/Assets/Sprites/PurpleWall_BOTR.png deleted file mode 100644 index 6b4fb8b..0000000 --- a/Assets/Sprites/PurpleWall_BOTR.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75e0b1c7e01f51823abeaeceafb3fdee138892466b633ff75886d36e8d765a46 -size 1563 diff --git a/Assets/Sprites/PurpleWall_BOTR.png.meta b/Assets/Sprites/PurpleWall_BOTR.png.meta deleted file mode 100644 index 51fa314..0000000 --- a/Assets/Sprites/PurpleWall_BOTR.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 8b0e6101c22415a489bd7e6dd0732538 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - 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: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 29e977c76e32b7146bbae1ca1a4038db - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_LEFT.png b/Assets/Sprites/PurpleWall_LEFT.png deleted file mode 100644 index 48b8806..0000000 --- a/Assets/Sprites/PurpleWall_LEFT.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb2261cdecc15a54e3ed48ed171e444fb9f4f162390461e55f56ee089e32da87 -size 1764 diff --git a/Assets/Sprites/PurpleWall_LEFT.png.meta b/Assets/Sprites/PurpleWall_LEFT.png.meta deleted file mode 100644 index a029815..0000000 --- a/Assets/Sprites/PurpleWall_LEFT.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 1c1ab193bd23fde40a1d3400075ccd26 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 9 - spritePivot: {x: 0, y: 0.5} - spritePixelsToUnits: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 6f50407d14075ba448ed13452cb04b7e - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_RIGHT.png b/Assets/Sprites/PurpleWall_RIGHT.png deleted file mode 100644 index b6c061c..0000000 --- a/Assets/Sprites/PurpleWall_RIGHT.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24928d0562dca396ba98c18f9c512977a2fe018215855c377f3fa1bb7261b575 -size 1745 diff --git a/Assets/Sprites/PurpleWall_RIGHT.png.meta b/Assets/Sprites/PurpleWall_RIGHT.png.meta deleted file mode 100644 index ff0d438..0000000 --- a/Assets/Sprites/PurpleWall_RIGHT.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 47816dfcc9e4290499aa0189a04a5560 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 9 - spritePivot: {x: 1, y: 0.5} - spritePixelsToUnits: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: b10cf7aa4e5ffc342a42408b70029fde - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_UP.png b/Assets/Sprites/PurpleWall_UP.png deleted file mode 100644 index 9a2c5a1..0000000 --- a/Assets/Sprites/PurpleWall_UP.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d1c3acc7afc65a590533f750532d5fa5a8eabe12be442783a0ab42787e978ed -size 2821 diff --git a/Assets/Sprites/PurpleWall_UP.png.meta b/Assets/Sprites/PurpleWall_UP.png.meta deleted file mode 100644 index 81adde7..0000000 --- a/Assets/Sprites/PurpleWall_UP.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: a6548c20c0b36384f9ba55aac5cd513d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - 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: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: a11a90c26b5139c419cac9a1da608cb6 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_UP2.png b/Assets/Sprites/PurpleWall_UP2.png deleted file mode 100644 index f9822b5..0000000 --- a/Assets/Sprites/PurpleWall_UP2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fe39778eb0915015e1768fcff1c47e2ba0e9fa93006727441b715a8a406cb84 -size 3032 diff --git a/Assets/Sprites/PurpleWall_UP2.png.meta b/Assets/Sprites/PurpleWall_UP2.png.meta deleted file mode 100644 index cd5900c..0000000 --- a/Assets/Sprites/PurpleWall_UP2.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: de53d30fbdcfc2e458577832376fddc7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - 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: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 2eea6cc0c870521419febeda1e3efec4 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_UPL.png b/Assets/Sprites/PurpleWall_UPL.png deleted file mode 100644 index bf4e491..0000000 --- a/Assets/Sprites/PurpleWall_UPL.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:129393d956d88cb5a5b4a1fa4f0f5ed196ebd7f03e68f6e3f5c7d2710e93bd64 -size 1906 diff --git a/Assets/Sprites/PurpleWall_UPL.png.meta b/Assets/Sprites/PurpleWall_UPL.png.meta deleted file mode 100644 index 38ecc4b..0000000 --- a/Assets/Sprites/PurpleWall_UPL.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 1f464248b697d4b459679fd8c4215983 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - 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: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 306a2b16d03475741997fd38e47ab67f - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_UPR.png b/Assets/Sprites/PurpleWall_UPR.png deleted file mode 100644 index 760b51e..0000000 --- a/Assets/Sprites/PurpleWall_UPR.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a40aa961641fcc0275799684e407ac57b033667d264a673da58423b39fd53ebb -size 1923 diff --git a/Assets/Sprites/PurpleWall_UPR.png.meta b/Assets/Sprites/PurpleWall_UPR.png.meta deleted file mode 100644 index 15929a6..0000000 --- a/Assets/Sprites/PurpleWall_UPR.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 424d116bfc9d297468486f10739cb1b3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - 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: 40 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 7892eaa1858348b4a97a7cd93ce3250c - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/PurpleTileset.png b/Assets/Sprites/Tiles.png similarity index 100% rename from Assets/Sprites/PurpleTileset.png rename to Assets/Sprites/Tiles.png diff --git a/Assets/Sprites/PurpleTileset.png.meta b/Assets/Sprites/Tiles.png.meta similarity index 100% rename from Assets/Sprites/PurpleTileset.png.meta rename to Assets/Sprites/Tiles.png.meta diff --git a/Assets/Sprites/PurpleTileset2.png b/Assets/Sprites/TilesAlt.png similarity index 100% rename from Assets/Sprites/PurpleTileset2.png rename to Assets/Sprites/TilesAlt.png diff --git a/Assets/Sprites/PurpleTileset2.png.meta b/Assets/Sprites/TilesAlt.png.meta similarity index 100% rename from Assets/Sprites/PurpleTileset2.png.meta rename to Assets/Sprites/TilesAlt.png.meta diff --git a/Assets/Sprites/PurpleWall_BOTSteffo.png b/Assets/Sprites/TilesWall.png similarity index 100% rename from Assets/Sprites/PurpleWall_BOTSteffo.png rename to Assets/Sprites/TilesWall.png diff --git a/Assets/Sprites/PurpleWall_BOTSteffo.png.meta b/Assets/Sprites/TilesWall.png.meta similarity index 100% rename from Assets/Sprites/PurpleWall_BOTSteffo.png.meta rename to Assets/Sprites/TilesWall.png.meta diff --git a/Assets/Sprites/VaseRandom.png.meta b/Assets/Sprites/VaseRandom.png.meta index c95bf9f..984f567 100644 --- a/Assets/Sprites/VaseRandom.png.meta +++ b/Assets/Sprites/VaseRandom.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/The Watcher(Back).png b/Assets/Sprites/WatcherBack.png similarity index 100% rename from Assets/Sprites/The Watcher(Back).png rename to Assets/Sprites/WatcherBack.png diff --git a/Assets/Sprites/The Watcher(Back).png.meta b/Assets/Sprites/WatcherBack.png.meta similarity index 98% rename from Assets/Sprites/The Watcher(Back).png.meta rename to Assets/Sprites/WatcherBack.png.meta index 79768f6..54b49b8 100644 --- a/Assets/Sprites/The Watcher(Back).png.meta +++ b/Assets/Sprites/WatcherBack.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 25 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/The Watcher (Front).png b/Assets/Sprites/WatcherFront.png similarity index 100% rename from Assets/Sprites/The Watcher (Front).png rename to Assets/Sprites/WatcherFront.png diff --git a/Assets/Sprites/The Watcher (Front).png.meta b/Assets/Sprites/WatcherFront.png.meta similarity index 98% rename from Assets/Sprites/The Watcher (Front).png.meta rename to Assets/Sprites/WatcherFront.png.meta index c0c444a..cc6cf5d 100644 --- a/Assets/Sprites/The Watcher (Front).png.meta +++ b/Assets/Sprites/WatcherFront.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 25 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/WeaponBacchetta.png.meta b/Assets/Sprites/WeaponBacchetta.png.meta index ba5be39..36e4c87 100644 --- a/Assets/Sprites/WeaponBacchetta.png.meta +++ b/Assets/Sprites/WeaponBacchetta.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/WeaponScettro.png.meta b/Assets/Sprites/WeaponScettro.png.meta index cb0795b..5343fb8 100644 --- a/Assets/Sprites/WeaponScettro.png.meta +++ b/Assets/Sprites/WeaponScettro.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/WeaponSpadina.png.meta b/Assets/Sprites/WeaponSpadina.png.meta index a1616fa..9ee0e89 100644 --- a/Assets/Sprites/WeaponSpadina.png.meta +++ b/Assets/Sprites/WeaponSpadina.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/WeaponSpadone.png.meta b/Assets/Sprites/WeaponSpadone.png.meta index 6cba259..da6133b 100644 --- a/Assets/Sprites/WeaponSpadone.png.meta +++ b/Assets/Sprites/WeaponSpadone.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/WoodenStairs.png.meta b/Assets/Sprites/WoodenStairs.png.meta new file mode 100644 index 0000000..ba0b548 --- /dev/null +++ b/Assets/Sprites/WoodenStairs.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 831bed7066c807a478c9a7069bde5f13 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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 + 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: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 68cdd775e0b59924e9b0e4454f125100 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Storia.txt b/Assets/Storia.txt similarity index 100% rename from Assets/Scripts/Storia.txt rename to Assets/Storia.txt diff --git a/Assets/Prefabs/SkeletonBow.prefab.meta b/Assets/Storia.txt.meta similarity index 62% rename from Assets/Prefabs/SkeletonBow.prefab.meta rename to Assets/Storia.txt.meta index bf4e340..07f054e 100644 --- a/Assets/Prefabs/SkeletonBow.prefab.meta +++ b/Assets/Storia.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0f7d33d3a45ecdd4c9d53e593f893922 -PrefabImporter: +guid: 0b3a6d1486665b946946e01f066fa651 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..5567f20 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,11 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Game.unity + guid: 0b54e52e19a1cd84392cf13adf4ff9a6 + - enabled: 1 + path: Assets/Scenes/Dead.unity + guid: e980b8de6a02b0f4ebedd3f35b486608 m_configObjects: {} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 819cd6d..c6c1a8d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -49,3 +49,6 @@ TagManager: - name: Entities uniqueID: 3772233697 locked: 0 + - name: Effects + uniqueID: 1430251225 + locked: 0