Merge branch 'card0515' of git.eoxnet.com:pan/pixelheros into card0515
This commit is contained in:
@@ -212,8 +212,8 @@
|
||||
],
|
||||
"value": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0.7,
|
||||
"y": 1.7,
|
||||
"x": 0.25,
|
||||
"y": 0.7,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
],
|
||||
"value": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0.7,
|
||||
"y": 1.7,
|
||||
"x": 0.25,
|
||||
"y": 0.7,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
],
|
||||
"value": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0.7,
|
||||
"y": 1.7,
|
||||
"x": 0.25,
|
||||
"y": 0.7,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
],
|
||||
"value": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0.7,
|
||||
"y": 1.7,
|
||||
"x": 0.25,
|
||||
"y": 0.6,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
],
|
||||
"value": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 1.2,
|
||||
"y": 1.9,
|
||||
"x": 0.4,
|
||||
"y": 0.9,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@@ -697,6 +697,52 @@
|
||||
],
|
||||
"subMetas": {}
|
||||
},
|
||||
"34d88": {
|
||||
"importer": "sprite-frame",
|
||||
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@34d88",
|
||||
"displayName": "",
|
||||
"id": "34d88",
|
||||
"name": "shadow",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 1,
|
||||
"trimY": 2006,
|
||||
"width": 284,
|
||||
"height": 39,
|
||||
"rawWidth": 284,
|
||||
"rawHeight": 39,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [],
|
||||
"indexes": [],
|
||||
"uv": [],
|
||||
"nuv": [],
|
||||
"minPos": [],
|
||||
"maxPos": []
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
|
||||
"atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
},
|
||||
"c30fb": {
|
||||
"importer": "sprite-frame",
|
||||
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@c30fb",
|
||||
@@ -9805,52 +9851,6 @@
|
||||
],
|
||||
"subMetas": {}
|
||||
},
|
||||
"34d88": {
|
||||
"importer": "sprite-frame",
|
||||
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@34d88",
|
||||
"displayName": "",
|
||||
"id": "34d88",
|
||||
"name": "shadow",
|
||||
"userData": {
|
||||
"trimThreshold": 1,
|
||||
"rotated": false,
|
||||
"offsetX": 0,
|
||||
"offsetY": 0,
|
||||
"trimX": 1,
|
||||
"trimY": 2006,
|
||||
"width": 284,
|
||||
"height": 39,
|
||||
"rawWidth": 284,
|
||||
"rawHeight": 39,
|
||||
"borderTop": 0,
|
||||
"borderBottom": 0,
|
||||
"borderLeft": 0,
|
||||
"borderRight": 0,
|
||||
"packable": true,
|
||||
"pixelsToUnit": 100,
|
||||
"pivotX": 0.5,
|
||||
"pivotY": 0.5,
|
||||
"meshType": 0,
|
||||
"vertices": {
|
||||
"rawPosition": [],
|
||||
"indexes": [],
|
||||
"uv": [],
|
||||
"nuv": [],
|
||||
"minPos": [],
|
||||
"maxPos": []
|
||||
},
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
|
||||
"atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
|
||||
"trimType": "auto"
|
||||
},
|
||||
"ver": "1.0.12",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
},
|
||||
"c874e": {
|
||||
"importer": "sprite-frame",
|
||||
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@c874e",
|
||||
|
||||
Reference in New Issue
Block a user