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

DO singapore

Browse source
This commit is contained in:
wanlop run 2024-04-30 22:45:15 +07:00
parent ad0a5092d9
commit 02576c213c
8 changed files with 777 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

7
inter/sgp/animation01/play_list.tsv
View file

@ -875,3 +875,10 @@ Coconut Jasmine tea 52-02-02-0065 1 10 62 23 24 120 7:00 23
Coconut Jasmine tea 52-02-03-0065 1 10 62 23 41 24 120 8:00 23 Coconut Jasmine tea 52-02-03-0065 1 10 62 23 41 24 120 8:00 23
GINGER MILK TEA\nOREO SMOOTHIE 12-02-03-0056 GINGER MILK TEA\nOREO SMOOTHIE 12-02-03-0056
ESPRESSO SHAKE 52-04-02-0021 1 25 26 2 3 4 5 17 23 24 230 3:50 28 ESPRESSO SHAKE 52-04-02-0021 1 25 26 2 3 4 5 17 23 24 230 3:50 28
PEPSI Max PLUM 52-05-02-0074
PEPSI Max PLUM 52-05-03-0074
PEPSI Max MELON 52-05-02-0075
PEPSI Max MELON 52-05-03-0075
PEPSI Max BANANA 52-05-02-0077
PEPSI Max YUZU 52-05-02-0076
PEPSI MINT 52-05-02-0068

Can't render this file because it has a wrong number of fields in line 40.

1136
inter/sgp/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

20
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

@ -11708,6 +11708,7 @@
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_MAX.png" </Filename> <Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_MAX.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_MAX.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_MAX.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_MAX.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_MAX.png" </FilenameDisable>
<OverlayImage> xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -11804,7 +11805,16 @@
Var OverlayMenuFilter1 = "" Var OverlayMenuFilter1 = ""
Var OverlayMenuFilter2 = "" Var OverlayMenuFilter2 = ""
Var OverlayMenuFilter3 = "" Var OverlayMenuFilter3 = ""
If PD_STAGE_2 = "Enable" Then
Var OverlayMenuFilter2 = "52-05-02-0062"
Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")
DEBUGVAR OverlayMenuFilter2
DEBUGVAR OverlayMenuFilter2_Value
Else
Var OverlayMenuFilter = "" Var OverlayMenuFilter = ""
EndIf
Var OverlayMenuFilter = "xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")"
Open "ROOT/taobin_project/xml/page_topping_select6.lxml" Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@ -11983,6 +11993,7 @@
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename> <Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
<OverlayImage> xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_4_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -12079,7 +12090,16 @@
Var OverlayMenuFilter1 = "" Var OverlayMenuFilter1 = ""
Var OverlayMenuFilter2 = "" Var OverlayMenuFilter2 = ""
Var OverlayMenuFilter3 = "" Var OverlayMenuFilter3 = ""
If PD_STAGE_2 = "Enable" Then
Var OverlayMenuFilter2 = "52-05-02-0076"
Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")
DEBUGVAR OverlayMenuFilter2
DEBUGVAR OverlayMenuFilter2_Value
Else
Var OverlayMenuFilter = "" Var OverlayMenuFilter = ""
EndIf
Var OverlayMenuFilter = "xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")"
Open "ROOT/taobin_project/xml/page_topping_select6.lxml" Open "ROOT/taobin_project/xml/page_topping_select6.lxml"

2
inter/sgp/xml/page_catalog_group_tea.lxml
View file

@ -6811,7 +6811,7 @@
If PD_STAGE_3 = "Enable" Then If PD_STAGE_3 = "Enable" Then
Var OverlayMenuFilter3 = "52-02-03-0065" Var OverlayMenuFilter3 = "52-02-03-0065"
Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3
DEBUGVAR OverlayMenuFilter3_Value DEBUGVAR OverlayMenuFilter3_Value
Else Else

12
inter/sgp/xml/page_topping_select6.lxml
View file

@ -1112,6 +1112,18 @@
EndIf EndIf
EndIf EndIf
If BGSugarNew = "Enable" Then
If SelectDrinkType = 1 Then
If show_eng = "true" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
EndIf
EndIf
EndIf
DEBUGVAR SelectDrinkType DEBUGVAR SelectDrinkType
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then

2
xml/page_board.xml
View file

@ -821,7 +821,7 @@
STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
Var SettingDisableTaobinCredit = "true" Var SettingDisableTaobinCredit = "true"
Var SettingDisableTaobinCode = "true" Var SettingDisableTaobinCode = "false"
; Singapore disable point ; Singapore disable point
Var SettingIgnoreCollectPoint = 1 Var SettingIgnoreCollectPoint = 1

3
xml/page_payment_cash-SGP.xml
View file

@ -465,9 +465,6 @@
EndIf EndIf
Var PayState5 = "Invisible"
DEBUGVAR SettingDisableTaobinCredit DEBUGVAR SettingDisableTaobinCredit

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "8.42" Var XMLPageVersion = "8.43"
Var XMLPageVersionInt = 842 Var XMLPageVersionInt = 843
;Oreo ;Oreo
Var OreoGuarantee = 0 Var OreoGuarantee = 0