2 Achegas 28d8662c2b ... a4ab9b3d86

Autor SHA1 Mensaxe Data
  zenghaowei a4ab9b3d86 Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev %!s(int64=3) %!d(string=hai) anos
  zenghaowei 4f2acf54d9 图4编辑 %!s(int64=3) %!d(string=hai) anos

+ 13 - 13
assets/Script/game/fight/object/skill/SkillFixed.ts

@@ -6,13 +6,13 @@ import SkillBase from "./SkillBase";
 /**
  * 点射
  */
-const {ccclass, property} = cc._decorator;
+const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class SkillFixed extends SkillBase {
-   /**
-     * 每次攻击几颗子弹
-     */
+    /**
+      * 每次攻击几颗子弹
+      */
     @property({
         displayName: '每次攻击子弹数量'
     })
@@ -24,25 +24,25 @@ export default class SkillFixed extends SkillBase {
     public btime = 1;
 
     @property({
-        type:cc.Prefab,
+        type: cc.Prefab,
         displayName: '子弹'
     })
-    mBullet:cc.Prefab = null;
+    mBullet: cc.Prefab = null;
     /**
      * 释放技能
      */
-    public exe(target:FSprite,callback:()=>void){
+    public exe(target: FSprite, callback: () => void) {
         this.time = new Date().getTime();
         // this.sprite.setDir({ x: 0, y: 0 });
 
 
         //-----播放开始动画
         let bNode = cc.instantiate(this.mBullet)
-        
+
         let bobject = bNode.getComponent(BObject)
         bobject.distance = this.range
         let sf = bobject.mStartEffect
-
+        if (this.sprite) return
         let x = this.sprite.mAtkSite.worldX * this.sprite.spine.node.scaleX
         let y = this.sprite.mAtkSite.worldY
 
@@ -57,16 +57,16 @@ export default class SkillFixed extends SkillBase {
             sfNode.destroy()
             callback()
         });
-        if(startSpine.findAnimation('skill')){
+        if (startSpine.findAnimation('skill')) {
             startSpine.setAnimation(0, 'skill', false);
-        }else{
+        } else {
             startSpine.setAnimation(0, 'atk', false);
         }
         //----开始动画播放结束
 
         this.sprite.playAction(SpriteActionType.atk, false, () => {
             // this.AI.walk(this.range);
-            this.sprite.playAction(SpriteActionType.stand,true)
+            this.sprite.playAction(SpriteActionType.stand, true)
         });
         let tp = target.node.getPosition();
         for (let i = 0; i < this.count; i++) {
@@ -114,5 +114,5 @@ export default class SkillFixed extends SkillBase {
         bObject.fireAngle(angle);
     }
 
-    
+
 }

+ 2 - 2
assets/Script/game/home/stage/scene/minimap/MiniMap.ts

@@ -41,7 +41,7 @@ export default class MiniMap extends cc.Component {
                 if(stageData.stageIndex >= item._stageData.id - 1){
                     node.active = true
                 }else{
-                    node.active = false
+                    node.active = true
                 }
             }
         }
@@ -64,7 +64,7 @@ export default class MiniMap extends cc.Component {
                 if(stageData.stageIndex >= item._stageData.id - 1){
                     node.active = true
                 }else{
-                    node.active = false
+                    node.active = true
                 }
             }
         }

+ 487 - 0
assets/resources/prefab/map/1001.prefab

@@ -0,0 +1,487 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "1001",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 90
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        2783.939,
+        1414.808,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 3,
+    "groupIndex": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "juese01",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 3,
+    "groupIndex": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "spineRight",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 102,
+      "height": 26
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        2
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 3,
+    "groupIndex": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "idle",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "idle",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "0ab27ee3-7a97-4672-8f96-822c1de599f1"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3bFOPG4xBOhY0oT5xb+UJM",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "bePYNKVxZO94AkCcssJ+Je",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fire",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        33.032,
+        28.717,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 3,
+    "groupIndex": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4c5cA62SdD3ahDcakgI2Xl",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RigidBody",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_type": 2,
+    "_allowSleep": true,
+    "_gravityScale": 0,
+    "_linearDamping": 30,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": true,
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsBoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "tag": 0,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 45
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 90
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsCircleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "tag": 1,
+    "_density": 1,
+    "_sensor": false,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 40
+    },
+    "_radius": 40,
+    "_id": ""
+  },
+  {
+    "__type__": "cc65bYPVW5My7ctVKJuPNMm",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "id": 1001,
+    "_id": ""
+  },
+  {
+    "__type__": "884851NW4JDEbZlM+S7icPi",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "AI_CD": 300,
+    "speed": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "14f4cXX6/ZHFphrrohFfXC/",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "ID": 0,
+    "CD": 3000,
+    "range": 1000,
+    "speed": 500,
+    "count": 1,
+    "btime": 1,
+    "mBullet": {
+      "__uuid__": "11364221-35d8-475e-b9ec-43ab3aa2993d"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/prefab/map/1001.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "9a7543c9-ca0c-4ce8-85eb-54db05f422c4",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 2 - 2
assets/resources/prefab/map/map3.prefab

@@ -19915,8 +19915,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        2394.912,
-        272.934,
+        2384.938,
+        6045.933,
         0,
         0,
         0,

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 15526 - 9111
assets/resources/prefab/map/map4.prefab