NEWUI: add elock btn, MYS: add button remove cup every catalog

inter/mys/xml/page_remove_cup.lxml

@@ -18,6 +18,14 @@
 		
 	LED LedDoorDoor 5 255 255 255 255
 
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
+
+	Var ShowMenuNameAndImage = "Invisible"
+	Var RemoveCupOnArmID = -1
+	Var remove_cup_name = ""
+	Var remove_cup_image = ""
+
+
 	Var CheckCupStateDoorCupClose = ""
 	Var CheckCupStateDoorCupCloseCnt = 0
 
@@ -43,50 +51,33 @@
 		Open "ROOT/taobin_project/xml/page_show_error.lxml"
 	EndIf
 
-	Var Timeout = Timeout + 1
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
 	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
 
-		DEBUGVAR DoorCupPosition
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml 
-	; protect lock 
-	; 
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
 
 </EventTimeout>
 
+;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc
+
 <Text>
   <X> 50 </X>
   <Y> 852 </Y>
@@ -117,12 +108,8 @@
 <State> buttonRemoveCup </State>
 <EventClick> 
 
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
 
-	Machine RemoveCup
-	Machine DoorLidOpen
-	Var buttonRemoveCup = "Invisible"
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -154,6 +141,37 @@
 </EventClick>
 </Button>
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
+