push

2024-06-20 17:37:53 +07:00 · 2024-06-20 17:37:53 +07:00 · 076a478f9f
commit 076a478f9f
parent 0d8cd867ff
81 changed files with 6344 additions and 669 deletions
--- a/adv/taobin_adv_menu_01.mp4
+++ b/adv/taobin_adv_menu_01.mp4
--- a/image/page_drink_disable_n2/bn_dirty_light__peacher.png
+++ b/image/page_drink_disable_n2/bn_dirty_light__peacher.png
--- a/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png
--- a/image/page_drink_disable_n2/bn_dirty_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_geisha.png
--- a/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png
--- a/image/page_drink_n/bn_dirty_light__peacher.png
+++ b/image/page_drink_n/bn_dirty_light__peacher.png
--- a/image/page_drink_n/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_n/bn_dirty_light__snowwhite.png
--- a/image/page_drink_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_n/bn_dirty_light_geisha.png
--- a/image/page_drink_n/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_n/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_n/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_n/bn_dirty_light_rosalyn.png
--- a/image/page_drink_n/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_n/bn_dirty_light_whiskydude.png
--- a/image/page_drink_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_n/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_n/bn_hot_americano_light_peacher.png
--- a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_n/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_n/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_n/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_n/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_n/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_n/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_n/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_n/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_n/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_n/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_n/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_n/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png
--- a/image/page_drink_picture2_n/bn_dirty_light__peacher.png
+++ b/image/page_drink_picture2_n/bn_dirty_light__peacher.png
--- a/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png
--- a/image/page_drink_picture2_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_geisha.png
--- a/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png
--- a/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png
--- a/image/page_drink_press_n/bn_dirty_light__peacher.png
+++ b/image/page_drink_press_n/bn_dirty_light__peacher.png
--- a/image/page_drink_press_n/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_press_n/bn_dirty_light__snowwhite.png
--- a/image/page_drink_press_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_press_n/bn_dirty_light_geisha.png
--- a/image/page_drink_press_n/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_press_n/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_press_n/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_press_n/bn_dirty_light_rosalyn.png
--- a/image/page_drink_press_n/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_press_n/bn_dirty_light_whiskydude.png
--- a/image/page_drink_press_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_press_n/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_peacher.png
--- a/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@ -199,9 +199,9 @@ ROSALYN ALMOST DIRTY	51-01-02-0037	1	7	50	2	3	4	5			24	66	6:06	32



-นมยูซุร้อน	51-03-01-0023	1	53	6	16						24	120	3:00	23
-นมยูซุเย็น	51-03-02-0023	1	53	6	23						24	120	4:00	23
-นมยูซุปั่น	51-03-03-0023	1	53	6	23	41					24	120	5:00	23
+นมโตเกียวบานาน่า	51-03-01-0023	1	56	6	16						24	120	3:00	23
+นมโตเกียวบานาน่า	51-03-02-0023	1	56	6	23						24	120	4:00	23
+นมโตเกียวบานาน่า	51-03-03-0023	1	56	6	23	41					24	120	5:00	23
 ยูซุโซดา	51-05-02-0045	1	53	23	23	13					24	120	6:00	23

 อเมริกาโซดา	51-01-02-0041	1	2	3	4	5	23	16	13		24	120	3:00	23
@ -895,3 +895,29 @@ Banana Cheesecake Royale	51-03-03-0057	1	63	53	56	17	23	41			24	120	17:00	23
 CARAMEL MILK \nBISCOFF VOLCANO	51-03-03-0045	1	22	17	23	40	41				24	120	17:00	23
 STRAWBERRY MILK \nBISCOFF VOLCANO	51-03-03-0046	1	19	17	23	40	41				24	120	17:00	23
 Mint MILK \nBISCOFF VOLCANO	51-03-03-0047	1	59	17	23	40	41				24	120	17:00	23
