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

2024-08-02 13:44:36 +07:00 · 2024-08-02 13:44:36 +07:00 · 361f205771
commit 361f205771
parent 9136d1b395 a78d8f7bef
153 changed files with 52720 additions and 2131 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1094,3 +1094,11 @@ Iced Mocha	12-21-02-0064	1	2	3	4	5	15	7	59	23	24	167	2:47	23
 12-05-02-0118	7UP BANANA	1	18	56	23	13					24	120	2:00	23
 12-05-02-0119	7UP MELON	1	18	52	23	13					24	120	2:00	23
 12-05-02-0120	7UP PEACH	1	18	60	23	12					24	120	2:00	23
+
+
+12-03-02-0065	โกโก้ตัวมัม	1	15	17	23						24	120	2:00	23
+12-03-02-0067	โกโก้ตัวมารดา	1	15	17	23						24	120	2:00	23
+12-03-02-0066	โกโก้ตัวมาเท้อ	1	15	17	23						24	120	2:00	23
+12-03-01-0068	โกโก้ตัวสูตินรีร้อน	1	15	26							24	120	2:00	23
+12-03-02-0068	โกโก้ตัวสูตินรีเย็น	1	15	26	23						24	120	2:00	23
+12-03-02-0069	โกโก้ตัวแม่ลูกอ่อน	1	15	17	23						24	120	2:00	23
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
-disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+normal_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+normal_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+press_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+press_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+disable_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+disable_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
--- a/image/event/mom_cocoa/mom_cocoa_banner_10-12.png
+++ b/image/event/mom_cocoa/mom_cocoa_banner_10-12.png
--- a/image/event/mom_cocoa/mom_cocoa_banner_13-16.png
+++ b/image/event/mom_cocoa/mom_cocoa_banner_13-16.png
--- a/image/new_vending_info/backtohome_testcoin.png
+++ b/image/new_vending_info/backtohome_testcoin.png
--- a/image/new_vending_info/backtohome_testcoin_bp.png
+++ b/image/new_vending_info/backtohome_testcoin_bp.png
--- a/image/new_vending_info/checkin.png
+++ b/image/new_vending_info/checkin.png
--- a/image/new_vending_info/checkinheader.png
+++ b/image/new_vending_info/checkinheader.png
--- a/image/new_vending_info/checkinplasewait.png
+++ b/image/new_vending_info/checkinplasewait.png
--- a/image/new_vending_info/checkinplasewait2.png
+++ b/image/new_vending_info/checkinplasewait2.png
--- a/image/new_vending_info/messagebankfail.png
+++ b/image/new_vending_info/messagebankfail.png
--- a/image/new_vending_info/messagecoinfail.png
+++ b/image/new_vending_info/messagecoinfail.png
--- a/image/new_vending_info/messagetestallsuccess.png
+++ b/image/new_vending_info/messagetestallsuccess.png
--- a/image/new_vending_info/messsagechangefail.png
+++ b/image/new_vending_info/messsagechangefail.png
--- a/image/new_vending_info/personguildline.png
+++ b/image/new_vending_info/personguildline.png
--- a/image/new_vending_info/retrycheckin.png
+++ b/image/new_vending_info/retrycheckin.png
--- a/image/new_vending_info/retryprocess_testcoin.png
+++ b/image/new_vending_info/retryprocess_testcoin.png
--- a/image/new_vending_info/retryprocess_testcoin_bp.png
+++ b/image/new_vending_info/retryprocess_testcoin_bp.png
--- a/image/new_vending_info/sendcheckin.png
+++ b/image/new_vending_info/sendcheckin.png
--- a/image/new_vending_info/sendpicturecheckinbackhome.png
+++ b/image/new_vending_info/sendpicturecheckinbackhome.png
--- a/image/new_vending_info/sendpicturecheckinprocess.png
+++ b/image/new_vending_info/sendpicturecheckinprocess.png
--- a/image/new_vending_info/sendpicturecheckinsuccess.png
+++ b/image/new_vending_info/sendpicturecheckinsuccess.png
--- a/image/new_vending_info/startcapture.png
+++ b/image/new_vending_info/startcapture.png
--- a/image/new_vending_info/test_bank_20.png
+++ b/image/new_vending_info/test_bank_20.png
--- a/image/new_vending_info/test_bank_coin_plasewait.png
+++ b/image/new_vending_info/test_bank_coin_plasewait.png
--- a/image/new_vending_info/test_bank_header_page.png
+++ b/image/new_vending_info/test_bank_header_page.png
--- a/image/new_vending_info/test_change_10.png
+++ b/image/new_vending_info/test_change_10.png
--- a/image/new_vending_info/test_change_10_page.png
+++ b/image/new_vending_info/test_change_10_page.png
--- a/image/new_vending_info/test_change_10_page_bn.png
+++ b/image/new_vending_info/test_change_10_page_bn.png
--- a/image/new_vending_info/test_change_10_page_bp.png
+++ b/image/new_vending_info/test_change_10_page_bp.png
--- a/image/new_vending_info/test_change_header_page.png
+++ b/image/new_vending_info/test_change_header_page.png
--- a/image/new_vending_info/test_coin_10_bath.png
+++ b/image/new_vending_info/test_coin_10_bath.png
--- a/image/new_vending_info/test_coin_5_bath.png
+++ b/image/new_vending_info/test_coin_5_bath.png
--- a/image/new_vending_info/test_coin_backmain_page.png
+++ b/image/new_vending_info/test_coin_backmain_page.png
--- a/image/new_vending_info/test_coin_cancel.png
+++ b/image/new_vending_info/test_coin_cancel.png
--- a/image/new_vending_info/test_coin_cancel_page.png
+++ b/image/new_vending_info/test_coin_cancel_page.png
--- a/image/new_vending_info/test_coin_header_page.png
+++ b/image/new_vending_info/test_coin_header_page.png
--- a/image/new_vending_info/test_success_coinbank_header_page.png
+++ b/image/new_vending_info/test_success_coinbank_header_page.png
--- a/image/new_vending_info/testcoin_10_fail.png
+++ b/image/new_vending_info/testcoin_10_fail.png
--- a/image/new_vending_info/testcoin_10_foc.png
+++ b/image/new_vending_info/testcoin_10_foc.png
--- a/image/new_vending_info/testcoin_10_nor.png
+++ b/image/new_vending_info/testcoin_10_nor.png
--- a/image/new_vending_info/testcoin_10_succ.png
+++ b/image/new_vending_info/testcoin_10_succ.png
--- a/image/new_vending_info/testcoin_20_fail.png
+++ b/image/new_vending_info/testcoin_20_fail.png
--- a/image/new_vending_info/testcoin_20_foc.png
+++ b/image/new_vending_info/testcoin_20_foc.png
--- a/image/new_vending_info/testcoin_20_nor.png
+++ b/image/new_vending_info/testcoin_20_nor.png
--- a/image/new_vending_info/testcoin_20_succ.png
+++ b/image/new_vending_info/testcoin_20_succ.png
--- a/image/new_vending_info/testcoin_5_fail.png
+++ b/image/new_vending_info/testcoin_5_fail.png
--- a/image/new_vending_info/testcoin_5_foc.png
+++ b/image/new_vending_info/testcoin_5_foc.png
--- a/image/new_vending_info/testcoin_5_succ.png
+++ b/image/new_vending_info/testcoin_5_succ.png
--- a/image/new_vending_info/testcoin_change_fail.png
+++ b/image/new_vending_info/testcoin_change_fail.png
--- a/image/new_vending_info/testcoin_change_foc.png
+++ b/image/new_vending_info/testcoin_change_foc.png
--- a/image/new_vending_info/testcoin_change_nor.png
+++ b/image/new_vending_info/testcoin_change_nor.png
--- a/image/new_vending_info/testcoin_change_succ.png
+++ b/image/new_vending_info/testcoin_change_succ.png
--- a/image/new_vending_info/testcoinbank_header.png
+++ b/image/new_vending_info/testcoinbank_header.png
--- a/image/new_vending_info/testcoinbankwait.png
+++ b/image/new_vending_info/testcoinbankwait.png
--- a/image/new_vending_info/testmoney.png
+++ b/image/new_vending_info/testmoney.png
--- a/image/new_vending_info/undotest_testcoin.png
+++ b/image/new_vending_info/undotest_testcoin.png
--- a/image/new_vending_info/undotest_testcoin_bp.png
+++ b/image/new_vending_info/undotest_testcoin_bp.png
--- a/image/page_drink_disable_n2/CocoaNoMilk_mom_cocoa.png
+++ b/image/page_drink_disable_n2/CocoaNoMilk_mom_cocoa.png
--- a/image/page_drink_disable_n2/IcedBabyCocoa_mom_cocoa.png
+++ b/image/page_drink_disable_n2/IcedBabyCocoa_mom_cocoa.png
--- a/image/page_drink_disable_n2/IcedCocoax2_mom_cocoa.png
+++ b/image/page_drink_disable_n2/IcedCocoax2_mom_cocoa.png
--- a/image/page_drink_disable_n2/IcedCocoax3_mom_cocoa.png
+++ b/image/page_drink_disable_n2/IcedCocoax3_mom_cocoa.png
--- a/image/page_drink_disable_n2/IcedCocoax4_mom_cocoa.png
+++ b/image/page_drink_disable_n2/IcedCocoax4_mom_cocoa.png
--- a/image/page_drink_disable_n2/bn_hot_Banana_Mocha.png
+++ b/image/page_drink_disable_n2/bn_hot_Banana_Mocha.png
--- a/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_mom_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_mom_cocoa.png
--- a/image/page_drink_n/CocoaNoMilk_mom_cocoa.png
+++ b/image/page_drink_n/CocoaNoMilk_mom_cocoa.png
--- a/image/page_drink_n/IcedBabyCocoa_mom_cocoa.png
+++ b/image/page_drink_n/IcedBabyCocoa_mom_cocoa.png
--- a/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png
+++ b/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png
--- a/image/page_drink_n/IcedCocoax2_mom_cocoa.png
+++ b/image/page_drink_n/IcedCocoax2_mom_cocoa.png
--- a/image/page_drink_n/IcedCocoax3_mom_cocoa.png
+++ b/image/page_drink_n/IcedCocoax3_mom_cocoa.png
--- a/image/page_drink_n/IcedCocoax4_mom_cocoa.png
+++ b/image/page_drink_n/IcedCocoax4_mom_cocoa.png
--- a/image/page_drink_n/bn_hot_Banana_Mocha.png
+++ b/image/page_drink_n/bn_hot_Banana_Mocha.png
--- a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_mom_cocoa.png
+++ b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_mom_cocoa.png
--- a/image/page_drink_picture2_n/CocoaNoMilk_mom_cocoa.png
+++ b/image/page_drink_picture2_n/CocoaNoMilk_mom_cocoa.png
--- a/image/page_drink_picture2_n/IcedBabyCocoa_mom_cocoa.png
+++ b/image/page_drink_picture2_n/IcedBabyCocoa_mom_cocoa.png
--- a/image/page_drink_picture2_n/IcedCocoax1_mom_cocoacocoa.png
+++ b/image/page_drink_picture2_n/IcedCocoax1_mom_cocoacocoa.png
--- a/image/page_drink_picture2_n/IcedCocoax2_mom_cocoa.png
+++ b/image/page_drink_picture2_n/IcedCocoax2_mom_cocoa.png
--- a/image/page_drink_picture2_n/IcedCocoax3_mom_cocoa.png
+++ b/image/page_drink_picture2_n/IcedCocoax3_mom_cocoa.png
--- a/image/page_drink_picture2_n/IcedCocoax4_mom_cocoa.png
+++ b/image/page_drink_picture2_n/IcedCocoax4_mom_cocoa.png
--- a/image/page_drink_picture2_n/bn_ChocoBanana_milk.png
+++ b/image/page_drink_picture2_n/bn_ChocoBanana_milk.png
--- a/image/page_drink_picture2_n/bn_hot_Banana_Mocha.png
+++ b/image/page_drink_picture2_n/bn_hot_Banana_Mocha.png
--- a/image/page_drink_picture2_n/bn_iced_Choco_strawberry_banana_smoothie_mom_cocoa.png
+++ b/image/page_drink_picture2_n/bn_iced_Choco_strawberry_banana_smoothie_mom_cocoa.png
--- a/image/page_drink_press_n/CocoaNoMilk_mom_cocoa.png
+++ b/image/page_drink_press_n/CocoaNoMilk_mom_cocoa.png
--- a/image/page_drink_press_n/IcedBabyCocoa_mom_cocoa.png
+++ b/image/page_drink_press_n/IcedBabyCocoa_mom_cocoa.png
--- a/image/page_drink_press_n/IcedCocoax1_mom_cocoacocoa.png
+++ b/image/page_drink_press_n/IcedCocoax1_mom_cocoacocoa.png
--- a/image/page_drink_press_n/IcedCocoax2_mom_cocoa.png
+++ b/image/page_drink_press_n/IcedCocoax2_mom_cocoa.png
--- a/image/page_drink_press_n/IcedCocoax3_mom_cocoa.png
+++ b/image/page_drink_press_n/IcedCocoax3_mom_cocoa.png
--- a/image/page_drink_press_n/IcedCocoax4_mom_cocoa.png
+++ b/image/page_drink_press_n/IcedCocoax4_mom_cocoa.png
--- a/image/page_drink_press_n/bn_hot_Banana_Mocha.png
+++ b/image/page_drink_press_n/bn_hot_Banana_Mocha.png
--- a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_mom_cocoa.png
+++ b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_mom_cocoa.png
--- a/inter/aus/xml/event/promotion_2.xml
+++ b/inter/aus/xml/event/promotion_2.xml
@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
    Machine RemoveCup
    Machine DoorLidOpen
