diff --git a/assets/resources/GameDone_DC_H.lh b/assets/resources/GameDone_DC_H.lh index 0e05817..ec424cd 100644 --- a/assets/resources/GameDone_DC_H.lh +++ b/assets/resources/GameDone_DC_H.lh @@ -385,11 +385,11 @@ "_$id": "pezhhu4s", "_$type": "Box", "name": "btn_new", - "y": 366, + "y": 510, "width": 540, "height": 156, "visible": false, - "top": 366, + "top": 510, "centerX": 0, "_$comp": [ { @@ -506,10 +506,10 @@ "_$id": "txe3oxe8", "_$type": "Box", "name": "btn_continue", - "y": 366, + "y": 510, "width": 540, "height": 156, - "top": 366, + "top": 510, "centerX": 0, "_$comp": [ { diff --git a/assets/resources/GameDone_Normal_H.lh b/assets/resources/GameDone_Normal_H.lh index a5c6cfe..2fa941a 100644 --- a/assets/resources/GameDone_Normal_H.lh +++ b/assets/resources/GameDone_Normal_H.lh @@ -388,10 +388,10 @@ "_$id": "hgpxx02g", "_$type": "Box", "name": "btn_new", - "y": 366, + "y": 510, "width": 540, "height": 156, - "top": 366, + "top": 510, "centerX": 0, "_$comp": [ { @@ -447,11 +447,11 @@ "_$id": "it1c7c3x", "_$type": "Box", "name": "btn_home", - "y": 558, + "y": 510, "width": 540, "height": 156, "visible": false, - "top": 558, + "top": 510, "centerX": 0, "_$comp": [ { diff --git a/assets/resources/Stage.lh b/assets/resources/Stage.lh index afa2c49..3927fc6 100644 --- a/assets/resources/Stage.lh +++ b/assets/resources/Stage.lh @@ -44571,7 +44571,7 @@ "_$id": "9t9m3cg3", "_$type": "Sprite", "name": "normal", - "x": 34, + "x": 40, "y": -26, "width": 48, "height": 48, @@ -44610,7 +44610,7 @@ "_$id": "jgwq47et", "_$type": "Sprite", "name": "ad", - "x": 34, + "x": 40, "y": -26, "width": 96, "height": 48, diff --git a/assets/resources/dc/DailyChallenge_H.lh b/assets/resources/dc/DailyChallenge_H.lh index 9cadd33..91baa33 100644 --- a/assets/resources/dc/DailyChallenge_H.lh +++ b/assets/resources/dc/DailyChallenge_H.lh @@ -7081,8 +7081,8 @@ "x": 64, "y": 644, "width": 1072, - "height": 244, - "bottom": 72, + "height": 268, + "bottom": 48, "centerX": 0, "_$child": [ { @@ -7090,7 +7090,7 @@ "_$type": "Sprite", "name": "Sprite", "width": 1072, - "height": 244, + "height": 268, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -7271,8 +7271,8 @@ "y": 96, "width": 720, "height": 120, - "visible": false, - "top": 96, + "visible": true, + "top": 106, "centerX": 0, "_$comp": [ { diff --git a/src/models/UIManager.ts b/src/models/UIManager.ts index 26dfe13..a07adfa 100644 --- a/src/models/UIManager.ts +++ b/src/models/UIManager.ts @@ -119,6 +119,13 @@ export class UIManager extends Laya.Script { }) } + public loadDCWtihMonth(year: number, month: number): void { + this.closeTrophyUI() + if (this.dc_ui) { + this.dc_ui.loadWithMonth(year, month) + } + } + public closeDCUI(): void { if (this.dc_ui) { this.dc_ui.owner.destroy() @@ -151,10 +158,12 @@ export class UIManager extends Laya.Script { } public loadTrophyShowUI(record: TrophyRecord): void { + this.mask.visible = true Laya.loader.load(respath.trophy_show_ui_res()).then((go) => { const prefab = go.create() const obj = this.getUIRoot().addChild(prefab).getComponent(TrophyShow) obj.onSetShow(record) + this.mask.visible = false }) } diff --git a/src/views/dc/TrophyUnit.ts b/src/views/dc/TrophyUnit.ts index b8a8417..1ff3ea1 100644 --- a/src/views/dc/TrophyUnit.ts +++ b/src/views/dc/TrophyUnit.ts @@ -42,6 +42,9 @@ export class TrophyUnit extends Laya.Script { if (find) { UIManager.getInstance().loadTrophyShowUI(find) } + else { + UIManager.getInstance().loadDCWtihMonth(info.year, info.month) + } }) } }