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
inter/aus/xml/event/tricker.ev
View file

@ -13,7 +13,7 @@ Var NewCollectPointFlag = 0
Var WinterWarmersCatalogFlag = 1
Var XMLLiveInfoEnable = 0
Var XMLLiveInfoEnable = 1
DEBUGVAR Propepsi99Enable

BIN
inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 226 KiB

56
inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml
View file

@ -163,6 +163,14 @@
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
</EventOpen>
@ -182,13 +190,13 @@
Var block_index_move = 0
</Script>
;dummy_layout.inc
;block1
<Block>
<State> PromotionState1 </State>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 484 </Width>
<Height> 602 </Height>
;block1
<Block>
<State> PromotionState1 </State>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 484 </Width>
<Height> 602 </Height>
<Button>
@ -226,16 +234,16 @@
</EventOnClick>
</Button>
</Block>
</Button>
</Block>
;endblock1
;block2
<Block>
<State> PromotionState2 </State>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 484 </Width>
<Height> 602 </Height>
;block2
<Block>
<State> PromotionState2 </State>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 484 </Width>
<Height> 602 </Height>
<Button>
@ -243,27 +251,27 @@
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
Else
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
Else
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
Else
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png"
Var return = "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png"
EndIf
)
</FilenameDisable>
@ -273,8 +281,8 @@
</EventOnClick>
</Button>
</Block>
</Button>
</Block>
;endblock2
;block3
<Block>

12
inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json
View file

@ -16,12 +16,12 @@
"name": "yuzu",
"template": "/event/promotion_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png",
"event_on_click": "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu.lxml"
}
}

9
inter/mys/xml/event/promotion_thai_tea.lxml
View file

@ -163,6 +163,15 @@
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
</EventOpen>

4
inter/mys/xml/event/tricker.ev
View file

@ -16,6 +16,10 @@ Var FromFruityRaya = 0
Var ProThaiTeaEnable = 0
Var FromProThaiTea = 0
; Yuzu Promo
Var ProYuzuEnable = 0
Var FromProYuzu = 0
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 15 Then
Var ProThaiTeaEnable = 1

10
inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml
View file

@ -25,22 +25,24 @@
Else
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR TelephoneNumber
Var Seeker.TNumberTaobinMember = TelephoneNumber
DEBUGVAR Seeker.TNumberTaobinMember
; Telephone must not empty
If Seeker.CodeChannel = 1 Then
DEBUGVAR Seeker.CodeChannel
Var Seeker.UseProYuzuCode = 1
Var Seeker.ProYuzu = 1
Else
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR TelephoneNumber
Var Seeker.TNumberTaobinMember = TelephoneNumber
DEBUGVAR Seeker.TNumberTaobinMember
Var Seeker.ProYuzu = 1
Var Seeker.UseProYuzuCode = 0
DEBUGVAR Seeker.ProYuzu
DEBUGVAR Seeker.UseProYuzuCode
; support-for-multi-pro-with-same-cid
Var param1 = "701"
Var param1 = "703"
AddData Cid TelephoneNumber param1 param2 param3
EndIf

2
inter/mys/xml/page_brewing3.lxml
View file

@ -474,7 +474,7 @@
; reset
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"
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://10.0.16.231:30460&#34\r\n"
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: &#34http://game.my.taobin.local:26969&#34\r\n"
If TelephoneNumber = "0899999999" Then
; Coupon or customer not input phone number.

1911
inter/mys/xml/page_catalog_group_pro_yuzu.lxml
View file

File diff suppressed because it is too large Load diff

16
inter/mys/xml/page_topping_select6.lxml
View file

@ -526,8 +526,15 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR "back"
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
@ -3394,6 +3401,15 @@
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR "back.cancel"
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
If Seeker = "next" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"

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