Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-03-21 17:56:41 +07:00
commit 22462f63b9
10 changed files with 162 additions and 102 deletions

View file

@ -1,17 +1,20 @@
SAVELOG "For change size this file."
GetFileSizeK "taobin_project/inter/aus/video/frying_turtle_save_world.mp4" ThankyouFileSize
DEBUGVAR ThankyouFileSize
If ThankyouFileSize = 6285202 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
If SaveTheWorldCount = 2 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventNewYear = 1 Then
GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf
If EventNewYear = 1 Then
GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
EndIf
EndIf

View file

@ -1,13 +1,24 @@
SAVELOG "For change size this file. New video"
If EventTurnOn = 1 Then
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
GetFileSizeK "taobin_project/inter/hkg/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/hkg/video/taobin_thank1_event.mp4"
EndIf
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/inter/hkg/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/hkg/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf

View file

@ -1,13 +1,23 @@
SAVELOG "For change size this file. New video"
If EventTurnOn = 1 Then
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
GetFileSizeK "taobin_project/inter/mys/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/mys/video/taobin_thank1_event.mp4"
EndIf
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/inter/mys/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/mys/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf

View file

@ -1,13 +1,25 @@
SAVELOG "For change size this file. New video"
If EventTurnOn = 1 Then
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4"
EndIf
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf

View file

@ -1,11 +1,23 @@
SAVELOG "For change size this file."
If EventTurnOn = 1 Then
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
EndIf
Var video_file_name = "ROOT/taobin_project/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
EndIf
Var video_file_name = "ROOT/taobin_project/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 6749397 Then
Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf

View file

@ -1,5 +1,18 @@
SAVELOG "For change size this file. New video"
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
EndIf
If UsePepsiTheme = 1 Then

View file

@ -1,15 +1,29 @@
SAVELOG "None."
If SaveTheWorldCount = 2 Then
Var video_id_to_ran = 3
Random2 1 3 video_id_to_ran
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
Var video_file_name = "ROOT/taobin_project/video/taobin_save_world" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
Else
Var video_id_to_ran = 2
Random2 1 2 video_id_to_ran
If MainfileSize = 22 Then
Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
Var video_file_name = "ROOT/taobin_project/video/taobin_thank" + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If EventTurnOn = 1 Then
GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize
DEBUGVAR MainfileSize
If MainfileSize = 22 Then
Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
EndIf
EndIf
EndIf
DEBUGVAR video_file_name

View file

@ -205,8 +205,8 @@
EndIf
If CountryName = "HongKong" Then
Var PlaySongLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
End
Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
EndIf
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"

View file

@ -134,26 +134,9 @@
DEBUGVAR SaveTheWorldCount
If SaveTheWorldCount = 2 Then
If LedLidBlink = "no" Then
Var SaveTheWorldST = "Enable"
EndIf
Var video_id_to_ran = 3
Var video_name_to_play = "taobin_save_world"
Random2 1 3 video_id_to_ran
Var ThankyouST = "Invisible"
Else
Var video_id_to_ran = 2
Var video_name_to_play = "taobin_thank"
Random2 1 2 video_id_to_ran
Var ThankyouST = "Enable"
EndIf
@ -162,40 +145,16 @@
Var show_video = 1
Var SaveTheWorldST = "Invisible"
If CountryName = "Thailand" Then
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
; ================= Video thankyou =============================
If InternationalEnable = 1 Then
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
Else
If InternationalEnable = 1 Then
Var video_file_name = "ROOT/taobin_project/inter/common/video/" + video_name_to_play
Else
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
EndIf
Var video_file_name = video_file_name + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If SaveTheWorldCount < 2 Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
Else
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
EndIf
Else
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
EndIf
Else
If InternationalEnable = 1 Then
If UsePepsiTheme = 1 Then
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
EndIf
EndIf
EndIf
; ================== End video thankyou =========================

View file

@ -10732,8 +10732,18 @@
<Style> "shake-text" </Style>
<OnEvent> "OnValueChange" </OnEvent>
</Animation>
</Button>
<Text>
<X> 750 </X>
<Y> 1083 </Y>
<Font> KanitRegularTTF </Font>
<State> CustomOreoState </State>
<Size> 16 </Size>
<Color> 0x84776F </Color>
<Value> OreoPriceText </Value>
</Text>
<Image>
@ -10829,7 +10839,15 @@
</Animation>
</Button>
<Text>
<X> 750 </X>
<Y> 1155 </Y>
<Font> KanitRegularTTF </Font>
<State> CustomOvaltineState </State>
<Size> 16 </Size>
<Color> 0x84776F </Color>
<Value> OvaltinePriceText </Value>
</Text>
@ -10926,7 +10944,15 @@
</Animation>
</Button>
<Text>
<X> 750 </X>
<Y> 1226 </Y>
<Font> KanitRegularTTF </Font>
<State> CustomCocoaState </State>
<Size> 16 </Size>
<Color> 0x84776F </Color>
<Value> CocoaPriceText </Value>
</Text>
<Image>