Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

2021-09-08 12:09:47 +07:00 · 2021-09-08 12:09:47 +07:00 · 0af9ef27df
commit 0af9ef27df
parent 8bb5cb100b b9ba305f5f
31 changed files with 18 additions and 6 deletions
--- a/animation01/Menu
+++ b/animation01/Menu
@ -141,9 +141,9 @@ Iced strawberrry tea	12-02-02-0022	1	10	19	23						24	85	1:25	27
 STRAWBERRY SHAKE	12-04-02-0013	1	25	26	19	17	23				24	178	2:58	35
 														
 ETHIOPAI BLUE DADDY DIRTY	12-01-02-0020	1	7	36	2	3	4	5			24	100	22:40	32
-HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	36	2	3	4	5	16			24	88	1:28	32
-ICED AMERICANO BLUE DADDY	12-01-02-0019	1	36	2	3	4	5	23	16		24	133	2:13	32
-ESPRESSO BLUE DADDY	12-01-01-0020	1	36	2	3	4	5				24	66	1:06	32
+HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	2	36	3	4	5	16			24	88	1:28	32
+ICED AMERICANO BLUE DADDY	12-01-02-0019	1	2	36	3	4	5	23	16		24	133	2:13	32
+ESPRESSO BLUE DADDY	12-01-01-0020	1	2	36	3	4	5				24	66	1:06	32
 														
 Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 														
--- a/image/page2/bn_soda_coke.png
+++ b/image/page2/bn_soda_coke.png
--- a/image/page2/bp_soda_coke.png
+++ b/image/page2/bp_soda_coke.png
--- a/image/page2_en/page2/bn_soda_coke.png
+++ b/image/page2_en/page2/bn_soda_coke.png
--- a/image/page2_en/page2/bp_soda_coke.png
+++ b/image/page2_en/page2/bp_soda_coke.png
--- a/image/page_doing/txt_25.png
+++ b/image/page_doing/txt_25.png
--- a/image/page_doing/txt_25_en.png
+++ b/image/page_doing/txt_25_en.png
--- a/image/page_doing/txt_26.png
+++ b/image/page_doing/txt_26.png
--- a/image/page_doing/txt_26_en.png
+++ b/image/page_doing/txt_26_en.png
--- a/image/page_doing/txt_36.png
+++ b/image/page_doing/txt_36.png
--- a/image/page_doing/txt_36_en.png
+++ b/image/page_doing/txt_36_en.png
--- a/image/page_doing/txt_37.png
+++ b/image/page_doing/txt_37.png
--- a/image/page_drink/bn_dirty_light.png
+++ b/image/page_drink/bn_dirty_light.png
--- a/image/page_drink/bn_hot_americano_light.png
+++ b/image/page_drink/bn_hot_americano_light.png
--- a/image/page_drink/bn_hot_espresso_light.png
+++ b/image/page_drink/bn_hot_espresso_light.png
--- a/image/page_drink/bn_iced_americano_light.png
+++ b/image/page_drink/bn_iced_americano_light.png
--- a/image/page_drink_disable/bn_dirty_light.png
+++ b/image/page_drink_disable/bn_dirty_light.png
--- a/image/page_drink_disable/bn_hot_americano_light.png
+++ b/image/page_drink_disable/bn_hot_americano_light.png
--- a/image/page_drink_disable/bn_hot_espresso_light.png
+++ b/image/page_drink_disable/bn_hot_espresso_light.png
--- a/image/page_drink_disable/bn_iced_americano_light.png
+++ b/image/page_drink_disable/bn_iced_americano_light.png
--- a/image/page_drink_press/bn_dirty_light.png
+++ b/image/page_drink_press/bn_dirty_light.png
--- a/image/page_drink_press/bn_hot_americano_light.png
+++ b/image/page_drink_press/bn_hot_americano_light.png
--- a/image/page_drink_press/bn_hot_espresso_light.png
+++ b/image/page_drink_press/bn_hot_espresso_light.png
--- a/image/page_drink_press/bn_iced_americano_light.png
+++ b/image/page_drink_press/bn_iced_americano_light.png
--- a/image/page_drink_select/bn_dirty_light.png
+++ b/image/page_drink_select/bn_dirty_light.png
--- a/image/page_drink_select/bn_hot_americano_light.png
+++ b/image/page_drink_select/bn_hot_americano_light.png
--- a/image/page_drink_select/bn_hot_espresso_light.png
+++ b/image/page_drink_select/bn_hot_espresso_light.png
--- a/image/page_drink_select/bn_iced_americano_light.png
+++ b/image/page_drink_select/bn_iced_americano_light.png
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@ -1,5 +1,7 @@
 17/1/21	
 12-05-02-0019
+12-01-01-0019
+12-01-02-0019
 12-01-02-0018
 12-01-02-0020
 12-05-02-0029
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@ -65,6 +65,16 @@
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 	EndIf

+	; 1035 is Coke.
+	STRCONTAIN "1035" MaterialAvailable CokeUI 
+
+	If CokeUI = "true" Then
+		Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+		Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+	Else
+		Var bnSodaAndOther = DirImage + "/bn_soda.png"
+		Var bpSodaAndOther = DirImage + "/bp_soda.png"
+	EndIf

 </EventOpen>
 <Timeout> 1000 </Timeout>
@ -229,8 +239,8 @@
 <Button>
 <X> 579 </X>
 <Y> 1533 </Y>
-<Filename> Var(DirImage + "/bn_soda.png") </Filename>
-<FilenamePress> Var(DirImage + "/bp_soda.png") </FilenamePress>
+<Filename> bnSodaAndOther </Filename>
+<FilenamePress> bpSodaAndOther </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "5.56"
+	Var XMLPageVersion = "5.57"

 </EventOpen>