Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

2023-11-30 09:56:51 +07:00 · 2023-11-30 09:56:51 +07:00 · 1e6495e903
commit 1e6495e903
parent b19d5a3d78 24beb457d8
66 changed files with 10 additions and 0 deletions
--- a/inter/aus/image/page_drink_n/bn_limeblack
+++ b/inter/aus/image/page_drink_n/bn_limeblack
--- a/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
+++ b/inter/aus/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
--- a/inter/aus/image/page_drink_press_n/bn_limeblack
+++ b/inter/aus/image/page_drink_press_n/bn_limeblack
--- a/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark_Healthy.png
+++ b/inter/aus/image/page_drink_press_n/bn_limeblack_tea_SingPark_Healthy.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Americano.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Americano.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Cocoa.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Cocoa.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Milk.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Milk.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_cafe_Latte.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_cafe_Latte.png
--- a/inter/mys/image/page_drink_disable_n2/bn_Mint_pepsi.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_Mint_pepsi.png
--- a/inter/mys/image/page_drink_disable_n2/bn_iced_mint_lime_soda.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_iced_mint_lime_soda.png
--- a/inter/mys/image/page_drink_disable_n2/bn_limeblack
+++ b/inter/mys/image/page_drink_disable_n2/bn_limeblack
--- a/inter/mys/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png
+++ b/inter/mys/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Americano.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Americano.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Black_tea.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Black_tea.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Cocoa.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Cocoa.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Lime_Black_tea.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Lime_Black_tea.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Lychee_lime_soda.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Lychee_lime_soda.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Matcha_Latte.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Matcha_Latte.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Milk.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Milk.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Milk_Straw.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Milk_Straw.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Oreo_smoothie.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Plum_limenade_Soda.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Plum_limenade_Soda.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Strawberry_Soda.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Strawberry_Soda.png
--- a/inter/mys/image/page_drink_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_Yuzu_Soda.png
--- a/inter/mys/image/page_drink_n/bn_Mint_cafe_Latte.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_cafe_Latte.png
--- a/inter/mys/image/page_drink_n/bn_Mint_pepsi.png
+++ b/inter/mys/image/page_drink_n/bn_Mint_pepsi.png
--- a/inter/mys/image/page_drink_n/bn_iced_mint_lime_soda.png
+++ b/inter/mys/image/page_drink_n/bn_iced_mint_lime_soda.png
--- a/inter/mys/image/page_drink_n/bn_limeblack
+++ b/inter/mys/image/page_drink_n/bn_limeblack
--- a/inter/mys/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
+++ b/inter/mys/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Americano.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Americano.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Cocoa.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Cocoa.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Lychee_lime_soda.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Lychee_lime_soda.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Milk.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Milk.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Milk_Straw.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Milk_Straw.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_cafe_Latte.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_cafe_Latte.png
--- a/inter/mys/image/page_drink_picture2_n/bn_Mint_pepsi.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_Mint_pepsi.png
--- a/inter/mys/image/page_drink_picture2_n/bn_iced_mint_lime_soda.png
+++ b/inter/mys/image/page_drink_picture2_n/bn_iced_mint_lime_soda.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Americano.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Americano.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Cocoa.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Cocoa.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Lime_Black_tea.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Lime_Black_tea.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Matcha_Latte.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Matcha_Latte.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Milk.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Milk.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Milk_Straw.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Milk_Straw.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Strawberry_Soda.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Strawberry_Soda.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_cafe_Latte.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_cafe_Latte.png
--- a/inter/mys/image/page_drink_press_n/bn_Mint_pepsi.png
+++ b/inter/mys/image/page_drink_press_n/bn_Mint_pepsi.png
--- a/inter/mys/image/page_drink_press_n/bn_iced_mint_lime_soda.png
+++ b/inter/mys/image/page_drink_press_n/bn_iced_mint_lime_soda.png
--- a/xml/page_topping_select6.lxml
+++ b/xml/page_topping_select6.lxml
@ -630,6 +630,11 @@
 			Var normal_button_state = "PressForever"
 		EndIf

+		If PD_CODE2 = "51-05-02-0016" Then
+			Var cold_button_state = "Invisible"
+			Var normal_button_state = "PressForever"
+		EndIf
+
 		; i f Hot menu disable away
 		If hot_button_state = "PressForever" Then
 			If showOreoAddEnable = "Enable" Then
@ -3782,6 +3787,11 @@
 				Var cold_button_state = "Invisible"
 				Var normal_button_state = "PressForever"
 			EndIf
+
+			If PD_CODE2 = "51-05-02-0016" Then
+				Var cold_button_state = "Invisible"
+				Var normal_button_state = "PressForever"
+			EndIf
 			
 			Var IndexDrinktType = 1
 		EndIf