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

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