2 次代码提交 fd3f860d56 ... b5f8bdfcc9

作者 SHA1 备注 提交日期
  zenghaowei b5f8bdfcc9 Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev 3 年之前
  zenghaowei 2e7a37d727 地图1 3 年之前

+ 23 - 3
assets/resources/prefab/element/JG0115.prefab

@@ -28,10 +28,13 @@
       },
       {
         "__id__": 6
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -55,8 +58,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        989.982,
+        2528.499,
         0,
         0,
         0,
@@ -248,6 +251,23 @@
     },
     "_id": ""
   },
+  {
+    "__type__": "e9d7bgXyK9OaLZEYyRtyPTN",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "spine": {
+      "__id__": 3
+    },
+    "speedUpDirection": "zuo",
+    "speedUpTime": 0.3,
+    "speedUpMul": 2,
+    "speedUpDis": 320,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 3 - 1
assets/resources/prefab/map/map1.prefab

@@ -37221,6 +37221,8 @@
       "-1|稻草人开口说话了!!!"
     ],
     "text2": [
+      "-1|矮人的日记……",
+      "-1|……",
       "0|请允许我自我介绍一下,我的名字叫艾迪·罗因。",
       "-1|稻草人又说话了……",
       "0|年轻的法师,你为什么来到这片森林?",
@@ -37229,7 +37231,7 @@
       "-1|你有解救失落之地的办法?!",
       "0|抱歉,我并不这么认为",
       "0|年轻的法师,你可以在森林中多逛一会儿。",
-      "0|我忽然想起了一些事,告辞。金色泉水……"
+      "0|我忽然想起了一些事,告辞。金色泉水……"
     ],
     "icon": {
       "__id__": 1071

+ 228 - 35
assets/resources/prefab/map/map3.prefab

@@ -24,26 +24,26 @@
         "__id__": 22
       },
       {
-        "__id__": 1056
+        "__id__": 1062
       },
       {
-        "__id__": 1064
+        "__id__": 1070
       },
       {
-        "__id__": 1066
+        "__id__": 1072
       },
       {
-        "__id__": 1068
+        "__id__": 1074
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 1070
+        "__id__": 1076
       }
     ],
     "_prefab": {
-      "__id__": 1071
+      "__id__": 1077
     },
     "_opacity": 255,
     "_color": {
@@ -577,7 +577,7 @@
     "node": {
       "__id__": 13
     },
-    "_enabled": true,
+    "_enabled": false,
     "_materials": [
       {
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
@@ -1166,12 +1166,15 @@
       },
       {
         "__id__": 1052
+      },
+      {
+        "__id__": 1055
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1055
+      "__id__": 1061
     },
     "_opacity": 255,
     "_color": {
@@ -4650,6 +4653,7 @@
     },
     "text": [],
     "isBoss": false,
+    "isPlot": false,
     "countDown": -1,
     "_id": ""
   },
@@ -4665,7 +4669,7 @@
         "__id__": 131
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 134
@@ -4915,7 +4919,7 @@
         "__id__": 138
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 141
@@ -5165,7 +5169,7 @@
         "__id__": 145
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 148
@@ -5415,7 +5419,7 @@
         "__id__": 152
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 155
@@ -11098,6 +11102,7 @@
     },
     "text": [],
     "isBoss": false,
+    "isPlot": false,
     "countDown": -1,
     "_id": ""
   },
@@ -11113,7 +11118,7 @@
         "__id__": 330
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 333
@@ -11363,7 +11368,7 @@
         "__id__": 337
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 340
@@ -11613,7 +11618,7 @@
         "__id__": 344
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 347
@@ -11863,7 +11868,7 @@
         "__id__": 351
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 354
@@ -15573,6 +15578,7 @@
     },
     "text": [],
     "isBoss": false,
+    "isPlot": false,
     "countDown": -1,
     "_id": ""
   },
@@ -15588,7 +15594,7 @@
         "__id__": 465
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 468
@@ -15838,7 +15844,7 @@
         "__id__": 472
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 475
@@ -16088,7 +16094,7 @@
         "__id__": 479
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 482
@@ -16338,7 +16344,7 @@
         "__id__": 486
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 489
@@ -35760,6 +35766,193 @@
     "fileId": "85oiSgILhKT4ZU3gzf+wyq",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "louti",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 22
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 1056
+      },
+      {
+        "__id__": 1057
+      },
+      {
+        "__id__": 1058
+      },
+      {
+        "__id__": 1059
+      }
+    ],
+    "_prefab": {
+      "__id__": 1060
+    },
+    "_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": [
+        1376.246,
+        3360.443,
+        0,
+        0,
+        0,
+        0,
+        1,
+        2,
+        2,
+        2
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 1,
+    "groupIndex": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.RigidBody",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1055
+    },
+    "_enabled": true,
+    "_type": 0,
+    "_allowSleep": true,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "enabledContactListener": false,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsBoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1055
+    },
+    "_enabled": true,
+    "tag": 0,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 416
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsBoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1055
+    },
+    "_enabled": true,
+    "tag": 0,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 368
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 64
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsBoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1055
+    },
+    "_enabled": true,
+    "tag": 1,
+    "_density": 1,
+    "_sensor": false,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 272
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 128
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "7657f40d-bece-48f6-bcf3-9df3840fb551"
+    },
+    "fileId": "c8zvF1xhNChonvKAXoU/Ye",
+    "sync": false
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -35780,19 +35973,19 @@
     },
     "_children": [
       {
-        "__id__": 1057
+        "__id__": 1063
       },
       {
-        "__id__": 1059
+        "__id__": 1065
       },
       {
-        "__id__": 1061
+        "__id__": 1067
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1063
+      "__id__": 1069
     },
     "_opacity": 255,
     "_color": {
@@ -35846,13 +36039,13 @@
     "_name": "1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1056
+      "__id__": 1062
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1058
+      "__id__": 1064
     },
     "_opacity": 255,
     "_color": {
@@ -35917,13 +36110,13 @@
     "_name": "2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1056
+      "__id__": 1062
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1060
+      "__id__": 1066
     },
     "_opacity": 255,
     "_color": {
@@ -35988,13 +36181,13 @@
     "_name": "3",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1056
+      "__id__": 1062
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1062
+      "__id__": 1068
     },
     "_opacity": 255,
     "_color": {
@@ -36076,7 +36269,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1065
+      "__id__": 1071
     },
     "_opacity": 255,
     "_color": {
@@ -36147,7 +36340,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1067
+      "__id__": 1073
     },
     "_opacity": 255,
     "_color": {
@@ -36218,7 +36411,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 1069
+      "__id__": 1075
     },
     "_opacity": 255,
     "_color": {
@@ -36290,10 +36483,10 @@
       "__id__": 22
     },
     "mInit": {
-      "__id__": 1068
+      "__id__": 1074
     },
     "mRooms": {
-      "__id__": 1056
+      "__id__": 1062
     },
     "mBgm": {
       "__uuid__": "5ebae157-e705-4bfc-925e-b035c52da232"