pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' into sgp_blue

Browse source
This commit is contained in:
Pakin 2024-09-17 15:06:32 +07:00
commit dcf94d4fc3
12 changed files with 73 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collectiing_en/img_popup11-AUS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/collectiing_en/img_popup15-AUS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/page_payment_cash_extend_en/img_popup12_uae.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

18
inter/aus/xml/page_brewing3.lxml
View file

@ -449,6 +449,7 @@
DEBUGVAR Seeker
If game_mode_enable = "true" Then
CheckApp "com.NDF.taobin" GameInstalled
DEBUGVAR GameInstalled
@ -721,14 +722,15 @@
Var Timeout = Timeout + 1
If Timeout < 2 Then
If Game01Enable = 0 Then
If game_mode_enable = "true" Then
If BREW_CNT > 75 Then
SAVELOG "Button game enable from EventTimeout"
Var Game01Enable = 1
Var ButtonGameCountDownState = "Invisible"
Var ButtonGamePressToPlayState = "Enable"
If GameInstalled = "true" Then
If Game01Enable = 0 Then
If game_mode_enable = "true" Then
If BREW_CNT > 75 Then
SAVELOG "Button game enable from EventTimeout"
Var Game01Enable = 1
Var ButtonGameCountDownState = "Invisible"
Var ButtonGamePressToPlayState = "Enable"
EndIf
EndIf
EndIf
EndIf

29
inter/uae_dubai/xml/page_topping_select6.lxml
View file

@ -113,22 +113,14 @@
Var text_x_add_oreo_price = 510
Var text_show_normal_x = 408
Var SugarZeroCalPrice_X = 540
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var showname = NameDrinkTH
Var showdesc = DrinkDescriptionTH
Var text_show_thai = "Enable"
Var text_show_eng = "Invisible"
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_show_normal_x = 386
Var SugarZeroCalPrice_X = 482
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 620
Var text_show_normal_x = 535
Var text_milk_choice_price_x = 325
Var SugarZeroCalPrice_X = 540
EndIf
Var bg_strawlid = DirImage + "/bg_strawlid.png"
@ -491,13 +483,14 @@
If SugarSoundFlag = 1 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 600
Var text_show_normal_x = 528
Var text_milk_choice_price_x = 295
Var text_x_add_oreo_price = 620
Var text_show_normal_x = 535
Var text_milk_choice_price_x = 325
Var SugarZeroCalPrice_X = 540
EndIf

21
xml/page_board.xml
View file

@ -924,7 +924,7 @@
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
@ -1343,7 +1343,7 @@
<EventUnitTest2>
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFromPageBoard = 1
@ -1609,7 +1609,8 @@
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFromPageBoard = 1
@ -1807,10 +1808,10 @@
; Handle penetrator
If Only18 = "true" Then
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml"
Else
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
@ -1846,7 +1847,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 VideoAdvert
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If CocktailShow = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
Else
@ -1884,7 +1885,7 @@
Var NextPage = "-"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If InternationalEnable = 1 Then
;inter-xml-open
@ -1938,7 +1939,7 @@
SAVELOG "click ShowButtonClickFull"
Var NextPage = "-"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If SpiralOnline = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
@ -2009,7 +2010,7 @@
If IgnoreNetCore = "true" Then
Var NextPage = "-"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
@ -2032,7 +2033,7 @@
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 VideoAdvert
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFromPageBoard = 1

4
xml/page_get_yourchange.xml
View file

@ -19,6 +19,10 @@
Var LangButtonEnable = "Invisible"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Var LangButtonEnable = "Invisible"
EndIf
DEBUGVAR LangButtonEnable
If show_eng = "true" Then

2
xml/page_payment_cash-AUS.xml
View file

@ -1646,7 +1646,7 @@ EndIf
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
</Image>

38
xml/page_payment_cash-UAE.xml
View file

@ -1266,11 +1266,11 @@
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
EndIf
;If show_eng = "true" Then
; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
;Else
; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
;EndIf
EndIf
@ -1949,22 +1949,22 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage + "/img_popup12.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup12_uae.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1208 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
</EventClick>
</Button>
;<Button>
;<X> 327 </X>
;<Y> 1208 </Y>
;<State> alphaState3 </State>
;<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
;<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
; Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
;</EventClick>
;</Button>
<Button>
<X> 327 </X>

6
xml/page_payment_credit3-TopupCash.xml
View file

@ -67,6 +67,12 @@
Var img_popup15 = "/img_popup15-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
Var img_popup15 = "/img_popup15-AUS.png"
EndIf
Var CreditAmount = SumCreditAmount

5
xml/page_payment_credit3.xml
View file

@ -105,6 +105,11 @@
Var img_popup11 = "/img_popup11-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>

6
xml/page_topup_credit3-TopupCash.xml
View file

@ -69,6 +69,12 @@
Var img_popup15 = "/img_popup15-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
Var img_popup15 = "/img_popup15-AUS.png"
EndIf
Var CreditAmount = 0