aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcross28 <icross028@gmail.com>2022-04-15 02:14:57 -0500
committercross28 <icross028@gmail.com>2022-04-15 02:14:57 -0500
commitc86860eb94cd1d3bdd8beda44c2b9faee56a6d99 (patch)
treefb3308480480950683418d35b70cc10e5827368b
parent9e00737362f197f18db363b83b9ce4d9708bf4d9 (diff)
feat: added poly collider to zombie prefab
-rw-r--r--Assets/Animations/Prototype.meta (renamed from Assets/Animations/Prototype/Player.controller.meta)6
-rw-r--r--Assets/Prefabs/Enemies/Zombie.prefab155
-rw-r--r--Assets/Scenes/Jungle.unity64
-rw-r--r--Assets/Scripts/Actors/Enemy.cs2
-rw-r--r--Assets/Sprites/Player/PrototypeHero.meta8
-rw-r--r--Assets/Sprites/Player/Warrior.meta8
6 files changed, 227 insertions, 16 deletions
diff --git a/Assets/Animations/Prototype/Player.controller.meta b/Assets/Animations/Prototype.meta
index 998593b..7be3619 100644
--- a/Assets/Animations/Prototype/Player.controller.meta
+++ b/Assets/Animations/Prototype.meta
@@ -1,8 +1,8 @@
fileFormatVersion: 2
-guid: 363aef300fba71f40ab5aa64ba12659f
-NativeFormatImporter:
+guid: 512e0933132944d4ba2180e0b31b6420
+folderAsset: yes
+DefaultImporter:
externalObjects: {}
- mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/Prefabs/Enemies/Zombie.prefab b/Assets/Prefabs/Enemies/Zombie.prefab
index c1fbcf2..7059ac9 100644
--- a/Assets/Prefabs/Enemies/Zombie.prefab
+++ b/Assets/Prefabs/Enemies/Zombie.prefab
@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 3542940353895036420}
- component: {fileID: 7876354948243592078}
- component: {fileID: -1788752809794239346}
+ - component: {fileID: 4349160083341462742}
+ - component: {fileID: -849362167687110816}
m_Layer: 10
m_Name: Zombie
m_TagString: Enemy
@@ -127,17 +129,150 @@ MonoBehaviour:
maxJumps: 1
jumpForce: 500
damage: 0
- groundLayer:
- serializedVersion: 2
- m_Bits: 0
- groundCheckPoint: {fileID: 0}
- stats:
- maxHealth: 0
- speedMultiplier: 0
- maxJumps: 0
- jumpForce: 0
- damage: 0
+ groundCheckPoint: {fileID: 2602158014784719401}
health: 0
+--- !u!95 &4349160083341462742
+Animator:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4799600927363337844}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: e0579059f0698394b91f11d7e4bc1e7f, 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!60 &-849362167687110816
+PolygonCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4799600927363337844}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 1, y: 1}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Points:
+ m_Paths:
+ - - {x: 0.25018322, y: -0.06131868}
+ - {x: 0.24924393, y: 0.0015283437}
+ - {x: 0.22211315, y: 0.002368521}
+ - {x: 0.21988362, y: 0.063510455}
+ - {x: 0.25186226, y: 0.06274653}
+ - {x: 0.25161874, y: 0.187289}
+ - {x: 0.2205683, y: 0.18843195}
+ - {x: 0.22007418, y: 0.25069618}
+ - {x: 0.18764253, y: 0.25115567}
+ - {x: 0.18764482, y: 0.28205344}
+ - {x: 0.09530307, y: 0.28201076}
+ - {x: 0.09450532, y: 0.311815}
+ - {x: 0.061127104, y: 0.31222564}
+ - {x: 0.060848728, y: 0.28091303}
+ - {x: -0.00024937838, y: 0.28107005}
+ - {x: -0.00025748226, y: 0.31361726}
+ - {x: -0.032501988, y: 0.31319395}
+ - {x: -0.03265647, y: 0.28087482}
+ - {x: -0.000997629, y: 0.2799999}
+ - {x: -0.0018962752, y: 0.25150684}
+ - {x: -0.032325733, y: 0.25013807}
+ - {x: -0.03171337, y: 0.12631121}
+ - {x: -0.15582198, y: 0.12842382}
+ - {x: -0.15540715, y: 0.09379548}
+ - {x: -0.21932296, y: 0.094253585}
+ - {x: -0.21885613, y: 0.063113414}
+ - {x: -0.24998015, y: 0.062444802}
+ - {x: -0.25039995, y: 0.00088302046}
+ - {x: -0.27987364, y: 0.0011970717}
+ - {x: -0.27994964, y: -0.030269377}
+ - {x: -0.31295708, y: -0.030762669}
+ - {x: -0.31404734, y: -0.061027683}
+ - {x: -0.3455596, y: -0.06082694}
+ - {x: -0.34401655, y: -0.12470007}
+ - {x: -0.31336495, y: -0.12609637}
+ - {x: -0.31247422, y: -0.15902151}
+ - {x: -0.21927421, y: -0.1619498}
+ - {x: -0.21915987, y: -0.2160559}
+ - {x: -0.24730948, y: -0.21943486}
+ - {x: -0.25000498, y: -0.24972314}
+ - {x: -0.28085735, y: -0.2524482}
+ - {x: -0.28032187, y: -0.2813004}
+ - {x: -0.31228638, y: -0.2812647}
+ - {x: -0.31371298, y: -0.37360686}
+ - {x: -0.34307098, y: -0.3741853}
+ - {x: -0.3440319, y: -0.40417448}
+ - {x: -0.31298617, y: -0.40494636}
+ - {x: -0.31475353, y: -0.46806902}
+ - {x: -0.34250525, y: -0.4673577}
+ - {x: -0.34196597, y: -0.5}
+ - {x: -0.24850044, y: -0.50065035}
+ - {x: -0.24751453, y: -0.3760564}
+ - {x: -0.2184577, y: -0.37525386}
+ - {x: -0.21846609, y: -0.3111339}
+ - {x: -0.187082, y: -0.31284425}
+ - {x: -0.18542004, y: -0.28503302}
+ - {x: -0.124415, y: -0.28176644}
+ - {x: -0.12281474, y: -0.25150424}
+ - {x: -0.09448738, y: -0.24960592}
+ - {x: -0.09406432, y: -0.21682861}
+ - {x: -0.0023855101, y: -0.21927963}
+ - {x: -0.0006275065, y: -0.2522452}
+ - {x: 0.028823482, y: -0.25205347}
+ - {x: 0.03030616, y: -0.31061852}
+ - {x: 0.06150809, y: -0.3122098}
+ - {x: 0.061172117, y: -0.37348002}
+ - {x: 0.033905327, y: -0.37436426}
+ - {x: 0.030949412, y: -0.43594742}
+ - {x: -0.0027501024, y: -0.43901345}
+ - {x: -0.0013702288, y: -0.49865782}
+ - {x: 0.12571864, y: -0.49936068}
+ - {x: 0.12487145, y: -0.4688261}
+ - {x: 0.09383451, y: -0.46857587}
+ - {x: 0.09376809, y: -0.43731087}
+ - {x: 0.1251156, y: -0.43759334}
+ - {x: 0.12617117, y: -0.40669215}
+ - {x: 0.15567595, y: -0.40729666}
+ - {x: 0.15592104, y: -0.28043506}
+ - {x: 0.1255914, y: -0.27999204}
+ - {x: 0.12477123, y: -0.21882217}
+ - {x: 0.09544516, y: -0.21841311}
+ - {x: 0.09299556, y: -0.18694769}
+ - {x: 0.06319696, y: -0.18533382}
+ - {x: 0.0653142, y: -0.15644352}
+ - {x: 0.09549953, y: -0.15402734}
+ - {x: 0.12503016, y: -0.093180865}
+ - {x: 0.18853198, y: -0.15594384}
+ - {x: 0.21840577, y: -0.21926005}
+ - {x: 0.24813324, y: -0.2488403}
+ - {x: 0.31373888, y: -0.24786459}
+ - {x: 0.3137243, y: -0.219399}
+ - {x: 0.34449852, y: -0.21778946}
+ - {x: 0.3438207, y: -0.15590215}
+ - {x: 0.31342927, y: -0.15432817}
+ - {x: 0.31132627, y: -0.1250647}
+ - {x: 0.27915064, y: -0.12528598}
+ - {x: 0.27996275, y: -0.06255028}
--- !u!1 &8191793094342821551
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity
index 089da84..a699f61 100644
--- a/Assets/Scenes/Jungle.unity
+++ b/Assets/Scenes/Jungle.unity
@@ -12654,6 +12654,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3}
m_PrefabInstance: {fileID: 1298531768}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1301059137 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ m_PrefabInstance: {fileID: 6691474245549666830}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1303550327
PrefabInstance:
m_ObjectHideFlags: 0
@@ -324993,6 +324998,63 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2894666046278553864, guid: 8f6c22559c50b594496aaea2c749a6a4, type: 3}
m_PrefabInstance: {fileID: 2117636798}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2119287057
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_RootOrder
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -67.91
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -14.32
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_Name
+ value: Zombie
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
--- !u!1001 &2127662255
PrefabInstance:
m_ObjectHideFlags: 0
@@ -325374,7 +325436,7 @@ PrefabInstance:
- target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
propertyPath: firePoint
value:
- objectReference: {fileID: 371069633}
+ objectReference: {fileID: 1301059137}
- target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
propertyPath: projectilePrefab
value:
diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs
index 95ed278..8e4ce1b 100644
--- a/Assets/Scripts/Actors/Enemy.cs
+++ b/Assets/Scripts/Actors/Enemy.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
using UnityEngine;
namespace MontanaJohns.Actors
diff --git a/Assets/Sprites/Player/PrototypeHero.meta b/Assets/Sprites/Player/PrototypeHero.meta
new file mode 100644
index 0000000..c9f17a9
--- /dev/null
+++ b/Assets/Sprites/Player/PrototypeHero.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 01ce197cf3d0b9c409dd3c8d49cd01cc
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Sprites/Player/Warrior.meta b/Assets/Sprites/Player/Warrior.meta
new file mode 100644
index 0000000..e92f53e
--- /dev/null
+++ b/Assets/Sprites/Player/Warrior.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4649601a09c0b764aa31e101b9194028
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: