Merge branch 'JIJI-0.4.0' into zhuguoqing/dev-v4

This commit is contained in:
guoqing.zhu 2022-06-14 12:02:26 +08:00
commit dbefb6b187
2 changed files with 23069 additions and 10827 deletions

View File

@ -50,8 +50,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2116100569483213, "x": 0.2951417866647216,
"y": 0.2116100569483213, "y": 0.2951417866647216,
"z": 1 "z": 1
}, },
"_quat": { "_quat": {
@ -4393,7 +4393,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 456.81, "width": 460.18,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -4436,8 +4436,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": true, "_useOriginalSize": true,
"_string": "Click confirm to purchase this item", "_string": "Click confirm to purchase this hero",
"_N$string": "Click confirm to purchase this item", "_N$string": "Click confirm to purchase this hero",
"_fontSize": 30, "_fontSize": 30,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,

File diff suppressed because it is too large Load Diff