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

merge

Browse source
This commit is contained in:
wanlop run 2024-08-16 14:01:34 +07:00
commit 748a5179bf
140 changed files with 15227 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xml/event/promotion_mom_cocoa_ignore.xml
View file

@ -12834,13 +12834,13 @@ LIMENADE SODA" </Value>
eval(
If show_eng = "true" Then
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf
Else
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf
@ -12851,13 +12851,13 @@ LIMENADE SODA" </Value>
eval(
If show_eng = "true" Then
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf
Else
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf
@ -12868,13 +12868,13 @@ LIMENADE SODA" </Value>
eval(
If show_eng = "true" Then
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf
Else
If SystemDateDayInt >= 13 Then
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-16.png"
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "13-31.png"
Else
Var return = "ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_" + "10-12.png"
EndIf

10
xml/event/tricker.ev
View file

@ -239,14 +239,10 @@ If SystemDateMonthInt = 8 Then
EndIf
If SystemDateDayInt >= 10 Then
If SystemDateDayInt <= 16 Then
Var MomCocoaPro = 1
If SystemDateDayInt >= 12 Then
Var MomCocoaProDiscountEnable = 1
EndIf
Var MomCocoaPro = 1
If SystemDateDayInt >= 12 Then
Var MomCocoaProDiscountEnable = 1
EndIf
EndIf
EndIf

6377
xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
View file

File diff suppressed because it is too large Load diff

5786
xml/page_catalog_group_pro_mom_cocoa.xml
View file

File diff suppressed because it is too large Load diff

7
xml/page_check_member2.xml
View file

@ -967,7 +967,12 @@
;inter-image
If CountryName = "Singapore" Then
Var text5Img = "/text5-SGD.png"
EndIf
EndIf
;inter-image
If CountryName = "HongKong" Then
Var text5Img = "/text5-HKG.png"
EndIf
INT TaobinCredit

4
xml/page_drinkfail2.xml
View file

@ -22,6 +22,10 @@
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_aus.lxml"
EndIf
If CountryName = "HongKong" Then
Open "ROOT/taobin_project/inter/hkg/xml/page_drinkfail_hkg.lxml"
EndIf

4
xml/page_drinkok.xml
View file

@ -497,6 +497,10 @@
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
EndIf
If CountryName = "HongKong" 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"

7
xml/page_get_yourchange.xml
View file

@ -13,7 +13,10 @@
If CountryName = "Singapore" Then
Var LangButtonEnable = "Invisible"
EndIf
If CountryName = "HongKong" Then
Var LangButtonEnable = "Invisible"
EndIf
DEBUGVAR LangButtonEnable
@ -70,6 +73,10 @@
Var imgGetChange = "/imgGetChange-SGP.png"
EndIf
;inter-image
If CountryName = "HongKong" Then
Var imgGetChange = "/imgGetChange-HKG.png"
EndIf
;INT StoreCreditAmount
Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )

2497
xml/page_payment_cash-HKG.xml Normal file
View file

File diff suppressed because it is too large Load diff

5
xml/page_payment_cash.xml
View file

@ -43,6 +43,11 @@
Open "ROOT/taobin_project/xml/page_payment_cash-UAE.xml"
EndIf
;inter-xml-open
If CountryName = "HongKong" Then
Open "ROOT/taobin_project/xml/page_payment_cash-HKG.xml"
EndIf
Var PreScaleCanculate = 1

6
xml/page_payment_credit3-TopupCash.xml
View file

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

5
xml/page_payment_credit3.xml
View file

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

5
xml/page_payment_storeCredit3.xml
View file

@ -48,6 +48,11 @@
Var img_popup15 = "/img_popup15-SGP.png"
EndIf
;inter-image
If CountryName = "HongKong" Then
Var img_popup15 = "/img_popup15-HKG.png"
EndIf
DEBUGVAR Seeker.TNumberTaobinCredit
</EventOpen>

5
xml/page_thankyou.xml
View file

@ -188,6 +188,11 @@
Var remainCredit = "/remainCredit-SGP.png"
EndIf
;inter-image
If CountryName = "HongKong" Then
Var remainCredit = "/remainCredit-HKG.png"
EndIf
DEBUGVAR Seeker.CreditCard
DEBUGVAR Seeker.CreditCardRef

6
xml/page_topup_credit3-TopupCash.xml
View file

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

8
xml/sometime/script_open_page_show_error.ev
View file

@ -6,7 +6,13 @@ If InternationalEnable = 1 Then
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.lxml"
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.lxml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"

2
xml/vending_info.xml
View file

@ -3,7 +3,7 @@
<Width> 1080 </Width>
<Height> 1312 </Height>
<Volume> SoundVolume </Volume>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<EventOpen>
; On open
Machine AndroidTemperatureUpdateNow