Refactoring

jerukan · May 22, 2019 · 37af565 · 37af565
1 parent 4830774
commit 37af565
Show file tree

Hide file tree

Showing 108 changed files with 9,369 additions and 662 deletions.
diff --git a/Assets/Resources/Prefabs.meta → Assets/Prefabs.meta b/Assets/Resources/Prefabs.meta → Assets/Prefabs.meta
diff --git a/Assets/Resources/Prefabs/GameManager.prefab → Assets/Prefabs/GameManager.prefab b/Assets/Resources/Prefabs/GameManager.prefab → Assets/Prefabs/GameManager.prefab
diff --git a/...Resources/Prefabs/GameManager.prefab.meta → Assets/Prefabs/GameManager.prefab.meta b/...Resources/Prefabs/GameManager.prefab.meta → Assets/Prefabs/GameManager.prefab.meta
diff --git a/Assets/Resources/Prefabs/IngameUI.prefab → Assets/Prefabs/IngameUI.prefab b/Assets/Resources/Prefabs/IngameUI.prefab → Assets/Prefabs/IngameUI.prefab
diff --git a/...ts/Resources/Prefabs/IngameUI.prefab.meta → Assets/Prefabs/IngameUI.prefab.meta b/...ts/Resources/Prefabs/IngameUI.prefab.meta → Assets/Prefabs/IngameUI.prefab.meta
diff --git a/Assets/Resources/Prefabs/Misc.meta → Assets/Prefabs/Misc.meta b/Assets/Resources/Prefabs/Misc.meta → Assets/Prefabs/Misc.meta
diff --git a/...Resources/Prefabs/Misc/GREENCIRCLE.prefab → Assets/Prefabs/Misc/GREENCIRCLE.prefab b/...Resources/Prefabs/Misc/GREENCIRCLE.prefab → Assets/Prefabs/Misc/GREENCIRCLE.prefab
diff --git a/...rces/Prefabs/Misc/GREENCIRCLE.prefab.meta → Assets/Prefabs/Misc/GREENCIRCLE.prefab.meta b/...rces/Prefabs/Misc/GREENCIRCLE.prefab.meta → Assets/Prefabs/Misc/GREENCIRCLE.prefab.meta
diff --git a/...Resources/Prefabs/Misc/HelpTrigger.prefab → Assets/Prefabs/Misc/HelpTrigger.prefab b/...Resources/Prefabs/Misc/HelpTrigger.prefab → Assets/Prefabs/Misc/HelpTrigger.prefab
diff --git a/...rces/Prefabs/Misc/HelpTrigger.prefab.meta → Assets/Prefabs/Misc/HelpTrigger.prefab.meta b/...rces/Prefabs/Misc/HelpTrigger.prefab.meta → Assets/Prefabs/Misc/HelpTrigger.prefab.meta
diff --git a/...ces/Prefabs/Misc/LevelCompleteCube.prefab → Assets/Prefabs/Misc/LevelCompleteCube.prefab b/...ces/Prefabs/Misc/LevelCompleteCube.prefab → Assets/Prefabs/Misc/LevelCompleteCube.prefab
diff --git a/...refabs/Misc/LevelCompleteCube.prefab.meta → ...refabs/Misc/LevelCompleteCube.prefab.meta b/...refabs/Misc/LevelCompleteCube.prefab.meta → ...refabs/Misc/LevelCompleteCube.prefab.meta
diff --git a/.../Resources/Prefabs/Misc/ScoreBoard.prefab → Assets/Prefabs/Misc/ScoreBoard.prefab b/.../Resources/Prefabs/Misc/ScoreBoard.prefab → Assets/Prefabs/Misc/ScoreBoard.prefab
diff --git a/...urces/Prefabs/Misc/ScoreBoard.prefab.meta → Assets/Prefabs/Misc/ScoreBoard.prefab.meta b/...urces/Prefabs/Misc/ScoreBoard.prefab.meta → Assets/Prefabs/Misc/ScoreBoard.prefab.meta
diff --git a/Assets/Resources/Prefabs/Players.meta → Assets/Prefabs/Players.meta b/Assets/Resources/Prefabs/Players.meta → Assets/Prefabs/Players.meta
diff --git a/...rces/Prefabs/Players/BotController.prefab → Assets/Prefabs/Players/BotController.prefab b/...rces/Prefabs/Players/BotController.prefab → Assets/Prefabs/Players/BotController.prefab
@@ -41,16 +41,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1045040720708366}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 123f0d30b4d064865ad55e7343ae70bb, type: 3}
+  m_Script: {fileID: 11500000, guid: fbbf8bbf2821747ea905947990048ffd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   cam: {fileID: 4226428360555989521}
-  cameraLook:
-    clampVerticalRotation: 1
-    MinimumX: -89
-    MaximumX: 89
-    smooth: 0
-    smoothTime: 5
 --- !u!1 &1145021498028812
 GameObject:
   m_ObjectHideFlags: 0
@@ -350,9 +344,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxWeapons: 2
-  weaponPrefabs:
-  - {fileID: 114580479567636246, guid: 7827d3a98892b441b93a55e80e983783, type: 3}
-  - {fileID: 114450041212092134, guid: 6e21b60bac73e4863bc3f9b8b3faf62b, type: 3}
+  startingWeaponPrefabs: []
 --- !u!114 &114081812441207190
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -362,29 +354,33 @@ MonoBehaviour:
   m_GameObject: {fileID: 1830071249688946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 69e76fe7d6f444a8ab2ee207a15a7667, type: 3}
+  m_Script: {fileID: 11500000, guid: 8c5a4894500704e22a42569562dc31ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  head: {fileID: 0}
-  cam: {fileID: 0}
+  head: {fileID: 114342701231250032}
+  groundContactLayerNames:
+  - Default
   forwardSpeed: 4
   backwardSpeed: 3.5
   strafeSpeed: 4
   groundAccelerationRate: 0.2
-  crouchMultiplier: 0.5
+  crouchSpeedMultiplier: 0.5
   maxHorizontalSpeed: 100
   lowestSpeedPossible: 0.0001
+  terminalVelocity: 75
   jumpForce: 5
   gravityMultiplier: 1
-  bunnyHopWindow: 0.1
-  autoBunnyHop: 1
+  bunnyHopWindow: 0.2
+  autoBunnyHop: 0
+  crouchHeightMultiplier: 0.5
   groundCheckDistance: 0.01
   maxSlopeAllowed: 45
   requiredVelocityToSlide: 10
   requiredAngleToSlide: 5
-  autoClimbMaxHeight: 0.3
-  currentTargetSpeed: 0
-  currentTargetDirection: {x: 0, y: 0}
+  enableAutoClimb: 1
+  autoClimbMaxHeight: 0.2
+  currentGroundTargetSpeed: 0
+  currentTargetMovementDirection: {x: 0, y: 0}
   currentTargetLookAngle: {x: 0, y: 0}
 --- !u!114 &114762123195891280
 MonoBehaviour:
@@ -398,7 +394,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ecdfd1b60b3548039163ab58b46f63e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  linearAccelerationLimit: 1
+  linearAccelerationSpeedLimit: 1
   linearAcceleration: 0.5
 --- !u!195 &3014512715246363838
 NavMeshAgent:

diff --git a/...Prefabs/Players/BotController.prefab.meta → ...Prefabs/Players/BotController.prefab.meta b/...Prefabs/Players/BotController.prefab.meta → ...Prefabs/Players/BotController.prefab.meta
diff --git a/...bs/Players/FirstPersonSourcePlayer.prefab → ...bs/Players/FirstPersonSourcePlayer.prefab b/...bs/Players/FirstPersonSourcePlayer.prefab → ...bs/Players/FirstPersonSourcePlayer.prefab
@@ -42,7 +42,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3373630342929316283}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 123f0d30b4d064865ad55e7343ae70bb, type: 3}
+  m_Script: {fileID: 11500000, guid: fbbf8bbf2821747ea905947990048ffd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   cam: {fileID: 3358081611380480529}
@@ -55,12 +55,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 3373630342929316283}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 94be01cb95858461892e9369d785a167, type: 3}
+  m_Script: {fileID: 11500000, guid: 787705f4663c040699a84b4f5c2c4874, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   clampInDegrees: {x: 360, y: 179}
   lockCursor: 1
-  sensitivity: {x: 1.5, y: 1.5}
+  sensitivity: {x: 2, y: 2}
   smoothing: {x: 1, y: 1}
   targetDirection: {x: 0, y: 0}
   targetCharacterDirection: {x: 0, y: 0}
@@ -174,7 +174,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3374529730188977095}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 69e76fe7d6f444a8ab2ee207a15a7667, type: 3}
+  m_Script: {fileID: 11500000, guid: a3a4da57dc06848d3b9b71218233786f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   head: {fileID: 3405854421004116165}
@@ -190,15 +190,15 @@ MonoBehaviour:
   terminalVelocity: 75
   jumpForce: 5
   gravityMultiplier: 1
-  bunnyHopWindow: 0.1
-  autoBunnyHop: 1
+  bunnyHopWindow: 0.2
+  autoBunnyHop: 0
   crouchHeightMultiplier: 0.5
   groundCheckDistance: 0.01
   maxSlopeAllowed: 45
   requiredVelocityToSlide: 10
   requiredAngleToSlide: 5
   enableAutoClimb: 1
-  autoClimbMaxHeight: 0.3
+  autoClimbMaxHeight: 0.2
   currentGroundTargetSpeed: 0
   currentTargetMovementDirection: {x: 0, y: 0}
   currentTargetLookAngle: {x: 0, y: 0}
@@ -211,7 +211,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3374529730188977095}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f70b29925396842e7a94fba24d9136d9, type: 3}
+  m_Script: {fileID: 11500000, guid: c2e87bdea54684d3fabd65c2044db44b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   crouchKey: 306
@@ -227,8 +227,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ecdfd1b60b3548039163ab58b46f63e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  linearAccelerationLimit: 1
-  linearAcceleration: 1.5
+  linearAccelerationSpeedLimit: 1
+  linearAcceleration: 30
 --- !u!1 &3374935538205100473
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/...ayers/FirstPersonSourcePlayer.prefab.meta → ...ayers/FirstPersonSourcePlayer.prefab.meta b/...ayers/FirstPersonSourcePlayer.prefab.meta → ...ayers/FirstPersonSourcePlayer.prefab.meta
diff --git a/...esources/Prefabs/Players/ThePlayer.prefab → Assets/Prefabs/Players/ThePlayer.prefab b/...esources/Prefabs/Players/ThePlayer.prefab → Assets/Prefabs/Players/ThePlayer.prefab
@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4440803843462806}
   - component: {fileID: 114342701231250032}
