diff --git a/MrBigsock/Assets/Prefabs/BigSock.prefab b/MrBigsock/Assets/Prefabs/BigSock.prefab
index ce2c672a0b93e6a5fb7160b8395e7338066b2706..4377491706318209a491ee3f5fc607363ec1dae6 100644
--- a/MrBigsock/Assets/Prefabs/BigSock.prefab
+++ b/MrBigsock/Assets/Prefabs/BigSock.prefab
@@ -131,9 +131,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7cac03e60e9d6f24591d5bdc111d211a, type: 3}
m_Name:
m_EditorClassIdentifier:
- baseAttackSpeed: 1
- baseMovementSpeed: 1
+ baseAttackSpeed: 4
+ baseMovementSpeed: 3
baseDamage: 1
+ KnockbackForce: 150
baseHP: 10
baseMaxHP: 10
collisionOffset: 0.05
@@ -160,19 +161,19 @@ Rigidbody2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8799933624292384519}
- m_BodyType: 1
+ m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
- m_LinearDrag: 0
+ m_LinearDrag: 1
m_AngularDrag: 0.05
- m_GravityScale: 1
+ m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
- m_Constraints: 0
+ m_Constraints: 4
--- !u!95 &8616172023331984945
Animator:
serializedVersion: 4
diff --git a/MrBigsock/Assets/Prefabs/attack.prefab b/MrBigsock/Assets/Prefabs/attack.prefab
index a6ad0cd9dd75a90f05f4e0606ecbe4a7138a6633..22ddb3611f09dea88044c02f546a8a856e5a7087 100644
--- a/MrBigsock/Assets/Prefabs/attack.prefab
+++ b/MrBigsock/Assets/Prefabs/attack.prefab
@@ -134,7 +134,7 @@ Rigidbody2D:
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
- m_Constraints: 0
+ m_Constraints: 4
--- !u!114 &7173793660907891948
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -160,3 +160,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 10
+ baseDamage: 1
diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
index c1a279cd7bf56faf547fed50dc360c00807ceec8..9df14e8df38d288bfa3b48089d173fe7f8ef47d7 100644
--- a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
+++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
@@ -103,7 +103,7 @@ Rigidbody2D:
m_UseFullKinematicContacts: 1
m_UseAutoMass: 1
m_Mass: 0.6243647
- m_LinearDrag: 0
+ m_LinearDrag: 2.5
m_AngularDrag: 0
m_GravityScale: 0
m_Material: {fileID: 0}
@@ -144,8 +144,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
baseAttackSpeed: 1
- baseMovementSpeed: 1
+ baseMovementSpeed: 2
baseDamage: 1
+ KnockbackForce: 150
baseHP: 10
baseMaxHP: 10
collisionOffset: 0.05
diff --git a/MrBigsock/Assets/Scenes/example.unity b/MrBigsock/Assets/Scenes/example.unity
index a0d9b57fdd5201ba30efecf7651349a417d3ca06..ae3430c66e13ac527d29f94df253134b697a80d4 100644
--- a/MrBigsock/Assets/Scenes/example.unity
+++ b/MrBigsock/Assets/Scenes/example.unity
@@ -168,8 +168,65 @@ Transform:
- {fileID: 323648872}
- {fileID: 1483953644}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &103867413
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_Name
+ value: Enemy_Slime
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.072864
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.2126632
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
--- !u!1 &114663866
GameObject:
m_ObjectHideFlags: 0
@@ -1467,6 +1524,128 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
+--- !u!1001 &555339182
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_Name
+ value: enemy_orc_warrior
+ objectReference: {fileID: 0}
+ - target: {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.7570767
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.98749655
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8506405333948921944, guid: f256acc71054c194a819c82677b399a7, type: 3}
+ propertyPath: m_CollisionDetection
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f256acc71054c194a819c82677b399a7, type: 3}
+--- !u!1001 &866064932
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1.1768394
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.8187598
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8799933624292384519, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_Name
+ value: BigSock
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
--- !u!1 &1483953643
GameObject:
m_ObjectHideFlags: 0
@@ -2108,80 +2287,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &8799933624669862766
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 8280117626939289948, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Size.x
- value: 0.53090835
- objectReference: {fileID: 0}
- - target: {fileID: 8280117626939289948, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Size.y
- value: 0.26792312
- objectReference: {fileID: 0}
- - target: {fileID: 8280117626939289948, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Offset.x
- value: -0.10727203
- objectReference: {fileID: 0}
- - target: {fileID: 8280117626939289948, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Offset.y
- value: -0.84557915
- objectReference: {fileID: 0}
- - target: {fileID: 8616172023331984945, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Controller
- value:
- objectReference: {fileID: 9100000, guid: 7bc7bec76fc4588429b332093f2416b9, type: 2}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8799933624292384519, guid: 008ac26ba660ab94484970b17c589923, type: 3}
- propertyPath: m_Name
- value: BigSock
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
diff --git a/MrBigsock/ProjectSettings/Physics2DSettings.asset b/MrBigsock/ProjectSettings/Physics2DSettings.asset
index ff6f57d502c6c6c0942d69e0183ca998677b2d6e..026c545f5f3ac1db0a076bbbf44d63b79ffd05c9 100644
--- a/MrBigsock/ProjectSettings/Physics2DSettings.asset
+++ b/MrBigsock/ProjectSettings/Physics2DSettings.asset
@@ -53,4 +53,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
- m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffdff9ffffffffffffffffffffffffffffdffbffffdff9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffff1ff8ffffdfffffffdfffffffdffbffffdffbffffdff8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff