Merge pull request #778 from Marssssssss/v2.1.4-release

fix wrong jump height in case platform

Author: knoxHuang

assets/cases/collider/Platform/HeroControl.js

@@ -8,7 +8,8 @@ cc.Class({
         gravity: -1000,
         drag: 1000,
         direction: 0,
-        jumpSpeed: 300
+        jumpSpeed: 300,
+        _lastSpeedY: 0
     },
 
     // use this for initialization
@@ -19,6 +20,7 @@ cc.Class({
 
         this.collisionX = 0;
         this.collisionY = 0;
+        this.jumping = true;
 
         this.prePosition = cc.v2();
         this.preStep = cc.v2();
@@ -51,7 +53,8 @@ cc.Class({
             case cc.macro.KEY.up:
                 if (!this.jumping) {
                     this.jumping = true;
-                    this.speed.y = this.jumpSpeed;    
+                    this.speed.y = this.jumpSpeed > this.maxSpeed.y ? this.maxSpeed.y : this.jumpSpeed;    
+                    this._lastSpeedY = this.jumpSpeed > this.maxSpeed.y ? this.maxSpeed.y : this.jumpSpeed;    
                 }
                 break;
         }
@@ -119,6 +122,7 @@ cc.Class({
             }
 
             this.speed.y = 0;
+            this._lastSpeedY = 0;
             other.touchingY = true;
         }    
 
@@ -161,9 +165,9 @@ cc.Class({
             this.jumping = true;
         }
     },
-    
+
     update: function (dt) {
-        if (this.collisionY === 0) {
+        if (this.jumping) {
             this.speed.y += this.gravity * dt;
             if (Math.abs(this.speed.y) > this.maxSpeed.y) {
                 this.speed.y = this.speed.y > 0 ? this.maxSpeed.y : -this.maxSpeed.y;
@@ -198,6 +202,13 @@ cc.Class({
         this.preStep.y = this.speed.y * dt;
 
         this.node.x += this.speed.x * dt;
-        this.node.y += this.speed.y * dt;
+        if (this._lastSpeedY === 0 || this.speed.y === 0 || this._lastSpeedY / Math.abs(this._lastSpeedY) === this.speed.y / Math.abs(this.speed.y)) {
+            this.node.y += (this._lastSpeedY + this.speed.y) * dt / 2;
+        }
+        else {
+            this.node.y +=  - this._lastSpeedY / this.gravity / 2 * this._lastSpeedY + this.speed.y / this.gravity / 2 * this.speed.y; 
+        } 
+
+        this._lastSpeedY = this.speed.y;
     },
 });