diff --git a/assets/atlas/comp/left.png b/assets/atlas/comp/left.png deleted file mode 100644 index 0423cf0..0000000 Binary files a/assets/atlas/comp/left.png and /dev/null differ diff --git a/assets/atlas/comp/left.png.meta b/assets/atlas/comp/left.png.meta deleted file mode 100644 index a13c8cf..0000000 --- a/assets/atlas/comp/left.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "01e2c8ef-cb3b-4633-acf1-85ae9e5e0062", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/right.png b/assets/atlas/comp/right.png deleted file mode 100644 index 5c90197..0000000 Binary files a/assets/atlas/comp/right.png and /dev/null differ diff --git a/assets/atlas/comp/right.png.meta b/assets/atlas/comp/right.png.meta deleted file mode 100644 index e59f9a8..0000000 --- a/assets/atlas/comp/right.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "a40c7d39-0906-4227-8784-e7f3eebba541", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/star.png b/assets/atlas/comp/star.png index f93d216..61dab45 100644 Binary files a/assets/atlas/comp/star.png and b/assets/atlas/comp/star.png differ diff --git a/assets/atlas/comp/vscroll$bar.png b/assets/atlas/comp/vscroll$bar.png new file mode 100644 index 0000000..3e9a397 Binary files /dev/null and b/assets/atlas/comp/vscroll$bar.png differ diff --git a/assets/atlas/comp/vscroll$bar.png.meta b/assets/atlas/comp/vscroll$bar.png.meta new file mode 100644 index 0000000..f6197d7 --- /dev/null +++ b/assets/atlas/comp/vscroll$bar.png.meta @@ -0,0 +1,14 @@ +{ + "uuid": "d79c761b-6bc3-49e0-9e51-bd2ba385cfe0", + "importer": { + "textureType": 2, + "stateNum": 3, + "sizeGrid": [ + 10, + 10, + 10, + 10, + 0 + ] + } +} \ No newline at end of file diff --git a/assets/atlas/comp/vscroll$down.png b/assets/atlas/comp/vscroll$down.png new file mode 100644 index 0000000..e6a0f14 Binary files /dev/null and b/assets/atlas/comp/vscroll$down.png differ diff --git a/assets/atlas/comp/vscroll$down.png.meta b/assets/atlas/comp/vscroll$down.png.meta new file mode 100644 index 0000000..766b502 --- /dev/null +++ b/assets/atlas/comp/vscroll$down.png.meta @@ -0,0 +1,7 @@ +{ + "uuid": "a62dfa59-dd5c-491c-8d7a-346205a51a5b", + "importer": { + "textureType": 2, + "stateNum": 3 + } +} \ No newline at end of file diff --git a/assets/atlas/comp/vscroll$up.png b/assets/atlas/comp/vscroll$up.png new file mode 100644 index 0000000..bee7a53 Binary files /dev/null and b/assets/atlas/comp/vscroll$up.png differ diff --git a/assets/atlas/comp/vscroll$up.png.meta b/assets/atlas/comp/vscroll$up.png.meta new file mode 100644 index 0000000..883623c --- /dev/null +++ b/assets/atlas/comp/vscroll$up.png.meta @@ -0,0 +1,7 @@ +{ + "uuid": "c1da2147-6391-438e-a9a3-6f2dfb6b32d3", + "importer": { + "textureType": 2, + "stateNum": 3 + } +} \ No newline at end of file diff --git a/assets/atlas/comp/vscroll.png b/assets/atlas/comp/vscroll.png new file mode 100644 index 0000000..5bd3b67 Binary files /dev/null and b/assets/atlas/comp/vscroll.png differ diff --git a/assets/atlas/comp/vscroll.png.meta b/assets/atlas/comp/vscroll.png.meta new file mode 100644 index 0000000..7380018 --- /dev/null +++ b/assets/atlas/comp/vscroll.png.meta @@ -0,0 +1,13 @@ +{ + "uuid": "fc3bb457-8d97-4456-b6b6-304c6b064689", + "importer": { + "textureType": 2, + "sizeGrid": [ + 11, + 9, + 11, + 9, + 0 + ] + } +} \ No newline at end of file diff --git a/assets/atlas/images/trophy.png b/assets/atlas/images/trophy.png deleted file mode 100644 index b03630f..0000000 Binary files a/assets/atlas/images/trophy.png and /dev/null differ diff --git a/assets/atlas/images/trophy.png.meta b/assets/atlas/images/trophy.png.meta deleted file mode 100644 index 274309f..0000000 --- a/assets/atlas/images/trophy.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "0a33c495-5713-4f5d-bb30-d0021966cf7e", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/trophys/img_trophy_bg_light_gold.png b/assets/atlas/trophys/img_trophy_bg_light_gold.png new file mode 100644 index 0000000..5417e2e Binary files /dev/null and b/assets/atlas/trophys/img_trophy_bg_light_gold.png differ diff --git a/assets/atlas/trophys/img_trophy_bg_light_gold.png.meta b/assets/atlas/trophys/img_trophy_bg_light_gold.png.meta new file mode 100644 index 0000000..081a1bb --- /dev/null +++ b/assets/atlas/trophys/img_trophy_bg_light_gold.png.meta @@ -0,0 +1,6 @@ +{ + "uuid": "d0c3b007-6036-460a-b23d-09d6f2492886", + "importer": { + "textureType": 2 + } +} \ No newline at end of file diff --git a/assets/atlas/trophys/img_trophy_bg_light_gray.png b/assets/atlas/trophys/img_trophy_bg_light_gray.png new file mode 100644 index 0000000..fa1cbbe Binary files /dev/null and b/assets/atlas/trophys/img_trophy_bg_light_gray.png differ diff --git a/assets/atlas/trophys/img_trophy_bg_light_gray.png.meta b/assets/atlas/trophys/img_trophy_bg_light_gray.png.meta new file mode 100644 index 0000000..fb12273 --- /dev/null +++ b/assets/atlas/trophys/img_trophy_bg_light_gray.png.meta @@ -0,0 +1,6 @@ +{ + "uuid": "338cf96d-06aa-4f4a-becc-470188c6fac2", + "importer": { + "textureType": 2 + } +} \ No newline at end of file diff --git a/assets/resources/DailyChallenge.lh b/assets/resources/DailyChallenge.lh index ee35128..c9f8b66 100644 --- a/assets/resources/DailyChallenge.lh +++ b/assets/resources/DailyChallenge.lh @@ -24,10 +24,10 @@ "_$ref": "e7a1ntdg" }, "btn_left": { - "_$ref": "vy67efg7" + "_$ref": "ydwm2tu6" }, "btn_right": { - "_$ref": "55ije39v" + "_$ref": "e2xuqxps" }, "bg_dc": { "_$ref": "hdia0flx" @@ -250,28 +250,81 @@ ] }, { - "_$id": "vy67efg7", - "_$type": "Image", + "_$id": "ydwm2tu6", + "_$type": "Box", "name": "btn_left", - "x": 50, - "y": 343, - "width": 21, - "height": 60, - "skin": "res://01e2c8ef-cb3b-4633-acf1-85ae9e5e0062", - "useSourceSize": true, - "color": "#ffffff" + "x": 60, + "y": 378, + "width": 20, + "height": 66, + "anchorX": 0.5, + "anchorY": 0.5, + "rotation": 180, + "_$child": [ + { + "_$id": "a1eyth57", + "_$type": "Sprite", + "name": "Sprite", + "width": 20, + "height": 66, + "alpha": 0.6, + "_gcmds": [ + { + "_$type": "DrawPolyCmd", + "x": 0, + "y": 0, + "points": [ + 0, + 0, + 20, + 33, + 0, + 66 + ], + "lineWidth": 1, + "fillColor": "#FFFFFF" + } + ] + } + ] }, { - "_$id": "55ije39v", - "_$type": "Image", + "_$id": "e2xuqxps", + "_$type": "Box", "name": "btn_right", - "x": 996, - "y": 337, - "width": 48, - "height": 97, - "skin": "res://a40c7d39-0906-4227-8784-e7f3eebba541", - "useSourceSize": true, - "color": "#ffffff" + "x": 1012, + "y": 378, + "width": 20, + "height": 66, + "anchorX": 0.5, + "anchorY": 0.5, + "_$child": [ + { + "_$id": "q72t1vv2", + "_$type": "Sprite", + "name": "Sprite", + "width": 20, + "height": 66, + "alpha": 0.6, + "_gcmds": [ + { + "_$type": "DrawPolyCmd", + "x": 0, + "y": 0, + "points": [ + 0, + 0, + 20, + 33, + 0, + 66 + ], + "lineWidth": 1, + "fillColor": "#FFFFFF" + } + ] + } + ] } ] }, diff --git a/assets/resources/GameDone.lh b/assets/resources/GameDone.lh index 5369679..f8ed5a0 100644 --- a/assets/resources/GameDone.lh +++ b/assets/resources/GameDone.lh @@ -209,11 +209,11 @@ "_$id": "t0v4lr20", "_$type": "Label", "name": "Label", - "y": 184, + "y": 226, "width": 984, "height": 100, "centerX": 0, - "centerY": -189, + "centerY": -147, "text": "Congratulations!", "fontSize": 80, "color": "rgba(0, 0, 0, 1)", diff --git a/assets/resources/TrophyRoom.lh b/assets/resources/TrophyRoom.lh index 8dffaf9..f1547c7 100644 --- a/assets/resources/TrophyRoom.lh +++ b/assets/resources/TrophyRoom.lh @@ -169,6 +169,9 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "xs2facku" + }, "icon": { "_$ref": "i99wsuz9" }, @@ -181,6 +184,15 @@ } ], "_$child": [ + { + "_$id": "xs2facku", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, { "_$id": "i99wsuz9", "_$type": "Image", @@ -228,7 +240,7 @@ ] }, { - "_$id": "5a72w6r6", + "_$id": "3dpnbnbm", "_$type": "Box", "name": "Box(2)", "x": 336, @@ -238,20 +250,32 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "etn7qmiw" + }, "icon": { - "_$ref": "qtzrgk8b" + "_$ref": "7hjok1ev" }, "label_count": { - "_$ref": "nejjxzap" + "_$ref": "koikjqiv" }, "label_month": { - "_$ref": "kyfur82i" + "_$ref": "kpfyndbn" } } ], "_$child": [ { - "_$id": "qtzrgk8b", + "_$id": "etn7qmiw", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, + { + "_$id": "7hjok1ev", "_$type": "Image", "name": "icon", "width": 288, @@ -261,7 +285,7 @@ "color": "#ffffff" }, { - "_$id": "nejjxzap", + "_$id": "koikjqiv", "_$type": "Label", "name": "label_count", "x": 108, @@ -278,7 +302,7 @@ "padding": "0,0,0,0" }, { - "_$id": "kyfur82i", + "_$id": "kpfyndbn", "_$type": "Label", "name": "month", "x": 94, @@ -297,7 +321,7 @@ ] }, { - "_$id": "ou2bc7ya", + "_$id": "4hfbjkna", "_$type": "Box", "name": "Box(3)", "x": 672, @@ -307,20 +331,32 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "n1srjbm6" + }, "icon": { - "_$ref": "60czvplu" + "_$ref": "r09n4fhm" }, "label_count": { - "_$ref": "z9p6fvm8" + "_$ref": "5lcf8a4b" }, "label_month": { - "_$ref": "qt83mjyk" + "_$ref": "pf8nfx2v" } } ], "_$child": [ { - "_$id": "60czvplu", + "_$id": "n1srjbm6", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, + { + "_$id": "r09n4fhm", "_$type": "Image", "name": "icon", "width": 288, @@ -330,7 +366,7 @@ "color": "#ffffff" }, { - "_$id": "z9p6fvm8", + "_$id": "5lcf8a4b", "_$type": "Label", "name": "label_count", "x": 108, @@ -347,7 +383,7 @@ "padding": "0,0,0,0" }, { - "_$id": "qt83mjyk", + "_$id": "pf8nfx2v", "_$type": "Label", "name": "month", "x": 94, @@ -390,7 +426,7 @@ ] }, { - "_$id": "qafamkwj", + "_$id": "d57ox1j2", "_$type": "Box", "name": "Box(2)", "y": 416, @@ -398,7 +434,7 @@ "height": 288, "_$child": [ { - "_$id": "pqcum5of", + "_$id": "0b9gkf05", "_$type": "HBox", "name": "HBox", "width": 960, @@ -407,7 +443,7 @@ "align": "middle", "_$child": [ { - "_$id": "r4wq2wm7", + "_$id": "jp4pzvxr", "_$type": "Box", "name": "Box(1)", "width": 288, @@ -416,20 +452,32 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "u167io9a" + }, "icon": { - "_$ref": "f8qx50up" + "_$ref": "umqtxrh0" }, "label_count": { - "_$ref": "sx3ojzwo" + "_$ref": "cixct5br" }, "label_month": { - "_$ref": "49lxnrrm" + "_$ref": "7343tj11" } } ], "_$child": [ { - "_$id": "f8qx50up", + "_$id": "u167io9a", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, + { + "_$id": "umqtxrh0", "_$type": "Image", "name": "icon", "width": 288, @@ -439,7 +487,7 @@ "color": "#ffffff" }, { - "_$id": "sx3ojzwo", + "_$id": "cixct5br", "_$type": "Label", "name": "label_count", "x": 108, @@ -456,7 +504,7 @@ "padding": "0,0,0,0" }, { - "_$id": "49lxnrrm", + "_$id": "7343tj11", "_$type": "Label", "name": "month", "x": 94, @@ -475,7 +523,7 @@ ] }, { - "_$id": "fvekysyv", + "_$id": "hx6pe1ov", "_$type": "Box", "name": "Box(2)", "x": 336, @@ -485,20 +533,32 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "74es56r4" + }, "icon": { - "_$ref": "7er8q2x5" + "_$ref": "tcdkrp1u" }, "label_count": { - "_$ref": "6vznujfd" + "_$ref": "n8uw70hh" }, "label_month": { - "_$ref": "0jjnp6zh" + "_$ref": "1fmgl5ec" } } ], "_$child": [ { - "_$id": "7er8q2x5", + "_$id": "74es56r4", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, + { + "_$id": "tcdkrp1u", "_$type": "Image", "name": "icon", "width": 288, @@ -508,7 +568,7 @@ "color": "#ffffff" }, { - "_$id": "6vznujfd", + "_$id": "n8uw70hh", "_$type": "Label", "name": "label_count", "x": 108, @@ -525,7 +585,7 @@ "padding": "0,0,0,0" }, { - "_$id": "0jjnp6zh", + "_$id": "1fmgl5ec", "_$type": "Label", "name": "month", "x": 94, @@ -544,7 +604,7 @@ ] }, { - "_$id": "3sbxo969", + "_$id": "crbop6ic", "_$type": "Box", "name": "Box(3)", "x": 672, @@ -554,20 +614,32 @@ { "_$type": "79064920-30a6-4b11-a82e-bbdd4112c4e1", "scriptPath": "../src/views/TrophyUnit.ts", + "bg_light": { + "_$ref": "k1u9d18x" + }, "icon": { - "_$ref": "xk7btt6d" + "_$ref": "js7oqbfw" }, "label_count": { - "_$ref": "42lm20bs" + "_$ref": "tyah3p0y" }, "label_month": { - "_$ref": "ch29xisl" + "_$ref": "k8xv4u65" } } ], "_$child": [ { - "_$id": "xk7btt6d", + "_$id": "k1u9d18x", + "_$type": "Image", + "name": "bg_light", + "width": 288, + "height": 288, + "skin": "res://d0c3b007-6036-460a-b23d-09d6f2492886", + "color": "#ffffff" + }, + { + "_$id": "js7oqbfw", "_$type": "Image", "name": "icon", "width": 288, @@ -577,7 +649,7 @@ "color": "#ffffff" }, { - "_$id": "42lm20bs", + "_$id": "tyah3p0y", "_$type": "Label", "name": "label_count", "x": 108, @@ -594,7 +666,7 @@ "padding": "0,0,0,0" }, { - "_$id": "ch29xisl", + "_$id": "k8xv4u65", "_$type": "Label", "name": "month", "x": 94, @@ -615,7 +687,7 @@ ] }, { - "_$id": "fmb77cdv", + "_$id": "qddl5vua", "_$type": "Sprite", "name": "Sprite", "y": 288, diff --git a/src/constants/dc-config.ts.meta b/src/constants/dc-config.ts.meta deleted file mode 100644 index 9121f66..0000000 --- a/src/constants/dc-config.ts.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "uuid": "fb5508ba-9b4a-43b3-903e-1063df3deeb8" -} \ No newline at end of file diff --git a/src/constants/respath.ts b/src/constants/respath.ts index b5dcdd4..9df9988 100644 --- a/src/constants/respath.ts +++ b/src/constants/respath.ts @@ -18,6 +18,10 @@ export const respath = { dc_top_bg_day_finish: "atlas/images/img_dc_bg2.png", dc_top_bg_month_finish: "atlas/images/img_dc_finished.png", + + trophy_bg_light_gold: "atlas/trophys/img_trophy_bg_light_gold.png", + trophy_bg_light_grey: "atlas/trophys/img_trophy_bg_light_gray.png", + trophy_01: "atlas/trophys/trophy_01.png", trophy_02: "atlas/trophys/trophy_02.png", trophy_03: "atlas/trophys/trophy_03.png", diff --git a/src/views/DailyChallenge.ts b/src/views/DailyChallenge.ts index 59bc708..847a3c4 100644 --- a/src/views/DailyChallenge.ts +++ b/src/views/DailyChallenge.ts @@ -18,10 +18,10 @@ export class DailyChallenge extends Laya.Script { public btn_trophy: Laya.Image @property(Laya.Image) public icon_trophy: Laya.Image - @property(Laya.Image) - public btn_left: Laya.Image - @property(Laya.Image) - public btn_right: Laya.Image + @property(Laya.Box) + public btn_left: Laya.Box + @property(Laya.Box) + public btn_right: Laya.Box @property(Laya.Image) public bg_dc: Laya.Image; diff --git a/src/views/TrophyUnit.ts b/src/views/TrophyUnit.ts index c631723..7bb8468 100644 --- a/src/views/TrophyUnit.ts +++ b/src/views/TrophyUnit.ts @@ -1,4 +1,5 @@ import { config } from "../constants/config"; +import { respath } from "../constants/respath"; import { StorageManager } from "../models/StorageManager"; const { regClass, property } = Laya; @@ -7,6 +8,8 @@ const { regClass, property } = Laya; export class TrophyUnit extends Laya.Script { declare owner : Laya.Box; + @property(Laya.Image) + public bg_light: Laya.Image; @property(Laya.Image) public icon: Laya.Image; @property(Laya.Label) @@ -21,10 +24,12 @@ export class TrophyUnit extends Laya.Script { this.label_count.text = `${starCount}/${info.dayCount}` this.label_month.text = config.MONTH_ABBRS[info.month-1] if (starCount >= info.dayCount) { + this.bg_light.skin = respath.trophy_bg_light_gold this.icon.gray = false this.label_month.color = "#2d3138" } else { + this.bg_light.skin = respath.trophy_bg_light_grey this.icon.gray = true this.label_month.color = "#a7abb3" }