From cdc8d55c2b002334d5937dfae8ce565c66df5612 Mon Sep 17 00:00:00 2001 From: Thomas Lamiable Date: Wed, 23 Oct 2024 17:07:04 +0200 Subject: [PATCH 1/2] feature: Update some animations and system for the player, and add new trap --- ...layerMovementAnimatorController.controller | 28 +- Assets/Prefabs/Traps/Bear_Trap.meta | 8 + Assets/Prefabs/Traps/Bear_Trap/Anims.meta | 8 + .../Traps/Bear_Trap/Anims/Bear_Trap.anim | 81 +++ .../Traps/Bear_Trap/Anims/Bear_Trap.anim.meta | 8 + .../Traps/Bear_Trap/Anims/Bear_Trap.png | Bin 0 -> 825 bytes .../Traps/Bear_Trap/Anims/Bear_Trap.png.meta | 215 +++++++ .../Bear_Trap_Anim_Controller.controller | 133 ++++ .../Bear_Trap_Anim_Controller.controller.meta | 8 + .../Prefabs/Traps/Bear_Trap/bear_trap.prefab | 167 +++++ .../Traps/Bear_Trap/bear_trap.prefab.meta | 7 + Assets/Prefabs/Traps/Fire_Trap.meta | 8 + Assets/Prefabs/Traps/Fire_Trap.png | Bin 0 -> 2370 bytes Assets/Prefabs/Traps/Fire_Trap.png.meta | 435 +++++++++++++ Assets/Prefabs/Traps/Push_Trap_Right.png | Bin 0 -> 1197 bytes Assets/Prefabs/Traps/Push_Trap_Right.png.meta | 369 +++++++++++ Assets/Prefabs/Traps/Spike Trap.png | Bin 0 -> 1091 bytes Assets/Prefabs/Traps/Spike Trap.png.meta | 435 +++++++++++++ Assets/Prefabs/Traps/Spike_V2.meta | 8 + Assets/Prefabs/UI/LifeCanvas.prefab | 280 ++++++++- Assets/Resources/Traps.meta | 8 + Assets/Resources/Traps/Bear_Trap.png | Bin 0 -> 825 bytes Assets/Resources/Traps/Bear_Trap.png.meta | 215 +++++++ Assets/Resources/Traps/Fire_Trap.png | Bin 0 -> 2370 bytes Assets/Resources/Traps/Fire_Trap.png.meta | 435 +++++++++++++ Assets/Resources/Traps/Push_Trap_Right.png | Bin 0 -> 1197 bytes .../Resources/Traps/Push_Trap_Right.png.meta | 369 +++++++++++ Assets/Resources/Traps/Spike Trap.png | Bin 0 -> 1091 bytes Assets/Resources/Traps/Spike Trap.png.meta | 435 +++++++++++++ Assets/Scenes/EmptyRoom_2.unity | 572 +++++------------- Assets/Scripts/Trap/Bear_Trap.meta | 8 + Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs | 41 ++ .../Scripts/Trap/Bear_Trap/Bear_Trap.cs.meta | 11 + Assets/Scripts/UI/PlayerHealth.cs | 33 +- 34 files changed, 3857 insertions(+), 468 deletions(-) create mode 100644 Assets/Prefabs/Traps/Bear_Trap.meta create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims.meta create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim.meta create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.png.meta create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller create mode 100644 Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller.meta create mode 100644 Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab create mode 100644 Assets/Prefabs/Traps/Bear_Trap/bear_trap.prefab.meta create mode 100644 Assets/Prefabs/Traps/Fire_Trap.meta create mode 100644 Assets/Prefabs/Traps/Fire_Trap.png create mode 100644 Assets/Prefabs/Traps/Fire_Trap.png.meta create mode 100644 Assets/Prefabs/Traps/Push_Trap_Right.png create mode 100644 Assets/Prefabs/Traps/Push_Trap_Right.png.meta create mode 100644 Assets/Prefabs/Traps/Spike Trap.png create mode 100644 Assets/Prefabs/Traps/Spike Trap.png.meta create mode 100644 Assets/Prefabs/Traps/Spike_V2.meta create mode 100644 Assets/Resources/Traps.meta create mode 100644 Assets/Resources/Traps/Bear_Trap.png create mode 100644 Assets/Resources/Traps/Bear_Trap.png.meta create mode 100644 Assets/Resources/Traps/Fire_Trap.png create mode 100644 Assets/Resources/Traps/Fire_Trap.png.meta create mode 100644 Assets/Resources/Traps/Push_Trap_Right.png create mode 100644 Assets/Resources/Traps/Push_Trap_Right.png.meta create mode 100644 Assets/Resources/Traps/Spike Trap.png create mode 100644 Assets/Resources/Traps/Spike Trap.png.meta create mode 100644 Assets/Scripts/Trap/Bear_Trap.meta create mode 100644 Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs create mode 100644 Assets/Scripts/Trap/Bear_Trap/Bear_Trap.cs.meta 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..b0ec6a13 --- /dev/null +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim @@ -0,0 +1,81 @@ +%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: [] 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 0000000000000000000000000000000000000000..11f3160205af0a900095e0b555a23c2c7dd2e62a GIT binary patch literal 825 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79e36b392304b6abab883d2d427afd6011b965a9 GIT binary patch literal 1197 zcmeAS@N?(olHy`uVBq!ia0y~yU~B-g6*$;{r1YBgPZ=0kN<3X0Ln`LHook;b>?qQH zKWg1drG+6b(|WjL0s>TpgeKK?UQlo1J|K9A)nQ?~w}p^UP*7liimT8`FLA}CkC?n0 zkKK~(FE77l{r-F0w_09BmEW~d=g+;FKO?36y4YFEw;`5#>Kfe84 zzIFY>EWK?hk<*@5&P$IBd+E2aKeoL%ymUeQW4m9Lb5_dCy1muFf!#yxyF=Lz+kYz2 z=0BHbY5D!>=<|(jOT1$2!tQZwZlw1MjejrevKP<2 zLIAv>~DQlRK z?e=}v{QKu0`aHdGM^AJ&Yl=kM#o!0;nK|}~MqAyQb#d>r=iiGhf-Nts51$_q&G7A* z@~(t^yk+IPW2%4ky;!l>!obu7XfnhL3*zJYL&3?0oPxMW9 zi2XK8{`LL&vQK@_l?3-*ypSt??yGu!3%{QL7;BV=?kaNE8MEbP4Zg1~#O1G>6in zocgjYRUA*sES|qVQu8lqn()-~EEd*t_VdP?i;}1u&}COD~S?*`M3jtYv?E zPQ$$a7pAOZm}S@F)eB1}@C13L;OB4l-ne~@taoDOrn!=w={VR_kXkFj#K9+`#GGi&tP-;U*5#Bq~yqgwUW>%1|>;0HWwHFd3Mg_0u$#z zlOxQU>jxS%{w$urfvKl0?`!dN#}!utyxe(^5~IoX?8Fyg`yVw=n63R!06iJ6WBuKm z(3U7+dsK|!utCqfB<_Yp2{(Vuy}~~py;gTe~DWM4fdPHFS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..862e7c2b8f3360f80cc86a551474c6e07acce0ea GIT binary patch literal 1091 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..79e36b392304b6abab883d2d427afd6011b965a9 GIT binary patch literal 1197 zcmeAS@N?(olHy`uVBq!ia0y~yU~B-g6*$;{r1YBgPZ=0kN<3X0Ln`LHook;b>?qQH zKWg1drG+6b(|WjL0s>TpgeKK?UQlo1J|K9A)nQ?~w}p^UP*7liimT8`FLA}CkC?n0 zkKK~(FE77l{r-F0w_09BmEW~d=g+;FKO?36y4YFEw;`5#>Kfe84 zzIFY>EWK?hk<*@5&P$IBd+E2aKeoL%ymUeQW4m9Lb5_dCy1muFf!#yxyF=Lz+kYz2 z=0BHbY5D!>=<|(jOT1$2!tQZwZlw1MjejrevKP<2 zLIAv>~DQlRK z?e=}v{QKu0`aHdGM^AJ&Yl=kM#o!0;nK|}~MqAyQb#d>r=iiGhf-Nts51$_q&G7A* z@~(t^yk+IPW2%4ky;!l>!obu7XfnhL3*zJYL&3?0oPxMW9 zi2XK8{`LL&vQK@_l?3-*ypSt??yGu!3%{QL7;BV=?kaNE8MEbP4Zg1~#O1G>6in zocgjYRUA*sES|qVQu8lqn()-~EEd*t_VdP?i;}1u&}COD~S?*`M3jtYv?E zPQ$$a7pAOZm}S@F)eB1}@C13L;OB4l-ne~@taoDOrn!=w={VR_kXkFj#K9+`#GGi&tP-;U*5#Bq~yqgwUW>%1|>;0HWwHFd3Mg_0u$#z zlOxQU>jxS%{w$urfvKl0?`!dN#}!utyxe(^5~IoX?8Fyg`yVw=n63R!06iJ6WBuKm z(3U7+dsK|!utCqfB<_Yp2{(Vuy}~~py;gTe~DWM4fdPHFS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..862e7c2b8f3360f80cc86a551474c6e07acce0ea GIT binary patch literal 1091 zcmV-J1ibr+P) zzfTik7{{M8&Q2tW6Y61iQ0hp4|4MQ<;VsR~#jYb9+Ny|_Z zrIF|a1}6W3*TGzKcWv*uzSs9h@AFAqXg~cnK(A-+r0k0tnzJwr+y3efq$6>hjy#ed+a8g z8NT0slrr3eb36Hi>8Y92U()4uH%NONA0J=ezqmT&l>ZUQbSJnu7P)ez1uU^aH z-exe0Prh6EB6jO9^g~Rnzt{;dYxB%{4t}xzN~IDjCX@dDyEpRrZ_p1n zjX@jPIQ@33leu|DNq)wY*C*eteB1SBWBv6mfO$R}81!8H;{AH97W?0eNq_bEOZj^G zUD~aVoE$gt4f-d?&A!be`WoZ*lO#9K%j<4XtvA%h@}kVm&&tx;w#w_1?{2;e^=E4R z^}W#j2MeixM?L%2Ox@`5@$vojqjw4pIyHQ0?gt|A&zst%@*M%O#Wo&PZIP20(gq8Mq}GwvqioeUvuU|qk9%y00BJ3Mx$|&jn?G* zmmkH4M)xfG8sW3hZB*2SeDcYs(H-nyyZ(w^f4NS8x{ZpukWW7Oaq=`8>!RCeO}^jx zw(D;k>+i-Fz-Xgk+P_iW1o?jEUtFEZ`qnP_hV$3AcKbHLCr@7#o*(^;XL@QzMKcF& zzTsVmVSbTcrcA#1{3tf+Z&-ej>o3;{P`A-r7xMKQ-HXg0rBRjqV)93AG|r1|qjk|= zrcA!s{3NF9FYUF9T7Ngb0O~e+>q5R>qkGZ$c^g&9FD`$SM&rEbHd-fr^8LzBV!Hm) z@(); + } + + 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); } } From 686b9d840b019a237ba5d6e383c1b4351d055954 Mon Sep 17 00:00:00 2001 From: Thomas Lamiable Date: Wed, 23 Oct 2024 17:07:35 +0200 Subject: [PATCH 2/2] feat: update EmptyRoom2 for test --- .../Traps/Bear_Trap/Anims/Bear_Trap.anim | 9 +- .../Bear_Trap_Anim_Controller.controller | 2 +- Assets/Scenes/EmptyRoom_2.unity | 116 +++++++++--------- 3 files changed, 67 insertions(+), 60 deletions(-) diff --git a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim index b0ec6a13..a8f0e895 100644 --- a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap.anim @@ -78,4 +78,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + 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_Controller.controller b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller index f19f268b..66baf807 100644 --- a/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller +++ b/Assets/Prefabs/Traps/Bear_Trap/Anims/Bear_Trap_Anim_Controller.controller @@ -70,7 +70,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 63740c93c8e5e814cad70b54d71c655a, type: 2} + m_Motion: {fileID: 7400000, guid: bedf9b40b73566041bfa851ee6e6c648, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Scenes/EmptyRoom_2.unity b/Assets/Scenes/EmptyRoom_2.unity index f89b3b07..7e2499ec 100644 --- a/Assets/Scenes/EmptyRoom_2.unity +++ b/Assets/Scenes/EmptyRoom_2.unity @@ -153,6 +153,63 @@ 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} @@ -942,63 +999,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5978902062025093567, guid: fc0db64e6e1fd4a4b89718f12ab347f7, type: 3} m_PrefabInstance: {fileID: 8803801296905376457} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6035180426050046708 -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: 4.32 - objectReference: {fileID: 0} - - target: {fileID: 4773554291628338639, guid: df9ca486b9215294b871fe77d6a52372, type: 3} - propertyPath: m_LocalPosition.y - value: 2.94 - 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!1001 &8615776833325847340 PrefabInstance: m_ObjectHideFlags: 0 @@ -1227,5 +1227,5 @@ SceneRoots: - {fileID: 1762927023} - {fileID: 2117950151} - {fileID: 1657731470} - - {fileID: 6035180426050046708} + - {fileID: 230314650} - {fileID: 836618273}