merge

assets/Script/game/fight/object/MSprite.ts

@@ -35,12 +35,8 @@ export default class MSprite extends FSprite {
     /**
      * 移动速度
      */
-<<<<<<< HEAD
-    private speedN = 120000;
-    public speedUp: string = "";
-=======
     private speedN = 80000;
->>>>>>> 05c7557fd359051ba5c907802c1d34a511f5f6c4
+    public speedUp: string = "";
 
     public start() {
         super.start()
@@ -307,18 +303,18 @@ export default class MSprite extends FSprite {
     /**
      * 临时捡起的东西
      */
-    public tmpObject:cc.Node = null;
+    public tmpObject: cc.Node = null;
     /**
      * 角色举起物品
      * @param object 
      */
-    public liftObject(object:cc.Node){
-        
+    public liftObject(object: cc.Node) {
+
     }
     /**
      * 将捡起来的东西扔出去
      */
-    public throwObject(){
+    public throwObject() {