greater hitboxes

antoniusnaumann · Jun 30, 2018 · bd19bd1 · bd19bd1
1 parent fcb17f3
commit bd19bd1
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 94 deletions.
diff --git a/Neonmania/Assets/Prefabs/Enemy.prefab b/Neonmania/Assets/Prefabs/Enemy.prefab
@@ -140,7 +140,7 @@ MonoBehaviour:
  player: {fileID: 0}
  speed: 1
  checkFrequency: 1
- timeToDie: 4
+ timeToDie: 1
 --- !u!135 &135147735715590696
 SphereCollider:
  m_ObjectHideFlags: 1

diff --git a/Neonmania/Assets/Prefabs/Projectile.prefab b/Neonmania/Assets/Prefabs/Projectile.prefab
@@ -124,5 +124,5 @@ SphereCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
- m_Radius: 0.5
+ m_Radius: 5
  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Neonmania/Assets/Scenes/SampleScene.unity b/Neonmania/Assets/Scenes/SampleScene.unity
@@ -197,7 +197,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_RootOrder
- value: 9
+ value: 8
  objectReference: {fileID: 0}
  - target: {fileID: 1240062629978812, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_Name
@@ -451,7 +451,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.y
- value: 0
+ value: 1.5
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.z
@@ -481,6 +481,10 @@ Prefab:
  propertyPath: m_LocalScale.x
  value: 50
  objectReference: {fileID: 0}
+ - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
+ propertyPath: m_LocalScale.y
+ value: 3
+ objectReference: {fileID: 0}
  m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  m_IsPrefabParent: 0
@@ -502,7 +506,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.y
- value: 0
+ value: 1.5
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.z
@@ -530,7 +534,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalScale.x
- value: 50
+ value: 51
  objectReference: {fileID: 0}
  - target: {fileID: 1240062629978812, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_Name
@@ -544,6 +548,10 @@ Prefab:
  propertyPath: m_LocalScale.z
  value: 1.0000005
  objectReference: {fileID: 0}
+ - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
+ propertyPath: m_LocalScale.y
+ value: 3
+ objectReference: {fileID: 0}
  m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  m_IsPrefabParent: 0
@@ -560,7 +568,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.y
- value: 0
+ value: 1.5
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.z
@@ -590,9 +598,55 @@ Prefab:
  propertyPath: m_Name
  value: Wall (1)
  objectReference: {fileID: 0}
+ - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
+ propertyPath: m_LocalScale.y
+ value: 3
+ objectReference: {fileID: 0}
  m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  m_IsPrefabParent: 0
+--- !u!1001 &842170033
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 2.639
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4248616108762626, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ propertyPath: m_RootOrder
+ value: 10
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: 3c962cc7998b9463cb5d83d57f03468e, type: 2}
+ m_IsPrefabParent: 0
 --- !u!4 &842620342 stripped
 Transform:
  m_PrefabParentObject: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752,
@@ -664,6 +718,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e68807ba205749440827fc5e71ba7c09, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+ color: 1
 --- !u!1 &1148241113
 GameObject:
  m_ObjectHideFlags: 0
@@ -688,7 +743,7 @@ Canvas:
  m_GameObject: {fileID: 1148241113}
  m_Enabled: 1
  serializedVersion: 3
- m_RenderMode: 2
+ m_RenderMode: 0
  m_Camera: {fileID: 0}
  m_PlaneDistance: 100
  m_PixelPerfect: 0
@@ -708,18 +763,18 @@ RectTransform:
  m_GameObject: {fileID: 1148241113}
  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_LocalScale: {x: 0, y: 0, z: 0}
  m_Children:
  - {fileID: 2114914617}
  - {fileID: 2140120284}
  m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 12
  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_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
 --- !u!4 &1243357422 stripped
 Transform:
  m_PrefabParentObject: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752,
@@ -929,7 +984,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.y
- value: 0
+ value: 1.5
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalPosition.z
@@ -957,7 +1012,7 @@ Prefab:
  objectReference: {fileID: 0}
  - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_LocalScale.x
- value: 50
+ value: 51
  objectReference: {fileID: 0}
  - target: {fileID: 1240062629978812, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  propertyPath: m_Name
@@ -967,9 +1022,61 @@ Prefab:
  propertyPath: m_LocalEulerAnglesHint.y
  value: 90
  objectReference: {fileID: 0}
+ - target: {fileID: 4582049809608818, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
+ propertyPath: m_LocalScale.y
+ value: 3
+ objectReference: {fileID: 0}
  m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: f3d86897f293bfc4aa1fb70a3384a752, type: 2}
  m_IsPrefabParent: 0
+--- !u!1001 &1452824194
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 0.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ propertyPath: m_RootOrder
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 114429256390817914, guid: da9c70ea3ed54464b955c8fdd666b19d,
+ type: 2}
+ propertyPath: properties
+ value: 
+ objectReference: {fileID: 11400000, guid: 75edf39147a941649a58939134f2060b,
+ type: 2}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
+ m_IsPrefabParent: 0
 --- !u!1 &1457170021
 GameObject:
  m_ObjectHideFlags: 0
@@ -1057,71 +1164,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1476481431
-Prefab:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalPosition.y
- value: 2.5
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_RootOrder
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 114429256390817914, guid: da9c70ea3ed54464b955c8fdd666b19d,
- type: 2}
- propertyPath: properties
- value: 
- objectReference: {fileID: 11400000, guid: 75edf39147a941649a58939134f2060b,
- type: 2}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalScale.x
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalScale.y
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 4060328548485418, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- propertyPath: m_LocalScale.z
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 114976053587055040, guid: da9c70ea3ed54464b955c8fdd666b19d,
- type: 2}
- propertyPath: player
- value: 
- objectReference: {fileID: 1079610139}
- m_RemovedComponents: []
- m_ParentPrefab: {fileID: 100100000, guid: da9c70ea3ed54464b955c8fdd666b19d, type: 2}
- m_IsPrefabParent: 0
 --- !u!1001 &1500499031
 Prefab:
  m_ObjectHideFlags: 0
@@ -1292,7 +1334,8 @@ Prefab:
  propertyPath: m_TagString
  value: Player
  objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 114997818589997276, guid: d1d07de129d15a74390304540206fded, type: 2}
  m_ParentPrefab: {fileID: 100100000, guid: d1d07de129d15a74390304540206fded, type: 2}
  m_IsPrefabParent: 0
 --- !u!1 &1942816429
@@ -1378,7 +1421,7 @@ Transform:
  - {fileID: 14614190}
  - {fileID: 670339953}
  m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2114914616
 GameObject:
@@ -1410,11 +1453,11 @@ RectTransform:
  m_Father: {fileID: 1148241115}
  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_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 1, y: 1}
 --- !u!114 &2114914618
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1484,11 +1527,11 @@ RectTransform:
  m_Father: {fileID: 1148241115}
  m_RootOrder: 1
  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_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0, y: 1}
 --- !u!114 &2140120285
 MonoBehaviour:
  m_ObjectHideFlags: 0

diff --git a/Neonmania/Assets/Scripts/CMYColor.cs b/Neonmania/Assets/Scripts/CMYColor.cs
@@ -69,6 +69,6 @@ public override string ToString() {
  }
 
  public Color AsHDRColor(float glow) {
- return new Vector4(1.0f -this.c, 1.0f - this.m, 1.0f - this.y, glow);
+ return new Vector4(1.0f - this.c, 1.0f - this.m, 1.0f - this.y, glow);
  }
 }