-  - component: {fileID: 7940782880158903307}
+  - component: {fileID: 9034066751887891751}
   m_Layer: 9
   m_Name: PlayerHead
   m_TagString: Untagged
@@ -42,11 +42,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1045040720708366}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 123f0d30b4d064865ad55e7343ae70bb, type: 3}
+  m_Script: {fileID: 11500000, guid: fbbf8bbf2821747ea905947990048ffd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   cam: {fileID: 20391502722244772}
---- !u!114 &7940782880158903307
+--- !u!114 &9034066751887891751
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -55,12 +55,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 1045040720708366}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 94be01cb95858461892e9369d785a167, type: 3}
+  m_Script: {fileID: 11500000, guid: 787705f4663c040699a84b4f5c2c4874, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   clampInDegrees: {x: 360, y: 179}
-  lockCursor: 0
-  sensitivity: {x: 1.5, y: 1.5}
+  lockCursor: 1
+  sensitivity: {x: 2, y: 2}
   smoothing: {x: 1, y: 1}
   targetDirection: {x: 0, y: 0}
   targetCharacterDirection: {x: 0, y: 0}
@@ -359,8 +359,9 @@ GameObject:
   - component: {fileID: 114437883547269092}
   - component: {fileID: 114508855472955520}
   - component: {fileID: 114145203885197520}
-  - component: {fileID: 114081812441207190}
   - component: {fileID: 114175758182727334}
+  - component: {fileID: 114081812441207190}
+  - component: {fileID: 1195699236145540881}
   - component: {fileID: 114762123195891280}
   - component: {fileID: 114834855372642138}
   m_Layer: 9
@@ -458,7 +459,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxWeapons: 2
-  weaponPrefabs: []
+  startingWeaponPrefabs: []
 --- !u!114 &114145203885197520
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -473,6 +474,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   primaryFireButton: 323
   secondaryFireButton: 324
+--- !u!114 &114175758182727334
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1830071249688946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e26bb5c050dc34b8ea2a27112274fca3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxHealth: 200
+  healthRegen: 100
+  healthRegenDelay: 5
 --- !u!114 &114081812441207190
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -482,7 +498,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1830071249688946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 69e76fe7d6f444a8ab2ee207a15a7667, type: 3}
+  m_Script: {fileID: 11500000, guid: a3a4da57dc06848d3b9b71218233786f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   head: {fileID: 114342701231250032}
@@ -498,19 +514,19 @@ MonoBehaviour:
   terminalVelocity: 75
   jumpForce: 5
   gravityMultiplier: 1
-  bunnyHopWindow: 0.1
+  bunnyHopWindow: 0.2
   autoBunnyHop: 1
   crouchHeightMultiplier: 0.5
   groundCheckDistance: 0.01
   maxSlopeAllowed: 45
   requiredVelocityToSlide: 10
   requiredAngleToSlide: 5
   enableAutoClimb: 1
-  autoClimbMaxHeight: 0.3
+  autoClimbMaxHeight: 0.2
   currentGroundTargetSpeed: 0
   currentTargetMovementDirection: {x: 0, y: 0}
   currentTargetLookAngle: {x: 0, y: 0}
---- !u!114 &114175758182727334
+--- !u!114 &1195699236145540881
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -519,7 +535,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1830071249688946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f70b29925396842e7a94fba24d9136d9, type: 3}
+  m_Script: {fileID: 11500000, guid: c2e87bdea54684d3fabd65c2044db44b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   crouchKey: 306
@@ -535,8 +551,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ecdfd1b60b3548039163ab58b46f63e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  linearAccelerationLimit: 1
-  linearAcceleration: 1.5
+  linearAccelerationSpeedLimit: 1
+  linearAcceleration: 30
 --- !u!114 &114834855372642138
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -546,7 +562,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1830071249688946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9c41ab7be99684507af53fd6d2e439c1, type: 3}
+  m_Script: {fileID: 11500000, guid: 860afe8fb4b774451b2d6fd3341c4df3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   landingIndicatorPrefab: {fileID: 1281365869355268, guid: 835e59da4ce3b443cb6b723dcd6c8b90,

diff --git a/...ces/Prefabs/Players/ThePlayer.prefab.meta → Assets/Prefabs/Players/ThePlayer.prefab.meta b/...ces/Prefabs/Players/ThePlayer.prefab.meta → Assets/Prefabs/Players/ThePlayer.prefab.meta
diff --git a/Assets/Resources/Prefabs/Weaponry.meta → Assets/Prefabs/Weaponry.meta b/Assets/Resources/Prefabs/Weaponry.meta → Assets/Prefabs/Weaponry.meta
diff --git a/...urces/Prefabs/Weaponry/BasicRocket.prefab → Assets/Prefabs/Weaponry/BasicRocket.prefab b/...urces/Prefabs/Weaponry/BasicRocket.prefab → Assets/Prefabs/Weaponry/BasicRocket.prefab
diff --git a/.../Prefabs/Weaponry/BasicRocket.prefab.meta → .../Prefabs/Weaponry/BasicRocket.prefab.meta b/.../Prefabs/Weaponry/BasicRocket.prefab.meta → .../Prefabs/Weaponry/BasicRocket.prefab.meta