Compare commits
No commits in common. "d6eb489f91fe660079ac8de839f0cf022963d217" and "3f493a1b03db8621aab9b418cd423219e4650f84" have entirely different histories.
d6eb489f91
...
3f493a1b03
@ -1419,7 +1419,7 @@
|
|||||||
"b": 255,
|
"b": 255,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "65.2",
|
"_string": "65.2222222",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 26,
|
"_actualFontSize": 26,
|
||||||
@ -1427,7 +1427,7 @@
|
|||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 200,
|
"_lineHeight": 200,
|
||||||
"_overflow": 2,
|
"_overflow": 2,
|
||||||
"_enableWrapText": false,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
"__uuid__": "277ce92c-75d5-4d3f-9b31-5ba7c7e8a8fa",
|
"__uuid__": "277ce92c-75d5-4d3f-9b31-5ba7c7e8a8fa",
|
||||||
"__expectedType__": "cc.BitmapFont"
|
"__expectedType__": "cc.BitmapFont"
|
||||||
|
|||||||
@ -885,7 +885,7 @@
|
|||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 1080,
|
"width": 1080,
|
||||||
"height": 1812
|
"height": 18120
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
|||||||
@ -32,7 +32,7 @@ export function getHistoryUrl() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getLanguage() {
|
export function getLanguage() {
|
||||||
// return 'zh';
|
return 'zh';
|
||||||
return language;
|
return language;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user