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

7.04

Browse source
This commit is contained in:
kong 2023-03-14 22:07:46 +07:00
parent cf77e2d43e
commit ae750d2085
18 changed files with 125 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/menu_catalog_new.xml
View file

@ -179,7 +179,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

45
xml/page_board.xml
View file

@ -158,6 +158,7 @@
STRCONTAIN "1046" MaterialAvailable WheyEnable
STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable
STRCONTAIN "1058" MaterialAvailable OreoEnable
DEBUGVAR PromoteYuzuEnable
@ -665,7 +666,7 @@
EndIf
EndIf
Var ShowPromoitonOreo = 1
Var PromotionOreoVolcanoEnable = 0
@ -726,15 +727,34 @@
EndIf
EndIf
Var ShowPromoitonOreo = 1
If SystemDateMonthInt = 3 Then
If SystemDateDayInt = 30 Then
Var ShowPromoitonOreo = 0
EndIf
If SystemDateDayInt = 31 Then
Var ShowPromoitonOreo = 0
EndIf
EndIf
If SystemDateMonthInt = 4 Then
Var ShowPromoitonOreo = 0
EndIf
If SystemDateMonthInt = 5 Then
Var ShowPromoitonOreo = 0
EndIf
;Var ShowPromoitonOreo = 0
If ShowPromoitonOreo = 0 Then
Var PromotionOreoVolcanoEnable = 0
Var PromotionOreoToppingFreeEnable = 0
EndIf
DEBUGVAR $12-03-03-0009.Button
If PromotionOreoVolcanoEnable = 1 Then
@ -753,10 +773,21 @@
Var PromotionIDCurrentOrder = 0
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR PromotionOreoVolcanoEnable
If OreoEnable = "true" Then
Else
Var PromotionOreoVolcanoEnable = 0
Var PromotionOreoToppingFreeEnable = 0
Var ShowPromoitonOreo = 0
EndIf
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR PromotionOreoVolcanoEnable
DEBUGVAR OreoEnable
DEBUGVAR $12-03-03-0026.Button
RootLayoutVisible 3 "hide"
</EventOpen>
@ -882,9 +913,9 @@
If ShowPromoitonOreo = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
Machine DoorClose

8
xml/page_brewing3.xml
View file

@ -1096,6 +1096,7 @@
EndIf
If adver_brewing_count_down = 0 Then
GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size
DEBUGVAR brewing_adv_size
If brewing_adv_size = 8321419 Then
@ -1105,6 +1106,13 @@
Var adver_brewing_play_index = 1
Var adver_brewing_count_down = 0
EndIf
If ShowPromoitonOreo = 1 Then
Else
Var adver_brewing_play_index = 1
Var adver_brewing_count_down = 0
EndIf
EndIf
EndIf

17
xml/page_catalog.xml
View file

@ -89,6 +89,23 @@
DEBUGVAR PromotionOreoVolcanoEnable
If SystemDateMonthInt = 3 Then
If SystemDateDayInt = 30 Then
Var ShowPromoitonOreo = 0
EndIf
If SystemDateDayInt = 31 Then
Var ShowPromoitonOreo = 0
EndIf
EndIf
If SystemDateMonthInt = 4 Then
Var ShowPromoitonOreo = 0
EndIf
If SystemDateMonthInt = 5 Then
Var ShowPromoitonOreo = 0
EndIf
If SpiralOnline = "true" Then
If Seeker = "next" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"

8
xml/page_catalog2.xml
View file

@ -336,9 +336,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_appfast.xml
View file

@ -326,7 +326,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_cocktail.xml
View file

@ -318,7 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_coffee.xml
View file

@ -318,7 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_forkid.xml
View file

@ -327,7 +327,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_health.xml
View file

@ -318,7 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_milk.xml
View file

@ -316,7 +316,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_oreo.xml
View file

@ -314,7 +314,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_other.xml
View file

@ -317,7 +317,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_recommend.xml
View file

@ -324,7 +324,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_tea.xml
View file

@ -318,7 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

4
xml/page_catalog_group_whey.xml
View file

@ -323,7 +323,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_topping_select6.xml
View file

@ -321,6 +321,13 @@
EndIf
If ShowPromoitonOreo = 1 Then
Else
Var oreo_topping_wed_free = "Invisible"
Var oreo_topping_wed_topping = "Invisible"
EndIf
DEBUGVAR PromotionIDCurrentOrder
</EventOpen>

4
xml_main/startup.xml
View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "7.03"
Var XMLPageVersionInt = 703
Var XMLPageVersion = "7.04"
Var XMLPageVersionInt = 704
</EventOpen>
<Text>