From 12e1b630d5f15ee805c31c52c7c516517740d513 Mon Sep 17 00:00:00 2001 From: wanlop run Date: Thu, 5 Oct 2023 08:43:58 +0700 Subject: [PATCH] Remove block NCIC07_EVENT_CNT and update play-list --- animation01/play_list.tsv | 47 +++++++++++++++++++++- xml/event/promotion_Tamatian.xml | 8 +--- xml/event/promotion_mystery_cup_35.xml | 8 +--- xml/event/promotion_oreo_welcome_drink.xml | 8 +--- xml/menu_catalog_new.xml | 8 +--- xml/page_board.xml | 8 ++-- xml/page_catalog_group_appfast.xml | 8 +--- xml/page_catalog_group_cocktail.xml | 8 +--- xml/page_catalog_group_coffee.xml | 8 +--- xml/page_catalog_group_forkid.xml | 8 +--- xml/page_catalog_group_health.xml | 8 +--- xml/page_catalog_group_milk.xml | 8 +--- xml/page_catalog_group_oreo.xml | 8 +--- xml/page_catalog_group_other.xml | 8 +--- xml/page_catalog_group_pepsi_pro.xml | 8 +--- xml/page_catalog_group_pro_melon.xml | 8 +--- xml/page_catalog_group_pro_pepween.xml | 8 +--- xml/page_catalog_group_recommend.xml | 8 +--- xml/page_catalog_group_songkran.xml | 8 +--- xml/page_catalog_group_tea.xml | 8 +--- xml/page_catalog_group_whey.xml | 8 +--- xml/page_catalog_momday.xml | 8 +--- xml/page_show_error.lxml | 32 ++++++++++++++- xml/page_show_error.xml | 28 +++++++++++++ xml_main/startup.xml | 4 +- 25 files changed, 130 insertions(+), 149 deletions(-) diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 3d68fc12..704af8be 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -244,8 +244,19 @@ PEPSI LYCHEE 12-05-02-0048 1 14 11 23 13 24 120 4:00 23 เป๊ปซี่อย่าชี้หน้าเมล่อน 12-99-02-0005 1 14 52 23 13 24 120 18:00 23 เป๊ปซี่อย่าวีนบ๊วย 12-99-02-0004 1 14 33 23 13 24 120 19:00 23 - - +Red Moon 12-99-05-0053 1 +White Lady 12-99-05-0054 1 +Mysterious\nmusic box 12-99-05-0055 1 +Haunted Haze 12-99-05-0056 1 +The Haunting of\nthe Past 12-99-05-0057 1 +The dark lord 12-99-05-0058 1 +Room no.13 12-99-05-0059 1 +Haunted Harvest 12-99-05-0060 1 +Cursed Coffee 12-99-05-0061 1 +The Haunting\nHag of village 12-99-05-0062 1 +Midnight's Enigma 12-99-05-0064 1 +Unbelievers' Demise 12-99-05-0065 1 +7 Haunted Woods 12-99-03-0066 1 @@ -498,6 +509,24 @@ Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23 + + + + + + + + + + + + + + + + + + @@ -919,3 +948,17 @@ RandomCup19 12-99-03-0038 1 81 82 83 84 81 82 83 84 24 120 17:00 23 RandomCup20 12-99-03-0039 1 81 82 83 84 81 82 83 84 24 120 17:00 23 RandomCup21 12-99-03-0041 1 81 82 83 84 81 82 83 84 24 120 17:00 23 RandomCup22 12-99-03-0042 1 81 82 83 84 81 82 83 84 24 120 17:00 23 + 24 120 18:00 23 +Red Moon 12-99-05-0053 1 14 19 12 23 13 24 120 19:00 23 +White Lady 12-99-05-0054 1 14 10 12 11 23 13 24 120 20:00 23 +Mysterious\nmusic box 12-99-05-0055 1 14 55 12 23 13 24 120 21:00 23 +Haunted Haze 12-99-05-0056 1 14 11 33 12 23 13 24 120 22:00 23 +The Haunting of\nthe Past 12-99-05-0057 1 14 34 23 13 24 120 23:00 23 +The dark lord 12-99-05-0058 1 14 12 21 23 13 24 120 0:00 23 +Room no.13 12-99-05-0059 1 14 11 12 23 13 24 120 1:00 23 +Haunted Harvest 12-99-05-0060 1 14 8 9 23 13 24 120 2:00 23 +Cursed Coffee 12-99-05-0061 1 14 53 4 5 23 13 24 120 3:00 23 +The Haunting\nHag of village 12-99-05-0062 1 14 10 33 23 13 24 120 4:00 23 +Midnight's Enigma 12-99-05-0064 1 14 33 12 23 13 24 120 5:00 23 +Unbelievers' Demise 12-99-05-0065 1 14 52 55 23 13 24 120 6:00 23 +7 Haunted Woods 12-99-03-0066 1 14 40 7 23 41 24 120 7:00 23 diff --git a/xml/event/promotion_Tamatian.xml b/xml/event/promotion_Tamatian.xml index bda66011..d2efcf2a 100644 --- a/xml/event/promotion_Tamatian.xml +++ b/xml/event/promotion_Tamatian.xml @@ -227,13 +227,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml index 37908c47..6e41abe6 100644 --- a/xml/event/promotion_mystery_cup_35.xml +++ b/xml/event/promotion_mystery_cup_35.xml @@ -227,13 +227,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/event/promotion_oreo_welcome_drink.xml b/xml/event/promotion_oreo_welcome_drink.xml index ef7795d0..ade20fe3 100644 --- a/xml/event/promotion_oreo_welcome_drink.xml +++ b/xml/event/promotion_oreo_welcome_drink.xml @@ -227,13 +227,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 13eae514..53061854 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -70,13 +70,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index 37c0e781..83dc76de 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -639,7 +639,6 @@ Var show_lang = "THAI" - Var NETCORE_EVENT_CNT_X = 0 Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT @@ -899,7 +898,7 @@ EndIf EndIf - + Var NETCORE_LOST_COUNT_UP = 0 @@ -996,9 +995,12 @@ If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1 + + DEBUGVAR NETCORE_EVENT_CNT_X - If NETCORE_EVENT_CNT_X >= 30 Then + If NETCORE_EVENT_CNT_X > 600 Then Var stop_now = "true" + Var stop_now_from_netcore_event = 1 Var MachineErrorDetailAll = "Netcore Lost" SAVELOG "Netcore Lost NCIC07_EVENT_CNT" DEBUGVAR NCIC07_EVENT_CNT diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 9df72f5d..1cf7a79d 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -218,13 +218,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index d3c5a38e..5f5190af 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -210,13 +210,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 367d8e59..9bc5a057 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -210,13 +210,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index c155da1a..68a24cf3 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -219,13 +219,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index cb3397e4..d49f83da 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -210,13 +210,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index e811f0aa..e61f722f 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -208,13 +208,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 8d8ac2ea..77db3e12 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -206,13 +206,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index ed35207f..3909f11a 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -209,13 +209,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_pepsi_pro.xml b/xml/page_catalog_group_pepsi_pro.xml index e1c783e9..36406eb9 100644 --- a/xml/page_catalog_group_pepsi_pro.xml +++ b/xml/page_catalog_group_pepsi_pro.xml @@ -206,13 +206,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_pro_melon.xml b/xml/page_catalog_group_pro_melon.xml index dbb15a9b..5a7e2385 100644 --- a/xml/page_catalog_group_pro_melon.xml +++ b/xml/page_catalog_group_pro_melon.xml @@ -204,13 +204,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml index 6b701a27..2c149800 100644 --- a/xml/page_catalog_group_pro_pepween.xml +++ b/xml/page_catalog_group_pro_pepween.xml @@ -216,13 +216,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index bf39bc79..eeea5e6d 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -227,13 +227,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index 585f02df..414c291c 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -206,13 +206,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 22d35d96..bb59f46e 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -210,13 +210,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 8a1efa97..aad8a39a 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -215,13 +215,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_catalog_momday.xml b/xml/page_catalog_momday.xml index e48112e8..2fac6cab 100644 --- a/xml/page_catalog_momday.xml +++ b/xml/page_catalog_momday.xml @@ -206,13 +206,7 @@ Else ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf + EndIf diff --git a/xml/page_show_error.lxml b/xml/page_show_error.lxml index ce91486d..04ce0789 100644 --- a/xml/page_show_error.lxml +++ b/xml/page_show_error.lxml @@ -40,6 +40,7 @@ Var EmergencyStop = "-" + If EmergencyStop = "true" Then If DoorCupPosition = "bottom" Then ; It normal @@ -81,8 +82,34 @@ DEBUGVAR NETCORE_EVENT_CNT_TMP If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then + + Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1 + DEBUGVAR NETCORE_LOST_COUNT_UP + + If NETCORE_LOST_COUNT_UP > 900 Then + If textStep > 3 Then + Var textStep = 0 + Var MachineErrorDetailAll = MachineErrorDetailAll + " !" + EndIf + If textStep = 3 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!" + EndIf + If textStep = 2 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!" + EndIf + If textStep = 1 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!!" + EndIf + EndIf Else + + If stop_now_from_netcore_event = 1 Then + Var stop_now = "false" + SAVELOG "stop_now_from_netcore_event is set" + Var stop_now_from_netcore_event = 0 + EndIf + If MachineStage = "" Then Var LEDSet = "false" @@ -105,7 +132,7 @@ If MachineStage = "drink-failed" Then Var FirstOpen = 1 Var LEDSet = "true" - ;Open "ROOT/taobin_project/xml/page_show_error.lxml" + ;Open "ROOT/taobin_project/xml/page_show_error.xml" Refresh EndIf @@ -114,7 +141,7 @@ If MachineStage = "close-maintenance" Then Var LEDSet = "true" - ;Open "ROOT/taobin_project/xml/page_show_error.lxml" + ;Open "ROOT/taobin_project/xml/page_show_error.xml" Refresh EndIf @@ -127,6 +154,7 @@ EndIf + Var TimeOut = TimeOut + 1 If TimeOut > 60 Then Var TimeOut = 0 diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index d518b3ba..b5faaaa6 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -192,8 +192,36 @@ DEBUGVAR NETCORE_EVENT_CNT_TMP If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then + + Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1 + DEBUGVAR NETCORE_LOST_COUNT_UP + If NETCORE_LOST_COUNT_UP > 300 Then + SAVELOG " NETCORE_LOST_COUNT_UP out !" + Reboot + EndIf + + If textStep > 3 Then + Var textStep = 0 + Var MachineErrorDetailAll = MachineErrorDetailAll + " !" + EndIf + If textStep = 3 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!" + EndIf + If textStep = 2 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!" + EndIf + If textStep = 1 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!!" + EndIf Else + + If stop_now_from_netcore_event = 1 Then + Var stop_now = "false" + SAVELOG "stop_now_from_netcore_event is set" + Var stop_now_from_netcore_event = 0 + EndIf + If MachineStage = "" Then Var LEDSet = "false" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index b71182ff..c8227c9f 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.71" - Var XMLPageVersionInt = 771 + Var XMLPageVersion = "7.72" + Var XMLPageVersionInt = 772 ;Oreo Var OreoGuarantee = 0