Skip to content
Snippets Groups Projects
Commit a2668b01 authored by Robin Halseth Sandvik's avatar Robin Halseth Sandvik
Browse files

Merge branch 'master' into 'main' 

Updated the example scenario.

See merge request !16
parents 89b76a80 9a035b8a
No related branches found
No related tags found
2 merge requests!21Updating master to have the new stuff from main.,!16Updated the example scenario.
Hide whitespace changes
Inline Side-by-side
MrBigsock/Assets/Scenes/example.unity
+ 186
− 186
View file @ a2668b01
......@@ -168,65 +168,8 @@ Transform:
- {fileID: 323648872}
- {fileID: 1483953644}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 1
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
......@@ -1165,13 +1108,74 @@ RectTransform:
m_Children:
- {fileID: 651767214}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1001 &248757423
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: 6
objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_LocalPosition.x
value: -1.12
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}
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: hpBar
value:
objectReference: {fileID: 651767215}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
--- !u!1 &323648871
GameObject:
m_ObjectHideFlags: 0
......@@ -1625,71 +1629,6 @@ 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!224 &651767214 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
......@@ -1706,67 +1645,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 34ee06bf3eaf64142ac1526be9676c25, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !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}
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: hpBar
value:
objectReference: {fileID: 651767215}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
--- !u!1 &931844718
GameObject:
m_ObjectHideFlags: 0
......@@ -1833,8 +1711,69 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1229029431
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: 4
objectReference: {fileID: 0}
- target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
propertyPath: m_LocalPosition.x
value: 2.82
objectReference: {fileID: 0}
- target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
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}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f256acc71054c194a819c82677b399a7, type: 3}
--- !u!1 &1483953643
GameObject:
m_ObjectHideFlags: 0
......@@ -2589,3 +2528,64 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
--- !u!1001 &2143596491
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: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
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}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment