Revert "修改跳跃逻辑，二段跳不是重置速度为speed而是加上speed"

This reverts commit 708afabba60cfe4d1bd166024f048a2b67ca0fb3.

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -762,6 +762,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0b46e3a90d8fc304caef18f1c373478c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isTran: 0
+  pc: {fileID: 0}
+  isSpirit: 0
+  HitCols:
+  - {fileID: 5569876744729591823}
+  - {fileID: 1367816017394770223}
+  cookNum: 10
   mecanim: {fileID: 6843453365888964567}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6197716555580445942}
@@ -769,33 +776,19 @@ MonoBehaviour:
   rb: {fileID: 3571941038519084339}
   bodyTrans: {fileID: 2788556811231999033}
   beSearchTrigger: {fileID: 573198802}
-  searchTrigger: {fileID: 2246792914537570827}
+  beHitTrigger: {fileID: 7995092481582001509}
   bodyCollider: {fileID: 458160094715212641}
   uiHp: {fileID: 205997967}
   state: 1
-  totalHp: 5000
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  linked: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  totalDieKeepTime: 0.3
-  dieKeepTime: 0
-  canHitFly: 1
-  isNonAttack: 0
   attackTime: 0
   totalAttack1Time: 0.1
   totalAttack2Time: 0.1
-  attackType: 1
-  bulletPrefab: {fileID: 7473170563405908938, guid: 0f488b5ad45b7bc449182ade64d3abe9, type: 3}
-  shootPos:
-  - {fileID: 9015502495672612501}
-  - {fileID: 1384034400187750894}
-  - {fileID: 4278110667860756949}
-  - {fileID: 8692792125260174174}
-  shootTrack: 1
+  isNonAttack: 0
+  hptp: 0
+  isDie: 0
+  isRevive: 0
+  totalHp: 5000
+  hp: 0
   attack1Infos:
   - damage: 5
     attackDir: {x: -1, y: 0, z: 0}
@@ -820,55 +813,75 @@ MonoBehaviour:
   attack2Infos: []
   attackTriggers:
   - {fileID: 1267495056}
-  targetTypes: 0400000005000000
-  targetCharacter: {fileID: 0}
+  attackType: 1
+  bulletPrefab: {fileID: 7473170563405908938, guid: 0f488b5ad45b7bc449182ade64d3abe9, type: 3}
+  shootPos:
+  - {fileID: 9015502495672612501}
+  - {fileID: 1384034400187750894}
+  - {fileID: 4278110667860756949}
+  - {fileID: 8692792125260174174}
+  dieKeepTime: 0
+  totalDieKeepTime: 0.3
   attackTarget: {fileID: 0}
+  shootTrack: 1
+  invincibleTime: 0
+  totalInvincibleTime: 0.5
+  targetCharacter: {fileID: 0}
   beTargetCharacter: []
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
+  searchTrigger: {fileID: 2246792914537570827}
+  targetTypes: 0400000005000000
+  canHitFly: 1
+  linked: 0
   joint: {fileID: 0}
   rope: {fileID: 0}
+  hasHpUp: 0
   beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: 81069b2e594d94340983febc6c5ff9b3, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: 60af008f6e7aa1549bc707cc9bccad80, type: 2}
+  canHitFloat: 0
+  floatProbability: 0
+  attackToFloat: 0
+  floatTimes: 0
+  hasFloatTimes: 0
+  criticalChance: 0
+  criticalMultiplier: 0
+  canMove: 1
   foot: {fileID: 3571941039716665623}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 10
-  totalBeRepelValue: 100
   beRepelValue: 0
+  totalBeRepelValue: 100
   weakTime: 0
   totalWeakTime: 0.5
-  weakHitRate: 2
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
+  weakUpSpeed: 10
   decelerationRatio: 1
+  minHurtKeepTime: 0.2
+  hurtKeepTime: 0
+  hurtChangeVelocity: 10
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
+  isCaughtByCook: 0
+  isBeDropped: 0
   maxTime: 1.5
   minTime: 0.1
   maxHeight: 9
   minHeight: 4
-  floatTime: 5
   maxRotateSpeed: 20
   minRotateSpeed: 5
+  floatTime: 5
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
+  rapidFallSpeed: 30
+  curFallSpeed: 0
+  floatState: 0
+  matState: 1
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
+  outlineMats:
+  - {fileID: 2100000, guid: 81069b2e594d94340983febc6c5ff9b3, type: 2}
+  outline1Mats:
+  - {fileID: 2100000, guid: 60af008f6e7aa1549bc707cc9bccad80, type: 2}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
@@ -881,77 +894,19 @@ MonoBehaviour:
   playerMesh: {fileID: 0}
   playerMats: []
   playerOut: []
+  canNotChangeHurt: 0
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0
   invisibleTime: 0
   velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  playerId: 0
-  canJump: 1
-  canfly: 0
-  isTransfiguration: 0
-  canTranSummon: 0
-  endTranSummon: 1
-  isUltimate: 0
-  keyTransfigurateRelease: 0
+  easyToGetHit: 0.2
   changePrefabs:
   - {fileID: 8639832132491289359, guid: b924426f768fd34418c3332de33d391a, type: 3}
   - {fileID: 2437299196472462361, guid: 00861cbb6651ced4a85013d35a07b3e6, type: 3}
   - {fileID: 5440846222648032759, guid: 1d487061d2e4ceb409a42daadf985eec, type: 3}
   - {fileID: 2437299196472462361, guid: 0e7e5e45ddc25b641963c78f68b041b8, type: 3}
-  needCorpses: 14000000140000001400000014000000
   endChange: 0
