From f6c9baecfbd92c33e2764b6721cf3287a86155cc Mon Sep 17 00:00:00 2001
From: Gard Furre <gardaf@stud.ntnu.no>
Date: Thu, 15 Sep 2022 16:38:12 +0200
Subject: [PATCH] fix sprite orc
---
MrBigsock/Assets/Code/orc/enemyMovement.cs.meta | 11 +++++++++++
MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab | 8 ++++----
.../Assets/Prefabs/enemy_orc_warrior.prefab.meta | 7 +++++++
.../Assets/Sprites/Enemy/Animations/orc_warrior.meta | 8 ++++++++
.../orc_warrior/orc_warrior_idle_anim_f0.png.meta | 2 +-
.../orc_warrior/orc_warrior_idle_anim_f1.png.meta | 2 +-
.../orc_warrior/orc_warrior_idle_anim_f2.png.meta | 2 +-
.../orc_warrior/orc_warrior_idle_anim_f3.png.meta | 2 +-
.../orc_warrior/orc_warrior_run_anim_f0.png.meta | 2 +-
.../orc_warrior/orc_warrior_run_anim_f1.png.meta | 2 +-
.../orc_warrior/orc_warrior_run_anim_f2.png.meta | 2 +-
.../orc_warrior/orc_warrior_run_anim_f3.png.meta | 2 +-
12 files changed, 38 insertions(+), 12 deletions(-)
create mode 100644 MrBigsock/Assets/Code/orc/enemyMovement.cs.meta
create mode 100644 MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab.meta
create mode 100644 MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior.meta
diff --git a/MrBigsock/Assets/Code/orc/enemyMovement.cs.meta b/MrBigsock/Assets/Code/orc/enemyMovement.cs.meta
new file mode 100644
index 00000000..1968a501
--- /dev/null
+++ b/MrBigsock/Assets/Code/orc/enemyMovement.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 227b56e9abdf92742969115a025426b5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
index b16bc168..6a505c92 100644
--- a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
+++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
@@ -81,7 +81,7 @@ SpriteRenderer:
m_Size: {x: 0.09, y: 0.21}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
+ m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2996495149472241661
@@ -161,7 +161,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: dfb75b4c193e2994dabfcb50c3cf64e5, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -239,8 +239,8 @@ MonoBehaviour:
m_GameObject: {fileID: 2996495149472241661}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 62c1905005817ea4b864394cf358d378, type: 3}
+ m_Script: {fileID: 11500000, guid: 227b56e9abdf92742969115a025426b5, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 0.6
- attackSpeed: 1
+ attackSpeed: 3
diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab.meta b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab.meta
new file mode 100644
index 00000000..046edcaf
--- /dev/null
+++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f256acc71054c194a819c82677b399a7
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior.meta
new file mode 100644
index 00000000..5edb66cc
--- /dev/null
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5c8f497872bb6364b82b8664cf457579
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f0.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f0.png.meta
index 51778214..89a28f21 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f0.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f0.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f1.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f1.png.meta
index 71098275..d4b87189 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f1.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f1.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f2.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f2.png.meta
index 02e03132..9af3ed74 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f2.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f2.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f3.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f3.png.meta
index 8718e61e..293a3694 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f3.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_idle_anim_f3.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f0.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f0.png.meta
index 7aa20ca1..003262b9 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f0.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f0.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f1.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f1.png.meta
index 69166340..1d7e62a2 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f1.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f1.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f2.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f2.png.meta
index f4a31fa7..741c2985 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f2.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f2.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
diff --git a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f3.png.meta b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f3.png.meta
index 78c6671a..4bee9c0b 100644
--- a/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f3.png.meta
+++ b/MrBigsock/Assets/Sprites/Enemy/Animations/orc_warrior/orc_warrior_run_anim_f3.png.meta
@@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
+ spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
--
GitLab