GJP/GlobalGameJam-2021
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor Tweeks

Browse Source
This commit is contained in:
GamerClassN7
2021-01-31 13:50:44 +01:00
parent b5cae58199
commit 1e5adb4149
19 changed files with 406 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Artifac.prefab
View File

@@ -164,7 +164,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2}
objectReference: {fileID: 2100000, guid: 1794d360318012046bcba6a1c92570d9, type: 2}
- target: {fileID: 919132149155446097, guid: dbb67ade1acacb046b14f8c82b3d1495,
type: 3}
propertyPath: m_Name

98
Assets/Prefabs/HideSpikes.prefab
View File

@@ -79,18 +79,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &1998731762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1388626848845330808}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!136 &6421470552571676874
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -105,13 +93,13 @@ CapsuleCollider:
m_Height: 5
m_Direction: 1
m_Center: {x: 0, y: 3.425582, z: 0}
--- !u!114 &1998731763
--- !u!114 &1998731762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2156174483670564380}
m_GameObject: {fileID: 1388626848845330808}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
@@ -131,6 +119,18 @@ CapsuleCollider:
m_Height: 6
m_Direction: 1
m_Center: {x: 2.1933563, y: 3.5384803, z: 0}
--- !u!114 &1998731763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2156174483670564380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2445808756126767684
GameObject:
m_ObjectHideFlags: 0
@@ -163,18 +163,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1998731783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5196525844608827118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!136 &543006812352869409
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -189,6 +177,18 @@ CapsuleCollider:
m_Height: 6
m_Direction: 1
m_Center: {x: -0.07755566, y: 3.5041447, z: -0.069414735}
--- !u!114 &1998731783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5196525844608827118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!65 &6731158098948586105
BoxCollider:
m_ObjectHideFlags: 0
@@ -234,18 +234,8 @@ MonoBehaviour:
instaKill: 0
damage: 10
damageRate: 1
--- !u!114 &1998731782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8125980356071770695}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
fromPosition: {fileID: 0}
toPosition: {fileID: 0}
--- !u!136 &7854312960757732773
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -260,6 +250,18 @@ CapsuleCollider:
m_Height: 5
m_Direction: 1
m_Center: {x: 2.2515378, y: 3.3230143, z: 0}
--- !u!114 &1998731782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8125980356071770695}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6731158098948586093
PrefabInstance:
m_ObjectHideFlags: 0
@@ -337,6 +339,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -6877481245417288963, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: -6034480803058315714, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: -4856746350265117782, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: 919132149155446097, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Name
@@ -347,6 +364,11 @@ PrefabInstance:
propertyPath: m_TagString
value: EnemyObjects
objectReference: {fileID: 0}
- target: {fileID: 1541998606474349963, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!1 &5884104032974260028 stripped

7
Assets/Prefabs/Saw.prefab
View File

@@ -42,7 +42,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
objectType: 3
instaKill: 0
instaKill: 1
damage: 25
damageRate: 0.5
fromPosition: {fileID: 0}
@@ -294,6 +294,11 @@ PrefabInstance:
propertyPath: m_Name
value: Saw
objectReference: {fileID: 0}
- target: {fileID: 7202271454713460447, guid: 8e76ebdc23b6a7c48b338f18330c3d6e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 362210ecf78b8454bb2af1c2fe3321de, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, type: 3}
--- !u!1 &1677231193731325872 stripped

5
Assets/Prefabs/SawRiding.prefab
View File

@@ -272,6 +272,11 @@ PrefabInstance:
propertyPath: m_Name
value: Saw
objectReference: {fileID: 0}
- target: {fileID: 7202271454713460447, guid: 8e76ebdc23b6a7c48b338f18330c3d6e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 362210ecf78b8454bb2af1c2fe3321de, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, type: 3}
--- !u!1 &2243115294033145012 stripped

109
Assets/Prefabs/ShowSpikes.prefab
View File

@@ -1,5 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!64 &6364420393879567125
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1620859099576797736}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -4746165098021687754, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!64 &6364420394372686582
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789990931432410444}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 2504345457074934838, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!64 &6364420394340331402
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5559362483217059262}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -6195245291975648998, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!65 &6364420393197139716
BoxCollider:
m_ObjectHideFlags: 0
@@ -42,20 +84,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
objectType: 2
--- !u!64 &6364420393879567125
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1620859099576797736}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -4746165098021687754, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
instaKill: 0
damage: 10
damageRate: 5
fromPosition: {fileID: 0}
toPosition: {fileID: 0}
--- !u!1 &6364420394033728395
GameObject:
m_ObjectHideFlags: 0
@@ -87,34 +120,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &6364420394340331402
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5559362483217059262}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -6195245291975648998, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!64 &6364420394372686582
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789990931432410444}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 2504345457074934838, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!64 &6364420394726793011
MeshCollider:
m_ObjectHideFlags: 0
@@ -206,6 +211,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -6877481245417288963, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: -6034480803058315714, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: -4856746350265117782, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- target: {fileID: 919132149155446097, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Name
@@ -216,6 +236,11 @@ PrefabInstance:
propertyPath: m_TagString
value: EnemyObjects
objectReference: {fileID: 0}
- target: {fileID: 1541998606474349963, guid: 330aaef30835dc6428fa0611d8636c28,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 330aaef30835dc6428fa0611d8636c28, type: 3}
--- !u!1 &6094390029467858028 stripped

6
Assets/Prefabs/Sign.prefab
View File

@@ -58,7 +58,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3}
- {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -199,8 +199,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3}
- {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2}
- {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
- {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0