Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
88f2a6d3b3
13 changed files with 137 additions and 99 deletions
|
|
@ -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
|
||||
If SaveTheWorldCount = 2 Then
|
||||
Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If EventNewYear = 1 Then
|
||||
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
|
||||
BIN
inter/hkg/image/page_drink_disable_n2/bn_ginger_cafe_latte.png
Normal file
BIN
inter/hkg/image/page_drink_disable_n2/bn_ginger_cafe_latte.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
BIN
inter/hkg/image/page_drink_n/bn_ginger_cafe_latte.png
Normal file
BIN
inter/hkg/image/page_drink_n/bn_ginger_cafe_latte.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8 KiB |
BIN
inter/hkg/image/page_drink_picture2_n/bn_ginger_cafe_latte.png
Normal file
BIN
inter/hkg/image/page_drink_picture2_n/bn_ginger_cafe_latte.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
inter/hkg/image/page_drink_press_n/bn_ginger_cafe_latte.png
Normal file
BIN
inter/hkg/image/page_drink_press_n/bn_ginger_cafe_latte.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8 KiB |
|
|
@ -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
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,20 @@
|
|||
|
||||
SAVELOG "None."
|
||||
|
||||
If SaveTheWorldCount = 2 Then
|
||||
Var video_id_to_ran = 3
|
||||
Random2 1 3 video_id_to_ran
|
||||
|
||||
If EventTurnOn = 1 Then
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -11,5 +23,7 @@ If EventTurnOn = 1 Then
|
|||
Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR video_file_name
|
||||
|
|
|
|||
|
|
@ -204,6 +204,10 @@
|
|||
Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav"
|
||||
EndIf
|
||||
|
||||
If CountryName = "HongKong" Then
|
||||
Var PlaySongLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
|
||||
End
|
||||
|
||||
|
||||
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -127,26 +127,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
|
||||
|
||||
|
||||
|
|
@ -155,40 +138,16 @@
|
|||
Var show_video = 1
|
||||
Var SaveTheWorldST = "Invisible"
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
|
||||
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
|
||||
EndIf
|
||||
|
||||
Var video_file_name = video_file_name + video_id_to_ran
|
||||
Var video_file_name = video_file_name + ".mp4"
|
||||
|
||||
If SaveTheWorldCount < 2 Then
|
||||
; ================= Video thankyou =============================
|
||||
|
||||
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 =========================
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue