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

This commit is contained in:
guoqing.zhu 2022-06-15 16:39:41 +08:00
commit 87cb77eed1

View File

@ -32118,8 +32118,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1152.54, "width": 989.47,
"height": 440 "height": 400
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -32128,8 +32128,8 @@
}, },
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -36, "x": -67.9,
"y": -36, "y": -41,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -32161,8 +32161,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "The June 15th update\n\n1. Level Enhancement enabled.\n\n2. Hero Advanced enabled.\n\n3. Related Settings and interface update.\n\n4. Store open for heroes only.\n\nYou can only use 1 star hero as material cost when you advance.", "_string": "The June 15th update\n\n1. Level Enhancement enabled.\n2. Hero Advanced enabled.\n3. Related Settings and interface update.\n4. Store open for heroes only.\nYou can only use 1 star hero as material cost \nwhen you advance.\nSome features will be available at 2022/6/16 00:00 UTC\nplease login again at that time.",
"_N$string": "The June 15th update\n\n1. Level Enhancement enabled.\n\n2. Hero Advanced enabled.\n\n3. Related Settings and interface update.\n\n4. Store open for heroes only.\n\nYou can only use 1 star hero as material cost when you advance.", "_N$string": "The June 15th update\n\n1. Level Enhancement enabled.\n2. Hero Advanced enabled.\n3. Related Settings and interface update.\n4. Store open for heroes only.\nYou can only use 1 star hero as material cost \nwhen you advance.\nSome features will be available at 2022/6/16 00:00 UTC\nplease login again at that time.",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,