--- a/inter/aus/xml/event/promotion_3.xml
+++ b/inter/aus/xml/event/promotion_3.xml
@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
    Machine RemoveCup
    Machine DoorLidOpen
--- a/inter/aus/xml/event/promotion_pepsi_099.lxml
+++ b/inter/aus/xml/event/promotion_pepsi_099.lxml
@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
    Machine RemoveCup
    Machine DoorLidOpen
--- a/inter/aus/xml/event/promotion_westfield.lxml
+++ b/inter/aus/xml/event/promotion_westfield.lxml
@ -12124,8 +12124,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
    Machine RemoveCup
    Machine DoorLidOpen
--- a/inter/aus/xml/event/promotion_winter_warmers.lxml
+++ b/inter/aus/xml/event/promotion_winter_warmers.lxml
@ -12124,8 +12124,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
    Machine RemoveCup
    Machine DoorLidOpen
--- a/inter/aus/xml/page_catalog_cocktail.lxml
+++ b/inter/aus/xml/page_catalog_cocktail.lxml
@ -689,8 +689,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
    Machine RemoveCup
 	Machine DoorLidOpen
--- a/inter/aus/xml/page_catalog_group_recommend.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend.lxml
@ -1,49 +1,49 @@
-
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
-    
-    Var Menu1Selected = "PressForever"
-
-    Var OreoBigButtonEnable = "Enable"
-
-    If $12-01-01-0001.Button = "Invisible" Then
-        Var esp102101001Enable = "Invisible"
-        Var esp122101001Enable = "Enable"
-
-    Else
-        Var esp102101001Enable = "Enable"
-        Var esp122101001Enable = "Invisible"
-
-    EndIf
-    
-    SAVELOG PreviseXMLFileName2
-
-    Var Timeout = 0
-
-    If show_eng = "true" Then 
-    
-        Var text_unavailable = "UNAVAILABLE###size=16"
-    Else
-        Var text_unavailable = "หมด###size=32"
-    
-    EndIf
-
-    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
-
-
-</EventOpen>
-
-
-;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
-
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
+    
+    Var Menu1Selected = "PressForever"
+
+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+    If show_eng = "true" Then 
+    
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    Else
+        Var text_unavailable = "หมด###size=32"
+    
+    EndIf
+
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+
+
+</EventOpen>
+
+
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+
 <FrameScroll> 
 <Max> 16 </Max>
 <X> 10 </X>
@ -12083,28 +12083,28 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
-
-
-
-;BigLogoLayout
-
-</Popup>
-
-
+
+
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+
+
+;BigLogoLayout
+
+</Popup>
+
+
--- a/inter/aus/xml/page_catalog_westfield.lxml
+++ b/inter/aus/xml/page_catalog_westfield.lxml
@ -700,8 +700,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
    Machine RemoveCup
 	Machine DoorLidOpen
--- a/inter/aus/xml/page_catalog_winter_warmers.lxml
+++ b/inter/aus/xml/page_catalog_winter_warmers.lxml
@ -700,8 +700,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
    Machine RemoveCup
 	Machine DoorLidOpen
--- a/inter/aus/xml/page_remove_cup.lxml
+++ b/inter/aus/xml/page_remove_cup.lxml
@ -31,8 +31,7 @@
 <EventTimeout>
 	
 	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetail + " / "
-	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+	Var MachineErrorDetailAll = MachineErrorDetailEng


 	If MachineStage = "show-menu" Then
--- a/Show more
+++ b/Show more