diff --git a/inter/mys/xml/event/promotion_2.xml b/inter/mys/xml/event/promotion_2.xml
index 1d853494..e78b6e99 100644
--- a/inter/mys/xml/event/promotion_2.xml
+++ b/inter/mys/xml/event/promotion_2.xml
@@ -11470,16 +11470,16 @@
Var PD_CODE2 = "12-05-02-0062"
Var PD_CODE3 = "##-##-##-####"
; begin lang
- Var aliasName[0] = "PEPSI"
- Var aliasDesc[0] = "Pepsi, Ice"
+ Var aliasName[0] = "PEPSI Black"
+ Var aliasDesc[0] = "Pepsi Black, Ice"
Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
- Var aliasName[4] = "PEPSI"
- Var aliasDesc[4] = "Pepsi, Ais"
+ Var aliasName[4] = "PEPSI Black"
+ Var aliasDesc[4] = "Pepsi Black, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
KanitMediumTTF
0x322B26
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
@@ -11573,11 +11573,11 @@
KanitMediumTTF
0x6F5F51
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ais
+ Pepsi Black, Ais
เป๊ปซี่
diff --git a/inter/mys/xml/event/promotion_3.xml b/inter/mys/xml/event/promotion_3.xml
index 92648619..612dedfd 100644
--- a/inter/mys/xml/event/promotion_3.xml
+++ b/inter/mys/xml/event/promotion_3.xml
@@ -11470,16 +11470,16 @@
Var PD_CODE2 = "12-05-02-0062"
Var PD_CODE3 = "##-##-##-####"
; begin lang
- Var aliasName[0] = "PEPSI"
- Var aliasDesc[0] = "Pepsi, Ice"
+ Var aliasName[0] = "PEPSI Black"
+ Var aliasDesc[0] = "Pepsi Black, Ice"
Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
- Var aliasName[4] = "PEPSI"
- Var aliasDesc[4] = "Pepsi, Ais"
+ Var aliasName[4] = "PEPSI Black"
+ Var aliasDesc[4] = "Pepsi Black, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
KanitMediumTTF
0x322B26
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
@@ -11573,11 +11573,11 @@
KanitMediumTTF
0x6F5F51
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ais
+ Pepsi Black, Ais
เป๊ปซี่
diff --git a/inter/mys/xml/event/promotion_pepsi_099.lxml b/inter/mys/xml/event/promotion_pepsi_099.lxml
index a0c764f6..4c68f6b8 100644
--- a/inter/mys/xml/event/promotion_pepsi_099.lxml
+++ b/inter/mys/xml/event/promotion_pepsi_099.lxml
@@ -11470,16 +11470,16 @@
Var PD_CODE2 = "12-05-02-0062"
Var PD_CODE3 = "##-##-##-####"
; begin lang
- Var aliasName[0] = "PEPSI"
- Var aliasDesc[0] = "Pepsi, Ice"
+ Var aliasName[0] = "PEPSI Black"
+ Var aliasDesc[0] = "Pepsi Black, Ice"
Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
- Var aliasName[4] = "PEPSI"
- Var aliasDesc[4] = "Pepsi, Ais"
+ Var aliasName[4] = "PEPSI Black"
+ Var aliasDesc[4] = "Pepsi Black, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
KanitMediumTTF
0x322B26
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
@@ -11573,11 +11573,11 @@
KanitMediumTTF
0x6F5F51
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ais
+ Pepsi Black, Ais
เป๊ปซี่
diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml
index a98af53f..91bfd63f 100644
--- a/inter/mys/xml/page_catalog_group_other.lxml
+++ b/inter/mys/xml/page_catalog_group_other.lxml
@@ -927,8 +927,8 @@
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
- Var aliasName[4] = "PEPSI"
- Var aliasDesc[4] = "Pepsi, Ais"
+ Var aliasName[4] = "PEPSI Black"
+ Var aliasDesc[4] = "Pepsi Black, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
@@ -1010,7 +1010,7 @@
เป็ปซี่น้ำแข็ง
PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
@@ -1026,7 +1026,7 @@
เป๊ปซี่
Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ais
+ Pepsi Black, Ais
เป๊ปซี่
@@ -9281,6 +9281,272 @@
center-vertical-horizontal
+
+ ; ==================> Len = 3
+ ; 12-05-01-0001 12-05-02-0001 12-05-03-0001
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-05-01-0001.Button,12-05-02-0001.Button,12-05-03-0001.Button,$Sum120501000112050200011205030001)
+
+
+ 16
+ 164
+ 22
+ 222
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+
+ LIMENADE
+ น้ำมะนาว
+ LIMENADE
+ น้ำมะนาว
+ LIMAU AIS
+ น้ำมะนาว
+
+
+
+ 16
+ 220
+ 14
+ 222
+ KanitMediumTTF
+ 0x6F5F51
+
+ Limenade, Sugar
+ น้ำมะนาว น้ำตาล
+ Limenade, Sugar
+ น้ำมะนาว น้ำตาล
+ Sirap Limau, Gula, Ais
+ น้ำมะนาว น้ำตาล
+
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-05-01-0001.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ TextPriceMenuHotX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-01-0001.Button
+ StringFmt( $12-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-05-02-0001.Button
+
+
+ 113
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-02-0001.Button
+ StringFmt( $12-05-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-05-03-0001.Button
+
+
+ TextPriceMenuBlendX
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-05-03-0001.Button
+ StringFmt( $12-05-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum120501000112050200011205030001 = "Disable" Then
+ Var ice_tab_process_show = "Disable"
+ Else
+ Var ice_tab_process_show = "Enable"
+ EndIf
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum120501000112050200011205030001 = "Disable" Then
+ STRCONTAIN "ERR" $12-05-01-0001.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-05-02-0001.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-05-03-0001.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ "disable-show"
+ $Sum120501000112050200011205030001
+
+ 000013
+
+ center-vertical-horizontal
+
; ==================> Len = 3
; - 12-05-02-0026 12-05-03-0026
diff --git a/inter/mys/xml/page_catalog_group_recommend.lxml b/inter/mys/xml/page_catalog_group_recommend.lxml
index 673d0f24..0ec76c7c 100644
--- a/inter/mys/xml/page_catalog_group_recommend.lxml
+++ b/inter/mys/xml/page_catalog_group_recommend.lxml
@@ -10759,16 +10759,16 @@
Var PD_CODE2 = "12-05-02-0062"
Var PD_CODE3 = "##-##-##-####"
; begin lang
- Var aliasName[0] = "PEPSI"
- Var aliasDesc[0] = "Pepsi, Ice"
+ Var aliasName[0] = "PEPSI Black"
+ Var aliasDesc[0] = "Pepsi Black, Ice"
Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
- Var aliasName[4] = "PEPSI"
- Var aliasDesc[4] = "Pepsi, Ais"
+ Var aliasName[4] = "PEPSI Black"
+ Var aliasDesc[4] = "Pepsi Black, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
@@ -10846,11 +10846,11 @@
KanitMediumTTF
0x322B26
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
- PEPSI
+ PEPSI Black
เป็ปซี่น้ำแข็ง
@@ -10862,11 +10862,11 @@
KanitMediumTTF
0x6F5F51
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ice
+ Pepsi Black, Ice
เป๊ปซี่
- Pepsi, Ais
+ Pepsi Black, Ais
เป๊ปซี่
diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index abddbc68..d59572c0 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -33,7 +33,7 @@ Var MomDayEnable = 0
Var GameEnableFromTrickerEv = 0
; Enable pro Pepween
-Var PepweenEnable = 1
+Var PepweenEnable = 0
; Enable pro Tamatian. 16-30 Sep
Var TamatianEnable = 0
@@ -90,6 +90,10 @@ If BoxID = 172644 Then
Var MilkChoiceVeganEnable = 1
EndIf
+If ConfigNumer = 1581 Then
+ Var PepweenEnable = 0
+EndIf
+
Var GameEnableFromTrickerEv = 1
diff --git a/xml/page_board.xml b/xml/page_board.xml
index e80900da..46d890d9 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1000,7 +1000,12 @@
Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
- DEBUGVAR NETCORE_EVENT_CNT_X
+ If NETCORE_EVENT_CNT_X = 30 Then
+ DEBUGVAR NETCORE_EVENT_CNT_X
+ EndIf
+ If NETCORE_EVENT_CNT_X = 90 Then
+ DEBUGVAR NETCORE_EVENT_CNT_X
+ EndIf
If NETCORE_EVENT_CNT_X > 300 Then
Var stop_now = "true"
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 2cf512a2..ab722eba 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -9,6 +9,7 @@
Var GetMoreStrawCount = 3
+ Var CountUpWhenBREW_CNT = 0
DEBUGVAR TxRef1
SAVELOG "page_brewing3.xml"
@@ -809,6 +810,22 @@
EndIf
+ If BREW_CNT = 0 Then
+ If CountUpWhenBREW_CNT > 56 Then
+ Var CountUpWhenBREW_CNT = 0
+ Var drink_success_set = "-"
+ READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+ DEBUGVAR drink_success_set
+ If drink_success_set = "1" Then
+ Var MachineState_Result = 1
+ EndIf
+
+ EndIf
+
+ Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
+
+ EndIf
+
If Timeout > 480 Then
SAVELOG " Timeout > 480"
Var MachineState_Result = 2
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index ec5ef7c0..10689ae0 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -180,6 +180,7 @@
EndIf
+ WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
500
diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml
index dc03a268..af979e56 100644
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@@ -48,7 +48,7 @@
Var CHECK_EventOpen_Double = 0
If RecipeTag3 = "CoffeePlay" Then
- ;Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+ Open "ROOT/taobin_project/xml/page_topping_select8.xml"
EndIf
If BoxID = 200001 Then
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 4f7cff95..f25e99e9 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.74"
- Var XMLPageVersionInt = 774
+ Var XMLPageVersion = "7.75"
+ Var XMLPageVersionInt = 775
;Oreo
Var OreoGuarantee = 0