Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev

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

@@ -369,6 +369,9 @@ export default class FSprite extends FObject {
         this.isWalk = isWalk;
         // this.updateSpine()
         // this.updateAction();
+        if(!isWalk){
+            this.spine.setAnimation(0, SpriteActionType.stand, true)
+        }
     }
     /**
      * 设置是否跑

assets/resources/prefab/map/map3.prefab

@@ -5407,9 +5407,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -5885,9 +5882,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -6363,9 +6357,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -10908,9 +10899,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -11386,9 +11374,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -11864,9 +11849,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -12342,9 +12324,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -14445,9 +14424,6 @@
     },
     "_enabled": true,
     "id": 3001,
-    "mBullet": {
-      "__uuid__": "17ad2a77-62ab-4903-ac54-252be1792308"
-    },
     "_id": ""
   },
   {
@@ -14947,9 +14923,6 @@
     },
     "_enabled": true,
     "id": 3001,
-    "mBullet": {
-      "__uuid__": "17ad2a77-62ab-4903-ac54-252be1792308"
-    },
     "_id": ""
   },
   {
@@ -15449,9 +15422,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -15927,9 +15897,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -16405,9 +16372,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "9fb099ea-142d-418f-a1e8-f5a46e4f27ee"
-    },
     "_id": ""
   },
   {
@@ -16883,9 +16847,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -17361,9 +17322,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -17839,9 +17797,6 @@
     },
     "_enabled": true,
     "id": 1001,
-    "mBullet": {
-      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
-    },
     "_id": ""
   },
   {
@@ -19582,8 +19537,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 835,
-      "height": 2178
+      "width": 2029,
+      "height": 2112
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19594,7 +19549,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        1986,
+        1389,
         64,
         0,
         0,

assets/resources/prefab/role/1002.prefab

@@ -594,7 +594,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 84.54,
-      "height": 96.5
+      "height": 96.51
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1127,7 +1127,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "7fMaGgFQZBgZvO3SoMRWtD",
+    "fileId": "247wWpLPFAdo//hPeJM8eB",
     "sync": false
   },
   {
@@ -1138,7 +1138,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "debheKJ/JM47zMty360uQZ",
+    "fileId": "674TgLNTNA8K9HEMJPV7pG",
     "sync": false
   },
   {
@@ -1273,7 +1273,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "02hiaf0tBNjKZ3hwaagnJs",
+    "fileId": "7abpalMKxOmJAF37BF4eAx",
     "sync": false
   },
   {
@@ -1284,7 +1284,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "681QkFH4tIIa2vuVMMOJ0u",
+    "fileId": "64CwwfaglKP6HhnT5rA8La",
     "sync": false
   },
   {
@@ -1295,7 +1295,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "e54j9TR+JLuplzVrjKDvoA",
+    "fileId": "a6ocUCEXhDepdT1WJRtwYy",
     "sync": false
   },
   {
@@ -1366,7 +1366,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "762DPFUNFM7Lmw/5FV+KcL",
+    "fileId": "8bOfm0h/ROra7EC6ayLZvw",
     "sync": false
   },
   {
@@ -1437,7 +1437,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "a6br6T4tJFIYduY0TbwV6h",
+    "fileId": "4fhlj/HQdMYbE2dnPY6ZAO",
     "sync": false
   },
   {
@@ -1508,7 +1508,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "05adKPH31EOaOT3pnFoqYU",
+    "fileId": "ebohPCYmhF2q31dd+X6ueD",
     "sync": false
   },
   {
@@ -1579,7 +1579,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "8eBMAVLVtESIW68/UbTA0r",
+    "fileId": "3fiSN/sj5JYZdzdvALZ9NG",
     "sync": false
   },
   {
@@ -1590,7 +1590,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "e6/kJHGtJFQKT9JybGdkeQ",
+    "fileId": "9aeJBtT69Pqbyn97LIwAoj",
     "sync": false
   },
   {
@@ -1725,7 +1725,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "36AECzGfxMioxH7JFsWVGz",
+    "fileId": "11uEQ5gbJHm7IYOOuO3WN5",
     "sync": false
   },
   {
@@ -1736,7 +1736,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "1eoYFe/BJMkqiN7/edLBgj",
+    "fileId": "52QhAT5kpOpaFRr2tF9w9Q",
     "sync": false
   },
   {
@@ -1871,7 +1871,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "ccgUJGnRdPRrhS9F5V6ri4",
+    "fileId": "23PW8RDs1PC5BWjQ2zuIpY",
     "sync": false
   },
   {
@@ -1882,7 +1882,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "a6Vz6wq7VKrLu9N/UxLxx4",
+    "fileId": "59Hx67QepCkI4PHui168d6",
     "sync": false
   },
   {
@@ -2145,7 +2145,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "e2sRdy0nZG34ACMKDR6HHl",
+    "fileId": "c9n/kdnuZMlonkLlkE7NXh",
     "sync": false
   },
   {
@@ -2156,7 +2156,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "71zcft2WdBEYMIjzgRk5sJ",
+    "fileId": "d75SZnscVFGrO7dQpUnbBr",
     "sync": false
   },
   {
@@ -2167,7 +2167,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "2a87TqFeBIFqXEyxAEdEqi",
+    "fileId": "9elZwl5CJJNIyZ+zt4z6wG",
     "sync": false
   },
   {
@@ -2178,7 +2178,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "a4CEG4765O/7PTn7vcLGyK",
+    "fileId": "e3GTvyBexKjYDrFwvly4Ub",
     "sync": false
   },
   {
@@ -2377,7 +2377,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "93yWBTEsxAE7dIWW7bLq9G",
+    "fileId": "a3LLyTgDpBArrOeerLhvwg",
     "sync": false
   },
   {
@@ -2388,7 +2388,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "c93+DomINKpIb4PwT7Nvyu",
+    "fileId": "afZC2CYx5EAqzjUmoYHM76",
     "sync": false
   },
   {
@@ -2399,7 +2399,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "24Ij9esLJBsaimioWx4+Kf",
+    "fileId": "53MohdKAFFkr2+aWMnlxxE",
     "sync": false
   },
   {
@@ -2410,7 +2410,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "a6C5Dq4stHiYvdYhKgUGPo",
+    "fileId": "b9JeLwzVlPVqKNyyXoD2O/",
     "sync": false
   },
   {
@@ -2481,7 +2481,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "8dPGmjLXRFgK+mO4DS00D0",
+    "fileId": "90NHz8wV1BgYeqMTsZfr95",
     "sync": false
   },
   {
@@ -2552,7 +2552,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "7aZrH+NjNB3quxnz17eibj",
+    "fileId": "cbsk4rmylNbZ5F24cKZq7V",
     "sync": false
   },
   {
@@ -2623,7 +2623,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "3ebqbi/3hJQ7HpgDUyKKnZ",
+    "fileId": "fdB9jqHrtNcYXSIo6gymvT",
     "sync": false
   },
   {
@@ -2694,7 +2694,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "33+SYa+4VAqIsHoqiWavi7",
+    "fileId": "38074nhkJMfpKf44VuJKlx",
     "sync": false
   },
   {
@@ -2765,7 +2765,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "da5OvyjllP3II07bjk+SqA",
+    "fileId": "c8gFxQX2VJtZZMf2UaLeli",
     "sync": false
   },
   {
@@ -2836,7 +2836,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "a9xLAbOTBIz5n8WK1ke3jM",
+    "fileId": "19qHz2TXRHOJyPXQTUkl6+",
     "sync": false
   },
   {
@@ -2847,7 +2847,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "87tO9xu2BJOZvDR8ZSVL80",
+    "fileId": "ccAo6u+CxLpZ5EXxMhW8RH",
     "sync": false
   },
   {
@@ -2858,7 +2858,7 @@
     "asset": {
       "__uuid__": "51a7178b-1133-44d1-92b5-5f5e1e2348a4"
     },
-    "fileId": "11p7QgqQxJh7yHf8NI2jZU",
+    "fileId": "a1ZWC/O3dFKJkhPARnVoF4",
     "sync": false
   },
   {