+
+STX On The Beach	51-99-05-0001	1	27	28							24	120	17:00	23
+Noxious Nitrous	51-99-05-0002	1	27	28							24	120	17:00	23
+Sea Level RISE	51-99-05-0003	1	27	28							24	120	17:00	23
+Methane Bubbles	51-99-05-0004	1	27	28							24	120	17:00	23
+My Carbon\nFootprint	51-99-05-0005	1	27	28							24	120	17:00	23
+Fossil Fuel	51-99-05-0006	1	27	28							24	120	17:00	23
+Stinky Sulphur	51-99-05-0007	1	27	28							24	120	17:00	23
+Biofuel	51-99-05-0008	1	27	28							24	120	17:00	23
+Coal Story Bro	51-99-05-0009	1	27	28							24	120	17:00	23
+Bangkok\nUnderwater	51-99-05-0010	1	27	28							24	120	17:00	23
+Druzhba Pipe	51-99-05-0012	1	27	28							24	120	17:00	23
+2050	51-99-05-0013	1	27	28							24	120	17:00	23
+Greenwash	51-99-05-0014	1	27	28							24	120	17:00	23
+Tailpipe Emissions	51-99-05-0015	1	27	28							24	120	17:00	23
+Petrol Fumes	51-99-05-0017	1	27	28							24	120	17:00	23
+Big Kid	51-99-05-0018	1	27	28							24	120	17:00	23
+Peach Smash	51-99-05-0019	1	27	28							24	120	17:00	23
+Melon Fizz	51-99-05-0020	1	27	28							24	120	17:00	23
+Yuzu Collins	51-99-05-0021	1	27	28							24	120	17:00	23
+Gin Collins	51-99-05-0022	1	27	28							24	120	17:00	23
+The Floral	51-99-05-0023	1	27	28							24	120	17:00	23
+Combination	51-99-05-0024	1	27	28							24	120	17:00	23
+Ume Ume	51-99-05-0025	1	27	28							24	120	17:00	23
+Like Sex\non The Beach	51-99-05-0026	1	27	28							24	120	17:00	23
+Plum Highball	51-99-05-0027	1	27	28							24	120	17:00	23
--- a/inter/aus/xml/page_catalog_group_cocktail.lxml
+++ b/inter/aus/xml/page_catalog_group_cocktail.lxml
--- a/inter/aus/xml/page_catalog_group_winter_warmers.lxml
+++ b/inter/aus/xml/page_catalog_group_winter_warmers.lxml
@ -1,35 +1,35 @@
-
-
-<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"    
-
-    
-    SAVELOG PreviseXMLFileName2
-
-    Var Timeout = 0
-
-	Var MenuWinterWarmersCatalogState = "PressForever"
-
-
-    ;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"    
+
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+	Var MenuWinterWarmersCatalogState = "PressForever"
+
+
+    ;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> 
 <X> 10 </X>
 <Y> 497 </Y>
@ -42,42 +42,6 @@
 	 Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
-<Block>
-	<State> "Enable" </State> 
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 998 </Width>
-	<Height> 617 </Height>
-	<Image>
-		<X> 0 </X>
-		<Y> 0 </Y>
-		<Filename> "ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner_big.png" </Filename>
-	</Image>
-</Block>
-<Block>
-    <MarginLeft> 33 </MarginLeft>
-    <MarginTop> 22 </MarginTop>
-    <Width> 225 </Width>
-    <Height> 296 </Height>
-    <State> "Enable" </State> 
-	; empty block
-</Block>
-<Block>
-    <MarginLeft> 33 </MarginLeft>
-    <MarginTop> 22 </MarginTop>
-    <Width> 225 </Width>
-    <Height> 296 </Height>
-    <State> "Enable" </State> 
-	; empty block
-</Block>
-<Block>
-    <MarginLeft> 33 </MarginLeft>
-    <MarginTop> 22 </MarginTop>
-    <Width> 225 </Width>
-    <Height> 296 </Height>
-    <State> "Enable" </State> 
-	; empty block
-</Block>
 	; ==================> Len = 3
 	; 51-03-01-0002 - - 
 <Block>
@ -6668,16 +6632,30 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-<EventUnitTest1>
-    Var BigButtonEnable = "Enable"  
-    Refresh
-</EventUnitTest1>
-<EventUnitTest2>
-    Var BigButtonEnable = "Invisible"
-    Refresh
-</EventUnitTest2>
-
-
-</Popup>
-
+
+
+
+<Button>
+    <X> 42 </X>
+    <Y> 520 </Y>
+    <State> BigButtonEnable </State>
+    <Filename> "ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png </Filename>
+    <FilenamePress> "ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png" </FilenamePress>
+    <FilenameDisable> "ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png" </FilenameDisable>
+<EventOnClick> 
+        
+</EventOnClick>
+</Button>
+
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"  
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>
+
+
+</Popup>
+
--- a/inter/mys/xml/page_brewing3Conti.xml
+++ b/inter/mys/xml/page_brewing3Conti.xml
--- a/inter/sgp/xml/page_brewing3Conti.xml
+++ b/inter/sgp/xml/page_brewing3Conti.xml
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@ -3629,9 +3629,9 @@ Sugar, Biscof" </Value>
 	<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State> 
 	<Button>
 	<State> $Sum1203030061 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@ -3640,7 +3640,7 @@ Sugar, Biscof" </Value>
 		Var NameDrinkTH = "โกโก้ บิสคอฟ"
 		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล   บิสคอฟ"
 		Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1205,13 +1205,14 @@
 </EventUnitTest2>

 <EventUnitTest3>
-	Var XMLProfile = "AllPriceUp10"
-	Open CurrentXMLFileName0
+	;Var XMLProfile = "AllPriceUp10"
+	;Open CurrentXMLFileName0
+	PRICE "Reload" "-"
 </EventUnitTest3>

 <EventUnitTest4>
-	Var XMLProfile = "Discount50"
-	Open CurrentXMLFileName0
+	PRICE "Load" "-"
+	PRICE "Check" XMLProfile
 </EventUnitTest4>

 <EventDrink>
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "8.59"
-	Var XMLPageVersionInt = 859
+	Var XMLPageVersion = "8.60"
+	Var XMLPageVersionInt = 860
 ;Oreo
 Var OreoGuarantee = 0