Compare commits
No commits in common. "master" and "v0.0.54" have entirely different histories.
@ -1240,7 +1240,7 @@
|
|||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 811.1579999999999,
|
"width": 811.1579999999999,
|
||||||
"height": 80
|
"height": 58
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -1470,7 +1470,7 @@
|
|||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 674.271,
|
"width": 674.271,
|
||||||
"height": 70
|
"height": 61.084999999999994
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -1700,7 +1700,7 @@
|
|||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 320,
|
"width": 320,
|
||||||
"height": 40
|
"height": 32.76
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
|||||||
@ -18669,8 +18669,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 40.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -18711,7 +18711,7 @@
|
|||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
@ -19387,8 +19387,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 40.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -19429,7 +19429,7 @@
|
|||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
@ -19785,8 +19785,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 104.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -19821,13 +19821,13 @@
|
|||||||
"b": 187,
|
"b": 187,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "Tabela de",
|
"_string": "Tabela de pagamentos",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 0,
|
"_verticalAlign": 0,
|
||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
@ -20228,8 +20228,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 40.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -20270,7 +20270,7 @@
|
|||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
@ -20671,8 +20671,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 40.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -20713,7 +20713,7 @@
|
|||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
@ -21114,8 +21114,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 172,
|
"width": 150,
|
||||||
"height": 42.84
|
"height": 40.32
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@ -21156,7 +21156,7 @@
|
|||||||
"_actualFontSize": 32,
|
"_actualFontSize": 32,
|
||||||
"_fontSize": 32,
|
"_fontSize": 32,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 34,
|
"_lineHeight": 32,
|
||||||
"_overflow": 3,
|
"_overflow": 3,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": {
|
"_font": {
|
||||||
|
|||||||
@ -668,7 +668,6 @@ export class HistoryDetail extends Component {
|
|||||||
if (idx == this.data.panDetails.length - 1) {
|
if (idx == this.data.panDetails.length - 1) {
|
||||||
// console.log("已全部生成完")
|
// console.log("已全部生成完")
|
||||||
this.hideLoading()
|
this.hideLoading()
|
||||||
this.item_detail.removeFromParent()
|
|
||||||
this.scrollControl.jumpToPage(0)
|
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.scrollControl.vert_scrollView = this.list_detail.content.children[0].getComponent(ScrollView)
|
||||||
this.list_detail.node.active = true
|
this.list_detail.node.active = true
|
||||||
|
|
||||||
|
|||||||
@ -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 { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
|
||||||
import { getLanguage } from 'db://assets/Main/Scripts/main/comm';
|
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.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
|
||||||
|
|
||||||
this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
|
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.scrollView.node.on('scrolling', this.onScrolling, this);
|
||||||
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
|
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
|
||||||
|
|||||||
@ -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 { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools';
|
||||||
import { getCsymbol, getLanguage } from 'db://assets/Main/Scripts/main/comm';
|
import { getCsymbol, getLanguage } from 'db://assets/Main/Scripts/main/comm';
|
||||||
const { ccclass, property } = _decorator;
|
const { ccclass, property } = _decorator;
|
||||||
@ -16,7 +16,6 @@ export class Rules extends Component {
|
|||||||
protected onLoad(): void {
|
protected onLoad(): void {
|
||||||
this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
|
this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"];
|
||||||
this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView)
|
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.scrollView.node.on('scrolling', this.onScrolling, this);
|
||||||
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
|
this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this);
|
||||||
|
|||||||
@ -30,7 +30,7 @@ export function getHistoryUrl() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getLanguage() {
|
export function getLanguage() {
|
||||||
// return 'my';
|
// return 'th';
|
||||||
return language;
|
return language;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2568,7 +2568,7 @@
|
|||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 1080,
|
"width": 1080,
|
||||||
"height": 2360
|
"height": 2400
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user