Skip to content

Commit

Permalink
fix: wizard hitbox
Browse files Browse the repository at this point in the history
  • Loading branch information
4kills committed Jun 23, 2022
1 parent c5661a3 commit e9ca91c
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 4 deletions.
64 changes: 61 additions & 3 deletions Assets/Scenes/Game.unity
Original file line number Diff line number Diff line change
Expand Up @@ -21638,6 +21638,63 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 307293182}
m_PrefabAsset: {fileID: 0}
--- !u!1 &307363606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 307363607}
- component: {fileID: 307363608}
m_Layer: 29
m_Name: HitBox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &307363607
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307363606}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 908599705}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &307363608
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307363606}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.12249747, y: 0.36749437}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.7758176, y: 0.632505}
m_EdgeRadius: 0
--- !u!1001 &309767075
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -73988,7 +74045,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.12797028, y: 0.18518642}
m_Offset: {x: 0.16510344, y: 2.5369358}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0}
Expand All @@ -73999,7 +74056,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.7347668, y: 0.5126424}
m_Size: {x: 3.6409278, y: 5.2161417}
m_EdgeRadius: 0
--- !u!50 &908599703
Rigidbody2D:
Expand Down Expand Up @@ -74083,7 +74140,8 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 21.41, y: 0.47, z: 0}
m_LocalScale: {x: 0.20000002, y: 0.20000002, z: 0.2}
m_Children: []
m_Children:
- {fileID: 307363607}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
2 changes: 1 addition & 1 deletion keybindings_default.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"player1_shoot_down": 118,
"player1_cooldown_action": 120,

"pause_button": 112,
"pause_button": 286,

"player2_move_up": 59,
"player2_move_left": 96,
Expand Down

0 comments on commit e9ca91c

Please sign in to comment.