Merge remote-tracking branch 'origin/masterpiece' into th_mmr

This commit is contained in:
Ittipat Lusuk 2025-01-21 14:44:29 +07:00
commit 020098b2af
457 changed files with 95264 additions and 50614 deletions

View file

@ -1,4 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
normal_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
disable_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
disable_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
normal_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
normal_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
press_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
press_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
disable_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
disable_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 KiB