Merge pull request #31 from Vinkle-hzt/zqh

数据修改完毕
Vinkle-hzt · Jul 31, 2022 · 5f6ae94 · 5f6ae94
2 parents 01a143a + 755e75c
commit 5f6ae94
Show file tree

Hide file tree

Showing 13 changed files with 1,165 additions and 617 deletions.
diff --git a/Assets/Data/EnemyData/Drone/EnemyDrone.asset b/Assets/Data/EnemyData/Drone/EnemyDrone.asset
@@ -15,20 +15,20 @@ MonoBehaviour:
   characterTag: Enemy
   maxHealth: 30
   health: 30
-  defence: 0
+  defence: 2
   maxEnergy: 0
   energy: 0
   energyAttack: 0
   energyLoss: 0
   energyGet: 0
   changeStateEnergy: 0
   changeStateTime: 0
-  speed: 3
+  speed: 2
   speedRatio: 0
   jumpforce: 0
-  attackSpeed: 0.25
-  shootSpeed: 4
-  damage: 5
+  attackSpeed: 0.3
+  shootSpeed: 6
+  damage: 6
   canShoot: 1
   hackDis: 0
   isStagger: 0
diff --git a/Assets/Data/EnemyData/Drone/EnemyDroneFallDown.asset b/Assets/Data/EnemyData/Drone/EnemyDroneFallDown.asset
@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   fallDownTime: 8
   plusFallDownTime: 1
-  maxFallDownTime: 15
-  resumePercent: 20
+  maxFallDownTime: 20
+  resumePercent: 40
   plusResumePercent: 10
   minResumePercent: 5
   perceptionDis: 12
diff --git a/Assets/Data/EnemyData/PDS/PDSEnemyInfo.asset b/Assets/Data/EnemyData/PDS/PDSEnemyInfo.asset
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7e63076e5fcc9fc43bc961e8c16cd36d, type: 3}
   m_Name: PDSEnemyInfo
   m_EditorClassIdentifier: 
-  fallDownTime: 3
-  plusFallDownTime: 1
-  maxFallDownTime: 5
+  fallDownTime: 8
+  plusFallDownTime: 2
+  maxFallDownTime: 20
   resumePercent: 40
   plusResumePercent: 10
-  minResumePercent: 20
+  minResumePercent: 10
   perceptionDis: 10
diff --git a/Assets/Data/EnemyData/PDS/PDSInfo.asset b/Assets/Data/EnemyData/PDS/PDSInfo.asset
@@ -13,22 +13,22 @@ MonoBehaviour:
   m_Name: PDSInfo
   m_EditorClassIdentifier: 
   characterTag: 
-  maxHealth: 10
-  health: 10
-  defence: 1
+  maxHealth: 40
+  health: 40
+  defence: 3
   maxEnergy: 0
   energy: 0
   energyAttack: 0
   energyLoss: 0
   energyGet: 0
   changeStateEnergy: 0
   changeStateTime: 0
-  speed: 3
+  speed: 2.5
   speedRatio: 0
   jumpforce: 0
   attackSpeed: 0.8
   shootSpeed: 0
-  damage: 3
+  damage: 4
   canShoot: 1
   hackDis: 0
   isStagger: 0
diff --git a/Assets/Data/EnemyData/Turret/EnemyTurret.asset b/Assets/Data/EnemyData/Turret/EnemyTurret.asset
@@ -13,9 +13,9 @@ MonoBehaviour:
   m_Name: EnemyTurret
   m_EditorClassIdentifier: 
   characterTag: Enemy
-  maxHealth: 30
-  health: 30
-  defence: 1
+  maxHealth: 40
+  health: 40
+  defence: 2
   maxEnergy: 0
   energy: 0
   energyAttack: 0
@@ -26,9 +26,9 @@ MonoBehaviour:
   speed: 2
   speedRatio: 0
   jumpforce: 0
-  attackSpeed: 0.5
+  attackSpeed: 0.2
   shootSpeed: 22
-  damage: 8
+  damage: 6
   canShoot: 1
   hackDis: 0
   isStagger: 0
diff --git a/Assets/Data/EnemyData/Turret/EnemyTurretFallDown.asset b/Assets/Data/EnemyData/Turret/EnemyTurretFallDown.asset
@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7e63076e5fcc9fc43bc961e8c16cd36d, type: 3}
   m_Name: EnemyTurretFallDown
   m_EditorClassIdentifier: 
-  fallDownTime: 10
+  fallDownTime: 8
   plusFallDownTime: 2
-  maxFallDownTime: 15
-  resumePercent: 30
+  maxFallDownTime: 20
+  resumePercent: 40
   plusResumePercent: 10
   minResumePercent: 5
   perceptionDis: 13
diff --git a/Assets/Data/PlayerData/CharacterInfo.asset b/Assets/Data/PlayerData/CharacterInfo.asset
@@ -19,16 +19,16 @@ MonoBehaviour:
   maxEnergy: 100
   energy: 80
   energyAttack: 5
-  energyLoss: 15
+  energyLoss: 20
   energyGet: 8
-  changeStateEnergy: 10
-  changeStateTime: 1
-  speed: 6
+  changeStateEnergy: 20
+  changeStateTime: 0.5
+  speed: 5
   speedRatio: 2
   jumpforce: 16
   attackSpeed: 18
   shootSpeed: 35
-  damage: 3
+  damage: 10
   canShoot: 1
   hackDis: 3
   isStagger: 0
diff --git a/Assets/Resources/Prefabs/Enemy/RemoteEnemy/RemoteEnemy.prefab b/Assets/Resources/Prefabs/Enemy/RemoteEnemy/RemoteEnemy.prefab
@@ -251,8 +251,8 @@ MonoBehaviour:
   isElite: 0
   eInfo: {fileID: 0}
   enemyInfo: {fileID: 0}
-  doAimTime: 2
-  intervalTime: 0.2
+  doAimTime: 3
+  intervalTime: 1.5
   target: {fileID: 0}
   pfBullet: {fileID: 1326878126941091125, guid: 756be0682847d104aad02e72f0e96d5f,
     type: 3}

diff --git a/Assets/Resources/Prefabs/InputController/InputController.prefab b/Assets/Resources/Prefabs/InputController/InputController.prefab
@@ -27,6 +27,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0.54739034, y: -0.41233075, z: -0.07042001}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -50,3 +51,4 @@ MonoBehaviour:
   hack: 324
   skill: 324
   esc: 27
+  exchange: 0