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

This commit is contained in:
Kenta420 2024-05-17 11:30:56 +07:00
commit 3eb39e1363
29 changed files with 2765 additions and 478 deletions

View file

@ -13052,6 +13052,92 @@ LIMENADE SODA" </Value>
<Button>
<X> 42 </X>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
</EventOnClick>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<Loop> "true" </Loop>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_th.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>
Var BigButtonEnable = "Enable"
Refresh
</EventUnitTest1>
<EventUnitTest2>
Var BigButtonEnable = "Invisible"
Refresh
</EventUnitTest2>
<Button>
<X> 780 </X>

View file

@ -318,7 +318,6 @@ If BoxID = 173149 Then
Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1
;Var EnableFreeEnergyDrink = "true"
Var WednesdayMelonPro = 1
EndIf
@ -349,17 +348,6 @@ EndIf
Var XMLLiveInfoEnable = 1
If BoxID = 172053 Then
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var NewFlowPaymentCode = 0
Var MondayBananaPro = 0
Var LipitPro = 0
Var FreeFirePro = 0
Var FreeEnergyDrink = 0
EndIf
; Exclusive Box

View file

@ -21,11 +21,7 @@
If InternationalEnable = 1 Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
Else
If TeaTimePro = 1 Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/top_spender.xml"
Else
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
EndIf
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
EndIf
</EventOpen>

View file

@ -610,14 +610,11 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
EndIf
;inter-xml-open
If CountryName = "UnitedArabEmirates Dubai" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
EndIf
DEBUGVAR CountDownShowButton
DEBUGVAR EventTurnOn
DEBUGVAR CountDownShowButton
DEBUGVAR EventTurnOn
;inter-page-board
If CountryName = "Malaysia" Then
@ -718,7 +715,7 @@
Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
Var CountryShortName = "aus"
ar TextPriceMenuSize = 12
Var TextPriceMenuSize = 12
Var TextPriceMenuY = 264
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
@ -845,9 +842,14 @@
;inter-page-board
; wait
If CountryName = "UnitedArabEmirates Dubai" Then
SAVELOG "UnitedArabEmirates Dubai UnitedArabEmirates Dubai UnitedArabEmirates Dubai"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
Var WebAppShow = "Invisible"
EnableLanguage "ENG"
EnableLanguage "UAE_DUBAI"
@ -864,7 +866,7 @@
Var CountryShortName = "uae_dubai"
Var TextPriceMenuSize = 12
Var TextPriceMenuY = 264
Var TextPriceMenuY = 266
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
Var ShowButtonClick2 = "Enable"
@ -885,6 +887,12 @@
EndIf
Var SettingDisableTaobinCredit = "true"
Var SettingDisableTaobinCode = "false"
; Dubai disable point
Var SettingIgnoreCollectPoint = 1
Var SettingVideoBrewingUseCommon = 1
EndIf
@ -1240,11 +1248,19 @@
; ignore
Var CountDownPauseVideo = CountDownPauseVideo - 1
If CountDownPauseVideo = 1 Then
If CountDownPauseVideo = 2 Then
TapScreen 30 638
TapScreen 30 638
EndIf
If CountDownPauseVideo = 1 Then
TapScreen 860 1004
EndIf
If CountDownPauseVideo = 0 Then
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -1254,6 +1270,8 @@
Var OpenFromPageBoard = 1
If InternationalEnable = 1 Then
; show language icon

View file

@ -472,22 +472,14 @@
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
EndIf
If CountryName = "Singapore" Then
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
EndIf
Play PlaySoundStraw
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf

View file

@ -647,13 +647,6 @@
<Value> showdesc </Value>
</Text>
<Image>
<State> StageShowAlias</State>
<X> 144 </X>
<Y> 413 </Y>
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
</Image>
<GIF>
<X> 493 </X>
<Y> 968 </Y>

View file

@ -156,7 +156,7 @@
Var strTouchScreen = " Reset Touch : disable."
Var MainMenuBlockCount = 2
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -311,7 +311,12 @@
<Y> info_5Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
MainMenu
Var MainMenuBlockCount = MainMenuBlockCount - 1
DEBUGVAR MainMenuBlockCount
If MainMenuBlockCount = 1 Then
MainMenu
EndIf
</EventClick>
</Image>