Compare commits

..

No commits in common. "master" and "v0.0.52" have entirely different histories.

9 changed files with 151 additions and 173 deletions

View File

@ -1240,7 +1240,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 811.1579999999999,
"height": 80
"height": 58
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1470,7 +1470,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 674.271,
"height": 70
"height": 61.084999999999994
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1700,7 +1700,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 320,
"height": 40
"height": 32.76
},
"_anchorPoint": {
"__type__": "cc.Vec2",

View File

@ -2032,8 +2032,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 140,
"x": 0.000500000000000167,
"y": 169.184,
"z": 0
},
"_lrot": {
@ -2073,13 +2073,13 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 260,
"height": 56.7
"width": 197.8125,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
"y": 0.5
},
"_id": ""
},
@ -2115,8 +2115,8 @@
"_actualFontSize": 40,
"_fontSize": 40,
"_fontFamily": "Arial",
"_lineHeight": 45,
"_overflow": 3,
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
@ -2527,7 +2527,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"width": 131.689453125,
"height": 50.4
},
"_anchorPoint": {
@ -2570,8 +2570,8 @@
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 3,
"_enableWrapText": true,
"_overflow": 0,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
@ -3026,8 +3026,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 140,
"x": 0.000500000000000167,
"y": 169.184,
"z": 0
},
"_lrot": {
@ -3067,13 +3067,13 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 260,
"height": 56.7
"width": 197.8125,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
"y": 0.5
},
"_id": ""
},
@ -3109,8 +3109,8 @@
"_actualFontSize": 40,
"_fontSize": 40,
"_fontFamily": "Arial",
"_lineHeight": 45,
"_overflow": 3,
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
@ -3521,8 +3521,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"height": 90.39999999999999
"width": 131.689453125,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -3557,15 +3557,15 @@
"b": 255,
"a": 255
},
"_string": "စိတ်လှုပ်ရှားဖွယ်ကစားနည်း",
"_string": "Thrill Play",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 30,
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 3,
"_enableWrapText": true,
"_overflow": 0,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
@ -4020,8 +4020,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 140,
"x": 0.000500000000000167,
"y": 169.184,
"z": 0
},
"_lrot": {
@ -4061,13 +4061,13 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 260,
"height": 56.7
"width": 197.8125,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
"y": 0.5
},
"_id": ""
},
@ -4103,8 +4103,8 @@
"_actualFontSize": 40,
"_fontSize": 40,
"_fontFamily": "Arial",
"_lineHeight": 45,
"_overflow": 3,
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
@ -4515,7 +4515,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"width": 131.689453125,
"height": 50.4
},
"_anchorPoint": {
@ -4558,8 +4558,8 @@
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 3,
"_enableWrapText": true,
"_overflow": 0,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,

View File

@ -18669,8 +18669,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -18711,7 +18711,7 @@
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
@ -19387,8 +19387,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -19429,7 +19429,7 @@
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
@ -19785,8 +19785,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 104.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -19821,13 +19821,13 @@
"b": 187,
"a": 255
},
"_string": "Tabela de",
"_string": "Tabela de pagamentos",
"_horizontalAlign": 1,
"_verticalAlign": 0,
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
@ -20228,8 +20228,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -20270,7 +20270,7 @@
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
@ -20671,8 +20671,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -20713,7 +20713,7 @@
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {
@ -21114,8 +21114,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 172,
"height": 42.84
"width": 150,
"height": 40.32
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -21156,7 +21156,7 @@
"_actualFontSize": 32,
"_fontSize": 32,
"_fontFamily": "Arial",
"_lineHeight": 34,
"_lineHeight": 32,
"_overflow": 3,
"_enableWrapText": true,
"_font": {

View File

@ -12217,7 +12217,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"width": 155.625,
"height": 75.6
},
"_anchorPoint": {
@ -12254,13 +12254,13 @@
"a": 255
},
"_string": "Transaction",
"_horizontalAlign": 1,
"_horizontalAlign": 0,
"_verticalAlign": 1,
"_actualFontSize": 31,
"_actualFontSize": 30,
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 60,
"_overflow": 2,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,

View File

@ -668,7 +668,6 @@ export class HistoryDetail extends Component {
if (idx == this.data.panDetails.length - 1) {
// console.log("已全部生成完")
this.hideLoading()
this.item_detail.removeFromParent()
this.scrollControl.jumpToPage(0)
}
@ -677,6 +676,7 @@ export class HistoryDetail extends Component {
})
this.item_detail.removeFromParent()
this.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
this.list_detail.node.active = true

View File

@ -1,4 +1,4 @@
import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc';
import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
import { getLanguage } from 'db://assets/Main/Scripts/main/comm';
@ -19,7 +19,6 @@ export class Paytable extends Component {
this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()
this.scrollView.node.on('scrolling', this.onScrolling, this);
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);

View File

@ -1,4 +1,4 @@
import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc';
import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform } from 'cc';
import { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
import { getCsymbol, getLanguage } from 'db://assets/Main/Scripts/main/comm';
const { ccclass, property } = _decorator;
@ -16,7 +16,6 @@ export class Rules extends Component {
protected onLoad(): void {
this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment()
this.scrollView.node.on('scrolling', this.onScrolling, this);
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);

View File

@ -27,18 +27,18 @@
],
"_active": true,
"_components": [
{
"__id__": 94
},
{
"__id__": 96
},
{
"__id__": 98
},
{
"__id__": 100
}
],
"_prefab": {
"__id__": 102
"__id__": 100
},
"_lpos": {
"__type__": "cc.Vec3",
@ -287,26 +287,26 @@
"__id__": 33
},
{
"__id__": 43
"__id__": 41
},
{
"__id__": 59
"__id__": 57
},
{
"__id__": 75
"__id__": 73
}
],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 89
},
{
"__id__": 93
"__id__": 91
}
],
"_prefab": {
"__id__": 95
"__id__": 93
},
"_lpos": {
"__type__": "cc.Vec3",
@ -718,7 +718,7 @@
"_actualFontSize": 57,
"_fontSize": 56,
"_fontFamily": "Arial",
"_lineHeight": 57,
"_lineHeight": 56,
"_overflow": 2,
"_enableWrapText": true,
"_font": {
@ -836,13 +836,10 @@
},
{
"__id__": 38
},
{
"__id__": 40
}
],
"_prefab": {
"__id__": 42
"__id__": 40
},
"_lpos": {
"__type__": "cc.Vec3",
@ -923,13 +920,13 @@
"b": 255,
"a": 255
},
"_string": "လက်ကျန်ငွေ မလုံလောက်ပါ။ အရောင်းပမာဏကို ပြောင်းလဲကြည့်ရှုပါ။",
"_string": "label",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 43,
"_fontSize": 42,
"_fontFamily": "Arial",
"_lineHeight": 57,
"_lineHeight": 42,
"_overflow": 2,
"_enableWrapText": true,
"_font": {
@ -1015,25 +1012,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "7bvpzJamlOlquyMqNzwm5Q"
},
{
"__type__": "cc.UIOpacity",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 33
},
"_enabled": true,
"__prefab": {
"__id__": 41
},
"_opacity": 255,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "9b/qfHIkVPwZouLlXmPvo4"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@ -1043,6 +1021,8 @@
"__id__": 0
},
"fileId": "d0C7b4KtxF3Z5olPuBCkBH",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@ -1055,20 +1035,20 @@
},
"_children": [
{
"__id__": 44
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 52
},
{
"__id__": 56
"__id__": 54
}
],
"_prefab": {
"__id__": 58
"__id__": 56
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1105,11 +1085,14 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 43
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
},
{
"__id__": 45
},
@ -1118,13 +1101,10 @@
},
{
"__id__": 49
},
{
"__id__": 51
}
],
"_prefab": {
"__id__": 53
"__id__": 51
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1161,11 +1141,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 44
},
"_contentSize": {
"__type__": "cc.Size",
@ -1189,11 +1169,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 48
"__id__": 46
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1260,11 +1240,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 48
},
"key": "Confirm",
"_id": ""
@ -1279,11 +1259,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 44
"__id__": 42
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 50
},
"isBold": true,
"fontOther": {
@ -1335,11 +1315,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 55
"__id__": 53
},
"_contentSize": {
"__type__": "cc.Size",
@ -1363,11 +1343,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
"__id__": 41
},
"_enabled": true,
"__prefab": {
"__id__": 57
"__id__": 55
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1425,20 +1405,20 @@
},
"_children": [
{
"__id__": 60
"__id__": 58
}
],
"_active": false,
"_components": [
{
"__id__": 70
"__id__": 68
},
{
"__id__": 72
"__id__": 70
}
],
"_prefab": {
"__id__": 74
"__id__": 72
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1475,11 +1455,14 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 59
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
},
{
"__id__": 61
},
@ -1488,13 +1471,10 @@
},
{
"__id__": 65
},
{
"__id__": 67
}
],
"_prefab": {
"__id__": 69
"__id__": 67
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1531,11 +1511,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 62
"__id__": 60
},
"_contentSize": {
"__type__": "cc.Size",
@ -1559,11 +1539,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 64
"__id__": 62
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1630,11 +1610,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 66
"__id__": 64
},
"key": "Confirm",
"_id": ""
@ -1649,11 +1629,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 68
"__id__": 66
},
"isBold": true,
"fontOther": {
@ -1705,11 +1685,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 59
"__id__": 57
},
"_enabled": true,
"__prefab": {
"__id__": 71
"__id__": 69
},
"_contentSize": {
"__type__": "cc.Size",
@ -1733,11 +1713,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 59
"__id__": 57
},
"_enabled": true,
"__prefab": {
"__id__": 73
"__id__": 71
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1795,20 +1775,20 @@
},
"_children": [
{
"__id__": 76
"__id__": 74
}
],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 84
},
{
"__id__": 88
"__id__": 86
}
],
"_prefab": {
"__id__": 90
"__id__": 88
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1845,11 +1825,14 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 75
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
},
{
"__id__": 77
},
@ -1858,13 +1841,10 @@
},
{
"__id__": 81
},
{
"__id__": 83
}
],
"_prefab": {
"__id__": 85
"__id__": 83
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1901,11 +1881,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
"__id__": 74
},
"_enabled": true,
"__prefab": {
"__id__": 78
"__id__": 76
},
"_contentSize": {
"__type__": "cc.Size",
@ -1929,11 +1909,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
"__id__": 74
},
"_enabled": true,
"__prefab": {
"__id__": 80
"__id__": 78
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -2000,11 +1980,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
"__id__": 74
},
"_enabled": true,
"__prefab": {
"__id__": 82
"__id__": 80
},
"key": "Close",
"_id": ""
@ -2019,11 +1999,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 76
"__id__": 74
},
"_enabled": true,
"__prefab": {
"__id__": 84
"__id__": 82
},
"isBold": true,
"fontOther": {
@ -2075,11 +2055,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 75
"__id__": 73
},
"_enabled": true,
"__prefab": {
"__id__": 87
"__id__": 85
},
"_contentSize": {
"__type__": "cc.Size",
@ -2103,11 +2083,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 75
"__id__": 73
},
"_enabled": true,
"__prefab": {
"__id__": 89
"__id__": 87
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -2165,7 +2145,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 92
"__id__": 90
},
"_contentSize": {
"__type__": "cc.Size",
@ -2193,7 +2173,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 94
"__id__": 92
},
"_alignFlags": 45,
"_target": null,
@ -2242,7 +2222,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 97
"__id__": 95
},
"_contentSize": {
"__type__": "cc.Size",
@ -2270,7 +2250,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 99
"__id__": 97
},
"_alignFlags": 45,
"_target": null,
@ -2306,7 +2286,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 101
"__id__": 99
},
"_id": ""
},

View File

@ -1960,7 +1960,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 326.66748046875,
"height": 69.3
"height": 56.7
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1995,7 +1995,7 @@
"_actualFontSize": 45,
"_fontSize": 45,
"_fontFamily": "Arial",
"_lineHeight": 55,
"_lineHeight": 45,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
@ -2568,7 +2568,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 2360
"height": 2400
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -3240,7 +3240,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 580,
"height": 62
"height": 60
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -3275,7 +3275,7 @@
"_actualFontSize": 58,
"_fontSize": 58,
"_fontFamily": "Arial",
"_lineHeight": 62,
"_lineHeight": 60,
"_overflow": 2,
"_enableWrapText": true,
"_font": {
@ -3522,7 +3522,7 @@
"_actualFontSize": 44,
"_fontSize": 43,
"_fontFamily": "Arial",
"_lineHeight": 62,
"_lineHeight": 40,
"_overflow": 2,
"_enableWrapText": true,
"_font": {