Merge branch 'master' of http://47.104.13.119:3000/zhoupeng/airWar

airPlay/assets/Script/game/flyImg.ts

@@ -18,6 +18,8 @@ export default class flyImg extends  GameLogic {
     pos:cc.Vec2 = cc.v2(0,0);
     uvSpeed: number = 0;
     mat: cc.MaterialVariant = null;
+
+    @property({type: cc.Integer})
     private _speed: number = 100;
     @property({type: cc.Integer})
     public get speed(): number {
@@ -32,7 +34,7 @@ export default class flyImg extends  GameLogic {
         let spr = this.getComponent(cc.Sprite);
         let mat = spr.getMaterial(0);
         mat.setProperty('center', this.pos);
-        this.speed = 100;
+        this.uvSpeed = this.speed / this.node.height
         this.mat = this.node.getComponent(cc.Sprite).getMaterial(0);
     }
 

airPlay/assets/Script/game/nest/nestPlay.ts

@@ -175,7 +175,8 @@ export class NestPlay extends cc.Component {
 
                     let ani = aniNode.addComponent(cc.Animation);
                     ani.addClip(this.aniClip[cnt], 'path')
-                    ani.play('path');
+                    ani.play('path').speed = 0.3;
+                    
                     ani.once(cc.Animation.EventType.FINISHED, ()=>{
                         cnt++;
                         if(cnt < this.aniClip.length){

airPlay/assets/Script/game/player.ts

@@ -38,7 +38,6 @@ export default class player extends GameLogic {
         }
         this.moveCpt.speed= 800;
         this.moveCpt.enabled = false;
-        
     }
 
 

airPlay/assets/Script/game/update/logic.ts

@@ -31,7 +31,7 @@ export class GameLogicMgr {
             aniMgr._oldUpdate = aniMgr.update;
             aniMgr.update = function(dt){
                 if(GameLogicMgr.inst.isGamePause) return;
-                aniMgr._oldUpdate(dt*0.15);
+                aniMgr._oldUpdate(dt);
             }
 
             // @ts-ignore

airPlay/assets/game/1.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "1",
+    "_name": "slideBG",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -116,6 +116,7 @@
       "__id__": 1
     },
     "_enabled": true,
+    "_speed": 20,
     "_id": ""
   },
   {