diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index d5473a12..6405f287 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -1339,14 +1339,14 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) ร้อน 12-02-01-0039 1 10 7 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) เย็น 12-02-02-0039 1 10 7 23 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) ปั่น 12-02-03-0039 1 10 7 23 41 24 100 7:40 32 - -ยูสุโอริโอ้โวคาโน่ปั่น 12-03-03-0087 1 40 53 23 41 24 100 7:40 -ยูซุคาราเมลโซดาเย็น 12-05-02-0147 1 53 22 13 23 24 100 7:40 - -เป๊ปซี่ยูซุ 12-05-02-0106 1 14 53 23 13 24 100 7:40 -เป๊ปซี่มะพร้าว 12-05-02-0114 1 14 62 23 13 24 100 7:40 -เป๊ปซี่ลิ้นจี่ 12-05-02-0057 1 14 13 11 23 24 100 7:40 -เป๊ปซี่สตรอเบอรี 12-05-02-0058 1 14 13 19 23 24 100 7:40 -เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 -เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 -เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 + 32 +ยูสุโอริโอ้โวคาโน่ปั่น 12-03-03-0087 1 40 53 23 41 24 100 7:40 32 +ยูซุคาราเมลโซดาเย็น 12-05-02-0147 1 53 22 13 23 24 100 7:40 32 + 32 +เป๊ปซี่ยูซุ 12-05-02-0106 1 14 53 23 13 24 100 7:40 32 +เป๊ปซี่มะพร้าว 12-05-02-0114 1 14 62 23 13 24 100 7:40 32 +เป๊ปซี่ลิ้นจี่ 12-05-02-0057 1 14 13 11 23 24 100 7:40 32 +เป๊ปซี่สตรอเบอรี 12-05-02-0058 1 14 13 19 23 24 100 7:40 32 +เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 32 +เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 32 +เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 32 diff --git a/image/page_doing/brewing_txt_adv3.png b/image/page_doing/brewing_txt_adv3.png index a5fc16cf..0ba3538d 100644 Binary files a/image/page_doing/brewing_txt_adv3.png and b/image/page_doing/brewing_txt_adv3.png differ diff --git a/image/page_doing/brewing_txt_adv3_en.png b/image/page_doing/brewing_txt_adv3_en.png index 9e12ffa1..dc3a912c 100644 Binary files a/image/page_doing/brewing_txt_adv3_en.png and b/image/page_doing/brewing_txt_adv3_en.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png b/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png new file mode 100644 index 00000000..102b747c Binary files /dev/null and b/image/page_drink_picture2_n/bn_Yuzu_Milk_Oreo_Volcano.png differ diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv index d5473a12..6405f287 100644 --- a/inter/tha/animation01/play_list.tsv +++ b/inter/tha/animation01/play_list.tsv @@ -1339,14 +1339,14 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) ร้อน 12-02-01-0039 1 10 7 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) เย็น 12-02-02-0039 1 10 7 23 24 100 7:40 32 ชาไทยเต่าบิน (ชานมไทย) ปั่น 12-02-03-0039 1 10 7 23 41 24 100 7:40 32 - -ยูสุโอริโอ้โวคาโน่ปั่น 12-03-03-0087 1 40 53 23 41 24 100 7:40 -ยูซุคาราเมลโซดาเย็น 12-05-02-0147 1 53 22 13 23 24 100 7:40 - -เป๊ปซี่ยูซุ 12-05-02-0106 1 14 53 23 13 24 100 7:40 -เป๊ปซี่มะพร้าว 12-05-02-0114 1 14 62 23 13 24 100 7:40 -เป๊ปซี่ลิ้นจี่ 12-05-02-0057 1 14 13 11 23 24 100 7:40 -เป๊ปซี่สตรอเบอรี 12-05-02-0058 1 14 13 19 23 24 100 7:40 -เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 -เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 -เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 + 32 +ยูสุโอริโอ้โวคาโน่ปั่น 12-03-03-0087 1 40 53 23 41 24 100 7:40 32 +ยูซุคาราเมลโซดาเย็น 12-05-02-0147 1 53 22 13 23 24 100 7:40 32 + 32 +เป๊ปซี่ยูซุ 12-05-02-0106 1 14 53 23 13 24 100 7:40 32 +เป๊ปซี่มะพร้าว 12-05-02-0114 1 14 62 23 13 24 100 7:40 32 +เป๊ปซี่ลิ้นจี่ 12-05-02-0057 1 14 13 11 23 24 100 7:40 32 +เป๊ปซี่สตรอเบอรี 12-05-02-0058 1 14 13 19 23 24 100 7:40 32 +เป๊ปซี่ทรอปิคอล 12-05-02-0148 1 14 34 62 23 24 100 7:40 32 +เป๊ปซี่มะนาว 12-05-02-0149 1 14 13 12 23 24 100 7:40 32 +เป๊ปซี่คาราเมล 12-05-02-0150 1 14 13 22 23 24 100 7:40 32 diff --git a/inter/tha/xml/multi/instance5.inc b/inter/tha/xml/multi/instance5.inc new file mode 100644 index 00000000..82e26180 --- /dev/null +++ b/inter/tha/xml/multi/instance5.inc @@ -0,0 +1,183 @@ + + + GetVisible inst_show2 + ;DEBUGVAR inst_show2 + + + If inst_show2 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + SAVELOG "OPEN slient Refresh" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + SAVELOG "OPEN slient 2" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + If SlientRefreshIndex = 2 Then + If inst_show2 = 0 Then + SAVELOG "OPEN slient 1" + GetXMLFileNameCurrentRunning CurrentOpenFile2 + Open CurrentOpenFile2 + + Else + Var SlientRefreshIndex = 3 + EndIf + EndIf + + If langnext1 = "true" Then + DEBUGVAR langnext1 + Var langnext1 = "false" + RefreshAll + EndIf + + If inst_show2 = 1 Then + + + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + If LanguageShow = "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + EndIf + + + + + + Var Inst5CountMenuEnable = 0 + Var Inst5CountCurrentMenuEnable = 0 + GetFrameScrollBlockCount Inst5CountCurrentMenuEnable + GetCurrentEnableBlockCount Inst5CountMenuEnable + + ;DEBUGVAR Inst5CountMenuEnable + ;DEBUGVAR Inst5CountMenuEnablePrev + ;DEBUGVAR Inst5CountCurrentMenuEnable + + If Inst5CountMenuEnablePrev = "" Then + Var Inst5CountMenuEnablePrev = Inst5CountMenuEnable + Var Inst5CountDownForOpenXML = 0 + Var Inst5CountDownOpenXMLFromMenuZero = 20 + EndIf + + If Inst5CountMenuEnable = Inst5CountMenuEnablePrev Then + + Else + SAVELOG "Inst5 Refresh ===================================================================== Refresh" + Var Inst5CountDownForOpenXML = 10 + Var Inst5CountMenuEnablePrev = CountMenuEnable + EndIf + + If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then + + Else + If Inst5CountDownForOpenXML = 0 Then + SAVELOG "Inst5 Refresh =======================Inst5CountMenuEnable / Inst5CountCurrentMenuEnable ============================================== Refresh" + Var Inst5CountDownForOpenXML = 10 + EndIf + EndIf + + If Inst5CountCurrentMenuEnable = 0 Then + + DEBUGVAR Inst5CountDownOpenXMLFromMenuZero + + If Inst5CountDownOpenXMLFromMenuZero > 0 Then + Var Inst5CountDownOpenXMLFromMenuZero = Inst5CountDownOpenXMLFromMenuZero - 1 + If Inst5CountDownOpenXMLFromMenuZero = 0 Then + Var Inst5CountDownOpenXMLFromMenuZero = 20 + SAVELOG "OPEN FROM 1" + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" + EndIf + EndIf + EndIf + + If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then + If Inst5CountCurrentMenuEnable > 0 Then + Var Inst5MenuLoaded = "done" + EndIf + EndIf + + If Inst5CountDownForOpenXML > 0 Then + Var Inst5CountDownForOpenXML = Inst5CountDownForOpenXML - 1 + DEBUGVAR Inst5CountDownForOpenXML + If Inst5CountDownForOpenXML = 0 Then + SAVELOG "OPEN FROM 2" + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" + EndIf + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + If LanguageShow = "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + EndIf + + ; setvarint RefreshCoffeeMenu 1 + If RefreshCoffeeMenu = 1 Then + Var RefreshCoffeeMenu = 0 + SAVELOG "OPEN FROM 3" + ;Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" + RefreshAll + EndIf + + ; setvarint ScriptCoffeeMenu 1 + If ScriptCoffeeMenu = 1 Then + Var ScriptCoffeeMenu = 0 + SAVELOG "Runscript 3" + Script "-" "-" + EndIf + + If CoffeeRefreshTimeOut > 15 Then + Var CoffeeRefreshTimeOut = 0 + Script "-" "-" + EndIf + + Var CoffeeRefreshTimeOut = CoffeeRefreshTimeOut + 1 + \ No newline at end of file diff --git a/inter/tha/xml/multi/instance8.inc b/inter/tha/xml/multi/instance8.inc new file mode 100644 index 00000000..542941c9 --- /dev/null +++ b/inter/tha/xml/multi/instance8.inc @@ -0,0 +1,137 @@ + + GetVisible inst_show5 + ;DEBUGVAR inst_show5 + + + If inst_show5 = 1 Then + InstanceGetString SaveStringInst + ;DEBUGVAR SaveStringInst + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + EndIf + EndIf + + ; setvarint SlientRefreshEnable 1 + ;DEBUGVAR SlientRefreshEnable + + If SlientRefreshEnable = 1 Then + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + If show_eng = "true" Then + InstanceSetString "ShowEng" + Else + InstanceSetString "ShowThai" + EndIf + + EndIf + EndIf + + + If SlientRefreshIndex = 5 Then + If inst_show5 = 0 Then + GetXMLFileNameCurrentRunning CurrentOpenFile5 + Open CurrentOpenFile5 + Else + Var SlientRefreshIndex = 6 + EndIf + EndIf + + If langnext4 = "true" Then + Var langnext4 = "false" + DEBUGVAR langnext4 + RefreshAll + EndIf + + If inst_show5 = 1 Then + + + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + + If LanguageShow = "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + EndIf + + + Var Inst8CountMenuEnable = 0 + Var Inst8CountCurrentMenuEnable = 0 + GetFrameScrollBlockCount Inst8CountCurrentMenuEnable + GetCurrentEnableBlockCount Inst8CountMenuEnable + + ;DEBUGVAR Inst8CountMenuEnable + ;DEBUGVAR Inst8CountMenuEnablePrev + ;DEBUGVAR Inst8CountCurrentMenuEnable + + If Inst8CountMenuEnablePrev = "" Then + Var Inst8CountMenuEnablePrev = Inst8CountMenuEnable + Var Inst8CountDownForOpenXML = 0 + Var Inst8CountDownOpenXMLFromMenuZero = 20 + EndIf + + If Inst8CountMenuEnable = Inst8CountMenuEnablePrev Then + + Else + SAVELOG "Inst8 Refresh ===================================================================== Refresh" + Var Inst8CountDownForOpenXML = 10 + Var Inst8CountMenuEnablePrev = CountMenuEnable + EndIf + + If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then + + Else + If Inst8CountDownForOpenXML = 0 Then + SAVELOG "Inst8 Refresh =======================Inst8CountMenuEnable / Inst8CountCurrentMenuEnable ============================================== Refresh" + Var Inst8CountDownForOpenXML = 10 + EndIf + EndIf + + + If Inst8CountCurrentMenuEnable = 0 Then + + DEBUGVAR Inst8CountDownOpenXMLFromMenuZero + + If Inst8CountDownOpenXMLFromMenuZero > 0 Then + Var Inst8CountDownOpenXMLFromMenuZero = Inst8CountDownOpenXMLFromMenuZero - 1 + If Inst8CountDownOpenXMLFromMenuZero = 0 Then + Var Inst8CountDownOpenXMLFromMenuZero = 20 + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" + EndIf + EndIf + EndIf + + If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then + If Inst8CountCurrentMenuEnable > 0 Then + Var Inst8MenuLoaded = "done" + EndIf + EndIf + + If Inst8CountDownForOpenXML > 0 Then + Var Inst8CountDownForOpenXML = Inst8CountDownForOpenXML - 1 + DEBUGVAR Inst8CountDownForOpenXML + If Inst8CountDownForOpenXML = 0 Then + Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" + EndIf + EndIf + \ No newline at end of file diff --git a/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml b/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml index c71d957a..0c3b1cc9 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml @@ -52,187 +52,7 @@ Var ice_tab_process_show = "Invisible" EndIf - - GetVisible inst_show2 - ;DEBUGVAR inst_show2 - - - If inst_show2 = 1 Then - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - If SaveStringInst = "RefreshNow" Then - SAVELOG "OPEN slient Refresh" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - SAVELOG "OPEN slient 2" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - If SlientRefreshIndex = 2 Then - If inst_show2 = 0 Then - SAVELOG "OPEN slient 1" - GetXMLFileNameCurrentRunning CurrentOpenFile2 - Open CurrentOpenFile2 - - Else - Var SlientRefreshIndex = 3 - EndIf - EndIf - - If langnext1 = "true" Then - DEBUGVAR langnext1 - Var langnext1 = "false" - RefreshAll - EndIf - - If inst_show2 = 1 Then - - - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - - - - - Var Inst5CountMenuEnable = 0 - Var Inst5CountCurrentMenuEnable = 0 - GetFrameScrollBlockCount Inst5CountCurrentMenuEnable - GetCurrentEnableBlockCount Inst5CountMenuEnable - - ;DEBUGVAR Inst5CountMenuEnable - ;DEBUGVAR Inst5CountMenuEnablePrev - ;DEBUGVAR Inst5CountCurrentMenuEnable - - If Inst5CountMenuEnablePrev = "" Then - Var Inst5CountMenuEnablePrev = Inst5CountMenuEnable - Var Inst5CountDownForOpenXML = 0 - Var Inst5CountDownOpenXMLFromMenuZero = 20 - EndIf - - If Inst5CountMenuEnable = Inst5CountMenuEnablePrev Then - - Else - SAVELOG "Inst5 Refresh ===================================================================== Refresh" - Var Inst5CountDownForOpenXML = 10 - Var Inst5CountMenuEnablePrev = CountMenuEnable - EndIf - - If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then - - Else - If Inst5CountDownForOpenXML = 0 Then - SAVELOG "Inst5 Refresh =======================Inst5CountMenuEnable / Inst5CountCurrentMenuEnable ============================================== Refresh" - Var Inst5CountDownForOpenXML = 10 - EndIf - EndIf - - If Inst5CountCurrentMenuEnable = 0 Then - - DEBUGVAR Inst5CountDownOpenXMLFromMenuZero - - If Inst5CountDownOpenXMLFromMenuZero > 0 Then - Var Inst5CountDownOpenXMLFromMenuZero = Inst5CountDownOpenXMLFromMenuZero - 1 - If Inst5CountDownOpenXMLFromMenuZero = 0 Then - Var Inst5CountDownOpenXMLFromMenuZero = 20 - SAVELOG "OPEN FROM 1" - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - EndIf - EndIf - EndIf - - If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then - If Inst5CountCurrentMenuEnable > 0 Then - Var Inst5MenuLoaded = "done" - EndIf - EndIf - - If Inst5CountDownForOpenXML > 0 Then - Var Inst5CountDownForOpenXML = Inst5CountDownForOpenXML - 1 - DEBUGVAR Inst5CountDownForOpenXML - If Inst5CountDownForOpenXML = 0 Then - SAVELOG "OPEN FROM 2" - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - EndIf - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - ; setvarint RefreshCoffeeMenu 1 - If RefreshCoffeeMenu = 1 Then - Var RefreshCoffeeMenu = 0 - SAVELOG "OPEN FROM 3" - ;Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - RefreshAll - EndIf - - ; setvarint ScriptCoffeeMenu 1 - If ScriptCoffeeMenu = 1 Then - Var ScriptCoffeeMenu = 0 - SAVELOG "Runscript 3" - Script "-" "-" - EndIf - - If CoffeeRefreshTimeOut > 15 Then - Var CoffeeRefreshTimeOut = 0 - Script "-" "-" - EndIf - - Var CoffeeRefreshTimeOut = CoffeeRefreshTimeOut + 1 + ;include="ROOT/taobin_project/inter/tha/xml/multi/coffee_instance.inc" TimerReset diff --git a/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt b/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt index 4e5d32f2..c2a9990c 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt @@ -54,187 +54,7 @@ Var ice_tab_process_show = "Invisible" EndIf - - GetVisible inst_show2 - ;DEBUGVAR inst_show2 - - - If inst_show2 = 1 Then - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - If SaveStringInst = "RefreshNow" Then - SAVELOG "OPEN slient Refresh" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - SAVELOG "OPEN slient 2" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - If SlientRefreshIndex = 2 Then - If inst_show2 = 0 Then - SAVELOG "OPEN slient 1" - GetXMLFileNameCurrentRunning CurrentOpenFile2 - Open CurrentOpenFile2 - - Else - Var SlientRefreshIndex = 3 - EndIf - EndIf - - If langnext1 = "true" Then - DEBUGVAR langnext1 - Var langnext1 = "false" - RefreshAll - EndIf - - If inst_show2 = 1 Then - - - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - - - - - Var Inst5CountMenuEnable = 0 - Var Inst5CountCurrentMenuEnable = 0 - GetFrameScrollBlockCount Inst5CountCurrentMenuEnable - GetCurrentEnableBlockCount Inst5CountMenuEnable - - ;DEBUGVAR Inst5CountMenuEnable - ;DEBUGVAR Inst5CountMenuEnablePrev - ;DEBUGVAR Inst5CountCurrentMenuEnable - - If Inst5CountMenuEnablePrev = "" Then - Var Inst5CountMenuEnablePrev = Inst5CountMenuEnable - Var Inst5CountDownForOpenXML = 0 - Var Inst5CountDownOpenXMLFromMenuZero = 20 - EndIf - - If Inst5CountMenuEnable = Inst5CountMenuEnablePrev Then - - Else - SAVELOG "Inst5 Refresh ===================================================================== Refresh" - Var Inst5CountDownForOpenXML = 10 - Var Inst5CountMenuEnablePrev = CountMenuEnable - EndIf - - If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then - - Else - If Inst5CountDownForOpenXML = 0 Then - SAVELOG "Inst5 Refresh =======================Inst5CountMenuEnable / Inst5CountCurrentMenuEnable ============================================== Refresh" - Var Inst5CountDownForOpenXML = 10 - EndIf - EndIf - - If Inst5CountCurrentMenuEnable = 0 Then - - DEBUGVAR Inst5CountDownOpenXMLFromMenuZero - - If Inst5CountDownOpenXMLFromMenuZero > 0 Then - Var Inst5CountDownOpenXMLFromMenuZero = Inst5CountDownOpenXMLFromMenuZero - 1 - If Inst5CountDownOpenXMLFromMenuZero = 0 Then - Var Inst5CountDownOpenXMLFromMenuZero = 20 - SAVELOG "OPEN FROM 1" - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - EndIf - EndIf - EndIf - - If Inst5CountMenuEnable = Inst5CountCurrentMenuEnable Then - If Inst5CountCurrentMenuEnable > 0 Then - Var Inst5MenuLoaded = "done" - EndIf - EndIf - - If Inst5CountDownForOpenXML > 0 Then - Var Inst5CountDownForOpenXML = Inst5CountDownForOpenXML - 1 - DEBUGVAR Inst5CountDownForOpenXML - If Inst5CountDownForOpenXML = 0 Then - SAVELOG "OPEN FROM 2" - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - EndIf - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - ; setvarint RefreshCoffeeMenu 1 - If RefreshCoffeeMenu = 1 Then - Var RefreshCoffeeMenu = 0 - SAVELOG "OPEN FROM 3" - ;Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml" - RefreshAll - EndIf - - ; setvarint ScriptCoffeeMenu 1 - If ScriptCoffeeMenu = 1 Then - Var ScriptCoffeeMenu = 0 - SAVELOG "Runscript 3" - Script "-" "-" - EndIf - - If CoffeeRefreshTimeOut > 15 Then - Var CoffeeRefreshTimeOut = 0 - Script "-" "-" - EndIf - - Var CoffeeRefreshTimeOut = CoffeeRefreshTimeOut + 1 + ;include="ROOT/taobin_project/inter/tha/xml/multi/coffee_instance.inc" TimerReset diff --git a/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml b/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml index 9b66e1bb..7235eed2 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml @@ -59,141 +59,9 @@ - GetVisible inst_show5 - ;DEBUGVAR inst_show5 + ;include="ROOT/taobin_project/inter/tha/xml/multi/instance5.inc" - If inst_show5 = 1 Then - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - If SlientRefreshIndex = 5 Then - If inst_show5 = 0 Then - GetXMLFileNameCurrentRunning CurrentOpenFile5 - Open CurrentOpenFile5 - Else - Var SlientRefreshIndex = 6 - EndIf - EndIf - - If langnext4 = "true" Then - Var langnext4 = "false" - DEBUGVAR langnext4 - RefreshAll - EndIf - - If inst_show5 = 1 Then - - - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - - Var Inst8CountMenuEnable = 0 - Var Inst8CountCurrentMenuEnable = 0 - GetFrameScrollBlockCount Inst8CountCurrentMenuEnable - GetCurrentEnableBlockCount Inst8CountMenuEnable - - ;DEBUGVAR Inst8CountMenuEnable - ;DEBUGVAR Inst8CountMenuEnablePrev - ;DEBUGVAR Inst8CountCurrentMenuEnable - - If Inst8CountMenuEnablePrev = "" Then - Var Inst8CountMenuEnablePrev = Inst8CountMenuEnable - Var Inst8CountDownForOpenXML = 0 - Var Inst8CountDownOpenXMLFromMenuZero = 20 - EndIf - - If Inst8CountMenuEnable = Inst8CountMenuEnablePrev Then - - Else - SAVELOG "Inst8 Refresh ===================================================================== Refresh" - Var Inst8CountDownForOpenXML = 10 - Var Inst8CountMenuEnablePrev = CountMenuEnable - EndIf - - If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then - - Else - If Inst8CountDownForOpenXML = 0 Then - SAVELOG "Inst8 Refresh =======================Inst8CountMenuEnable / Inst8CountCurrentMenuEnable ============================================== Refresh" - Var Inst8CountDownForOpenXML = 10 - EndIf - EndIf - - - If Inst8CountCurrentMenuEnable = 0 Then - - DEBUGVAR Inst8CountDownOpenXMLFromMenuZero - - If Inst8CountDownOpenXMLFromMenuZero > 0 Then - Var Inst8CountDownOpenXMLFromMenuZero = Inst8CountDownOpenXMLFromMenuZero - 1 - If Inst8CountDownOpenXMLFromMenuZero = 0 Then - Var Inst8CountDownOpenXMLFromMenuZero = 20 - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" - EndIf - EndIf - EndIf - - If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then - If Inst8CountCurrentMenuEnable > 0 Then - Var Inst8MenuLoaded = "done" - EndIf - EndIf - - If Inst8CountDownForOpenXML > 0 Then - Var Inst8CountDownForOpenXML = Inst8CountDownForOpenXML - 1 - DEBUGVAR Inst8CountDownForOpenXML - If Inst8CountDownForOpenXML = 0 Then - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" - EndIf - EndIf TimerReset diff --git a/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt b/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt index 6320d480..bd14f096 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt @@ -62,141 +62,9 @@ - GetVisible inst_show5 - ;DEBUGVAR inst_show5 + ;include="ROOT/taobin_project/inter/tha/xml/multi/instance5.inc" - If inst_show5 = 1 Then - InstanceGetString SaveStringInst - ;DEBUGVAR SaveStringInst - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - EndIf - EndIf - - ; setvarint SlientRefreshEnable 1 - ;DEBUGVAR SlientRefreshEnable - - If SlientRefreshEnable = 1 Then - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - - If show_eng = "true" Then - InstanceSetString "ShowEng" - Else - InstanceSetString "ShowThai" - EndIf - - EndIf - EndIf - - - If SlientRefreshIndex = 5 Then - If inst_show5 = 0 Then - GetXMLFileNameCurrentRunning CurrentOpenFile5 - Open CurrentOpenFile5 - Else - Var SlientRefreshIndex = 6 - EndIf - EndIf - - If langnext4 = "true" Then - Var langnext4 = "false" - DEBUGVAR langnext4 - RefreshAll - EndIf - - If inst_show5 = 1 Then - - - InstanceGetString SaveStringInst - If SaveStringInst = "RefreshNow" Then - - Else - If LanguageShow = "ENG" Then - Var SaveStringInst = "ShowEng" - Var show_eng = "false" - EndIf - If LanguageShow = "THAI" Then - Var SaveStringInst = "ShowThai" - Var show_eng = "true" - EndIf - - If LanguageShow = "MYANMAR" Then - Var show_eng = "false" - Var SaveStringInst = "ShowMYANMAR" - EndIf - EndIf - EndIf - - - Var Inst8CountMenuEnable = 0 - Var Inst8CountCurrentMenuEnable = 0 - GetFrameScrollBlockCount Inst8CountCurrentMenuEnable - GetCurrentEnableBlockCount Inst8CountMenuEnable - - ;DEBUGVAR Inst8CountMenuEnable - ;DEBUGVAR Inst8CountMenuEnablePrev - ;DEBUGVAR Inst8CountCurrentMenuEnable - - If Inst8CountMenuEnablePrev = "" Then - Var Inst8CountMenuEnablePrev = Inst8CountMenuEnable - Var Inst8CountDownForOpenXML = 0 - Var Inst8CountDownOpenXMLFromMenuZero = 20 - EndIf - - If Inst8CountMenuEnable = Inst8CountMenuEnablePrev Then - - Else - SAVELOG "Inst8 Refresh ===================================================================== Refresh" - Var Inst8CountDownForOpenXML = 10 - Var Inst8CountMenuEnablePrev = CountMenuEnable - EndIf - - If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then - - Else - If Inst8CountDownForOpenXML = 0 Then - SAVELOG "Inst8 Refresh =======================Inst8CountMenuEnable / Inst8CountCurrentMenuEnable ============================================== Refresh" - Var Inst8CountDownForOpenXML = 10 - EndIf - EndIf - - - If Inst8CountCurrentMenuEnable = 0 Then - - DEBUGVAR Inst8CountDownOpenXMLFromMenuZero - - If Inst8CountDownOpenXMLFromMenuZero > 0 Then - Var Inst8CountDownOpenXMLFromMenuZero = Inst8CountDownOpenXMLFromMenuZero - 1 - If Inst8CountDownOpenXMLFromMenuZero = 0 Then - Var Inst8CountDownOpenXMLFromMenuZero = 20 - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" - EndIf - EndIf - EndIf - - If Inst8CountMenuEnable = Inst8CountCurrentMenuEnable Then - If Inst8CountCurrentMenuEnable > 0 Then - Var Inst8MenuLoaded = "done" - EndIf - EndIf - - If Inst8CountDownForOpenXML > 0 Then - Var Inst8CountDownForOpenXML = Inst8CountDownForOpenXML - 1 - DEBUGVAR Inst8CountDownForOpenXML - If Inst8CountDownForOpenXML = 0 Then - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" - EndIf - EndIf TimerReset diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 96647404..222aac60 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -170,7 +170,7 @@ Name=Milk,file=page_catalog_group_milk.skt โอรีโอปั่นภูเขาไฟ Oreo Smoothie \nVolcano นม น้ำตาล โอรีโอ \n Milk, Sugar, Oreo, Ice - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi2 - - - - - #REF! NN #REF! ซูเปอร์โกโก้เข้ม คูณ 3 Super Cocoa X3 โกโก้ 3x นม และน้ำตาล Milk, Cocoa, Sugar - 12-03-02-0067 12-03-03-0067 IcedCocoax3.png - - - posi1 - - - โอวัลตินรถโรงเรียน\nภูเขาไฟ Mini Bus Ovaltine\nVolcano โอวัลติน น้ำตาล และ นม Ovaltine, Sugar, milk - - 12-03-03-0094 bn_iced_Ovaltine_cocoa_smoothie.png - - - posi1 2024/12/16T00:00:00 - - - ยูสุโอริโอ้โวคาโน่ Yuzu Milk Oreo Volcano ยูซุ นม โอริโอ้ Yuzu Milk Oreo - - 12-03-03-0087 bn_bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 2025/04/01T00:00:00 - - + ยูสุโอริโอ้โวคาโน่ Yuzu Milk Oreo Volcano ยูซุ นม โอริโอ้ Yuzu Milk Oreo - - 12-03-03-0087 bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 2025/04/01T00:00:00 - - เต่าบินไอติมถัง\nกะทิ Coconut Milk\nIce Cream มะพร้าว, คาราเมล, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Milk, Sugar\nAnd Ice - - 12-03-03-0103 bn_Coconut_Milk_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - เต่าบินไอติมถัง\nสตรอเบอรี Coconut Milk\nStrawberry Ice Cream มะพร้าว, คาราเมล, สตรอเบอรี, นม,\nน้ำตาล และ น้ำแข็ง Coconut, Caramel, Strawberry, Milk,\nSugar And Ice - - 12-03-03-0104 bn_Coconut_Milk_Strawberry_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - เต่าบินไอติมถัง\nโกโก้ Coconut Milk\nCocoa Ice Cream มะพร้าว, คาราเมล, โกโก้, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Cocoa, Milk,\nSugar And Ice - - 12-03-03-0105 bn_Coconut_Milk_Cocoa_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - diff --git a/video/brewing_adv3.mp4 b/video/brewing_adv3.mp4 index 683ff06c..dab25a29 100755 Binary files a/video/brewing_adv3.mp4 and b/video/brewing_adv3.mp4 differ diff --git a/video/brewing_adv3_long.mp4 b/video/brewing_adv3_long.mp4 new file mode 100755 index 00000000..dab25a29 Binary files /dev/null and b/video/brewing_adv3_long.mp4 differ diff --git a/video/brewing_txt_adv3.png b/video/brewing_txt_adv3.png index a5fc16cf..0ba3538d 100644 Binary files a/video/brewing_txt_adv3.png and b/video/brewing_txt_adv3.png differ diff --git a/video/brewing_txt_adv3_en.png b/video/brewing_txt_adv3_en.png index 9e12ffa1..dc3a912c 100644 Binary files a/video/brewing_txt_adv3_en.png and b/video/brewing_txt_adv3_en.png differ diff --git a/video/script1.ev b/video/script1.ev index 40c58958..01f20db0 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -111,6 +111,25 @@ EndIf + +If brewing_adv3_long_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv3_long.mp4" brewing_adv3_long_size +EndIf +DEBUGVAR brewing_adv3_long_size +If brewing_adv3_long_size = 9404451 Then + If AdvertisePepsiAtTheSun = 1 Then + + Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv3_long.mp4" + Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 + Var EventTurnOn = 1 + Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1 + EndIf +EndIf + + + + + If brewing_adv13_long_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv13_long.mp4" brewing_adv13_long_size EndIf @@ -150,8 +169,8 @@ If brewing_adv15_long_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv15_long.mp4" brewing_adv15_long_size EndIf DEBUGVAR brewing_adv15_long_size -If brewing_adv15_long_size = 5579052 Then - If RedStringOfFatePro = 1 Then +If brewing_adv15_long_size = 13110372 Then + If KingdomThaiTeaPro = 1 Then Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15_long.mp4" Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 @@ -179,36 +198,26 @@ If brewing_adv16_size = 7422861 Then EndIf EndIf -Var PearRequest1 = 0 -If BoxID = 201729 Then - Var PearRequest1 = 1 -EndIf -If BoxID = 201714 Then - Var PearRequest1 = 1 + +If brewing_adv17_long_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv17_long.mp4" brewing_adv17_long_size EndIf +DEBUGVAR brewing_adv17_long_size +If brewing_adv17_long_size = 4984284 Then + If SwensenPro = 1 Then + Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17_long.mp4" + Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 -If PearRequest1 = 1 Then + Var EventTurnOn = 1 + Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1 -Else - If brewing_adv17_long_size = "" Then - GetFileSizeK "taobin_project/video/brewing_adv17_long.mp4" brewing_adv17_long_size - EndIf - - DEBUGVAR brewing_adv17_long_size - If brewing_adv17_long_size = 4984284 Then - If SwensenPro = 1 Then - Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv17_long.mp4" - Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 - - Var EventTurnOn = 1 - Var MainAdvertiseRunSlot = MainAdvertiseRunSlot + 1 - - EndIf EndIf EndIf + + If brewing_adv21_long_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv21_long.mp4" brewing_adv21_long_size EndIf diff --git a/video/script3_first_brewing.ev b/video/script3_first_brewing.ev index 27c11f7c..0914607b 100644 --- a/video/script3_first_brewing.ev +++ b/video/script3_first_brewing.ev @@ -29,7 +29,7 @@ EndIf ; ; - +Var BrewingAdvertiseRunSlot = 0 Var BrewingAdvertiseEnable[0] = 0 Var BrewingAdvertiseEnable[1] = 0 Var BrewingAdvertiseEnable[2] = 0 @@ -40,10 +40,6 @@ Var BrewingAdvertiseEnable[6] = 0 Var BrewingAdvertiseEnable[7] = 0 -DEBUGVAR RobinsonBeautyPro -DEBUGVAR EDC_ThailandOn -DEBUGVAR ShopeePayLaterOn -Var BrewingAdvertiseRunSlot = 0 ; ; @@ -97,6 +93,35 @@ If brewing_adv11_size = 9461309 Then EndIf + +; +; +; +; +; + +If brewing_adv3_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv3_size +EndIf + +DEBUGVAR brewing_adv3_size +If brewing_adv3_size = 9404451 Then + If AdvertisePepsiAtTheSun = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv3.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv3_en.png" + Else + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv3.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseRunSlot] = 15 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + ; ; ; @@ -195,8 +220,8 @@ EndIf DEBUGVAR brewing_adv15_size -If brewing_adv15_size = 9493162 Then - If RedStringOfFatePro = 1 Then +If brewing_adv15_size = 13110372 Then + If KingdomThaiTeaPro = 1 Then Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15.mp4"; If show_eng = "true" Then diff --git a/video/sync_1.file b/video/sync_1.file index cf1a93fe..b80b3be4 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 272376 +total 292356 -rw-rw---- 1 root sdcard_rw 31311320 2025-03-07 11:32 Taobin_Sleep_Screen.mp4 -rw-rw---- 1 root sdcard_rw 9461309 2025-03-06 09:35 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 9461309 2025-03-06 09:35 brewing_adv11_long.mp4 @@ -7,14 +7,15 @@ total 272376 -rw-rw---- 1 root sdcard_rw 3789806 2024-12-20 22:31 brewing_adv13_long.mp4 -rw-rw---- 1 root sdcard_rw 9260622 2025-01-09 17:28 brewing_adv14.mp4 -rw-rw---- 1 root sdcard_rw 5353047 2025-01-23 13:08 brewing_adv14_long.mp4 --rw-rw---- 1 root sdcard_rw 9493162 2025-01-10 16:11 brewing_adv15.mp4 --rw-rw---- 1 root sdcard_rw 5579052 2025-01-23 13:11 brewing_adv15_long.mp4 +-rw-rw---- 1 root sdcard_rw 13110372 2025-03-19 14:13 brewing_adv15.mp4 +-rw-rw---- 1 root sdcard_rw 13110372 2025-03-19 14:13 brewing_adv15_long.mp4 -rw-rw---- 1 root sdcard_rw 7422861 2024-11-05 16:08 brewing_adv16.mp4 -rw-rw---- 1 root sdcard_rw 4984284 2025-02-24 16:30 brewing_adv17.mp4 -rw-rw---- 1 root sdcard_rw 4984284 2025-02-24 16:30 brewing_adv17_long.mp4 -rw-rw---- 1 root sdcard_rw 9701195 2024-11-28 13:34 brewing_adv21.mp4 -rw-rw---- 1 root sdcard_rw 6507746 2024-12-04 15:40 brewing_adv21_long.mp4 --rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 +-rw-rw---- 1 root sdcard_rw 9404451 2025-03-24 18:07 brewing_adv3.mp4 +-rw-rw---- 1 root sdcard_rw 9404451 2025-03-24 18:07 brewing_adv3_long.mp4 -rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png -rw-rw---- 1 root sdcard_rw 48205 2025-02-19 10:41 brewing_txt_adv11.png -rw-rw---- 1 root sdcard_rw 44382 2025-02-19 10:59 brewing_txt_adv11_en.png @@ -24,8 +25,8 @@ total 272376 -rw-rw---- 1 root sdcard_rw 50172 2024-12-20 22:10 brewing_txt_adv13_en.png -rw-rw---- 1 root sdcard_rw 42617 2025-01-27 10:02 brewing_txt_adv14.png -rw-rw---- 1 root sdcard_rw 46154 2025-01-27 10:02 brewing_txt_adv14_en.png --rw-rw---- 1 root sdcard_rw 37899 2025-01-27 10:02 brewing_txt_adv15.png --rw-rw---- 1 root sdcard_rw 35319 2025-01-27 10:02 brewing_txt_adv15_en.png +-rw-rw---- 1 root sdcard_rw 43560 2025-03-19 20:05 brewing_txt_adv15.png +-rw-rw---- 1 root sdcard_rw 39778 2025-03-19 20:05 brewing_txt_adv15_en.png -rw-rw---- 1 root sdcard_rw 49830 2024-11-05 16:48 brewing_txt_adv16.png -rw-rw---- 1 root sdcard_rw 50931 2024-11-05 16:49 brewing_txt_adv16_en.png -rw-rw---- 1 root sdcard_rw 45375 2025-02-24 16:56 brewing_txt_adv17.png @@ -33,16 +34,16 @@ total 272376 -rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png -rw-rw---- 1 root sdcard_rw 45665 2024-11-29 14:49 brewing_txt_adv21.png -rw-rw---- 1 root sdcard_rw 51795 2024-11-29 14:50 brewing_txt_adv21_en.png --rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png --rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png +-rw-rw---- 1 root sdcard_rw 42804 2025-03-24 18:02 brewing_txt_adv3.png +-rw-rw---- 1 root sdcard_rw 32565 2025-03-24 18:02 brewing_txt_adv3_en.png -rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 10065192 2025-02-21 16:58 remove_cup_how_to.mp4 --rw-rw---- 1 root sdcard_rw 7084 2025-03-06 10:30 script1.ev --rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev +-rw-rw---- 1 root sdcard_rw 7399 2025-03-24 18:38 script1.ev +-rw-rw---- 1 root sdcard_rw 708 2025-03-21 17:56 script2.ev -rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev --rw-rw---- 1 root sdcard_rw 9972 2025-03-06 10:27 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2025-03-18 12:09 sync_1.file +-rw-rw---- 1 root sdcard_rw 10749 2025-03-24 18:39 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2025-04-04 18:38 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/promotion_kingdom_thai_tea.xml b/xml/event/promotion_kingdom_thai_tea.xml index 0fa9b4b0..f8aa4770 100644 --- a/xml/event/promotion_kingdom_thai_tea.xml +++ b/xml/event/promotion_kingdom_thai_tea.xml @@ -337,8 +337,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Kati Shake" - Var NameDrinkTH = "กะทิเชค" + Var NameDrink = "Coconut Milk Ice Cream" + Var NameDrinkTH = "เต่าบินไอติมถัง กะทิ" Var DrinkDescriptionTH = "มะพร้าว, คาราเมล, นม, น้ำตาล และ น้ำแข็ง" Var DrinkDescription = "Coconut, Caramel, Milk, Sugar And Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Milk_Smoothie.png" @@ -411,7 +411,8 @@ KanitMediumTTF 0x322B26 showthaiText - "กะทิเชค" + "เต่าบินไอติมถัง +กะทิ" 16 @@ -433,7 +434,8 @@ KanitMediumTTF 0x322B26 showengText - "Kati Shake" + "Coconut Milk +Ice Cream" 16 @@ -590,8 +592,8 @@ And Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Kati Shake Matcha" - Var NameDrinkTH = "กะทิเชคมัทฉะญี่ปุ่น" + Var NameDrink = "Coconut Milk Matcha Ice Cream" + Var NameDrinkTH = "เต่าบินไอติมถัง มัทฉะญี่ปุ่น" Var DrinkDescriptionTH = "มะพร้าว, คาราเมล, มัทฉะ, นม, น้ำตาล และ น้ำแข็ง" Var DrinkDescription = "Coconut, Caramel, Matcha, Milk, Sugar And Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Milk_Matcha_Smoothie.png" @@ -664,7 +666,8 @@ And Ice" KanitMediumTTF 0x322B26 showthaiText - "กะทิเชคมัทฉะญี่ปุ่น" + "เต่าบินไอติมถัง +มัทฉะญี่ปุ่น" 16 @@ -686,7 +689,8 @@ And Ice" KanitMediumTTF 0x322B26 showengText - "Kati Shake Matcha" + "Coconut Milk +Matcha Ice Cream" 16 diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 8df7f555..2bbf7b3e 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -86,6 +86,8 @@ Var XMLLiveInfoEnable = 0 Var LuckyDrawCampaign = 0 +Var AdvertisePepsiAtTheSun = 0 + If SystemDateMonthInt = 1 Then Var LuckyDrawCampaign = 1 @@ -131,11 +133,24 @@ If SystemDateMonthInt = 3 Then Var CoconutMilkPro = 1 EndIf +If SystemDateMonthInt = 4 Then + If SystemDateDayInt < 7 Then + Var AdvertisePepsiAtTheSun = 1 + EndIf +EndIf +If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 31 Then + Var AdvertisePepsiAtTheSun = 1 + EndIf +EndIf + + If SystemDateMonthInt = 4 Then Var KingdomThaiTeaPro = 1 EndIf + Var JemilaToppingFlag = 1 If SystemDateDayOfWeek = "Wednesday" Then Var JemilaToppingFreeFlag = 1 @@ -180,6 +195,7 @@ EndIf Var ToppingNewUINewSystem = 1 If BoxID = 123456 Then Var ToppingNewUINewSystem = 1 + Var AdvertisePepsiAtTheSun = 1 EndIf ; override again diff --git a/xml/page_board.xml b/xml/page_board.xml index 1e8bfe59..d1712438 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1228,7 +1228,8 @@ If CountryName = "Thailand" Then Var MyanmarLangEnable = "true" - Var CatalogLayoutV3 = 0 + + Var CatalogLayoutV3 = 1 ; test payment Var New_Payment = 1 diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 296b74b0..08cf7346 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -1059,9 +1059,9 @@ Volcano" Flag( 12-03-03-0087.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1203030087)