diff --git a/Assets/PlayerMovementAnimatorController.controller b/Assets/PlayerMovementAnimatorController.controller index 6da36e48..ce795883 100644 --- a/Assets/PlayerMovementAnimatorController.controller +++ b/Assets/PlayerMovementAnimatorController.controller @@ -17,10 +17,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.10835931 m_TransitionOffset: 0 m_ExitTime: 0.25 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -45,7 +45,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.14936529 m_TransitionOffset: 0 m_ExitTime: 0.08775835 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -124,10 +124,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.25 - m_HasExitTime: 1 + m_TransitionDuration: 0.08565247 + m_TransitionOffset: 0.012336434 + m_ExitTime: 0.25616822 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -152,7 +152,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.15749912 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -295,10 +295,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.06266868 m_TransitionOffset: 0 m_ExitTime: 0.25 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -320,10 +320,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.074091345 m_TransitionOffset: 0 m_ExitTime: 0.25 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -382,7 +382,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.15940142 m_TransitionOffset: 0 m_ExitTime: 0.000000007914678 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -407,7 +407,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.15749913 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Prefabs/Traps/Bear_Trap.meta b/Assets/Prefabs/Traps/Bear_Trap.meta new file mode 100644 index 00000000..3d654d13 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: deda805c3c9c4d24ca8bfb71587ae001 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims.meta b/Assets/Prefabs/Traps/Bear_Trap/Anims.meta new file mode 100644 index 00000000..54ed0f9d --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e541ffeea70a23245b30c4ea8190ac8f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim new file mode 100644 index 00000000..a8f0e895 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim @@ -0,0 +1,88 @@ +%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: Bear_Trap + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 806633374, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - time: 0.083333336 + value: {fileID: -1666062894, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - time: 0.16666667 + value: {fileID: -415013816, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - time: 0.25 + value: {fileID: 118112998, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 806633374, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - {fileID: -1666062894, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - {fileID: -415013816, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + - {fileID: 118112998, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - time: 0.16666667 + functionName: TakeTrapDamage + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim.meta b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim.meta new file mode 100644 index 00000000..ddfb38ce --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bedf9b40b73566041bfa851ee6e6c648 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png new file mode 100644 index 00000000..11f31602 Binary files /dev/null and b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png differ diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png.meta b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png.meta new file mode 100644 index 00000000..2e1c0602 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png.meta @@ -0,0 +1,215 @@ +fileFormatVersion: 2 +guid: 12ff0c236cdc9e342b4a88fa58d332bd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Bear_Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 68bb4bd13e852b045a0eb8a22e174be8 + internalID: 806633374 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ef251589e79aab44d96d95d03bd44ff1 + internalID: -1666062894 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 416ec63fd440bfb428f7899d3844d0b1 + internalID: -415013816 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 410d5149d0ddb414d9121fd5ead59c0a + internalID: 118112998 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Bear_Trap_0: 806633374 + Bear_Trap_1: -1666062894 + Bear_Trap_2: -415013816 + Bear_Trap_3: 118112998 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller new file mode 100644 index 00000000..66baf807 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7190504744474550028 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsTouch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4651967881173442270} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-6784672704035944610 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3704032683205050527} + m_Position: {x: 423.24084, y: 233.89761, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4651967881173442270} + m_Position: {x: 450, y: 70, 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: 3704032683205050527} +--- !u!1102 &-4651967881173442270 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bear_Trap + m_Speed: 10 + 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: bedf9b40b73566041bfa851ee6e6c648, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bear_Trap_Anim_Controller + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsTouch + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6784672704035944610} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3704032683205050527 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7190504744474550028} + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller.meta b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller.meta new file mode 100644 index 00000000..14d5e5be --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6718ef340b66ce147b1adcdfa740241f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab b/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab new file mode 100644 index 00000000..dd90c312 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9096874691272071173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4773554291628338639} + - component: {fileID: 3891903052352906369} + - component: {fileID: 961515831037664253} + - component: {fileID: 8233138555884793280} + - component: {fileID: 8114584494963098503} + m_Layer: 0 + m_Name: bear_trap + m_TagString: trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4773554291628338639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096874691272071173} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.8900003, y: 4.257224, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3891903052352906369 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096874691272071173} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1791178601 + m_SortingLayer: 3 + m_SortingOrder: 1 + m_Sprite: {fileID: 806633374, guid: 12ff0c236cdc9e342b4a88fa58d332bd, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &961515831037664253 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096874691272071173} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6718ef340b66ce147b1adcdfa740241f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &8233138555884793280 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096874691272071173} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.7, y: 0.5} + m_EdgeRadius: 0 +--- !u!114 &8114584494963098503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096874691272071173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de496cf72dfc43c4694de5517ffb19a9, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab.meta b/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab.meta new file mode 100644 index 00000000..6217c164 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: df9ca486b9215294b871fe77d6a52372 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Fire_Trap.meta b/Assets/Prefabs/Traps/Fire_Trap.meta new file mode 100644 index 00000000..d6ff7270 --- /dev/null +++ b/Assets/Prefabs/Traps/Fire_Trap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6efc7cff618b3174b9329eefabbe63de +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Fire_Trap.png b/Assets/Prefabs/Traps/Fire_Trap.png new file mode 100644 index 00000000..b264bed9 Binary files /dev/null and b/Assets/Prefabs/Traps/Fire_Trap.png differ diff --git a/Assets/Prefabs/Traps/Fire_Trap.png.meta b/Assets/Prefabs/Traps/Fire_Trap.png.meta new file mode 100644 index 00000000..49ee4027 --- /dev/null +++ b/Assets/Prefabs/Traps/Fire_Trap.png.meta @@ -0,0 +1,435 @@ +fileFormatVersion: 2 +guid: c590d1fdde70ce547ab6952b3499ca89 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Fire_Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1cbc9d1af942bcc43a5ff12f3633c950 + internalID: -892190570 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 41035f396f1164e458ab1906b3f50f58 + internalID: -1811184840 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e951801767cc7a4e80c7fa1a4ac424a + internalID: 1681587440 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c4f36e8fd09a554c8a977243a59cfd2 + internalID: 708647140 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0968345ed3cee0f4cb8cf6c0e2274d62 + internalID: 1096600735 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 139dac28d27efa54284dfd3e00b0983c + internalID: -2123158550 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 487c11625fcdfea4e84f33741fe18d0b + internalID: -37057514 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d5dde4f9802d2548883fc1bc31aed63 + internalID: -1525397088 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9503d8404d5e395489139269ece9729d + internalID: -128884081 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4949a210274edb746988a0567d5bbf55 + internalID: -1282308065 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6b2b6e222ca1d2d43ac35140fe211440 + internalID: 798551756 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_11 + rect: + serializedVersion: 2 + x: 352 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a88708e4b640aa045afb11bce80af6f2 + internalID: 2123467838 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_12 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 27f1132254c4439438f564871ad1f58a + internalID: -1493971999 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_13 + rect: + serializedVersion: 2 + x: 416 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9de0bb0d02109d24b830b02517716fb3 + internalID: 1810120211 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Fire_Trap_0: -892190570 + Fire_Trap_1: -1811184840 + Fire_Trap_10: 798551756 + Fire_Trap_11: 2123467838 + Fire_Trap_12: -1493971999 + Fire_Trap_13: 1810120211 + Fire_Trap_2: 1681587440 + Fire_Trap_3: 708647140 + Fire_Trap_4: 1096600735 + Fire_Trap_5: -2123158550 + Fire_Trap_6: -37057514 + Fire_Trap_7: -1525397088 + Fire_Trap_8: -128884081 + Fire_Trap_9: -1282308065 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Push_Trap_Right.png b/Assets/Prefabs/Traps/Push_Trap_Right.png new file mode 100644 index 00000000..79e36b39 Binary files /dev/null and b/Assets/Prefabs/Traps/Push_Trap_Right.png differ diff --git a/Assets/Prefabs/Traps/Push_Trap_Right.png.meta b/Assets/Prefabs/Traps/Push_Trap_Right.png.meta new file mode 100644 index 00000000..6ee707e4 --- /dev/null +++ b/Assets/Prefabs/Traps/Push_Trap_Right.png.meta @@ -0,0 +1,369 @@ +fileFormatVersion: 2 +guid: 69a954f52e110f244825e1a32577ef4b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Push_Trap_Right_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fd37cead95c3b9a40ac1047c0cceb336 + internalID: -953090566 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f54b389abe2b0a642ae008a068a3b9ed + internalID: 1373710644 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6fa408aa70deb764f96dd2bee5f255d5 + internalID: 599580588 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c975bf4ed1761644dad2d66728b62bf4 + internalID: 1314092626 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a35be16611e796a45a1a78a69d6dd657 + internalID: -1964651805 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec450787a8d35314183b99aafd83bfe7 + internalID: 140587702 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f4dc3b01cb1ed6488ac4e773b69f355 + internalID: 1881789030 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a6f35d9307f71de4c878631c44a1720f + internalID: 2056513642 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0010559be42f1c46ae24a889825cecc + internalID: -869401853 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1a1f6e429880c94468dbdf25ee4894d4 + internalID: -453649468 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 69c26300c93ff774fbcbed2944008e00 + internalID: 294234533 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Push_Trap_Right_0: -953090566 + Push_Trap_Right_1: 1373710644 + Push_Trap_Right_10: 294234533 + Push_Trap_Right_2: 599580588 + Push_Trap_Right_3: 1314092626 + Push_Trap_Right_4: -1964651805 + Push_Trap_Right_5: 140587702 + Push_Trap_Right_6: 1881789030 + Push_Trap_Right_7: 2056513642 + Push_Trap_Right_8: -869401853 + Push_Trap_Right_9: -453649468 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Spike Trap.png b/Assets/Prefabs/Traps/Spike Trap.png new file mode 100644 index 00000000..862e7c2b Binary files /dev/null and b/Assets/Prefabs/Traps/Spike Trap.png differ diff --git a/Assets/Prefabs/Traps/Spike Trap.png.meta b/Assets/Prefabs/Traps/Spike Trap.png.meta new file mode 100644 index 00000000..3e473745 --- /dev/null +++ b/Assets/Prefabs/Traps/Spike Trap.png.meta @@ -0,0 +1,435 @@ +fileFormatVersion: 2 +guid: d47ce51d5f6d5d64cb49dc1e2d22fede +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Spike Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e36e763d22a895c478d65c025dfcefde + internalID: 361516866 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f14f8c5399547d547a17b5ef76957de8 + internalID: -264781690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5c9744522e58fa64f9a6bff26ab33aa9 + internalID: -1352782690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa856b2542b0e29459dd28f63ddf738b + internalID: 1869888229 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6151d73ba1adcb94fa7cf5bc14d03ca7 + internalID: 1463505182 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a2b83659c6dd74a42902b1120fc6a258 + internalID: 847824100 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: be9b673d13054a44a86170e362c22059 + internalID: 2053239290 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c38805164226b744bdfcbe84a5ce7af + internalID: 1043079682 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aa209533dd36d94479d1d072e7e23848 + internalID: 355495018 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1a81494e095bf774e87181bfaeef1636 + internalID: 1748245057 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f84d9bbe6632f404b967041915e692f3 + internalID: -136901021 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_11 + rect: + serializedVersion: 2 + x: 352 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bf4e44b90ecab244ebe761d04f5031fb + internalID: -1292400387 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_12 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b4af39773c9a2a49a3d16e897cb1249 + internalID: -356177089 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_13 + rect: + serializedVersion: 2 + x: 416 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cf885b29e2292ba47a3b7af0f4562c2f + internalID: 437321462 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Spike Trap_0: 361516866 + Spike Trap_1: -264781690 + Spike Trap_10: -136901021 + Spike Trap_11: -1292400387 + Spike Trap_12: -356177089 + Spike Trap_13: 437321462 + Spike Trap_2: -1352782690 + Spike Trap_3: 1869888229 + Spike Trap_4: 1463505182 + Spike Trap_5: 847824100 + Spike Trap_6: 2053239290 + Spike Trap_7: 1043079682 + Spike Trap_8: 355495018 + Spike Trap_9: 1748245057 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Spike_V2.meta b/Assets/Prefabs/Traps/Spike_V2.meta new file mode 100644 index 00000000..4dff3d0c --- /dev/null +++ b/Assets/Prefabs/Traps/Spike_V2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36f7f3fb9dcd4c045bf11950abb5ba86 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/LifeCanvas.prefab b/Assets/Prefabs/UI/LifeCanvas.prefab index 2f190fee..b27cfb0d 100644 --- a/Assets/Prefabs/UI/LifeCanvas.prefab +++ b/Assets/Prefabs/UI/LifeCanvas.prefab @@ -108,12 +108,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3816679404089340725} + - {fileID: 8338200564503878847} + - {fileID: 3541969290695416664} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 4.4745, y: 4.4733} - m_SizeDelta: {x: 989.0931, y: 994.3149} + m_AnchoredPosition: {x: 4.49, y: 3.8} + m_SizeDelta: {x: 989.0931, y: 988.4692} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5539019803415998369 Canvas: @@ -133,7 +135,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: -1791178601 m_SortingOrder: 32767 @@ -240,6 +242,274 @@ MonoBehaviour: m_ChildScaleWidth: 1 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 +--- !u!1 &3690536653345487166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8338200564503878847} + - component: {fileID: 5860404924008639143} + - component: {fileID: 5577912274743170655} + m_Layer: 5 + m_Name: Chrono + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8338200564503878847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690536653345487166} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5092284430274364147} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 671, y: 499.5} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5860404924008639143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690536653345487166} + m_CullTransparentMesh: 1 +--- !u!114 &5577912274743170655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690536653345487166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Chrono + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6865167439467567412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3541969290695416664} + - component: {fileID: 3548903198056808642} + - component: {fileID: 6022610885225331009} + m_Layer: 5 + m_Name: "Room N\xB0" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3541969290695416664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6865167439467567412} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5092284430274364147} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 871, y: 499.50006} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3548903198056808642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6865167439467567412} + m_CullTransparentMesh: 1 +--- !u!114 &6022610885225331009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6865167439467567412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Room N\xB0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8639724130513954838 GameObject: m_ObjectHideFlags: 0 @@ -265,7 +535,7 @@ RectTransform: m_GameObject: {fileID: 8639724130513954838} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 1} + m_LocalScale: {x: 5, y: 5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8914676203386326110} @@ -273,6 +543,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -232.1, y: 454.6} + m_AnchoredPosition: {x: -365, y: 470} m_SizeDelta: {x: 52, y: 9} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/Traps.meta b/Assets/Resources/Traps.meta new file mode 100644 index 00000000..1fd7d7ff --- /dev/null +++ b/Assets/Resources/Traps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4662cad7dd0755449b80efb6f19dc861 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Traps/Bear_Trap.png b/Assets/Resources/Traps/Bear_Trap.png new file mode 100644 index 00000000..11f31602 Binary files /dev/null and b/Assets/Resources/Traps/Bear_Trap.png differ diff --git a/Assets/Resources/Traps/Bear_Trap.png.meta b/Assets/Resources/Traps/Bear_Trap.png.meta new file mode 100644 index 00000000..bf34660b --- /dev/null +++ b/Assets/Resources/Traps/Bear_Trap.png.meta @@ -0,0 +1,215 @@ +fileFormatVersion: 2 +guid: fda3e90a39fc2834a9321fb0cdf1eeb0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Bear_Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: df1d56bcb4a52d349935912428ed0855 + internalID: -1248479787 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 31038fc3c8ac2554294de924066cc0b4 + internalID: -1425197527 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bc92c8bfdd58eb84a9085d1bfbbc11dd + internalID: -152818417 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bear_Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eb4a19cf3af842b409fc8c3bae0b77f2 + internalID: 1434679415 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Bear_Trap_0: -1248479787 + Bear_Trap_1: -1425197527 + Bear_Trap_2: -152818417 + Bear_Trap_3: 1434679415 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Traps/Fire_Trap.png b/Assets/Resources/Traps/Fire_Trap.png new file mode 100644 index 00000000..b264bed9 Binary files /dev/null and b/Assets/Resources/Traps/Fire_Trap.png differ diff --git a/Assets/Resources/Traps/Fire_Trap.png.meta b/Assets/Resources/Traps/Fire_Trap.png.meta new file mode 100644 index 00000000..9a616397 --- /dev/null +++ b/Assets/Resources/Traps/Fire_Trap.png.meta @@ -0,0 +1,435 @@ +fileFormatVersion: 2 +guid: 15c5d8e125a81f049b91aa3b7b7391a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Fire_Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1cbc9d1af942bcc43a5ff12f3633c950 + internalID: -892190570 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 41035f396f1164e458ab1906b3f50f58 + internalID: -1811184840 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e951801767cc7a4e80c7fa1a4ac424a + internalID: 1681587440 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c4f36e8fd09a554c8a977243a59cfd2 + internalID: 708647140 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0968345ed3cee0f4cb8cf6c0e2274d62 + internalID: 1096600735 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 139dac28d27efa54284dfd3e00b0983c + internalID: -2123158550 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 487c11625fcdfea4e84f33741fe18d0b + internalID: -37057514 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d5dde4f9802d2548883fc1bc31aed63 + internalID: -1525397088 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9503d8404d5e395489139269ece9729d + internalID: -128884081 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4949a210274edb746988a0567d5bbf55 + internalID: -1282308065 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6b2b6e222ca1d2d43ac35140fe211440 + internalID: 798551756 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_11 + rect: + serializedVersion: 2 + x: 352 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a88708e4b640aa045afb11bce80af6f2 + internalID: 2123467838 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_12 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 27f1132254c4439438f564871ad1f58a + internalID: -1493971999 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fire_Trap_13 + rect: + serializedVersion: 2 + x: 416 + y: 0 + width: 32 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9de0bb0d02109d24b830b02517716fb3 + internalID: 1810120211 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Fire_Trap_0: -892190570 + Fire_Trap_1: -1811184840 + Fire_Trap_10: 798551756 + Fire_Trap_11: 2123467838 + Fire_Trap_12: -1493971999 + Fire_Trap_13: 1810120211 + Fire_Trap_2: 1681587440 + Fire_Trap_3: 708647140 + Fire_Trap_4: 1096600735 + Fire_Trap_5: -2123158550 + Fire_Trap_6: -37057514 + Fire_Trap_7: -1525397088 + Fire_Trap_8: -128884081 + Fire_Trap_9: -1282308065 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Traps/Push_Trap_Right.png b/Assets/Resources/Traps/Push_Trap_Right.png new file mode 100644 index 00000000..79e36b39 Binary files /dev/null and b/Assets/Resources/Traps/Push_Trap_Right.png differ diff --git a/Assets/Resources/Traps/Push_Trap_Right.png.meta b/Assets/Resources/Traps/Push_Trap_Right.png.meta new file mode 100644 index 00000000..8e99d280 --- /dev/null +++ b/Assets/Resources/Traps/Push_Trap_Right.png.meta @@ -0,0 +1,369 @@ +fileFormatVersion: 2 +guid: 0fc86675d45b3f949b35d5bdec46eeb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Push_Trap_Right_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fd37cead95c3b9a40ac1047c0cceb336 + internalID: -953090566 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f54b389abe2b0a642ae008a068a3b9ed + internalID: 1373710644 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6fa408aa70deb764f96dd2bee5f255d5 + internalID: 599580588 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c975bf4ed1761644dad2d66728b62bf4 + internalID: 1314092626 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a35be16611e796a45a1a78a69d6dd657 + internalID: -1964651805 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec450787a8d35314183b99aafd83bfe7 + internalID: 140587702 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f4dc3b01cb1ed6488ac4e773b69f355 + internalID: 1881789030 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a6f35d9307f71de4c878631c44a1720f + internalID: 2056513642 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0010559be42f1c46ae24a889825cecc + internalID: -869401853 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1a1f6e429880c94468dbdf25ee4894d4 + internalID: -453649468 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Push_Trap_Right_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 69c26300c93ff774fbcbed2944008e00 + internalID: 294234533 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Push_Trap_Right_0: -953090566 + Push_Trap_Right_1: 1373710644 + Push_Trap_Right_10: 294234533 + Push_Trap_Right_2: 599580588 + Push_Trap_Right_3: 1314092626 + Push_Trap_Right_4: -1964651805 + Push_Trap_Right_5: 140587702 + Push_Trap_Right_6: 1881789030 + Push_Trap_Right_7: 2056513642 + Push_Trap_Right_8: -869401853 + Push_Trap_Right_9: -453649468 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Traps/Spike Trap.png b/Assets/Resources/Traps/Spike Trap.png new file mode 100644 index 00000000..862e7c2b Binary files /dev/null and b/Assets/Resources/Traps/Spike Trap.png differ diff --git a/Assets/Resources/Traps/Spike Trap.png.meta b/Assets/Resources/Traps/Spike Trap.png.meta new file mode 100644 index 00000000..843b90f3 --- /dev/null +++ b/Assets/Resources/Traps/Spike Trap.png.meta @@ -0,0 +1,435 @@ +fileFormatVersion: 2 +guid: 0e9f6f01aeccc974eb6f8001b6611403 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Spike Trap_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e36e763d22a895c478d65c025dfcefde + internalID: 361516866 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f14f8c5399547d547a17b5ef76957de8 + internalID: -264781690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5c9744522e58fa64f9a6bff26ab33aa9 + internalID: -1352782690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa856b2542b0e29459dd28f63ddf738b + internalID: 1869888229 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6151d73ba1adcb94fa7cf5bc14d03ca7 + internalID: 1463505182 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a2b83659c6dd74a42902b1120fc6a258 + internalID: 847824100 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: be9b673d13054a44a86170e362c22059 + internalID: 2053239290 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c38805164226b744bdfcbe84a5ce7af + internalID: 1043079682 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aa209533dd36d94479d1d072e7e23848 + internalID: 355495018 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1a81494e095bf774e87181bfaeef1636 + internalID: 1748245057 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f84d9bbe6632f404b967041915e692f3 + internalID: -136901021 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_11 + rect: + serializedVersion: 2 + x: 352 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bf4e44b90ecab244ebe761d04f5031fb + internalID: -1292400387 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_12 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b4af39773c9a2a49a3d16e897cb1249 + internalID: -356177089 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spike Trap_13 + rect: + serializedVersion: 2 + x: 416 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cf885b29e2292ba47a3b7af0f4562c2f + internalID: 437321462 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Spike Trap_0: 361516866 + Spike Trap_1: -264781690 + Spike Trap_10: -136901021 + Spike Trap_11: -1292400387 + Spike Trap_12: -356177089 + Spike Trap_13: 437321462 + Spike Trap_2: -1352782690 + Spike Trap_3: 1869888229 + Spike Trap_4: 1463505182 + Spike Trap_5: 847824100 + Spike Trap_6: 2053239290 + Spike Trap_7: 1043079682 + Spike Trap_8: 355495018 + Spike Trap_9: 1748245057 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/EmptyRoom_2.unity b/Assets/Scenes/EmptyRoom_2.unity index 3f3d3b96..a0a0d38b 100644 --- a/Assets/Scenes/EmptyRoom_2.unity +++ b/Assets/Scenes/EmptyRoom_2.unity @@ -153,16 +153,68 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &230314650 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalPosition.x + value: 6.8900003 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalPosition.y + value: 4.257224 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9096874691272071173, guid: df9ca486b9215294b871fe77d6a52372, type: 3} + propertyPath: m_Name + value: bear_trap + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df9ca486b9215294b871fe77d6a52372, type: 3} --- !u!1 &438735177 stripped GameObject: m_CorrespondingSourceObject: {fileID: 728652353996278025, guid: 9e9537c65eb0dd649899a676ec5b08c5, type: 3} m_PrefabInstance: {fileID: 2117950151} m_PrefabAsset: {fileID: 0} ---- !u!224 &505012136 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5092284430274364147, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - m_PrefabInstance: {fileID: 8803801296905376457} - m_PrefabAsset: {fileID: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -477,100 +529,71 @@ RectTransform: --- !u!222 &854916577 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854916575} - m_CullTransparentMesh: 1 ---- !u!114 &854916578 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalPosition.x + value: 2.57 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalPosition.y + value: 1.7172239 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5658978381433336244, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6097000079642511365, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} + propertyPath: m_Name + value: crossbow_down_prefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 127c53d14a0062f41a16963a87a85dc5, type: 3} +--- !u!114 &854916578 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5577912274743170655, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} + m_PrefabInstance: {fileID: 8803801296905376457} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854916575} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Chrono - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!114 &983807668 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3400266234795620559, guid: 9e9537c65eb0dd649899a676ec5b08c5, type: 3} @@ -598,31 +621,12 @@ MonoBehaviour: stageText: {fileID: 1219144881} blacksmithPrefab: {fileID: 181369798890271941, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} altarPrefab: {fileID: 4671168421616932687, guid: 52d0b7df8b3db394988157e997abbc1f, type: 3} ---- !u!1 &1219144880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1219144883} - - component: {fileID: 1219144882} - - component: {fileID: 1219144881} - m_Layer: 5 - m_Name: "Room N\xB0" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1219144881 +--- !u!114 &1219144881 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6022610885225331009, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} + m_PrefabInstance: {fileID: 8803801296905376457} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1219144880} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1278,26 +1282,6 @@ PrefabInstance: propertyPath: m_Name value: LifeCanvas objectReference: {fileID: 0} - - target: {fileID: 340918141599231381, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3816679404089340725, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3816679404089340725, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3816679404089340725, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_AnchoredPosition.x - value: -365 - objectReference: {fileID: 0} - - target: {fileID: 3816679404089340725, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 470 - objectReference: {fileID: 0} - target: {fileID: 5092284430274364147, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1382,22 +1366,13 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 519420031} - - target: {fileID: 5539019803415998369, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - propertyPath: m_AdditionalShaderChannelsFlag - value: 25 + - target: {fileID: 7021784079260240294, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} + propertyPath: m_Maskable + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5092284430274364147, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - insertIndex: -1 - addedObject: {fileID: 854916576} - - targetCorrespondingSourceObject: {fileID: 5092284430274364147, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - insertIndex: -1 - addedObject: {fileID: 718319819} - - targetCorrespondingSourceObject: {fileID: 5092284430274364147, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} - insertIndex: -1 - addedObject: {fileID: 1219144883} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} --- !u!1660057539 &9223372036854775807 diff --git a/Assets/Scripts/Trap/Bear_Trap.meta b/Assets/Scripts/Trap/Bear_Trap.meta new file mode 100644 index 00000000..2869c642 --- /dev/null +++ b/Assets/Scripts/Trap/Bear_Trap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 339f60bb52ffcfc42a708ef8fbc5e3b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs b/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs new file mode 100644 index 00000000..5237a172 --- /dev/null +++ b/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Bear_Trap : MonoBehaviour +{ + bool playerInTrap = false; + Animator m_Animator; + GameObject player; + void Start() + { + m_Animator = gameObject.GetComponent(); + } + + void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.CompareTag("Player")) + { + playerInTrap = true; + m_Animator.SetBool("IsTouch", true); + player = collision.gameObject; + } + } + + void OnTriggerExit2D(Collider2D collision) + { + if (collision.gameObject.CompareTag("Player")) + { + playerInTrap = false; + } + } + + public void TakeTrapDamage() + { + Debug.Log(playerInTrap); + if (playerInTrap) + { + player.GetComponent().TakeDamage(1); + } + } +} diff --git a/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs.meta b/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs.meta new file mode 100644 index 00000000..2e0a71b1 --- /dev/null +++ b/Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de496cf72dfc43c4694de5517ffb19a9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/PlayerHealth.cs b/Assets/Scripts/UI/PlayerHealth.cs index 325d692a..4ae9e5c1 100644 --- a/Assets/Scripts/UI/PlayerHealth.cs +++ b/Assets/Scripts/UI/PlayerHealth.cs @@ -1,61 +1,59 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.UI; // Nécessaire pour manipuler l'UI +using UnityEngine.UI; public class PlayerHealth : MonoBehaviour { public int maxHealth = 5; // Points de vie maximum private int currentHealth; - public GameObject heartPrefab; // Le prefab du cœur à dupliquer dans la HealthBar - public Transform healthBar; // Le conteneur de la HealthBar (l'endroit où les cœurs seront ajoutés) - - private List hearts = new List(); // Liste pour stocker les cœurs actifs + public GameObject heartPrefab; + public Transform healthBar; + private List hearts = new List(); void Start() { - currentHealth = maxHealth; // Commencer avec la vie maximale - UpdateHealthBar(); // Mettre à jour la barre de santé pour afficher les cœurs + currentHealth = maxHealth; + UpdateHealthBar(); } - // Méthode pour infliger des dégâts au joueur + public void TakeDamage(int amount) { currentHealth -= amount; if (currentHealth < 0) { - currentHealth = 0; // Eviter les points de vie négatifs + currentHealth = 0; } - UpdateHealthBar(); // Mettre à jour l'affichage des cœurs + UpdateHealthBar(); } - // Méthode pour soigner le joueur public void Heal(int amount) { currentHealth += amount; if (currentHealth > maxHealth) { - currentHealth = maxHealth; // Eviter de dépasser la vie maximale + currentHealth = maxHealth; } - UpdateHealthBar(); // Mettre à jour l'affichage des cœurs + UpdateHealthBar(); } - // Mettre à jour la barre de santé (ajouter ou supprimer des cœurs) + void UpdateHealthBar() { - // Supprimer tous les cœurs actuels + foreach (GameObject heart in hearts) { Destroy(heart); } hearts.Clear(); - // Ajouter un cœur pour chaque point de vie actuel + for (int i = 0; i < currentHealth; i++) { GameObject newHeart = Instantiate(heartPrefab, healthBar); - hearts.Add(newHeart); // Ajouter le cœur à la liste pour le traquer + hearts.Add(newHeart); // Ajouter le c�ur � la liste pour le traquer } } @@ -63,7 +61,6 @@ void OnCollisionEnter2D(Collision2D collision) { if (collision.gameObject.CompareTag("Enemy")) { - // Infliger des dégâts au joueur lorsqu'il entre en collision avec un ennemi GetComponent().TakeDamage(1); } }