diff --git a/inter/common/animation01/TaoBin2_draft02_art41.mp4 b/inter/common/animation01/TaoBin2_draft02_art41.mp4 index 3c7931b5..2ecc76ec 100644 Binary files a/inter/common/animation01/TaoBin2_draft02_art41.mp4 and b/inter/common/animation01/TaoBin2_draft02_art41.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art52.mp4 b/inter/common/animation01/TaoBin2_draft02_art52.mp4 index 7eef1e25..67d7a189 100644 Binary files a/inter/common/animation01/TaoBin2_draft02_art52.mp4 and b/inter/common/animation01/TaoBin2_draft02_art52.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art9.mp4 b/inter/common/animation01/TaoBin2_draft02_art9.mp4 new file mode 100644 index 00000000..16713f16 Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art9.mp4 differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index e4088ad4..a4316293 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -554,6 +554,23 @@ Name=BadValentine,file=page_catalog_group_pro_bad_valentine.skt แชมป์โอลิมปิก\nสาขาชวนคุย Chat's our sport,\ngold in NO REPLY น้ำเชื่อมกล้วย เต่าทรงพลัง \n(มีคาเฟอีน) Banana Syrup, Medicine drink, Soda and Ice - 12-05-02-0078 - bn_iced_energy_drink_Banana_soda.png - - - posi1 +Name=pepsi ซื้อคู่ถูกกว่า + วันนี้ลื้อดูร้อน Today, you're melting in the heat! เป๊ปซี่ น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee syrup and Soda - 12-05-02-0057 - + วันนี้ร้อนนิดหน่อย Today is heat MEH เป๊ปซี่ นม Pepsi, Milk - 12-99-02-0003 - + วันนี้ร้อนสุด ๆ Today is sizzling masterpiece เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา Pepsi, Plum Syrup and Soda - 12-05-02-0046 - + วันนี้ร้อนกว่าเมื่อวาน Today is hotter than yesterday (not) เป๊ปซี่ น้ำเชื่อมสละ มะนาว และโซดา Pepsi, Salak Syrup, Lime and Soda - 12-99-05-0058 - + วันนี้ร้อนพอทนไหว Today is warmth is just bearable เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - + วันนี้ร้อนพอหายใจได้ Today is heat: Breathe-able เป๊ปซี่ Pepsi, Ice and Soda - 12-05-02-0007 - + วันนี้ร้อนแบบพอดี Today is 'just right' sauna เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Pepsi, Strawberry Syrup, Limenade and Soda - 12-99-05-0053 - + วันนี้ร้อนแบบมีลม Today is warmth with a breeze เป๊ปซี่ น้ำเชื่อมบ๊วย มะนาว และโซดา Pepsi, Plum Syrup, Lime and Soda - 12-99-05-0064 - + วันนี้ร้อนตับแตก Today is liver-frying hot เป๊ปซี่ น้ำเชื่อมกล้วย โซดา Pepsi, Banana Syrup and Soda - 12-99-02-0007 - + วันนี้ร้อนเกินไป Today is scorchiness OVERDONE เป๊ปซี่ น้ำเชื่อมสละ น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Salak Syrup, Lychee syrup and Soda - 12-05-02-0084 - + วันนี้ร้อนเท่าไหร่ Today is heat? How much? เป๊ปซี่ ชามะลิ ผงมะนาว และโซดา Pepsi, Jasmine Tea, Limenade and Soda - 12-99-05-0052 - + วันนี้ร้อนเหมือนแดดโกรธ Today is heat: ANGRY sun mode เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา Pepsi, Mint Syrup and Soda - 12-05-02-0067 - + วันนี้ร้อนจนเดือด Today is boiling point reached เป๊ปซี่ Pepsi and Soda - - 12-05-03-0007 + วันนี้ร้อนจนผิวจะเกรียม Today is heat: Skin crisping เป๊ปซี่ น้ำเชื่อมชูกำลัง มะนาว และโซดา Pepsi Energy Syrup, Lime and Soda - 12-99-05-0057 - + + Name=Lip It น้ำเชื่อมคาราเมล น้ำเชื่อมบ๊วย นมและน้ำแข็ง Caramel Syrup, Plum Syrup, Milk and Ice - - 12-03-03-0046 น้ำเชื่อมคาราเมล น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำแข็ง Straw Syrup, Caramel Syrup, Milk and Ice - - 12-03-03-0047 @@ -568,21 +585,6 @@ Name=Lip It - - - - - - - - - - - - - - - Name=CockTail,file=page_catalog_group_cocktail.skt STX On The Beach STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - posi1 - #N/A - #N/A #N/A Noxious Nitrous Noxious Nitrous Mint syrup, Limeade, Ice, Rum Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - posi1 - #N/A - #N/A #N/A diff --git a/ui/lang.tsv b/ui/lang.tsv index 54a1f0eb..17dc12f3 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -800,9 +800,21 @@ 800752 Change / Clean เปลี่ยน / ทำความสะอาด +800753 Powder Canister กล่องผง +800754 Syrup buffer ถังไซรับ +800755 Bean Canister กล่องเมล็ด +800756 Whipper Module ชุดหัวชง +800757 Clean bowl ถ้วยล้าง +800758 Arm module ชุดแขน +800759 Change เปลี่ยน +800760 Clean ล้าง +800761 Disc Powder ฐานจานผง +800762 Change/Clean เปลี่ยน/ล้าง - +810000 +810001 Start เริ่มทำงาน +810002 Stop หยุดทำงาน diff --git a/xml/menutab/menu_catalog_new.xml b/xml/menutab/menu_catalog_new.xml index e9a9043a..95ed3fca 100644 --- a/xml/menutab/menu_catalog_new.xml +++ b/xml/menutab/menu_catalog_new.xml @@ -43,7 +43,6 @@ EndIf EndIf - @@ -118,8 +117,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_appfast.xml b/xml/menutab/page_catalog_group_appfast.xml index e1b3f582..3f9d7654 100644 --- a/xml/menutab/page_catalog_group_appfast.xml +++ b/xml/menutab/page_catalog_group_appfast.xml @@ -209,7 +209,6 @@ EndIf EndIf - @@ -284,8 +283,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml index 2c2bb8fc..08d71b0a 100644 --- a/xml/menutab/page_catalog_group_coffee.xml +++ b/xml/menutab/page_catalog_group_coffee.xml @@ -201,7 +201,6 @@ EndIf EndIf - @@ -276,8 +275,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_forkid.xml b/xml/menutab/page_catalog_group_forkid.xml index 34a4f219..df71f048 100644 --- a/xml/menutab/page_catalog_group_forkid.xml +++ b/xml/menutab/page_catalog_group_forkid.xml @@ -210,7 +210,6 @@ EndIf EndIf - @@ -285,8 +284,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_health.xml b/xml/menutab/page_catalog_group_health.xml index 43dadf45..88243ef3 100644 --- a/xml/menutab/page_catalog_group_health.xml +++ b/xml/menutab/page_catalog_group_health.xml @@ -201,7 +201,6 @@ EndIf EndIf - @@ -276,8 +275,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index 98a9da69..0071bce8 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -199,7 +199,6 @@ EndIf EndIf - @@ -274,8 +273,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_oreo.xml b/xml/menutab/page_catalog_group_oreo.xml index ea88f6b3..26530729 100644 --- a/xml/menutab/page_catalog_group_oreo.xml +++ b/xml/menutab/page_catalog_group_oreo.xml @@ -197,7 +197,6 @@ EndIf EndIf - @@ -272,8 +271,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_other.xml b/xml/menutab/page_catalog_group_other.xml index 160693a9..867ccf18 100644 --- a/xml/menutab/page_catalog_group_other.xml +++ b/xml/menutab/page_catalog_group_other.xml @@ -200,7 +200,6 @@ EndIf EndIf - @@ -275,8 +274,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pepsi_pro.xml b/xml/menutab/page_catalog_group_pepsi_pro.xml index 78066ab1..d88ee61d 100644 --- a/xml/menutab/page_catalog_group_pepsi_pro.xml +++ b/xml/menutab/page_catalog_group_pepsi_pro.xml @@ -197,7 +197,6 @@ EndIf EndIf - @@ -272,8 +271,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pro_15THB.xml b/xml/menutab/page_catalog_group_pro_15THB.xml index de9537f1..02d0ad7c 100644 --- a/xml/menutab/page_catalog_group_pro_15THB.xml +++ b/xml/menutab/page_catalog_group_pro_15THB.xml @@ -219,7 +219,6 @@ EndIf EndIf - @@ -294,8 +293,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pro_melon.xml b/xml/menutab/page_catalog_group_pro_melon.xml index f0fab284..cf60f30e 100644 --- a/xml/menutab/page_catalog_group_pro_melon.xml +++ b/xml/menutab/page_catalog_group_pro_melon.xml @@ -195,7 +195,6 @@ EndIf EndIf - @@ -270,8 +269,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pro_mymint.xml b/xml/menutab/page_catalog_group_pro_mymint.xml index 47edf5d0..55b0af70 100644 --- a/xml/menutab/page_catalog_group_pro_mymint.xml +++ b/xml/menutab/page_catalog_group_pro_mymint.xml @@ -198,7 +198,6 @@ EndIf EndIf - @@ -273,8 +272,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pro_pepween.xml b/xml/menutab/page_catalog_group_pro_pepween.xml index 9c74739a..06145c8c 100644 --- a/xml/menutab/page_catalog_group_pro_pepween.xml +++ b/xml/menutab/page_catalog_group_pro_pepween.xml @@ -226,7 +226,6 @@ EndIf EndIf - @@ -301,8 +300,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_pro_rerun.xml b/xml/menutab/page_catalog_group_pro_rerun.xml index 95ea5bbd..b3e52083 100644 --- a/xml/menutab/page_catalog_group_pro_rerun.xml +++ b/xml/menutab/page_catalog_group_pro_rerun.xml @@ -199,7 +199,6 @@ EndIf EndIf - @@ -274,8 +273,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 28c4b5a6..55254906 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -218,7 +218,6 @@ EndIf EndIf - @@ -293,8 +292,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_soft_serve.xml b/xml/menutab/page_catalog_group_soft_serve.xml index beb52970..3ca5e93e 100644 --- a/xml/menutab/page_catalog_group_soft_serve.xml +++ b/xml/menutab/page_catalog_group_soft_serve.xml @@ -197,7 +197,6 @@ EndIf EndIf - @@ -272,8 +271,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_songkran.xml b/xml/menutab/page_catalog_group_songkran.xml index 9370b170..66959f05 100644 --- a/xml/menutab/page_catalog_group_songkran.xml +++ b/xml/menutab/page_catalog_group_songkran.xml @@ -197,7 +197,6 @@ EndIf EndIf - @@ -272,8 +271,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml index 7af179c6..2828b92f 100644 --- a/xml/menutab/page_catalog_group_tea.xml +++ b/xml/menutab/page_catalog_group_tea.xml @@ -201,7 +201,6 @@ EndIf EndIf - @@ -276,8 +275,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_group_whey.xml b/xml/menutab/page_catalog_group_whey.xml index cd76c631..cc156592 100644 --- a/xml/menutab/page_catalog_group_whey.xml +++ b/xml/menutab/page_catalog_group_whey.xml @@ -206,7 +206,6 @@ EndIf EndIf - @@ -281,8 +280,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/menutab/page_catalog_momday.xml b/xml/menutab/page_catalog_momday.xml index 069030c1..9eb17161 100644 --- a/xml/menutab/page_catalog_momday.xml +++ b/xml/menutab/page_catalog_momday.xml @@ -197,7 +197,6 @@ EndIf EndIf - @@ -272,8 +271,6 @@ InstanceGetString SaveStringInst DEBUGVAR show_eng - - RefreshAll If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 6725450b..16b50c19 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -1685,12 +1685,6 @@ - ;If MachineStage = "drink-success" Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - ;If MachineStage = "drink-failed" Then - ; Open "ROOT/taobin_project/xml/page_drinkfail.xml" - ;EndIf If MachineStage = "drink-success" Then Var MachineState_Result = 1 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index fb502f30..dd22522e 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -627,7 +627,7 @@ 20 280 Center - RobotoBlack + KanitLightTTF 0x513C2F nextCount @@ -638,7 +638,7 @@ 20 280 Center - RobotoBlack + KanitLightTTF 0x513C2F next_name diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 556c236c..ec5ec9fc 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -371,7 +371,11 @@ If stop_now = "true" Then SAVELOG "stop_now is true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + If Seeker = "curr" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf EndIf If Seeker = "curr" Then diff --git a/xml_main/startup.xml b/xml_main/startup.xml index c00175b1..b3b90430 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.20" - Var XMLPageVersionInt = 820 + Var XMLPageVersion = "8.21" + Var XMLPageVersionInt = 821 ;Oreo Var OreoGuarantee = 0