Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb
This commit is contained in:
commit
f311e7624d
|
@ -4807,8 +4807,8 @@
|
||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 58,
|
"width": 50,
|
||||||
"height": 64
|
"height": 77
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
@ -4860,7 +4860,7 @@
|
||||||
"_srcBlendFactor": 770,
|
"_srcBlendFactor": 770,
|
||||||
"_dstBlendFactor": 771,
|
"_dstBlendFactor": 771,
|
||||||
"_spriteFrame": {
|
"_spriteFrame": {
|
||||||
"__uuid__": "d7c12d61-f696-4de5-b62b-449dbf8788f0"
|
"__uuid__": "44e66484-2774-4deb-a017-4c88eaf6341e"
|
||||||
},
|
},
|
||||||
"_type": 0,
|
"_type": 0,
|
||||||
"_sizeMode": 1,
|
"_sizeMode": 1,
|
||||||
|
@ -4903,8 +4903,8 @@
|
||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 31,
|
"width": 49,
|
||||||
"height": 37
|
"height": 95
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
@ -4956,7 +4956,7 @@
|
||||||
"_srcBlendFactor": 770,
|
"_srcBlendFactor": 770,
|
||||||
"_dstBlendFactor": 771,
|
"_dstBlendFactor": 771,
|
||||||
"_spriteFrame": {
|
"_spriteFrame": {
|
||||||
"__uuid__": "9a17964d-d911-4b67-8107-7c55470ed386"
|
"__uuid__": "1d95b241-ab66-4382-a413-ae2ce529c699"
|
||||||
},
|
},
|
||||||
"_type": 0,
|
"_type": 0,
|
||||||
"_sizeMode": 1,
|
"_sizeMode": 1,
|
||||||
|
@ -5262,8 +5262,8 @@
|
||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 58,
|
"width": 50,
|
||||||
"height": 64
|
"height": 77
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
@ -5315,7 +5315,7 @@
|
||||||
"_srcBlendFactor": 770,
|
"_srcBlendFactor": 770,
|
||||||
"_dstBlendFactor": 771,
|
"_dstBlendFactor": 771,
|
||||||
"_spriteFrame": {
|
"_spriteFrame": {
|
||||||
"__uuid__": "d7c12d61-f696-4de5-b62b-449dbf8788f0"
|
"__uuid__": "44e66484-2774-4deb-a017-4c88eaf6341e"
|
||||||
},
|
},
|
||||||
"_type": 0,
|
"_type": 0,
|
||||||
"_sizeMode": 1,
|
"_sizeMode": 1,
|
||||||
|
@ -5358,8 +5358,8 @@
|
||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 31,
|
"width": 49,
|
||||||
"height": 37
|
"height": 95
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
@ -5411,7 +5411,7 @@
|
||||||
"_srcBlendFactor": 770,
|
"_srcBlendFactor": 770,
|
||||||
"_dstBlendFactor": 771,
|
"_dstBlendFactor": 771,
|
||||||
"_spriteFrame": {
|
"_spriteFrame": {
|
||||||
"__uuid__": "9a17964d-d911-4b67-8107-7c55470ed386"
|
"__uuid__": "1d95b241-ab66-4382-a413-ae2ce529c699"
|
||||||
},
|
},
|
||||||
"_type": 0,
|
"_type": 0,
|
||||||
"_sizeMode": 1,
|
"_sizeMode": 1,
|
||||||
|
@ -5450,7 +5450,7 @@
|
||||||
"__id__": 120
|
"__id__": 120
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"_active": true,
|
"_active": false,
|
||||||
"_components": [],
|
"_components": [],
|
||||||
"_prefab": null,
|
"_prefab": null,
|
||||||
"_opacity": 255,
|
"_opacity": 255,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user