Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Assets/Prefabs/RoomSystem/Corridor/Room.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2801,6 +2801,7 @@ MonoBehaviour:
- {fileID: 7646078152559978388, guid: 96efbcbb8de02c04e8828f4c44b0af95, type: 3}
- {fileID: 7646078152559978388, guid: 6bd44dba7be27674aae083b13ec033b3, type: 3}
- {fileID: 9096874691272071173, guid: df9ca486b9215294b871fe77d6a52372, type: 3}
- {fileID: 462902943475074006, guid: 854cb3c942bbf354cb1d900eaadba24a, type: 3}
--- !u!1 &4171805761210331374
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2927,7 +2928,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
Expand All @@ -2937,7 +2938,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 2
m_TileSpriteIndex: 2
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
Expand Down Expand Up @@ -3242,10 +3243,10 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 1129282767, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 1
m_Data: {fileID: 916167026, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 2
m_Data: {fileID: -1345423878, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 2
Expand All @@ -3264,8 +3265,8 @@ Tilemap:
m_Data: {fileID: 693045916, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 1
m_Data: {fileID: 899381424, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 916167026, guid: 6b70aeaa417e82a4f9cc02ceaf140158, type: 3}
- m_RefCount: 1
m_Data: {fileID: 113733329, guid: ad684922a8aff654ebccc527594e7603, type: 3}
- m_RefCount: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Animator:
m_Controller: {fileID: 9100000, guid: cc739925a00880343beac9631c205704, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
Expand Down
18 changes: 16 additions & 2 deletions Assets/Prefabs/Traps/Spike/Anims/Spike_Anims.anim
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
Expand All @@ -93,4 +93,18 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0.25
functionName: OnTriggered
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.5833333
functionName: NotTriggered
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
Binary file added Assets/Prefabs/Traps/Spike/Anims/spike1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Assets/Prefabs/Traps/Spike/Anims/spike1.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Prefabs/Traps/Spike/Anims/spike2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Assets/Prefabs/Traps/Spike/Anims/spike2.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Prefabs/Traps/Spike/Anims/spike3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading