|
@@ -25,17 +25,17 @@
|
|
|
"_active": true,
|
|
|
"_components": [
|
|
|
{
|
|
|
- "__id__": 28
|
|
|
+ "__id__": 25
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 30
|
|
|
+ "__id__": 27
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 32
|
|
|
+ "__id__": 29
|
|
|
}
|
|
|
],
|
|
|
"_prefab": {
|
|
|
- "__id__": 34
|
|
|
+ "__id__": 31
|
|
|
},
|
|
|
"_lpos": {
|
|
|
"__type__": "cc.Vec3",
|
|
@@ -83,7 +83,7 @@
|
|
|
"__id__": 2
|
|
|
},
|
|
|
"asset": {
|
|
|
- "__uuid__": "5027a7d8-1f72-4507-9c51-58aec590001a@712d1",
|
|
|
+ "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@712d1",
|
|
|
"__expectedType__": "cc.Prefab"
|
|
|
},
|
|
|
"fileId": "bdaQ4BCqZXFLSla+tH53Xv",
|
|
@@ -94,7 +94,7 @@
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.PrefabInstance",
|
|
|
- "fileId": "cdWbl76JpK2qMCu60ZW+z5",
|
|
|
+ "fileId": "88q41AagNIjaKjOpVdZ5k4",
|
|
|
"prefabRootNode": {
|
|
|
"__id__": 1
|
|
|
},
|
|
@@ -120,7 +120,7 @@
|
|
|
"__id__": 12
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 14
|
|
|
+ "__id__": 13
|
|
|
},
|
|
|
{
|
|
|
"__id__": 15
|
|
@@ -131,9 +131,6 @@
|
|
|
{
|
|
|
"__id__": 17
|
|
|
},
|
|
|
- {
|
|
|
- "__id__": 18
|
|
|
- },
|
|
|
{
|
|
|
"__id__": 19
|
|
|
},
|
|
@@ -141,19 +138,13 @@
|
|
|
"__id__": 20
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 22
|
|
|
+ "__id__": 21
|
|
|
},
|
|
|
{
|
|
|
"__id__": 23
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 25
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 26
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 27
|
|
|
+ "__id__": 24
|
|
|
}
|
|
|
],
|
|
|
"removedComponents": []
|
|
@@ -225,22 +216,6 @@
|
|
|
"targetInfo": {
|
|
|
"__id__": 11
|
|
|
},
|
|
|
- "propertyPath": [
|
|
|
- "playOnLoad"
|
|
|
- ],
|
|
|
- "value": true
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "32V2V48W1fTqfDoaDTlGcY"
|
|
|
- ]
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 13
|
|
|
- },
|
|
|
"propertyPath": [
|
|
|
"_materials",
|
|
|
"0"
|
|
@@ -259,7 +234,7 @@
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 13
|
|
|
+ "__id__": 11
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_skinningRoot"
|
|
@@ -271,74 +246,80 @@
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 13
|
|
|
+ "__id__": 14
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
- "_mesh"
|
|
|
+ "_lpos"
|
|
|
],
|
|
|
"value": {
|
|
|
- "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@69dc9",
|
|
|
- "__expectedType__": "cc.Mesh"
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
+ "x": 0,
|
|
|
+ "y": 0,
|
|
|
+ "z": 0
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 13
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_skeleton"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@438fe",
|
|
|
- "__expectedType__": "cc.Skeleton"
|
|
|
- }
|
|
|
+ "__type__": "cc.TargetInfo",
|
|
|
+ "localID": [
|
|
|
+ "14phBEV0tRooz0GxMOYEX0"
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 11
|
|
|
+ "__id__": 14
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
- "_clips",
|
|
|
- "0"
|
|
|
+ "_euler"
|
|
|
],
|
|
|
"value": {
|
|
|
- "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@85142",
|
|
|
- "__expectedType__": "cc.AnimationClip"
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
+ "x": 0,
|
|
|
+ "y": 0,
|
|
|
+ "z": -2.36016652067128e-13
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 11
|
|
|
+ "__id__": 14
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
- "_defaultClip"
|
|
|
+ "_lrot"
|
|
|
],
|
|
|
"value": {
|
|
|
- "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@85142",
|
|
|
- "__expectedType__": "cc.AnimationClip"
|
|
|
+ "__type__": "cc.Quat",
|
|
|
+ "x": 0,
|
|
|
+ "y": 0,
|
|
|
+ "z": -2.0596338340526325e-15,
|
|
|
+ "w": 1
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 11
|
|
|
+ "__id__": 18
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
- "_clips",
|
|
|
- "1"
|
|
|
+ "_lpos"
|
|
|
],
|
|
|
"value": {
|
|
|
- "__uuid__": "b0313ef4-fc61-4ba0-b3dc-755a5e9539a9@1f586",
|
|
|
- "__expectedType__": "cc.AnimationClip"
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
+ "x": 0,
|
|
|
+ "y": 0,
|
|
|
+ "z": 1.3127117171052305e-8
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ "__type__": "cc.TargetInfo",
|
|
|
+ "localID": [
|
|
|
+ "51iQyD8XlfQbIGGm9qNI4W"
|
|
|
+ ]
|
|
|
+ },
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 21
|
|
|
+ "__id__": 18
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_lrot"
|
|
@@ -351,16 +332,10 @@
|
|
|
"w": 0.7071067811865476
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "51iQyD8XlfQbIGGm9qNI4W"
|
|
|
- ]
|
|
|
- },
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 21
|
|
|
+ "__id__": 18
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_euler"
|
|
@@ -375,28 +350,29 @@
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 24
|
|
|
+ "__id__": 22
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
- "_lpos"
|
|
|
+ "_lrot"
|
|
|
],
|
|
|
"value": {
|
|
|
- "__type__": "cc.Vec3",
|
|
|
+ "__type__": "cc.Quat",
|
|
|
"x": 0,
|
|
|
"y": 0,
|
|
|
- "z": 0
|
|
|
+ "z": 0,
|
|
|
+ "w": 1
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.TargetInfo",
|
|
|
"localID": [
|
|
|
- "14phBEV0tRooz0GxMOYEX0"
|
|
|
+ "66jKTyMm9WGodCv85T8w6A"
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 24
|
|
|
+ "__id__": 22
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_euler"
|
|
@@ -405,29 +381,13 @@
|
|
|
"__type__": "cc.Vec3",
|
|
|
"x": 0,
|
|
|
"y": 0,
|
|
|
- "z": -2.36016652067128e-13
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 24
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_lrot"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__type__": "cc.Quat",
|
|
|
- "x": 0,
|
|
|
- "y": 0,
|
|
|
- "z": -2.0596338340526325e-15,
|
|
|
- "w": 1
|
|
|
+ "z": 0
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 21
|
|
|
+ "__id__": 22
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_lpos"
|
|
@@ -435,8 +395,8 @@
|
|
|
"value": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
"x": 0,
|
|
|
- "y": 0,
|
|
|
- "z": 1.3127117171052305e-8
|
|
|
+ "y": 3.320460295608285e-10,
|
|
|
+ "z": 0
|
|
|
}
|
|
|
},
|
|
|
{
|
|
@@ -449,7 +409,7 @@
|
|
|
},
|
|
|
"_enabled": true,
|
|
|
"__prefab": {
|
|
|
- "__id__": 29
|
|
|
+ "__id__": 26
|
|
|
},
|
|
|
"_group": 16,
|
|
|
"_type": 4,
|
|
@@ -486,7 +446,7 @@
|
|
|
},
|
|
|
"_enabled": true,
|
|
|
"__prefab": {
|
|
|
- "__id__": 31
|
|
|
+ "__id__": 28
|
|
|
},
|
|
|
"_material": null,
|
|
|
"_isTrigger": false,
|
|
@@ -494,19 +454,19 @@
|
|
|
"__type__": "cc.Vec3",
|
|
|
"x": 0,
|
|
|
"y": 0,
|
|
|
- "z": 0
|
|
|
+ "z": -0.7
|
|
|
},
|
|
|
"_size": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
- "x": 2,
|
|
|
+ "x": 1,
|
|
|
"y": 2,
|
|
|
- "z": 1
|
|
|
+ "z": 2
|
|
|
},
|
|
|
"_id": ""
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.CompPrefabInfo",
|
|
|
- "fileId": "932LjmVplJoIzV9Dpz/yWw"
|
|
|
+ "fileId": "74HeVfnYBNO5W41hioRUrV"
|
|
|
},
|
|
|
{
|
|
|
"__type__": "9765f4UAXVMHqaZF3DacQSU",
|
|
@@ -518,7 +478,7 @@
|
|
|
},
|
|
|
"_enabled": true,
|
|
|
"__prefab": {
|
|
|
- "__id__": 33
|
|
|
+ "__id__": 30
|
|
|
},
|
|
|
"hp": 1,
|
|
|
"currentExp": 3,
|