From ca0317f40162d698fb3857d5d4b9283ed4cc49aa Mon Sep 17 00:00:00 2001
From: Gard <gardaf@stud.ntnu.no>
Date: Thu, 27 Oct 2022 21:17:32 +0200
Subject: [PATCH] animation added to bigsock attack
---
.../Assets/Code/Core/Abilities/BasicArrow.cs | 4 +-
MrBigsock/Assets/Code/orc/Enemy_orc_range.cs | 6 +-
.../Bullets/basic square bullet.prefab | 27 +-
MrBigsock/Assets/Prefabs/attack.prefab | 6 +-
MrBigsock/Assets/Scenes/GenTilemap.unity | 438 ++++-----
MrBigsock/Assets/Scenes/TestLevel1.unity | 899 ++++--------------
MrBigsock/Assets/Scenes/example.unity | 358 ++-----
.../orc_warrior/bow/bow_animation.anim | 2 +-
.../bow/bow_animation_controller.controller | 136 ++-
.../Animations/small_orc/small_orc.controller | 60 +-
.../Sprites/Player/BigSock/attackBigSock.png | Bin 0 -> 752 bytes
.../ProjectSettings/DynamicsManager.asset | 2 +-
.../ProjectSettings/Physics2DSettings.asset | 2 +-
MrBigsock/ProjectSettings/TagManager.asset | 2 +-
14 files changed, 624 insertions(+), 1318 deletions(-)
create mode 100644 MrBigsock/Assets/Sprites/Player/BigSock/attackBigSock.png
diff --git a/MrBigsock/Assets/Code/Core/Abilities/BasicArrow.cs b/MrBigsock/Assets/Code/Core/Abilities/BasicArrow.cs
index 2c58a3e7..9520f110 100644
--- a/MrBigsock/Assets/Code/Core/Abilities/BasicArrow.cs
+++ b/MrBigsock/Assets/Code/Core/Abilities/BasicArrow.cs
@@ -52,13 +52,15 @@ namespace BigSock {
var temp = (target.Value - actor.transform.position);
var temp1 = temp;
+
+
temp.z = 0;
temp1.z = 90;
var bullet = PrefabService.SINGLETON.Instance(PROJECTILE_NAME, actor.transform.position);
//bullet.transform.rotation = Quaternion.LookRotation(temp.normalized);
- bullet.transform.rotation = Quaternion.LookRotation(temp1 ,Vector3.up);
+ //bullet.transform.rotation = Quaternion.LookRotation(temp1 ,Vector3.up);
var bulletScript = bullet.GetComponent<AttackMovement>();
//bulletScript.Actor = actor;
diff --git a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
index 42d6936b..dff603f8 100644
--- a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
+++ b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
@@ -76,6 +76,9 @@ namespace BigSock {
State = State.Attacking;
NextTimeStateCanChange = DateTime.Now + ATTACK_WAIT_TIME;
}
+ if(target != null && !isInMelee){
+ TryMove((new Vector2(target.position.x, target.position.y) - rb.position).normalized);
+ }
}
else if(State == State.Attacking) {
@@ -94,9 +97,6 @@ namespace BigSock {
}
-
-
-
/*
Movement
*/
diff --git a/MrBigsock/Assets/Prefabs/Bullets/basic square bullet.prefab b/MrBigsock/Assets/Prefabs/Bullets/basic square bullet.prefab
index 84d2745d..e92ab626 100644
--- a/MrBigsock/Assets/Prefabs/Bullets/basic square bullet.prefab
+++ b/MrBigsock/Assets/Prefabs/Bullets/basic square bullet.prefab
@@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 7173793660907891949}
- component: {fileID: 7173793660907891948}
- component: {fileID: 5355219341519538053}
+ - component: {fileID: 7156683324352742488}
m_Layer: 10
m_Name: basic square bullet
m_TagString: Untagged
@@ -77,7 +78,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+ m_Sprite: {fileID: -1283349701, guid: 1710de3411c84ee46a2964301101ea13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -105,7 +106,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 1, y: 1}
+ oldSize: {x: 1.125, y: 0.75}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
@@ -160,5 +161,23 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 10
- baseDamage: 1
- knockbackForce: 2
+--- !u!95 &7156683324352742488
+Animator:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7173793660907891926}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 9c1c680f7a198ae4ab414ce4496a1de7, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/MrBigsock/Assets/Prefabs/attack.prefab b/MrBigsock/Assets/Prefabs/attack.prefab
index 0e34dd60..3eacefd0 100644
--- a/MrBigsock/Assets/Prefabs/attack.prefab
+++ b/MrBigsock/Assets/Prefabs/attack.prefab
@@ -77,7 +77,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+ m_Sprite: {fileID: -1283349701, guid: 1710de3411c84ee46a2964301101ea13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -105,7 +105,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 1, y: 1}
+ oldSize: {x: 1.125, y: 0.75}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
@@ -160,5 +160,3 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 10
- baseDamage: 1
- knockbackForce: 2
diff --git a/MrBigsock/Assets/Scenes/GenTilemap.unity b/MrBigsock/Assets/Scenes/GenTilemap.unity
index cedba3d7..a453e342 100644
--- a/MrBigsock/Assets/Scenes/GenTilemap.unity
+++ b/MrBigsock/Assets/Scenes/GenTilemap.unity
@@ -75704,6 +75704,147 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 137619414}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &214940923
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 948401219}
+ m_Modifications:
+ - target: {fileID: 4907253105222438197, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253105222438197, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253105222438197, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106123323541, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106123323541, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106123323541, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901568, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_Name
+ value: UtilityBar
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 847.5482
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 237.9789
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -515
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 396
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106807762425, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106807762425, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106807762425, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106852799653, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907253106852799653, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
--- !u!1839735485 &243683812 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -75743,8 +75884,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cb942e88bcce56a43ad5d5eb93684742, type: 3}
m_Name:
m_EditorClassIdentifier:
- Pos_2: {fileID: 0}
- player: {fileID: 0}
--- !u!4 &374517732
Transform:
m_ObjectHideFlags: 0
@@ -76187,7 +76326,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1110196460}
+ - {fileID: 1406204873}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -82612,140 +82751,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
---- !u!1 &1110196459
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1110196460}
- - component: {fileID: 1110196463}
- - component: {fileID: 1110196462}
- - component: {fileID: 1110196461}
- m_Layer: 5
- m_Name: Button
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1110196460
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1110196459}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7092986, y: 0.7092986, z: 0.7092986}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1729684651}
- m_Father: {fileID: 948401219}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -663.1, y: -318.9}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1110196461
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1110196459}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 1110196462}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 730662524}
- m_TargetAssemblyTypeName: BigSock.AbstractMapGen, Assembly-CSharp
- m_MethodName: Generate
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &1110196462
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1110196459}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1110196463
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1110196459}
- m_CullTransparentMesh: 1
--- !u!1 &1223302857
GameObject:
m_ObjectHideFlags: 0
@@ -82806,7 +82811,9 @@ MonoBehaviour:
tileSetSO: {fileID: 11400000, guid: 575173cd6a316be4a841f4318029d01d, type: 2}
polygonCollider: {fileID: 498579221}
Door: {fileID: 3927126222752442302, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3}
- Pad: {fileID: 8278828742844585403, guid: 2ebffe98d2371674b91878bc6f5468bb, type: 3}
+ Pad: {fileID: 498579220}
+ Enemy:
+ - {fileID: 2996495149472241661, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
--- !u!4 &1223302859
Transform:
m_ObjectHideFlags: 0
@@ -82827,6 +82834,22 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 27939564}
m_PrefabAsset: {fileID: 0}
+--- !u!224 &1406204873 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ m_PrefabInstance: {fileID: 214940923}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1406204874 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 4907253106310901574, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
+ m_PrefabInstance: {fileID: 214940923}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2d7f19087286e834f816cbf2da1d1aba, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &1698585129
PrefabInstance:
m_ObjectHideFlags: 0
@@ -120705,141 +120728,6 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 2140204255}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1729684650
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1729684651}
- - component: {fileID: 1729684653}
- - component: {fileID: 1729684652}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1729684651
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1729684650}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1110196460}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1729684652
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1729684650}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: Generat
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 24
- m_fontSizeBase: 24
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &1729684653
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1729684650}
- m_CullTransparentMesh: 1
--- !u!1839735485 &1759853368 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -121002,6 +120890,10 @@ PrefabInstance:
propertyPath: m_Name
value: BigSock
objectReference: {fileID: 0}
+ - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: utilBar
+ value:
+ objectReference: {fileID: 1406204874}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
--- !u!1001 &2140204255
diff --git a/MrBigsock/Assets/Scenes/TestLevel1.unity b/MrBigsock/Assets/Scenes/TestLevel1.unity
index 5f3a8ccd..7b2a0c4a 100644
--- a/MrBigsock/Assets/Scenes/TestLevel1.unity
+++ b/MrBigsock/Assets/Scenes/TestLevel1.unity
@@ -123,63 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1001 &38466856
-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 (7)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: 20.513561
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -5.1158733
- 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 &226070753
GameObject:
m_ObjectHideFlags: 0
@@ -263,7 +206,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &226070757
MonoBehaviour:
@@ -282,63 +225,6 @@ MonoBehaviour:
rightSide: {fileID: 904564854}
topSide: {fileID: 1898194327}
bottomSide: {fileID: 1552002432}
---- !u!1001 &254553606
-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 (11)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: -9.096013
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: 8.961895
- 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 &387884736
GameObject:
m_ObjectHideFlags: 0
@@ -1436,177 +1322,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1001 &403868133
-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 (2)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: -13.061582
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -3.529646
- 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!1001 &573826947
-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 (3)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 9
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: 1.0822778
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -12.055617
- 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!1001 &629690520
-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 (9)
- 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: 21.703232
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: 7.4417605
- 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 &785097225
GameObject:
m_ObjectHideFlags: 0
@@ -3322,63 +3037,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1001 &858384522
-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 (5)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 7
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: 10.004806
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -8.420513
- 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 &904564854
GameObject:
m_ObjectHideFlags: 0
@@ -3425,158 +3083,44 @@ SpriteRenderer:
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!4 &904564856
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 904564854}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 15.59, y: -1.4980459, z: -1.1708059}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2124047731}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1073222315
-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 (6)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: 15.622694
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -12.980917
- 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!1001 &1125241895
-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 (1)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 11
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: -14.05
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: 4.0049334
- 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}
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &904564856
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 904564854}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 15.59, y: -1.4980459, z: -1.1708059}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2124047731}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1181439011
GameObject:
m_ObjectHideFlags: 0
@@ -3661,120 +3205,49 @@ Transform:
m_Father: {fileID: 2124047731}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1503239833
-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 (8)
- 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: 15.093952
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.7577785
- 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!1001 &1520067528
-PrefabInstance:
+--- !u!1 &1448466263 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2996495149472241661, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ m_PrefabInstance: {fileID: 1955402141}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1448466269
+MonoBehaviour:
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 (10)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: 8.616858
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: 9.490637
- 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}
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1448466263}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d8835cfc2c53b6e48bd880abe1b78877, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ baseAttackSpeed: 1
+ baseMovementSpeed: 1
+ baseDamage: 1
+ knockbackForce: 1
+ baseHP: 10
+ baseMaxHP: 10
+ dropXP: 0
+ xp: 0
+ maxXp: 0
+ level: 0
+ collisionOffset: 0.05
+ movementFilter:
+ useTriggers: 0
+ useLayerMask: 0
+ useDepth: 0
+ useOutsideDepth: 0
+ useNormalAngle: 0
+ useOutsideNormalAngle: 0
+ layerMask:
+ serializedVersion: 2
+ m_Bits: 0
+ minDepth: 0
+ maxDepth: 0
+ minNormalAngle: 0
+ maxNormalAngle: 0
+ attack: {fileID: 7173793660907891926, guid: 905a56c36fcb8c64faad43986481914d, type: 3}
--- !u!1 &1552002432
GameObject:
m_ObjectHideFlags: 0
@@ -3904,7 +3377,7 @@ Transform:
- {fileID: 785097226}
- {fileID: 1711659553}
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1711659552
GameObject:
@@ -3917,6 +3390,7 @@ GameObject:
- component: {fileID: 1711659553}
- component: {fileID: 1711659555}
- component: {fileID: 1711659554}
+ - component: {fileID: 1711659556}
m_Layer: 0
m_Name: floor
m_TagString: Untagged
@@ -15972,63 +15446,26 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1001 &1827015613
-PrefabInstance:
+--- !u!95 &1711659556
+Animator:
+ serializedVersion: 4
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: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 12
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: -12.8
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -13.11
- 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}
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1711659552}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: a0f8f706ad95b124fb3b06ce02f546e1, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1898194327
GameObject:
m_ObjectHideFlags: 0
@@ -16120,9 +15557,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 8339702841083125274, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_Mass
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8339702841083125274, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_LinearDrag
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8339702841083125274, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+ propertyPath: m_AngularDrag
+ value: 0.5
+ objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_RootOrder
- value: 13
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_LocalPosition.x
@@ -16174,6 +15623,67 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+--- !u!1001 &1955402141
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2996495149472241661, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_Name
+ value: enemy_orc_range
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 7.79
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 2.991446
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7097463258699610772, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8983526051028480608, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+ propertyPath: m_Radius
+ value: 5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
--- !u!1 &1998109707 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8799933624292384519, guid: 008ac26ba660ab94484970b17c589923, type: 3}
@@ -16214,60 +15724,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2127870875
-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 (4)
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_RootOrder
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.x
- value: -3.015476
- objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3}
- propertyPath: m_LocalPosition.y
- value: -11.262504
- 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}
diff --git a/MrBigsock/Assets/Scenes/example.unity b/MrBigsock/Assets/Scenes/example.unity
index 56196085..67101ff4 100644
--- a/MrBigsock/Assets/Scenes/example.unity
+++ b/MrBigsock/Assets/Scenes/example.unity
@@ -1073,11 +1073,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_LocalPosition.x
- value: -1.12
+ value: -2.99
objectReference: {fileID: 0}
- target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: m_LocalPosition.y
@@ -1126,7 +1126,7 @@ PrefabInstance:
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: hpBar
value:
- objectReference: {fileID: 1916852861}
+ objectReference: {fileID: 0}
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: maxXp
value: 100
@@ -1134,7 +1134,7 @@ PrefabInstance:
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: xpBar
value:
- objectReference: {fileID: 638280757}
+ objectReference: {fileID: 0}
- target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3}
propertyPath: knockbackForce
value: 1
@@ -1594,92 +1594,73 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
---- !u!4 &532417265 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3}
- m_PrefabInstance: {fileID: 2107497264}
- m_PrefabAsset: {fileID: 0}
---- !u!224 &638280756 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- m_PrefabInstance: {fileID: 2046759202}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &638280757 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 4004970966474345117, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- m_PrefabInstance: {fileID: 2046759202}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a2ed0e7debd7bc7468e3a430508a7e71, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1001 &665291685
+--- !u!1001 &400342733
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: -2882901802891604921, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
- propertyPath: baseHP
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: -2882901802891604921, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
- propertyPath: dropXP
- value: 12
- objectReference: {fileID: 0}
- - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 2996495149472241661, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_Name
- value: Enemy_Slime
+ value: skleton-range
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 5891912875293609069, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
+ propertyPath: m_Controller
+ value:
+ objectReference: {fileID: 9100000, guid: 9823b24abd8becd45bde28cb883293d2, type: 2}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalPosition.x
- value: 1.0450952
+ value: 4.2502265
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.04883349
+ value: -0.2396295
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ - target: {fileID: 7097463258699610772, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
+ m_RemovedComponents:
+ - {fileID: 1448466269, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
+--- !u!4 &532417265 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3}
+ m_PrefabInstance: {fileID: 2107497264}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &931844718
GameObject:
m_ObjectHideFlags: 0
@@ -1746,118 +1727,13 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1008853218 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3}
m_PrefabInstance: {fileID: 1912704979}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &1096954372
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 1640099072}
- m_Modifications:
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_SizeDelta.x
- value: -1022.4061
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_SizeDelta.y
- value: -995.6837
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -446.203
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 465.84186
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214255517273169, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_Name
- value: HPBar
- objectReference: {fileID: 0}
- - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
--- !u!1 &1483953643
GameObject:
m_ObjectHideFlags: 0
@@ -2510,9 +2386,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1916852860}
- - {fileID: 638280756}
+ m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2521,6 +2395,49 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &1673619407 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2996495149472241661, guid: 68563ef53c17c6e49b31a02097dc71a2, type: 3}
+ m_PrefabInstance: {fileID: 400342733}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1673619414
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673619407}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9623aa535cf080142bec69eb76b4aecb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ baseAttackSpeed: 1
+ baseMovementSpeed: 1
+ baseDamage: 1
+ knockbackForce: 150
+ baseHP: 10
+ baseMaxHP: 10
+ dropXP: 0
+ xp: 0
+ maxXp: 0
+ level: 0
+ collisionOffset: 0.05
+ movementFilter:
+ useTriggers: 0
+ useLayerMask: 0
+ useDepth: 0
+ useOutsideDepth: 0
+ useNormalAngle: 0
+ useOutsideNormalAngle: 0
+ layerMask:
+ serializedVersion: 2
+ m_Bits: 0
+ minDepth: 0
+ maxDepth: 0
+ minNormalAngle: 0
+ maxNormalAngle: 0
+ attack: {fileID: 7173793660907891926, guid: 3aee44dd4b3096d4099aadbaf2fc04ef, type: 3}
--- !u!1 &1763586303
GameObject:
m_ObjectHideFlags: 0
@@ -2662,127 +2579,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3}
---- !u!224 &1916852860 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- m_PrefabInstance: {fileID: 1096954372}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1916852861 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5978214255517273171, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3}
- m_PrefabInstance: {fileID: 1096954372}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 34ee06bf3eaf64142ac1526be9676c25, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1001 &2046759202
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 1640099072}
- m_Modifications:
- - target: {fileID: 4004970964909595302, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970964909595302, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0.0000038146973
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_SizeDelta.x
- value: 469.7473
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_SizeDelta.y
- value: 51.7408
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -660.1264
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 369.79456
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4004970966474345104, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8581101802057755547, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
- propertyPath: m_Name
- value: XpBar
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: e31afff88fe1f9e488f7ff8f4ce13863, type: 3}
--- !u!1001 &2107497264
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation.anim b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation.anim
index 027f5289..1ad44b65 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation.anim
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation.anim
@@ -60,7 +60,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation_controller.controller b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation_controller.controller
index ac9c96c6..4782ac19 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation_controller.controller
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/bow/bow_animation_controller.controller
@@ -10,21 +10,41 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: 5722399322998186888}
- m_Position: {x: 40, y: 280, z: 0}
+ m_State: {fileID: -1239695290296361186}
+ m_Position: {x: 400, y: 180, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1900817882091058298}
+ m_Position: {x: 140, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- - {fileID: -5297590955187003794}
- m_EntryTransitions: []
+ - {fileID: -434530027883326111}
+ - {fileID: -2292957324952389756}
+ m_EntryTransitions:
+ - {fileID: -5155675960487261707}
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 350, y: 180, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_AnyStatePosition: {x: 420, y: 50, z: 0}
+ m_EntryPosition: {x: 160, y: 40, z: 0}
+ m_ExitPosition: {x: 260, y: 380, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 5722399322998186888}
---- !u!1101 &-5297590955187003794
-AnimatorStateTransition:
+ m_DefaultState: {fileID: 1900817882091058298}
+--- !u!206 &-7493460979623041063
+BlendTree:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Blend Tree
+ m_Childs: []
+ m_BlendParameter: Blend
+ m_BlendParameterY: Blend
+ m_MinThreshold: 0
+ m_MaxThreshold: 1
+ m_UseAutomaticThresholds: 1
+ m_NormalizedBlendValues: 0
+ m_BlendType: 0
+--- !u!1109 &-5155675960487261707
+AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -32,14 +52,82 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 5722399322998186888}
+ m_DstState: {fileID: 1900817882091058298}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
+--- !u!1101 &-2292957324952389756
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: none
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1900817882091058298}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
- m_TransitionDuration: 0.41331124
+ m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.000000035131944
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-1239695290296361186
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: bow_animation
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 59a8dbd7b180c0041b98141ced18995c, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-434530027883326111
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: attack
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1239695290296361186}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.27
+ m_TransitionOffset: 0.3647479
+ m_ExitTime: 0.04684174
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -53,7 +141,19 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: bow_animation_controller
serializedVersion: 5
- m_AnimatorParameters: []
+ m_AnimatorParameters:
+ - m_Name: attack
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: none
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -67,15 +167,15 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1102 &5722399322998186888
+--- !u!1102 &1900817882091058298
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New Animation
- m_Speed: 0.2
+ m_Name: New State
+ m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
@@ -87,7 +187,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 59a8dbd7b180c0041b98141ced18995c, type: 2}
+ m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/small_orc/small_orc.controller b/MrBigsock/Assets/Sprites/Enemy/Animations/small_orc/small_orc.controller
index 524ea033..9fff35e1 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/small_orc/small_orc.controller
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/small_orc/small_orc.controller
@@ -37,26 +37,50 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8238591593860054012}
- m_Position: {x: 200, y: 0, z: 0}
+ m_Position: {x: 40, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -5939552610002886965}
- m_Position: {x: 235, y: 65, z: 0}
+ m_Position: {x: 280, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 7190776975945004475}
- m_Position: {x: 270, y: 130, z: 0}
+ m_Position: {x: 510, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 9045172304044813324}
- m_Position: {x: 305, y: 195, z: 0}
+ m_Position: {x: 190, y: -120, z: 0}
m_ChildStateMachines: []
- m_AnyStateTransitions: []
+ m_AnyStateTransitions:
+ - {fileID: 4543763425327513943}
+ - {fileID: -204269914836540462}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_AnyStatePosition: {x: 290, y: -40, z: 0}
+ m_EntryPosition: {x: 60, y: -40, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8238591593860054012}
+--- !u!1101 &-204269914836540462
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 7190776975945004475}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -79,6 +103,28 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
+--- !u!1101 &4543763425327513943
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -5939552610002886965}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &7190776975945004475
AnimatorState:
serializedVersion: 6
diff --git a/MrBigsock/Assets/Sprites/Player/BigSock/attackBigSock.png b/MrBigsock/Assets/Sprites/Player/BigSock/attackBigSock.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0934005f1d239c55ba6277783c73f30023ca51b
GIT binary patch
literal 752
zcmeAS@N?(olHy`uVBq!ia0y~yU=#te^*Gpo<jZHzKonzfkh>GZx^prw85o#WdAc};
zRLpsMJFsZBfxxkkON09^%xiA8aDTMYeG~ts;sb)87T8G$ZuDrfXb5}x-+XfC<C90`
zn|Due5Mu<Ig&j!Gy2SXQ)cLyA{~zD)mv8=mIjZPUsr|Z|jSI75Z-h+yxn}E=uUV(N
z-#`7b*=5bawe#neq^+*J8yoXk%{NP6<E-fOA#1MQetz=linY(~-P~C(_t8D5ZC&a9
ze|z-jN&o(KW_r!c-QB`JPl!J&`(#saTBZAQb7$SXs=SH)&v?@ttiIpap2l|$Xw?i=
z8;#O>{=c8f*MGX{c){!4-8->&{)o=vi^;wd`%Lwm*6%MnN{&rQ$#eeN_cY=upHcM5
zwdY?v46?X-Uu^o^n|CgscYk8{RO-|s$vmycXI*En7KuM|<4npqyV~s&qUCdD`z9>7
z=X`zF#(eR}%{zOq+)h6e=imKhyWQ{UTeQD_`O$Hw-M26)_<HC@=YBUY|Ko?-WPg{%
z2F(5cu_xMSd)%zf6e-0s@hk2<yyRp4ZO-p!^R}8s<WKa;n^@8>{_gz^g-tVmH&oSE
zwoQs+kA8lBmXbBQu<|VP%ragzw<WWRC*I~)<Dc#Q<HM~(uNIih+3E6bI@^>hbxj-d
z&&HKpt$9}vu=1kT_NZl%i>gx<&72KgzIS)bko9p2e_ogAa5233YlcO;KdbqMJAx;l
z^cfoc6}x#tcJ<DQRoUHl*rr>rynXZL9VOS-b8jyzblvM;d3m+!gvPCZ<WAmUn`Nz9
zrF|h`@8R3CZf0vL74Ox(YsGi*e&+IhA8*)+tUk(jb&7TM!GJeUuKiZoRum1ia%FAU
z|KfM2%TGn=Zwo*C+;3Z+Wc1m!S9i?5^_%anZjk@GRgrfVh^+eh*$sPg0*TIfD?fWl
UkmgmzB_}~#Pgg&ebxsLQ0E+f&asU7T
literal 0
HcmV?d00001
diff --git a/MrBigsock/ProjectSettings/DynamicsManager.asset b/MrBigsock/ProjectSettings/DynamicsManager.asset
index b721ec58..f4f9fce2 100644
--- a/MrBigsock/ProjectSettings/DynamicsManager.asset
+++ b/MrBigsock/ProjectSettings/DynamicsManager.asset
@@ -18,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
- m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_LayerCollisionMatrix: ffefffffffefffffffefffffffefffffffefffffffefffffffefffffffefffffffffffffffefffffffefffffffefffff00e1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
diff --git a/MrBigsock/ProjectSettings/Physics2DSettings.asset b/MrBigsock/ProjectSettings/Physics2DSettings.asset
index 026c545f..c6a027f7 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: ffffffffffffffffffffffffffffffffffffffff1ff8ffffdfffffffdfffffffdffbffffdffbffffdff8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffff1ff8ffffdfefffffdfffffffdffbffffdffbffffdff8ffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/MrBigsock/ProjectSettings/TagManager.asset b/MrBigsock/ProjectSettings/TagManager.asset
index 17e91b9a..0698b4e6 100644
--- a/MrBigsock/ProjectSettings/TagManager.asset
+++ b/MrBigsock/ProjectSettings/TagManager.asset
@@ -17,7 +17,7 @@ TagManager:
- Player
- PlayerProjectile
- Interactable
- -
+ - Enemy_projectile
-
-
-
--
GitLab