Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
nattapon tachawong 2025-03-06 15:09:41 +07:00
commit 4df9405451
968 changed files with 222810 additions and 141824 deletions

BIN
video/brewing_adv11.mp4 Executable file → Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
video/brewing_adv17_long.mp4 Executable file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Before After
Before After

BIN
video/remove_cup_how_to.mp4 Normal file

Binary file not shown.

View file

@ -4,6 +4,34 @@ Var EventMatch = 0
; Strawberry Series, 7 - 31 Jan
Var StrawberrySeriesPro = 0
Var StrawberrySeriesMenu = 0
; zone logic flag event
If SystemDateMonthInt = 1 Then
Var LuckyDrawCampaign = 1
If SystemDateDayInt <= 6 Then
Var ThickTeaByBrewerPro = 1
Var ThickTeaByBrewerBanner = 1
EndIf
If SystemDateDayInt >= 7 Then
Var StrawberrySeriesPro = 1
EndIf
EndIf
If SystemDateMonthInt = 2 Then
Var OvaltineSchoolPro = 1
If SystemDateDayInt >= 10 Then
If SystemDateDayInt <= 23 Then
Var RedStringOfFatePro = 1
EndIf
EndIf
EndIf
@ -17,6 +45,17 @@ If SystemDateMonthInt = 2 Then
EndIf
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 10 Then
Var SwensenPro = 1
EndIf
Var CoconutMilkPro = 1
EndIf
; zone block logic follow ingredent
DEBUGVAR HaveIngredientOvaltine
If HaveIngredientOvaltine = "true" Then
@ -36,6 +75,28 @@ If MainAdvertiseShowSlot = "" Then
EndIf
Var MainAdvertiseFileName[0] = ""
Var MainAdvertiseFileName[1] = ""
Var MainAdvertiseFileName[2] = ""
Var MainAdvertiseFileName[3] = ""
Var MainAdvertiseFileName[4] = ""
Var MainAdvertiseFileName[5] = ""
If brewing_adv11_long_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv11_long.mp4" brewing_adv11_long_size
EndIf
DEBUGVAR brewing_adv11_long_size
If brewing_adv11_long_size = 9461310 Then
If CoconutMilkPro = 1 Then
Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11_long.mp4"
Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0
Var EventTurnOn = 1
Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1
EndIf
EndIf
If brewing_adv13_long_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv13_long.mp4" brewing_adv13_long_size
@ -53,6 +114,8 @@ EndIf
If brewing_adv14_long_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv14_long.mp4" brewing_adv14_long_size
EndIf
@ -86,6 +149,52 @@ EndIf
If brewing_adv16_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv16.mp4" brewing_adv16_size
EndIf
DEBUGVAR brewing_adv16_size
If brewing_adv16_size = 7422861 Then
If GiftNewYearEnable = 1 Then
Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv16.mp4"
Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0
Var EventTurnOn = 1
Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1
EndIf
EndIf
Var PearRequest1 = 0
If BoxID = 201729 Then
Var PearRequest1 = 1
EndIf
If BoxID = 201714 Then
Var PearRequest1 = 1
EndIf
If PearRequest1 = 1 Then
Else
If brewing_adv17_long_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv17_long.mp4" brewing_adv17_long_size
EndIf
DEBUGVAR brewing_adv17_long_size
If brewing_adv17_long_size = 4984284 Then
If SwensenPro = 1 Then
Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17_long.mp4"
Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0
Var EventTurnOn = 1
Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1
EndIf
EndIf
EndIf
If brewing_adv21_long_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv21_long.mp4" brewing_adv21_long_size
@ -106,24 +215,6 @@ EndIf
If brewing_adv16_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv16.mp4" brewing_adv16_size
EndIf
DEBUGVAR brewing_adv16_size
If brewing_adv16_size = 7422861 Then
If GiftNewYearEnable = 1 Then
Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv16.mp4"
Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0
Var EventTurnOn = 1
Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1
EndIf
EndIf
DEBUGVAR MainAdvertiseShowSlot
DEBUGVAR MainAdvertiseRunSlot
@ -184,7 +275,10 @@ Else
Var img_rest_main_page = ""
Var img_reset_topup = ""
Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible"
Var CountDownShowButton = 35
EndIf

