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

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

Browse source
This commit is contained in:
wanlop run 2024-07-02 11:08:53 +07:00
commit 320e7ea8f3
16 changed files with 2052 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_brewing3.xml
View file

@ -467,7 +467,7 @@
If bg_lidProblem_ST = "Enable" Then
Var EnableTopupCreditBetweenBrew = "Invisible"
Var EnableGetMore
End
EndIf
If bg_strawProblem_ST = "Enable" Then
Var EnableGetMoreStrawFileName = "Invisible"

10
xml/page_catalog.lxml
View file

@ -10,6 +10,16 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
EndIf
If CountryName = "Malaysia" Then
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"

37
xml/page_collect_point_1.xml
View file

@ -135,6 +135,7 @@
DEBUGVAR FromFruityRaya
DEBUGVAR ProThaiTeaEnable
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
If Seeker.TNumberTaobinCredit = "" Then
@ -202,6 +203,14 @@
EndIf
EndIf
DEBUGVAR ProYuzuEnable
DEBUGVAR FromProYuzu
If ProYuzuEnable = 1 Then
If FromProYuzu = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
EndIf
EndIf
If PepweenEnable = 1 Then
If PepweenCollectPoint = 0 Then
GETACCEXT TelephoneNumber 31
@ -317,6 +326,14 @@
Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
EndIf
EndIf
DEBUGVAR ProYuzuEnable
DEBUGVAR FromProYuzu
If ProYuzuEnable = 1 Then
If FromProYuzu = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
EndIf
EndIf
If ProBadValentineEnable = 1 Then
If FromBadValentinePro = 1 Then
@ -845,6 +862,14 @@
EndIf
EndIf
DEBUGVAR ProYuzuEnable
DEBUGVAR FromProYuzu
If ProYuzuEnable = 1 Then
If FromProYuzu = 1 Then
Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
EndIf
EndIf
If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then
GETACCEXT TelephoneNumber 32
@ -952,7 +977,11 @@
If FromProThaiTea = 1 Then
Var return = "Invisible"
Else
Var return = "Enable"
If FromProYuzu = 1 Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
EndIf
) </State>
<Filename> Var( DirImage + "/text_2.png") </Filename>
@ -965,7 +994,11 @@
If FromProThaiTea = 1 Then
Var return = "Enable"
Else
Var return = "Invisible"
If FromProYuzu = 1 Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
EndIf
) </State>
<Filename> Var( DirImage + "/edit.png") </Filename>

6
xml/page_payment.xml
View file

@ -447,6 +447,12 @@
Var Seeker.FreeVendingCampaign = 0
EndIf
; mys pro yuzu
If FromProYuzu = 1 Then
Var Seeker.VendingCode = "YZ1F1"
Var Seeker.FreeVendingCampaign = 0
EndIf
; Oreo free
If PromotionIDOreoBuyTwoSaveMore = 1 Then
Var PromotionIDOreoBuyTwoSaveMore = 0

4
xml/page_payment_cash-MYR.xml
View file

@ -509,6 +509,10 @@
Var X_PS6 = 652
EndIf
DEBUGVAR VendingCashless
Var VendingCashless = "-"
DEBUGVAR VendingCashless
</EventOpen>
<EventActionOk>

14
xml/vending_info.xml
View file

@ -725,14 +725,22 @@
Var TelephoneNumber = "0859586589"
WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" ""
;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://10.0.16.233:30487/taobingame&#34\r\n"
If CountryName = "Australia" Then
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://game.au.taobin.local:26969&#34\r\n"
If InternationalEnable = 1 Then
If CountryName = "Australia" Then
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://game.au.taobin.local:26969&#34\r\n"
EndIf
If CountryName = "Malaysia" Then
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://game.my.taobin.local:26969&#34\r\n"
EndIf
Else
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://10.0.16.231:30460&#34\r\n"
EndIf
Var ACCString !assigned SprintFmt("ACC: &#34%s&#34\r\n", TelephoneNumber)
DEBUGVAR ACCString