before merge

This commit is contained in:
wanlop run 2024-11-18 10:38:51 +07:00
parent 6676dbb984
commit de26fa563f
129 changed files with 1141 additions and 325008 deletions

View file

@ -22,6 +22,7 @@ If EventMatch = 1 Then
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png"
Var img_reset_topup = "ROOT/taobin_project/image/main_page/bn_main_page_topup.png"
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
If CocktailShow = "true" Then
@ -31,10 +32,31 @@ If EventMatch = 1 Then
EndIf
EndIf
If brewing_adv17_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv17.mp4" brewing_adv17_size
EndIf
DEBUGVAR brewing_adv17_size
If brewing_adv17_size = 9244716 Then
If PremiumTriosEnable = 1 Then
Var VideoMainPage = "ROOT/taobin_project/video/brewing_adv17.mp4";
Var img_rest_main_page = "ROOT/taobin_project/image/main_page/bn_main_page_start.png"
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png"
Var img_reset_topup = "ROOT/taobin_project/image/main_page/bn_main_page_topup.png"
Var EventTurnOn = 1
EndIf
EndIf
If EventTurnOn = 1 Then
Var CountDownShowButton = 0
Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
EndIf

View file

@ -115,8 +115,6 @@ If brewing_adv11_size = 9800005 Then
EndIf
EndIf
DEBUGVAR BrewingAdvertiseRunSlot
If brewing_adv12_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv12_size
EndIf
@ -139,8 +137,6 @@ If brewing_adv12_size = 3687715 Then
EndIf
EndIf
DEBUGVAR BrewingAdvertiseRunSlot
If brewing_adv13_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size
EndIf
@ -247,7 +243,7 @@ DEBUGVAR brewing_adv17_size
If brewing_adv17_size = 9244716 Then
If PremiumTriosEnable = 1 Then
Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17.mp4";
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17.mp4"
If show_eng = "true" Then
Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv17_en.png"
Else
@ -263,7 +259,7 @@ EndIf
Var BrewingAdvertiseShowSlot = BrewingAdvertiseShowSlot_SAVE_TEST
DEBUGVAR BrewingAdvertiseRunSlot

View file

@ -1,4 +1,4 @@
total 203812
total 203780
-rw-rw---- 1 root sdcard_rw 9800005 2024-10-10 14:37 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4
-rw-rw---- 1 root sdcard_rw 4223917 2024-11-01 10:02 brewing_adv13.mp4
@ -30,11 +30,11 @@ total 203812
-rw-rw---- 1 root sdcard_rw 42967 2024-07-19 18:16 brewing_txt_adv4_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 1218 2024-10-31 21:53 script1.ev
-rw-rw---- 1 root sdcard_rw 1814 2024-11-15 21:56 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 9564 2024-11-10 16:24 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-11-10 16:23 sync_1.file
-rw-rw---- 1 root sdcard_rw 9325 2024-11-15 21:54 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-11-05 12:14 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