Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Kenta420 2024-08-07 18:28:03 +07:00
commit ef2de0b8b7
33 changed files with 3504 additions and 2666 deletions

View file

@ -624,6 +624,8 @@
DEBUGVAR CountDownShowButton
DEBUGVAR EventTurnOn
Var UsePepsiTheme = 0
;inter-page-board
If CountryName = "Malaysia" Then
@ -826,6 +828,8 @@
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/sgp/"
@ -881,6 +885,8 @@
DEBUGVAR ShowButtonClick2
Var UsePepsiTheme = 1
EndIf
@ -941,6 +947,8 @@
Var MinPhoneNumber = 9
Var MaxPhoneNumber = 9
Var UsePepsiTheme = 1
EndIf
@ -1123,6 +1131,19 @@
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
If UsePepsiTheme = 1 Then
If InternationalEnable = 1 Then
; enable-color
TRY "ROOT/taobin_project/inter/whatthecup/color_settings.ev"
Var MainStartPepsiThemeDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
EndIf
EndIf
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
@ -1325,7 +1346,7 @@
</EventUnitTest7>
<EventUnitTest8>
Var XMLProfile = "$Discount90Per"
Var XMLProfile = "Discount90Per"
CacheVarStr "put" XMLProfile
PRICE "Reset" "-"
PRICE "Load" "-"

View file

@ -20,6 +20,13 @@
Var FromProYuzu = 0
EndIf
If UsePepsiTheme = 1 Then
Var WTCCatalogDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var WTCCatalogDir = WTCCatalogDir + "/xml/page_catalog.lxml"
Open WTCCatalogDir
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"