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

xml/page_drink_stuck.xml

@@ -54,6 +54,8 @@
 	Var StarwState = "Enable"
 	Var videoEnd = 0
 
+	Var TextBottomShowX = 0
+
 	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/complete_en/"
 
@@ -61,6 +63,20 @@
 		Var DirImage = "ROOT/taobin_project/image/complete/"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then
+		Var DirImage = "ROOT/taobin_project/image/complete_mmr/"
+	EndIf
+
+	If LanguageShow = "MSC" Then
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
+		Var TextBottomShowX = 20
+	EndIf
+
+	If LanguageShow = "MTC" Then
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
+		Var TextBottomShowX = 20
+	EndIf
+
 	Var VideoPlayFile = VideoPath
 	Var VideoPlayFile = VideoPlayFile + VideoFileBegin
 	Var VideoPlayFile = VideoPlayFile + "24"
@@ -399,7 +415,7 @@
 
 
 <Image>
-<X> 0 </X>
+<X> TextBottomShowX </X>
 <Y> 1418 </Y>
 <State> TextBottomShow </State>
 <Filename> Var( DirImage + "text_bottom.png") </Filename>

xml/page_drinkfail3.xml

@@ -26,6 +26,9 @@
   Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
  EndIf
 
+ If LanguageShow = "MTC" Then
+  Var DirImage = "ROOT/taobin_project/inter/hkg/image/collectiing_mtc/"
+ EndIf
 
     Var Timeout = 0
 

xml/page_thankyouConti.xml

@@ -125,7 +125,11 @@
 	If LanguageShow = "MSC" Then 
 		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
 	EndIf
-	
+
+	If LanguageShow = "MTC" Then 
+		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
+	EndIf
+
 	Var txtDrinkOKState = "Invisible"
 	Var buttonRemoveCup = "Invisible"
 
@@ -394,6 +398,9 @@
 		If LanguageShow = "MSC" Then 
 			Var MachineErrorDetailAll = " 请拿杯子。"
 		EndIf
+		If LanguageShow = "MTC" Then 
+			Var MachineErrorDetailAll = " 請拿杯子。"
+		EndIf
 	Else 
 		If CupChecking = "true" Then
 			If show_eng = "true" Then
@@ -408,7 +415,9 @@
 			If LanguageShow = "MSC" Then 
 				Var MachineErrorDetailAll = " 请拿杯子。"
 			EndIf
-		EndIf
+			If LanguageShow = "MTC" Then 
+				Var MachineErrorDetailAll = " 請拿杯子。"
+			EndIf
 		Else
 			If show_eng = "true" Then
 				Var MachineErrorDetailAll = " Press button for take a cup."
@@ -422,6 +431,9 @@
 			If LanguageShow = "MSC" Then 
 				Var MachineErrorDetailAll = " 按按钮取杯子。"
 			EndIf
+			If LanguageShow = "MTC" Then 
+				Var MachineErrorDetailAll = " 按按鈕取杯子。"
+			EndIf
 		EndIf
 	EndIf
 

xml/topview2.xml

@@ -315,7 +315,7 @@
 <Filename> Var( CountryRootPath + "/image/lang/bn_eng_lang.png") </Filename>
 <EventClick>
 	SetLanguage "MSC"
-	Var show_eng = "false"
+	Var show_eng = "true"
 	If EnableMultiInstance = "true" Then
 		Var langnext1 = "true"
 		Var langnext2 = "true"