diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 580608b8..028c5322 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -37,7 +37,7 @@ hot chrysanths tea 12-02-01-0001 1 10 24 65 1:05 61 Hot thai milk tea 12-02-01-0002 1 6 7 10 24 78 1:18 25 Hot Taiwanese Tea 12-02-01-0003 1 6 7 10 24 90 1:30 29 Hot matcha latte 12-02-01-0004 1 6 7 8 9 24 149 2:29 36 -Hot black tea 12-02-01-0005 +Hot black tea 12-02-01-0005 Hot Kokuto Tea 12-02-01-0006 1 6 7 10 27 24 133 2:13 32 Hot Limeade tea 12-02-01-0007 1 10 12 24 112 1:52 54 Hot Lychee tea 12-02-01-0008 1 10 11 24 112 1:52 54 @@ -47,7 +47,7 @@ Iced Chrysanths Tea 12-02-02-0001 1 10 23 24 88 1:28 42 Iced Thai milk Tea 12-02-02-0002 1 6 7 10 23 24 165 2:45 40 Iced Taiwanese Tea 12-02-02-0003 1 6 7 10 23 24 104 1:44 25 Iced matcha latte 12-02-02-0004 1 6 7 8 9 23 24 175 2:55 34 -Iced black tea รอเทสชาดำใหม่ 12-02-02-0005 +Iced black tea รอเทสชาดำใหม่ 12-02-02-0005 Iced Kokuto Tea 12-02-02-0006 1 6 7 10 27 23 24 131 2:11 25 Iced Lime tea 12-02-02-0007 1 10 12 23 24 130 2:10 42 Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 12-02-02-0008 1 10 11 23 24 129 2:09 42 @@ -127,29 +127,29 @@ ICED LYCHEE TEA 12-02-02-0019 1 11 16 23 24 100 20:40 32 HOT LYCHEE AMERICANO 12-01-01-0017 1 2 3 4 5 11 16 24 100 21:40 32 ICED LYCHEE AMERICANO 12-01-02-0017 1 2 3 4 5 11 16 23 24 100 22:40 32 ETHIOPAI GUJI DIRTY 12-01-02-0018 1 7 2 3 4 5 24 100 22:40 32 - + HOT GINGER TEA 12-02-01-0020 1 10 24 88 1:28 42 HOT LIME \nGINGER TEA 12-02-01-0021 1 10 12 24 88 1:28 42 ICED GINGER TEA 12-02-02-0020 1 10 23 24 88 2:28 42 GINGER SODA 12-05-02-0038 1 10 13 23 24 88 3:28 42 GINGER LIME \nSODA 12-05-02-0039 1 10 13 12 23 24 88 4:28 42 - + STRAWBERRY SODA 12-05-02-0041 1 19 23 13 24 55 0:55 17 ICED STRAWBERRY 12-05-02-0040 1 16 19 23 24 75 1:15 24 Hot strawberry tea 12-02-01-0022 1 10 19 24 90 1:30 43 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 42 2 3 4 5 24 100 22:40 32 HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 42 3 4 5 16 24 88 1:28 32 ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 42 3 4 5 23 16 24 133 2:13 32 ESPRESSO BLUE DADDY 12-01-01-0020 1 2 42 3 4 5 24 66 1:06 32 - + MOZART ALMOST DIRTY 12-01-02-0022 1 7 43 2 3 4 5 24 100 22:40 32 อเมริกาโนร้อน 12-01-01-0021 1 2 43 3 4 5 16 24 88 1:28 32 อเมริกาโนเย็น 12-01-02-0021 1 2 43 3 4 5 23 16 24 133 2:13 32 เอสเพรสโซ่ช็อต 12-01-01-0022 1 2 43 3 3 5 24 66 1:06 32 - + WHISKY DUDE 12-01-02-0026 1 7 44 2 3 4 5 24 100 22:40 32 WHISKY DUDE 12-01-01-0025 1 2 44 3 4 5 16 24 88 1:28 32 WHISKY DUDE 12-01-02-0025 1 2 44 3 4 5 23 16 24 133 2:13 32 @@ -158,32 +158,32 @@ SNOWWHITE 12-01-02-0024 1 7 45 2 3 4 5 24 100 22:40 32 SNOWWHITE 12-01-01-0023 1 2 45 3 4 5 16 24 88 1:28 32 SNOWWHITE 12-01-02-0023 1 2 45 3 4 5 23 16 24 133 2:13 32 SNOWWHITE 12-01-01-0024 1 2 45 3 4 5 24 66 1:06 32 - + PEACHER 12-01-02-0028 1 7 47 3 3 4 5 24 100 22:40 32 PEACHER 12-01-01-0027 1 2 47 3 4 5 16 24 88 1:28 32 PEACHER 12-01-02-0027 1 2 47 3 4 5 23 16 24 133 2:13 32 PEACHER 12-01-01-0028 1 2 47 3 4 5 24 66 1:06 32 - + Congee 12-06-01-0001 1 46 24 65 1:05 61 - + Pure beauty 12-01-02-0033 1 7 48 2 3 4 5 24 100 22:40 32 Pure beauty 12-01-01-0032 1 2 48 3 4 5 16 24 88 1:28 32 Pure beauty 12-01-02-0032 1 2 48 3 4 5 23 16 24 133 2:13 32 Pure beauty 12-01-01-0033 1 2 48 3 4 5 24 66 1:06 32 - - 12-02-01-0031 - 12-02-01-0032 - 12-02-03-0031 - 12-02-03-0032 - - + + 12-02-01-0031 + 12-02-01-0032 + 12-02-03-0031 + 12-02-03-0032 + + Geisha 12-01-02-0036 1 7 49 2 3 4 5 24 100 22:40 32 Geisha 12-01-01-0035 1 2 49 3 4 5 16 24 88 1:28 32 Geisha 12-01-02-0035 1 2 49 3 4 5 23 16 24 133 2:13 32 Geisha 12-01-01-0036 1 2 49 3 4 5 24 66 1:06 32 - - - + + + โจ๊กผักฮ้องกง 12-06-01-0002 1 46 24 66 1:06 32 โอวัลตินปั่นภูเขาไฟ 12-03-03-0020 1 51 17 23 41 24 66 2:06 32 โอวัลตินร้อน 12-03-01-0019 1 51 17 16 24 66 3:06 32 @@ -193,17 +193,17 @@ ROSALYN ALMOST DIRTY 12-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32 อเมริกาโนร้อน ROSALYN 12-01-01-0038 1 2 50 3 4 5 16 24 66 7:06 32 อเมริกาโนเย็น ROSALYN 12-01-02-0038 1 2 50 3 4 5 23 16 24 66 8:06 32 เอสเพรสโซ่ช็อต ROSALYN 12-01-01-0037 1 2 50 3 4 5 24 66 9:06 32 - + โกโก้โอดิบภูเขาไฟ 12-03-03-0021 1 51 15 17 23 41 51 24 66 5:06 32 - - - - + + + + นมยูซุร้อน 12-03-01-0023 1 53 6 16 24 120 3:00 23 นมยูซุเย็น 12-03-02-0023 1 53 6 23 24 120 4:00 23 นมยูซุปั่น 12-03-03-0023 1 53 6 23 41 24 120 5:00 23 ยูซุโซดา 12-05-02-0045 1 53 23 23 13 24 120 6:00 23 - + อเมริกาโซดา 12-01-02-0041 1 2 3 4 5 23 16 13 24 120 3:00 23 HOT MELON TAIWANESE 12-02-01-0035 1 6 7 10 25 24 120 7:00 23 24 120 8:00 23 @@ -214,8 +214,8 @@ HOT MELON TAIWANESE 12-02-01-0035 1 6 7 10 25 24 120 7:00 23 อเมริกาโนเมล่อนร้อน 12-01-01-0039 1 2 3 4 5 52 24 120 5:00 23 อเมริกาโนเมล่อนเย็น 12-01-02-0039 1 2 3 4 5 52 23 24 120 6:00 23 เมล่อนโปรตีน 12-04-02-0018 1 26 6 52 25 24 120 2:00 23 - - + + เป๊ปซี่บ๊วย 12-05-02-0046 1 14 33 23 13 24 120 2:00 23 เป๊ปซี่บ๊วยปั่น 12-05-03-0046 1 14 33 23 41 13 24 120 3:00 23 เป๊ปซี่เมล่อน 12-05-02-0047 1 14 52 23 13 24 120 4:00 23 @@ -231,14 +231,14 @@ HOT MELON TAIWANESE 12-02-01-0035 1 6 7 10 25 24 120 7:00 23 ชานมไทยโอริโอ้ภูเขาไฟ 12-02-03-0044 1 17 23 55 40 41 24 120 14:00 23 PEPSI YUZU 12-05-02-0053 1 14 53 23 13 24 120 4:00 23 PEPSI BANANA 12-05-02-0054 1 14 56 23 13 24 120 4:00 23 - - - - - - - - + + + + + + + + โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40 โกโก้สตอเบอร์รี่ปั่น 12-03-03-0010 1 15 17 19 23 41 24 125 2:05 40 สตอเบอร์รี่มัชฉะลาเต้เย็ 12-02-02-0023 1 16 8 9 19 23 24 125 3:05 40 @@ -246,9 +246,9 @@ PEPSI BANANA 12-05-02-0054 1 14 56 23 13 24 120 4:00 23 นมสตอเบอร์รี่เย็น 12-03-02-0011 1 17 19 23 24 125 5:05 40 นมสตอเบอร์รี่ปั่น 12-03-03-0011 1 17 19 23 41 24 125 6:05 40 โอรีโอ้โปรตีน 12-04-02-0014 1 17 25 40 26 24 125 7:05 40 - -เอสเพรสโซ่ช็อต - + +เอสเพรสโซ่ช็อต + Hot Thai Tea café Latte 12-01-01-0029 1 2 3 4 5 6 7 10 24 161 2:41 22 Hot Taiwanese Tea café Latte 12-01-01-0030 1 2 3 4 5 10 24 136 2:16 26 Hot Matcha café Latte 12-01-01-0031 1 2 3 4 5 8 9 7 24 140 2:20 19 @@ -268,8 +268,8 @@ Iced Taiwanese Tea 12-02-02-0025 1 6 7 10 23 24 104 1:44 25 Iced matcha latte 12-02-02-0026 1 6 7 8 9 23 24 175 2:55 34 ICED MATCHA 12-02-02-0027 1 16 8 9 23 24 100 15:40 32 ICED MATCHA LIMENADE 12-02-02-0028 1 8 9 12 23 24 1 1 32 - - + + Iced Thai milk Tea 12-02-03-0024 1 6 7 10 23 41 24 165 2:45 40 Iced Taiwanese Tea 12-02-03-0025 1 6 7 10 23 41 24 104 1:44 25 Iced matcha latte 12-02-03-0026 1 6 7 8 9 23 41 24 175 2:55 34 @@ -278,22 +278,22 @@ ICED MATCHA LIMENADE 12-02-03-0028 1 8 9 12 23 41 24 1 1 32 THAI TEA SHAKE 12-04-02-0015 1 25 26 6 7 10 23 24 223 3:43 37 MATCHA SHAKE 12-04-02-0016 1 25 26 9 6 7 23 24 181 3:01 30 TAIWANESE TEA SHAKE 12-04-02-0017 1 25 26 10 17 23 24 197 3:17 39 - + APP FAST ORIGINAL 12-04-02-1018 1 25 26 23 24 100 1:40 32 ESPRESSO SHAKE 12-04-02-1019 1 25 26 2 3 4 5 17 23 24 230 3:50 28 CHOCOLATE SHAKE 12-04-02-1020 1 25 26 6 7 15 23 24 219 3:39 36 THAI TEA SHAKE 12-04-02-1021 1 25 26 6 7 10 23 24 223 3:43 37 แอพ ฟาสท์ ชาเขียว 12-04-02-1022 1 25 26 9 6 7 23 24 181 3:01 30 - + ชาอู่หลงร้อน 12-02-01-0031 1 10 16 24 90 1:30 29 ชาอู่หลงเย็น 12-02-02-0031 1 10 16 23 24 104 1:44 25 - 12-02-03-0031 1 10 16 24 90 1:30 29 - 12-02-03-0032 1 10 16 24 104 1:44 25 - + ชาอู่หลงมะนาว ร้อน 12-02-01-0032 1 10 12 16 24 90 1:30 29 ชาอู่หลงมะนาว เย็น 12-02-02-0032 1 10 12 16 23 24 104 1:44 25 - - + + ชาดำร้อน 12-02-01-0029 1 10 16 24 90 1:30 29 ชาดำมะนาวร้อน 12-02-01-0030 1 10 12 16 24 104 1:44 25 ICED THAI TEA 12-02-02-0029 1 16 10 23 24 100 15:40 32 @@ -336,11 +336,11 @@ nUll 12-02-03-0037 24 1 1 32 คาปูชิโน่เย็น 12-01-02-1099 1 2 3 4 5 6 7 23 24 1 1 32 คาปูชิโน่ร้อน 12-01-01-1099 1 2 3 4 5 6 7 24 1 1 32 ICED LIMENADE 12-05-02-1001 1 16 12 23 24 100 1:40 32 - - - - - + + + + + อเมริกาโนยูซุร้อน 12-01-01-0040 1 53 3 5 6 7 24 49 0:49 23 อเมริกาโนยูซุเย็น 12-01-02-0040 1 53 3 5 6 7 23 24 49 0:49 23 ชายูซุร้อน 12-02-01-0038 1 10 16 53 24 49 1:49 23 @@ -348,14 +348,14 @@ ICED LIMENADE 12-05-02-1001 1 16 12 23 24 100 1:40 32 โกโก้ยูซุเย็น 12-03-02-0025 1 15 7 53 24 49 3:49 23 โกโก้ยูซุร้อน 12-03-01-0025 1 15 7 53 23 24 49 4:49 23 โกโก้ยูซุปั่น 12-03-03-0025 1 15 7 53 23 41 24 49 5:49 23 - + HOT BANANA CAFE LATTE 12-01-01-0042 1 56 3 4 5 16 24 49 1 23 ICED BANANA CAFE LATTE 12-01-02-0042 1 56 3 4 5 23 24 49 1 23 BANANA CAFE LATTE 12-01-03-0042 1 56 3 4 5 23 41 24 49 1 23 นมช็อกโกโตเกียวบานาน่า 12-03-03-0024 1 17 56 23 15 41 24 49 1 23 นมช็อกโกโตเกียวบานาน่า 12-03-02-0024 1 17 56 23 15 24 49 1 23 นมช็อกโกโตเกียวบานาน่า 12-03-01-0024 1 17 56 15 24 49 1 23 - + CHOPIN ALMOST DIRTY 12-01-02-0045 1 7 57 2 3 4 5 24 49 1 23 อเมริกาโนร้อนCHOPIN 12-01-01-0044 1 2 57 3 4 5 16 24 49 1 23 อเมริกาโนเย็นCHOPIN 12-01-02-0044 1 2 57 3 4 5 23 16 24 49 1 23 @@ -369,9 +369,9 @@ OPUS-ONE-DIRTY 12-01-02-0051 1 7 2 3 4 5 24 49 1 23 OPUS-ONE-AMERI 12-01-01-0050 1 2 3 4 5 16 24 49 1 23 OPUS-ONE-AMERI 12-01-02-0050 1 2 3 4 5 23 16 24 49 1 23 OPUS-ONE-ESP 12-01-01-0049 1 2 3 3 5 24 49 1 23 - - - + + + น้ำเมียงู 12-01-02-0054 1 56 3 4 5 23 24 49 1 23 SNAKE WIFE AMERICANO 12-01-02-0053 1 21 3 4 5 23 24 49 1 23 ชาดำปาโป่ง 12-02-02-0043 1 10 12 23 13 24 49 1 23 @@ -379,16 +379,30 @@ SNAKE WIFE AMERICANO 12-01-02-0053 1 21 3 4 5 23 24 49 1 23 โอวัลตินรถโรงเรียน 12-03-02-0026 1 51 17 23 24 49 1 23 โซดาสอยดาว 12-05-02-0055 1 12 33 11 23 13 24 49 1 23 โคล่าติมหลอด 12-05-02-0056 1 23 14 21 13 24 49 1 23 - - - - - + +ชามะลิร้อน 12-02-01-0045 1 16 10 24 49 1 23 +ชามะลิเย็น 12-02-02-0045 1 16 10 23 24 49 1 23 +ชามะลิลาเต้ร้อน 12-02-01-0046 1 16 7 10 24 49 1 23 +ชามะลิลาเต้เย็น 12-02-02-0046 1 16 7 10 23 24 49 1 23 + + + + + + + + + + + + + + Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23 Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23 OREO SMOOTHIE VOLCANO 12-03-03-0009 1 17 23 40 41 24 110 1:50 53 Supper oreo 12-03-03-0032 1 17 23 40 41 24 110 1:50 53 - + Iced Espresso 12-11-03-0001 1 2 3 4 5 6 7 23 41 24 208 3:28 29 Iced Americano 12-01-03-0001 1 2 3 4 5 23 16 41 24 133 2:13 22 Iced Cafe Latte 12-01-03-0002 1 2 3 4 5 6 7 23 41 24 186 3:06 26 @@ -465,16 +479,16 @@ Iced strawberrry tea 12-02-03-0022 1 10 19 23 41 24 85 1:25 27 STRAWBERRY SHAKE 12-04-03-0013 1 25 26 19 17 23 41 24 178 2:58 35 ICED AMERICANO BLUE DADDY 12-01-03-0019 1 2 36 3 4 5 23 16 41 24 133 2:13 32 Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23 - - - - - - - - - - + + + + + + + + + + Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 double espresso 14-11-01-0001 1 2 3 4 5 116 1:56 28 Hot Americano 14-01-01-0003 1 2 3 4 5 16 24 88 1:28 17 @@ -513,7 +527,7 @@ hot chrysanths tea 14-02-01-0001 1 10 24 65 1:05 61 Hot thai milk tea 14-02-01-0002 1 6 7 10 24 78 1:18 25 Hot Taiwanese Tea 14-02-01-0003 1 6 7 10 24 90 1:30 29 Hot matcha latte 14-02-01-0004 1 6 7 8 9 24 149 2:29 36 -Hot black tea 14-02-01-0005 +Hot black tea 14-02-01-0005 Hot Kokuto Tea 14-02-01-0006 1 6 7 10 27 24 133 2:13 32 Hot Limeade tea 14-02-01-0007 1 10 12 24 112 1:52 54 Hot Lychee tea 14-02-01-0008 1 10 11 24 112 1:52 54 @@ -523,7 +537,7 @@ Iced Chrysanths Tea 14-02-02-0001 1 10 23 24 88 1:28 42 Iced Thai milk Tea 14-02-02-0002 1 6 7 10 23 24 165 2:45 40 Iced Taiwanese Tea 14-02-02-0003 1 6 7 10 23 24 104 1:44 25 Iced matcha latte 14-02-02-0004 1 6 7 8 9 23 24 175 2:55 34 -Iced black tea รอเทสชาดำใหม่ 14-02-02-0005 +Iced black tea รอเทสชาดำใหม่ 14-02-02-0005 Iced Kokuto Tea 14-02-02-0006 1 6 7 10 27 23 24 131 2:11 25 Iced Lime tea 14-02-02-0007 1 10 12 23 24 130 2:10 42 Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 14-02-02-0008 1 10 11 23 24 129 2:09 42 @@ -569,7 +583,7 @@ Energy drink Pepsi 14-05-02-0036 1 34 14 23 24 100 4:40 32 Energy drink lime soda 14-05-02-0037 1 34 12 13 23 24 100 5:40 32 ICED MANGO 14-05-02-0030 1 31 23 24 100 12:40 32 ICED MANGO SODA 14-05-02-0031 1 31 23 13 24 100 13:40 32 - + ILYSB 11-99-05-0001 1 23 27 28 24 49 1:01 23 Gale Jail 11-99-05-0002 1 23 27 28 24 49 2:01 23 Third Behind Bars 11-99-05-0003 1 23 27 28 24 49 3:01 23 @@ -581,4 +595,4 @@ Good Night Kiss 11-99-05-0009 1 23 27 28 24 49 8:01 23 Forever Love 11-99-05-0010 1 23 27 28 24 49 9:01 23 Long Night 11-99-05-0008 1 23 27 28 24 49 10:01 23 Forever Love 11-99-05-0012 1 23 27 28 24 49 9:01 23 -Long Night 11-99-05-0013 1 23 27 28 24 49 10:01 23 \ No newline at end of file +Long Night 11-99-05-0013 1 23 27 28 24 49 10:01 23 diff --git a/image/lang/bn_malay_lang.png b/image/lang/bn_malay_lang.png new file mode 100644 index 00000000..e1343893 Binary files /dev/null and b/image/lang/bn_malay_lang.png differ diff --git a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea_SingPark.png b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..06c694a1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png new file mode 100644 index 00000000..7910eee9 Binary files /dev/null and b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png differ diff --git a/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png new file mode 100644 index 00000000..e60c75a6 Binary files /dev/null and b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_n/b_limeblack_tea_SingPark.png b/image/page_drink_n/b_limeblack_tea_SingPark.png new file mode 100644 index 00000000..7bbbad0a Binary files /dev/null and b/image/page_drink_n/b_limeblack_tea_SingPark.png differ diff --git a/image/page_drink_n/bn_hot_coffee_thai_milk_tea_SingPark.png b/image/page_drink_n/bn_hot_coffee_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..e7436a65 Binary files /dev/null and b/image/page_drink_n/bn_hot_coffee_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png b/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png new file mode 100644 index 00000000..a5dbf689 Binary files /dev/null and b/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_n/bn_thai_black_tea_SingPark.png b/image/page_drink_n/bn_thai_black_tea_SingPark.png new file mode 100644 index 00000000..3524cefe Binary files /dev/null and b/image/page_drink_n/bn_thai_black_tea_SingPark.png differ diff --git a/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png b/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png new file mode 100644 index 00000000..269bbae4 Binary files /dev/null and b/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_n/bn_thai_milk_tea_SingPark.png b/image/page_drink_n/bn_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..c3b4e73a Binary files /dev/null and b/image/page_drink_n/bn_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_n/bn_thai_milk_tea_SingPark_Healthy.png b/image/page_drink_n/bn_thai_milk_tea_SingPark_Healthy.png new file mode 100644 index 00000000..6616547a Binary files /dev/null and b/image/page_drink_n/bn_thai_milk_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_picture2_n/b_limeblack_tea_SingPark.png b/image/page_drink_picture2_n/b_limeblack_tea_SingPark.png new file mode 100644 index 00000000..fb5efeee Binary files /dev/null and b/image/page_drink_picture2_n/b_limeblack_tea_SingPark.png differ diff --git a/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea_SingPark.png b/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..8f1ee67c Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_picture2_n/bn_limeblack_tea_SingPark_Healthy.png b/image/page_drink_picture2_n/bn_limeblack_tea_SingPark_Healthy.png new file mode 100644 index 00000000..cebcd0ee Binary files /dev/null and b/image/page_drink_picture2_n/bn_limeblack_tea_SingPark_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png b/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png new file mode 100644 index 00000000..40a02289 Binary files /dev/null and b/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png differ diff --git a/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png b/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..14e45539 Binary files /dev/null and b/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea_SingPark.png b/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..34d84ea5 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea_SingPark.png differ diff --git a/image/page_drink_press_n/bn_limeblack_tea_SingPark.png b/image/page_drink_press_n/bn_limeblack_tea_SingPark.png new file mode 100644 index 00000000..4606f5b2 Binary files /dev/null and b/image/page_drink_press_n/bn_limeblack_tea_SingPark.png differ diff --git a/image/page_drink_press_n/bn_limeblack_tea_SingPark_Healthy.png b/image/page_drink_press_n/bn_limeblack_tea_SingPark_Healthy.png new file mode 100644 index 00000000..20a07b46 Binary files /dev/null and b/image/page_drink_press_n/bn_limeblack_tea_SingPark_Healthy.png differ diff --git a/image/topping2/bp_childrenFree.png b/image/topping2/bp_childrenFree.png index 0d30f123..d0f08669 100644 Binary files a/image/topping2/bp_childrenFree.png and b/image/topping2/bp_childrenFree.png differ diff --git a/image/topping2_en/bp_childrenFree.png b/image/topping2_en/bp_childrenFree.png index e61518d3..b054c848 100644 Binary files a/image/topping2_en/bp_childrenFree.png and b/image/topping2_en/bp_childrenFree.png differ diff --git a/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav b/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav deleted file mode 100644 index fda9876c..00000000 Binary files a/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav and /dev/null differ diff --git a/sound_thai/boy/Please_scan_to_pay_via_mobile.wav b/sound_thai/boy/Please_scan_to_pay_via_mobile.wav deleted file mode 100644 index 961c3df0..00000000 Binary files a/sound_thai/boy/Please_scan_to_pay_via_mobile.wav and /dev/null differ diff --git a/sound_thai/boy/drinkfinish.wav b/sound_thai/boy/drinkfinish.wav deleted file mode 100644 index 08ba8238..00000000 Binary files a/sound_thai/boy/drinkfinish.wav and /dev/null differ diff --git a/sound_thai/boy/drinkfinish_no_straw.wav b/sound_thai/boy/drinkfinish_no_straw.wav deleted file mode 100644 index 4bc861bd..00000000 Binary files a/sound_thai/boy/drinkfinish_no_straw.wav and /dev/null differ diff --git a/sound_thai/boy/next_drink.wav b/sound_thai/boy/next_drink.wav deleted file mode 100644 index a8358cb9..00000000 Binary files a/sound_thai/boy/next_drink.wav and /dev/null differ diff --git a/sound_thai/boy/payment.wav b/sound_thai/boy/payment.wav deleted file mode 100644 index 2d20f781..00000000 Binary files a/sound_thai/boy/payment.wav and /dev/null differ diff --git a/sound_thai/boy/select_level.wav b/sound_thai/boy/select_level.wav deleted file mode 100644 index b5e4f5a0..00000000 Binary files a/sound_thai/boy/select_level.wav and /dev/null differ diff --git a/sound_thai/boy/taobin_sawade.wav b/sound_thai/boy/taobin_sawade.wav deleted file mode 100644 index 99330e78..00000000 Binary files a/sound_thai/boy/taobin_sawade.wav and /dev/null differ diff --git a/sound_thai/boy/thankyou.wav b/sound_thai/boy/thankyou.wav deleted file mode 100644 index 697542dd..00000000 Binary files a/sound_thai/boy/thankyou.wav and /dev/null differ diff --git a/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav b/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav deleted file mode 100644 index 32edbf2c..00000000 Binary files a/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav and /dev/null differ diff --git a/sound_thai/girl/Please_scan_to_pay_via_mobile.wav b/sound_thai/girl/Please_scan_to_pay_via_mobile.wav deleted file mode 100644 index 5b624050..00000000 Binary files a/sound_thai/girl/Please_scan_to_pay_via_mobile.wav and /dev/null differ diff --git a/sound_thai/girl/drinkfinish.wav b/sound_thai/girl/drinkfinish.wav deleted file mode 100644 index 6c78ee3a..00000000 Binary files a/sound_thai/girl/drinkfinish.wav and /dev/null differ diff --git a/sound_thai/girl/drinkfinish_no_straw.wav b/sound_thai/girl/drinkfinish_no_straw.wav deleted file mode 100644 index 91fff02a..00000000 Binary files a/sound_thai/girl/drinkfinish_no_straw.wav and /dev/null differ diff --git a/sound_thai/girl/next_drink.wav b/sound_thai/girl/next_drink.wav deleted file mode 100644 index cf2da760..00000000 Binary files a/sound_thai/girl/next_drink.wav and /dev/null differ diff --git a/sound_thai/girl/payment.wav b/sound_thai/girl/payment.wav deleted file mode 100644 index 0df3c80c..00000000 Binary files a/sound_thai/girl/payment.wav and /dev/null differ diff --git a/sound_thai/girl/select_level.wav b/sound_thai/girl/select_level.wav deleted file mode 100644 index 9f0dc3f8..00000000 Binary files a/sound_thai/girl/select_level.wav and /dev/null differ diff --git a/sound_thai/girl/taobin_sawade.wav b/sound_thai/girl/taobin_sawade.wav deleted file mode 100644 index 28772611..00000000 Binary files a/sound_thai/girl/taobin_sawade.wav and /dev/null differ diff --git a/sound_thai/girl/thankyou.wav b/sound_thai/girl/thankyou.wav deleted file mode 100644 index 6f28342b..00000000 Binary files a/sound_thai/girl/thankyou.wav and /dev/null differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 6fba5a22..46396c58 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -80,6 +80,12 @@ If BoxID = 173149 Then Var OreoForFreeEnable = 1 EndIf + +If BoxID = 172102 Then + Var OreoDueEnable = 0 + Var OreoForFreeEnable = 1 +EndIf + Var OreoForFreeLimit = "" READ_FILE "/mnt/sdcard/oreo_for_free_limit" OreoForFreeLimit diff --git a/xml/menu_catalog_new.lxml b/xml/menu_catalog_new.lxml index 3b98d3b7..18a28d62 100644 --- a/xml/menu_catalog_new.lxml +++ b/xml/menu_catalog_new.lxml @@ -101,7 +101,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -143,17 +155,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_board.xml b/xml/page_board.xml index e1396b08..8337be68 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -636,23 +636,26 @@ ; Set default lang If JXMLVersionInt > 428 Then SetLanguage LanguageInit - EnableLanguage "ENG" - EnableLanguage "THAI" - EnableLanguage "CHINA" - EnableLanguage "JAPAN" - EnableLanguage "MALAY" - + Var InternationalEnable = 0 Var InternationalEnableStr = "false" If CountryName = "Malaysia" Then + EnableLanguage "ENG" + EnableLanguage "THAI" + EnableLanguage "CHINA" + EnableLanguage "JAPAN" + EnableLanguage "MALAY" + SetLanguage "MALAY" + LanguageControl "UpdateList" "-" Var InternationalEnable = 1 EndIf DEBUGVAR InternationalEnable + If InternationalEnable = 1 Then Var LanguageObjectShow = "Enable" Var NoLangObjectShow = "Invisible" @@ -662,6 +665,7 @@ EndIf EndIf + Var StrXMLPageVer = "ver=" + XMLPageVersionInt WRITE_FILE "/mnt/sdcard/coffeevending/version/xml_page_version.int" StrXMLPageVer @@ -685,7 +689,7 @@ Open "/ROOT/xml/offline.xml" EndIf - + ; zone cup on arm If CupOnArm = "true" Then @@ -825,6 +829,11 @@ Var OpenFromPageBoard = 1 If InternationalEnable = 1 Then + + ; show language icon + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml" Else TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" @@ -1007,6 +1016,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" Else If InternationalEnable = 1 Then + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" Else OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" @@ -1076,6 +1086,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" Else If InternationalEnable = 1 Then + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" Else OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index a77d8007..5c3204dd 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -321,8 +321,16 @@ Play PlaySoundLag Var countDownRetrun = 300 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + Refresh diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index 742fef17..bcad22cd 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - If AppFastEnable = "true" Then @@ -133,14 +135,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -249,7 +243,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -291,17 +297,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt index d6b34e4a..8ec2f501 100644 --- a/xml/page_catalog_group_appfast.skt +++ b/xml/page_catalog_group_appfast.skt @@ -12,7 +12,7 @@ ; On open @@ -32,7 +32,7 @@ diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 5f105aef..683bdebf 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -241,7 +241,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -283,17 +295,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 42b1f79d..349a5bc3 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - Var Menu2Selected = "PressForever" @@ -126,14 +128,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -241,7 +235,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -283,17 +289,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_coffee.skt b/xml/page_catalog_group_coffee.skt index 73dbef9e..1631a992 100644 --- a/xml/page_catalog_group_coffee.skt +++ b/xml/page_catalog_group_coffee.skt @@ -11,7 +11,7 @@ ; On open Var Menu2Selected = "PressForever" @@ -24,7 +24,7 @@ diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index 2de88761..d4a46eac 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - ; protein If AppFastEnable = "true" Then @@ -134,14 +136,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -250,7 +244,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -292,17 +298,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_forkid.skt b/xml/page_catalog_group_forkid.skt index 514c5af7..60d847b4 100644 --- a/xml/page_catalog_group_forkid.skt +++ b/xml/page_catalog_group_forkid.skt @@ -12,7 +12,7 @@ ; On open ; protein @@ -33,7 +33,7 @@ diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 9878aee8..72b69071 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - Var Menu22Selected = "PressForever" @@ -125,14 +127,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -241,7 +235,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -283,17 +289,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_health.skt b/xml/page_catalog_group_health.skt index 5b4b3aeb..15660b99 100644 --- a/xml/page_catalog_group_health.skt +++ b/xml/page_catalog_group_health.skt @@ -12,7 +12,7 @@ ; On open Var Menu22Selected = "PressForever" @@ -24,7 +24,7 @@ diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index 20893050..278d9772 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -233,7 +233,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -275,17 +287,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + @@ -4486,4 +4488,10 @@ + + + RefreshAll + + + diff --git a/xml/page_catalog_group_milk.skt b/xml/page_catalog_group_milk.skt index c6e6197e..9ff56a4e 100644 --- a/xml/page_catalog_group_milk.skt +++ b/xml/page_catalog_group_milk.skt @@ -46,4 +46,10 @@ + + + RefreshAll + + + diff --git a/xml/page_catalog_group_oreo.skt b/xml/page_catalog_group_oreo.skt index 90b6f62f..7551e6de 100644 --- a/xml/page_catalog_group_oreo.skt +++ b/xml/page_catalog_group_oreo.skt @@ -11,7 +11,7 @@ ; On open @@ -20,7 +20,7 @@ diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index 3e13deb6..1f7cc8df 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - ; soda and other Var Menu6Selected = "PressForever" @@ -125,14 +127,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -240,7 +234,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -282,17 +288,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_other.skt b/xml/page_catalog_group_other.skt index 3a177645..053ad43b 100644 --- a/xml/page_catalog_group_other.skt +++ b/xml/page_catalog_group_other.skt @@ -12,7 +12,7 @@ ; On open ; soda and other @@ -24,7 +24,7 @@ diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 47effdab..9d6cfbe8 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -258,7 +258,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -300,17 +312,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index 07e521bd..bd4649bc 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - Var Menu3Selected = "PressForever" @@ -125,14 +127,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -241,7 +235,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -283,17 +289,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_tea.skt b/xml/page_catalog_group_tea.skt index 716138e6..ebb57834 100644 --- a/xml/page_catalog_group_tea.skt +++ b/xml/page_catalog_group_tea.skt @@ -12,7 +12,7 @@ ; On open Var Menu3Selected = "PressForever" @@ -24,7 +24,7 @@ diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index 90e12847..54f2dea1 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -13,29 +13,32 @@ DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT + + DEBUGVAR LanguageShow + DEBUGVAR CountryName - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" @@ -114,7 +117,6 @@ ; - If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" @@ -130,14 +132,6 @@ - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf @@ -246,7 +240,19 @@ Var ice_tab_text = "Ice will be ready at " EndIf - RefreshAll + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + @@ -288,17 +294,7 @@ - - 1000 - 381 - show_btn - show_btp - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - ; - - + diff --git a/xml/page_catalog_group_whey.skt b/xml/page_catalog_group_whey.skt index f197c9fe..522bd130 100644 --- a/xml/page_catalog_group_whey.skt +++ b/xml/page_catalog_group_whey.skt @@ -12,7 +12,7 @@ ; On open If AppFastEnable = "true" Then @@ -29,7 +29,7 @@ diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index 853bb51b..d821ec45 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -228,16 +228,17 @@ EndIf EndIf - Var TimeOut = TimeOut + 1 - If TimeOut > 12 Then - Var TimeOut = 0 - Open "ROOT/taobin_project/xml/page_show_error.xml" - - EndIf + EndIf + Var TimeOut = TimeOut + 1 + If TimeOut > 60 Then + Var TimeOut = 0 + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf Refresh TimerReset diff --git a/xml/topview2.xml b/xml/topview2.xml index 336bbe23..b2f07a55 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -10,13 +10,18 @@ Var lang_icon_file_name[3] = "bn_japan_lang.png" Var lang_icon_file_name[2] = "bn_china_lang.png" + Var lang_icon_file_name[4] = "bn_malay_lang.png" + - Var LanguageButtonEnable = "Enable" Var LanguageButtonListEnable = "Invisible" Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex] Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon + Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27 + Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14 + + 1000 @@ -36,7 +41,7 @@ Refresh EndIf - DEBUGVAR langfn + ;DEBUGVAR langfn TimerReset @@ -54,15 +59,19 @@ 82 56 - "Enable" + ENABLE_ENG "ROOT/taobin_project/image/lang/lang_bg_center.png" - 82 56 - "Enable" + ENABLE_JAPAN "ROOT/taobin_project/image/lang/lang_bg_center.png" - - - - - 82 - 51 - "Enable" - - "ROOT/taobin_project/image/lang/lang_bg_center.png" - - + + + 82 + 56 + ENABLE_CHINA + + "ROOT/taobin_project/image/lang/lang_bg_center.png" + + + + 82 + 56 + ENABLE_MALAY + + "ROOT/taobin_project/image/lang/lang_bg_center.png" + 82 @@ -189,6 +145,121 @@ + + + + ButtonLanguageListXPositionIcon + ButtonLanguageListYPositionIcon + 958 + "auto" + "vertical" + LanguageButtonListEnable +; + + 82 + 68 + ENABLE_THAI + + + + 82 + 68 + ENABLE_ENG + + + + 82 + 68 + ENABLE_JAPAN + + + + 82 + 68 + ENABLE_CHINA + + + + 82 + 68 + ENABLE_MALAY + + + + ; diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 18b8f300..40e64c0a 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -144,7 +144,6 @@ Var Text2_9 = Text2_9 + "," Var Text2_9 = Text2_9 + android_text3_2 - 1000