Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/event/tricker.ev

@@ -41,6 +41,8 @@ Var TamatianEnable = 0
 ; September 9 - 16
 Var MayDayRunEnable = 0
 
+; Enable Milk Choice Vegan
+Var MilkChoiceVeganEnable = 0
 
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt > 5 Then
@@ -80,6 +82,11 @@ If SystemDateMonthInt = 10 Then
 		Var PepweenEnable = 1
 	EndIf
 
+	If SystemDateDayInt >= 13 Then
+		If SystemDateDayInt <= 24 Then
+			Var MilkChoiceVeganEnable = 1
+		EndIf
+	EndIf
 EndIf
 
 DEBUGVAR PepweenEnable
@@ -191,6 +198,7 @@ EndIf
 
 
 If InternationalEnable = 1 Then
+	Var MilkChoiceVeganEnable = 0
 	Var GameEnableFromTrickerEv = 0
 	Var TamatianEnable = 0
 	Var MayDayRunEnable = 0

xml/page_topping_select7.xml

@@ -85,7 +85,6 @@
 	;Var ShotCoffeePremium = "Enable"
 	;Var showOreoAddEnable = "Enable"
 
-	Var CerealMilkToppingEnable = "Invisible"
 
 	Var ExtraTopping = "Invisible"
 
@@ -118,6 +117,7 @@
 		Var text_x_add_oreo_price = 430
 		Var text_show_normal_x = 408
 		Var text_x_free_adjust = 100
+		Var text_milk_choice_price_x = 255
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 5
 		EndIf
@@ -136,10 +136,10 @@
 		Var text_x_add_oreo_price = 420
 		Var text_show_normal_x = 386
 		Var text_x_free_adjust = 70
+		Var text_milk_choice_price_x = 237
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 30
 		EndIf
-	
 	EndIf
 
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust
@@ -299,8 +299,15 @@
 	Var img_smth_dis = "/bt_smoothie_disable_no.png"
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
+	If MilkChoiceVeganEnable = 1 Then
+		Var CerealMilkToppingEnable = "Invisible"
+		Var CerealMilkToppingVegan = "Enable"
+	Else
+		Var CerealMilkToppingEnable = "Enable"
+		Var CerealMilkToppingVegan = "Invisible"
+	EndIf
+	Var CerealMilkEnable = "Invisible"
 
-	Var CerealMilkEnable = "Enable"
 
 	Var topping_price_refresh = 1
 
@@ -524,6 +531,7 @@
 		Var text_x_add_oreo_price = 430
 		Var text_show_normal_x = 408
 		Var text_x_free_adjust = 100
+		Var text_milk_choice_price_x = 255
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 5
 		EndIf
@@ -542,10 +550,10 @@
 		Var text_x_add_oreo_price = 420
 		Var text_show_normal_x = 386
 		Var text_x_free_adjust = 70
+		Var text_milk_choice_price_x = 237
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 30
 		EndIf
-	
 	EndIf
 
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust
@@ -1485,8 +1493,7 @@
 		If MenuCodeName1 = "Cereal-Milk" Then
 			Var CerealMilkToppingEnable = "Enable"
 			Var CerealMilkPrice = SubMenuPrice1
-			Var ExtraTopping = "Enable"
-		
+			Var CerealMilkEnable = "Enable"
 		EndIf
 
 		
@@ -1619,8 +1626,8 @@
 <X> 52 </X>
 <Y> 881 </Y>
 <Width> 1080 </Width>
-<Height> 900 </Height>
-<ScrollHeight> "auto-all" </ScrollHeight>
+<Height> 880 </Height>
+<ScrollHeight> 880 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 1 </Column>
 
@@ -2793,45 +2800,28 @@
 ;
 ;
 ;
-;-BEGIN shot layout
-<Block>	
-<State> ExtraTopping </State>
-<Width> 1080 </Width>
-<Height> "auto" </Height>
+;
+;
+;
+;
+;-BEGIN milk choice
+<Block>
+<State> "Enable" </State>
+<Width> 986 </Width>
+<Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
-
-<ListView1>
-<Width> 986 </Width>
-<Height> "auto" </Height>	
-<Align> "vertical"</Align>
-<State> ExtraTopping </State>
-;
-<Row1>
-	<Width> 986 </Width>
-	<Height> 64 </Height>
-	<State> ExtraTopping </State>
-	<Image>
-		<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
-	</Image>
-</Row1>
-
-;
-;
-;
-<Row1>
-<Width> 986 </Width>
-<Height> "auto" </Height>	
-<State> CerealMilkToppingEnable </State>
-; 
 <Image>
-	<X> 0 </X>
-	<Y> 0 </Y>
-	<Filename> Var( DirImage + "/bg_top_milk.png") </Filename>
+<State> CerealMilkToppingEnable </State>
+<Filename> Var( DirImage + "/bg_milk_choice.png" )</Filename>
+</Image>
+<Image>
+<State> CerealMilkToppingVegan </State>
+<Filename> Var( DirImage + "/bg_milk_choice_j.png" )</Filename>
 </Image>
 
 <Button>
 <X> 40 </X>
-<Y> 5 </Y>
+<Y> 72 </Y>
 <State> CerealMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
@@ -2857,7 +2847,7 @@
 ; 
 <Button>
 <X> 896 </X>
-<Y> 14 </Y>
+<Y> 78 </Y>
 <State> CerealMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
@@ -2883,16 +2873,51 @@
 </Button>
 
 <Text>
-<X> CerealMilkX </X>
-<Y> 2 </Y>
+<X> text_milk_choice_price_x </X>
+<Y> 69 </Y>
 <Font> KanitRegularTTF </Font>
-<State> CerealMilkEnable</State>
+<State> "Enable" </State>
 <Size> 36 </Size>
 <Color> 0x84776F </Color>
 <Value> CerealMilkPrice </Value>
 </Text>
 
+</Block>
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;-BEGIN shot layout
+<Block>	
+<State> ExtraTopping </State>
+<Width> 1080 </Width>
+<Height> "auto" </Height>
+<MarginTop> 20 </MarginTop>
+
+<ListView1>
+<Width> 986 </Width>
+<Height> "auto" </Height>	
+<Align> "vertical"</Align>
+<State> ExtraTopping </State>
+;
+<Row1>
+	<Width> 986 </Width>
+	<Height> 64 </Height>
+	<State> ExtraTopping </State>
+	<Image>
+		<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
+	</Image>
 </Row1>
+
 ;
 ;
 ;
@@ -4162,13 +4187,13 @@
 	Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
 	
 	If CerealMilkAddAmount = 0 Then
-		Var CerealMilkPrice = "(+฿10)"
+		Var CerealMilkPrice = "(+฿5)"
 
 	Else
 		Var CerealMilkPrice = "(+฿" +  CerealMilkAddAmount
 		Var CerealMilkPrice = CerealMilkPrice +  ")"
 
-		Var CerealMilkPrice = "(+฿10)"
+		Var CerealMilkPrice = "(+฿5)"
 	EndIf
 
 	DEBUGVAR SubMenuPrice1