View file

@ -8,13 +8,6 @@ EndIf
Var PremiumTriosEnable = 0
Var GiftNewYearEnable = 0
If SystemDateMonthInt = 10 Then
If SystemDateDayInt > 21 Then
Var EDC_ThailandOn = 1
EndIf
EndIf
If BoxID = 175599 Then
@ -52,6 +45,11 @@ DEBUGVAR EDC_ThailandOn
DEBUGVAR ShopeePayLaterOn
Var BrewingAdvertiseRunSlot = 0
;
;
;
;
;
Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/image/page_doing/tao_adv1.png";
@ -74,8 +72,8 @@ EndIf
DEBUGVAR brewing_adv11_size
If brewing_adv11_size = 18065754 Then
If WinterWonderPro = 1 Then
If brewing_adv11_size = 9461310 Then
If CoconutMilkPro = 1 Then
Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11.mp4";
If show_eng = "true" Then
@ -91,6 +89,13 @@ If brewing_adv11_size = 18065754 Then
EndIf
EndIf
;
;
;
;
;
If brewing_adv12_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv12_size
EndIf
@ -113,10 +118,17 @@ If brewing_adv12_size = 3687715 Then
EndIf
EndIf
;
;
;
;
;
If brewing_adv13_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size
EndIf
DEBUGVAR brewing_adv13_size
If brewing_adv13_size = 1919848 Then
If StrawberrySeriesPro = 1 Then
@ -136,6 +148,11 @@ If brewing_adv13_size = 1919848 Then
EndIf
;
;
;
;
;
If brewing_adv14_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv14.mp4" brewing_adv14_size
@ -159,6 +176,11 @@ If brewing_adv14_size = 9260622 Then
EndIf
EndIf
;
;
;
;
;
If brewing_adv15_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv15.mp4" brewing_adv15_size
@ -183,10 +205,11 @@ If brewing_adv15_size = 9493162 Then
EndIf
EndIf
;
;
;
;
;
If brewing_adv16_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv16.mp4" brewing_adv16_size
@ -211,6 +234,10 @@ If brewing_adv16_size = 7422861 Then
EndIf
EndIf
;
;
;
;
If brewing_adv17_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv17.mp4" brewing_adv17_size
@ -218,8 +245,8 @@ EndIf
DEBUGVAR brewing_adv17_size
If brewing_adv17_size = 10348323 Then
If PremiumTriosEnable = 1 Then
If brewing_adv17_size = 4984284 Then
If SwensenPro = 1 Then
Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17.mp4"
If show_eng = "true" Then
@ -228,41 +255,18 @@ If brewing_adv17_size = 10348323 Then
Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv17.png"
EndIf
Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 13
Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
EndIf
EndIf
If brewing_adv16_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv16.mp4" brewing_adv16_size
EndIf
DEBUGVAR brewing_adv16_size
If brewing_adv16_size = 7422861 Then
If GiftNewYearEnable = 1 Then
Var BrewingAdvertiseEnable[BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv16.mp4";
If show_eng = "true" Then
Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv16_en.png"
Else
Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv16.png"
EndIf
Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 18
Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 14
Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
EndIf
EndIf
;
;
;
;
;
If brewing_adv21_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv21.mp4" brewing_adv21_size

View file

@ -1,6 +1,6 @@
total 239472
-rw-rw---- 1 root sdcard_rw 18065754 2024-11-27 16:31 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 8233782 2024-12-04 15:39 brewing_adv11_long.mp4
total 231904
-rw-rw---- 1 root sdcard_rw 9461310 2025-02-18 15:34 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 9461310 2025-02-18 15:34 brewing_adv11_long.mp4
-rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4
-rw-rw---- 1 root sdcard_rw 1919848 2024-12-20 22:32 brewing_adv13.mp4
-rw-rw---- 1 root sdcard_rw 3789806 2024-12-20 22:31 brewing_adv13_long.mp4
@ -9,13 +9,14 @@ total 239472
-rw-rw---- 1 root sdcard_rw 9493162 2025-01-10 16:11 brewing_adv15.mp4
-rw-rw---- 1 root sdcard_rw 5579052 2025-01-23 13:11 brewing_adv15_long.mp4
-rw-rw---- 1 root sdcard_rw 7422861 2024-11-05 16:08 brewing_adv16.mp4
-rw-rw---- 1 root sdcard_rw 10348323 2024-11-21 18:04 brewing_adv17.mp4
-rw-rw---- 1 root sdcard_rw 4984284 2025-02-24 16:30 brewing_adv17.mp4
-rw-rw---- 1 root sdcard_rw 4984284 2025-02-24 16:30 brewing_adv17_long.mp4
-rw-rw---- 1 root sdcard_rw 9701195 2024-11-28 13:34 brewing_adv21.mp4
-rw-rw---- 1 root sdcard_rw 6507746 2024-12-04 15:40 brewing_adv21_long.mp4
-rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4
-rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png
-rw-rw---- 1 root sdcard_rw 59371 2024-11-29 14:49 brewing_txt_adv11.png
-rw-rw---- 1 root sdcard_rw 49207 2024-11-29 14:49 brewing_txt_adv11_en.png
-rw-rw---- 1 root sdcard_rw 48205 2025-02-19 10:41 brewing_txt_adv11.png
-rw-rw---- 1 root sdcard_rw 44382 2025-02-19 10:59 brewing_txt_adv11_en.png
-rw-rw---- 1 root sdcard_rw 43166 2024-08-29 11:31 brewing_txt_adv12.png
-rw-rw---- 1 root sdcard_rw 42692 2024-08-29 11:31 brewing_txt_adv12_en.png
-rw-rw---- 1 root sdcard_rw 50704 2024-12-20 22:09 brewing_txt_adv13.png
@ -26,8 +27,8 @@ total 239472
-rw-rw---- 1 root sdcard_rw 35319 2025-01-27 10:02 brewing_txt_adv15_en.png
-rw-rw---- 1 root sdcard_rw 49830 2024-11-05 16:48 brewing_txt_adv16.png
-rw-rw---- 1 root sdcard_rw 50931 2024-11-05 16:49 brewing_txt_adv16_en.png
-rw-rw---- 1 root sdcard_rw 47482 2024-11-05 21:28 brewing_txt_adv17.png
-rw-rw---- 1 root sdcard_rw 51544 2024-11-05 16:49 brewing_txt_adv17_en.png
-rw-rw---- 1 root sdcard_rw 45375 2025-02-24 16:56 brewing_txt_adv17.png
-rw-rw---- 1 root sdcard_rw 48172 2025-02-24 16:56 brewing_txt_adv17_en.png
-rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png
-rw-rw---- 1 root sdcard_rw 45665 2024-11-29 14:49 brewing_txt_adv21.png
-rw-rw---- 1 root sdcard_rw 51795 2024-11-29 14:50 brewing_txt_adv21_en.png
@ -35,11 +36,11 @@ total 239472
-rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png
-rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4
-rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4
-rw-rw---- 1 root sdcard_rw 4708 2025-01-28 15:33 script1.ev
-rw-rw---- 1 root sdcard_rw 6706 2025-02-24 17:02 script1.ev
-rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev
-rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev
-rw-rw---- 1 root sdcard_rw 10704 2025-01-27 13:42 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2025-01-29 09:27 sync_1.file
-rw-rw---- 1 root sdcard_rw 9807 2025-02-24 17:02 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2025-03-03 12:43 sync_1.file
-rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4
-rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4
-rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4