Merge branch 'zhuguoqing/dev-v3' of git.kingsome.cn:client/pubgv3 into zhuguoqing/dev-v3

This commit is contained in:
guyuanji 2022-06-04 11:48:46 +08:00
commit cf23bd2e18

View File

@ -53,8 +53,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.5755425848969735, "x": 0.688647449016571,
"y": 0.5755425848969735, "y": 0.688647449016571,
"z": 1 "z": 1
}, },
"_quat": { "_quat": {
@ -3432,9 +3432,7 @@
"_enabled": true, "_enabled": true,
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": null,
"__uuid__": "50788c29-2473-4646-b10d-07f67933c05b"
},
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
@ -14859,10 +14857,12 @@
{ {
"__id__": 201 "__id__": 201
}, },
null, {
null, "__id__": 225
null, },
null {
"__id__": 249
}
], ],
"tableView": { "tableView": {
"__id__": 274 "__id__": 274