-  uiMp: {fileID: 8465211090008398057}
-  playerRope: {fileID: 112529840073562573, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-  eventTrigger: {fileID: 8878694457807976444}
-  sprintLinkTrigger: {fileID: 2536450432252384432}
-  soulCollector: {fileID: 3739918129319493242}
-  skeletonMecanim: {fileID: 6843453365888964567}
-  playerSpine:
-  - {fileID: 11400000, guid: a1915b92abea4a049a4d50b2ebd53111, type: 2}
-  - {fileID: 11400000, guid: b8dcb564f1b91234588d66173ce4064e, type: 2}
-  mp: 0
-  totalMp: 300
-  isMpRepel: 1
-  isRapedReply: 0
-  mpReplySpeed: 10
-  rapidReplySpeed: 15
-  lostMp: 0
-  soul: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
-  rapidReplyEffect: {fileID: 1451166925420573129}
-  moveVec: {x: 0, y: 0}
-  leftDir: {x: 0, y: 0}
-  rushSpeed: 30
-  rushCostMp: 20
-  rushDir: {x: 0, y: 0, z: 0}
-  rushInvincibleTime: 0.2
-  rushTime: 0
-  totalRushTime: 0.2
-  cacheRushTime: 0
-  totalCacheRushTime: 0.1
-  sprintCostMp: 20
-  cachePullRopeTime: 0
-  totalCachePullRopeTime: 0.1
-  jumpSpeed: 18
-  airJumpSpeed: 14
-  airJumped: 0
-  airJumpNumber: 1
-  canAirJumpSpeed: 10
-  canJumpTime: 0
-  leaveGroundCanJumpTime: 0.15
-  cacheJumpTime: 0
-  totalCacheJumpTime: 0.15
-  tandemJumpTime: 0
-  totalTandemJumpTime: 0.1
-  flySpeed: 8
-  maxFlyHeight: 0
-  totalCacheSummonTime: 0.1
-  summonTime: 0
-  cacheSummonTime: 0
-  cacheSummonId: 0
   demonicPrefabs:
   - {fileID: 8639832132491289359, guid: 4c2987691cdb47040b3a55ff928803c3, type: 3}
   - {fileID: 5440846222648032759, guid: 05825e721b2832f478f66e78daed901f, type: 3}
@@ -969,10 +924,48 @@ MonoBehaviour:
   - {x: -1, y: 0, z: 0}
   - {x: -1, y: 0, z: 0}
   demonicId: 
-  attackState: 0
-  attackMoveSpeed: 5
+  uiMp: {fileID: 8465211090008398057}
+  playerRope: {fileID: 112529840073562573, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
+  eventTrigger: {fileID: 8878694457807976444}
+  sprintLinkTrigger: {fileID: 2536450432252384432}
+  jumpSpeed: 18
+  airJumpSpeed: 14
+  rushSpeed: 30
+  flySpeed: 8
+  mp: 0
+  totalMp: 300
+  mpReplySpeed: 10
+  rushCostMp: 20
+  sprintCostMp: 20
+  rushInvincibleTime: 0.2
+  canJumpTime: 0
+  leaveGroundCanJumpTime: 0.15
+  cacheJumpTime: 0
+  totalCacheJumpTime: 0.1
+  tandemJumpTime: 0
+  totalTandemJumpTime: 0.1
+  summonTime: 0
   cacheAttackTime: 0
   totalCacheAttackTime: 0.1
+  cachePullRopeTime: 0
+  totalCachePullRopeTime: 0.1
+  cacheSummonTime: 0
+  totalCacheSummonTime: 0.1
+  cacheSummonId: 0
+  rushTime: 0
+  totalRushTime: 0.2
+  cacheRushTime: 0
+  totalCacheRushTime: 0.1
+  airJumped: 0
+  jumpNumber: 2
+  attackState: 0
+  attackMoveSpeed: 5
+  rushDir: {x: 0, y: 0, z: 0}
+  lostMp: 0
+  soul: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
+  soulCollector: {fileID: 3739918129319493242}
+  isTransfiguration: 0
+  moveVec: {x: 0, y: 0}
   reviveTime: 0
   totalReviveTime: 10
   isBaseBtnOut: 0
@@ -989,7 +982,29 @@ MonoBehaviour:
   isSpiritSummon2: 0
   isSpiritSummon3: 0
   isKeepBtnNorth: 0
+  leftDir: {x: 0, y: 0}
+  playerId: 0
+  skeletonMecanim: {fileID: 6843453365888964567}
+  playerSpine:
+  - {fileID: 11400000, guid: a1915b92abea4a049a4d50b2ebd53111, type: 2}
+  - {fileID: 11400000, guid: b8dcb564f1b91234588d66173ce4064e, type: 2}
+  canJump: 1
+  canfly: 0
   LBisHold: 0
+  needCorpses: 14000000140000001400000014000000
+  isUltimate: 0
+  keyTransfigurateRelease: 0
+  canTranSummon: 0
+  isMpRepel: 1
+  rapidReplySpeed: 15
+  isRapedReply: 0
+  rapidReplyEffect: {fileID: 1451166925420573129}
+  maxFlyHeight: 0
+  endTranSummon: 1
+  canArrowHitFloat: 0
+  probability: 0
+  gainAbilityProbability: 0
+  abilityTimes: 0
 --- !u!54 &3571941038519084339
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1049,6 +1064,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   types: 4
+  floatEffect: {fileID: 417478504669294145, guid: 243eb0eff66414445990654286d861d1, type: 3}
   currentSpirit: -1
   hasSpirits: 0
   maxCards: 3

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -535,7 +535,7 @@ public class PlayerController : MoveCharacter
         ChangeState(CharacterState.Rise);
         Vector3 velocity = rb.velocity;
         CheckTurn();
-        velocity.y += speed;
+        velocity.y = speed;
         rb.velocity = velocity;
         //animalAni.SetInteger("state", (int)PlayerState.Rise);
     }