files add

2022-05-07 22:02:15 +07:00
parent 87568c4077
commit f9a3b06ec3
8 changed files with 281 additions and 213 deletions
--- a/Assets/Settings/Game
+++ b/Assets/Settings/Game
@ -12,7 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e2c47233b9062c84482336b145c6891b, type: 3}
  m_Name: Game Settings
  m_EditorClassIdentifier: 
-<<<<<<< HEAD
  IsTesting: 0
  TimeToWin: 15
  TimeOut: 3600
@ -39,29 +38,3 @@ MonoBehaviour:
  DoDamageChanceInRunning: 30
  DoDamageChanceInCover: 25
  CrouchingCoefficient: 1.4
-=======
-  isTesting: 1
-  timeToWin: 5
-  timeOut: 1600
-  movementDistance: 50
-  movementSpeed: 3
-  defTeamAI: 0
-  atcTeamAI: 0
-  numOfDefenders: 1
-  numOfAttackers: 1
-  hasHumanDefender: 1
-  hasHumanAttacker: 0
-  healthPickupAmount: 50
-  armourPickupAmount: 50
-  ammunitionPickupAmount: 120
-  pickupsAmount: 2
-  maxHealth: 100
-  maxArmour: 100
-  maxAmmo: 31337
-  GetHitChanceInDirectPoint: 0
-  GetHitChanceInRunning: 0
-  GetHitChanceInCover: 0
-  DoDamageChanceInDirectPoint: 0
-  DoDamageChanceInRunning: 0
-  DoDamageChanceInCover: 0
->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467