From 624728a8987a7a250f677b111aece6b83d1217d9 Mon Sep 17 00:00:00 2001 From: wanlop run Date: Mon, 29 Apr 2024 13:44:59 +0700 Subject: [PATCH] Fix text when offline and topsepnd --- inter/sgp/animation01/play_list.tsv | 42 +-- .../bn_iced_milk_coconut.png | Bin 0 -> 20946 bytes inter/sgp/xml/menu_new_layout_gen_v2.py | 9 +- inter/sgp/xml/page_brewing3.lxml | 258 +----------------- inter/sgp/xml/page_catalog_group_appfast.lxml | 15 +- inter/sgp/xml/page_catalog_group_coffee.lxml | 243 +++++++++++------ inter/sgp/xml/page_catalog_group_forkid.lxml | 42 ++- inter/sgp/xml/page_catalog_group_health.lxml | 78 ++++-- inter/sgp/xml/page_catalog_group_milk.lxml | 93 ++++--- inter/sgp/xml/page_catalog_group_other.lxml | 159 +++++++---- .../sgp/xml/page_catalog_group_recommend.lxml | 129 ++++++--- inter/sgp/xml/page_catalog_group_tea.lxml | 144 ++++++---- inter/sgp/xml/page_catalog_group_whey.lxml | 51 ++-- xml/page_board.xml | 4 + xml/page_lid_straw.xml | 42 +-- xml/page_payment.xml | 2 +- xml/page_payment_cash-AUS.xml | 2 +- xml/page_payment_cash-IDR.xml | 11 - xml/page_payment_cash-SGP.xml | 4 +- xml/page_payment_cash-UAE.xml | 3 +- xml/sometime/top_spender.xml | 2 +- xml/vending_info.xml | 2 + 22 files changed, 700 insertions(+), 635 deletions(-) create mode 100644 inter/sgp/image/page_drink_picture2_n/bn_iced_milk_coconut.png diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv index 16158b0b..5071ff36 100644 --- a/inter/sgp/animation01/play_list.tsv +++ b/inter/sgp/animation01/play_list.tsv @@ -852,24 +852,24 @@ Unbelievers' Demise 52-99-05-0065 1 14 52 55 23 13 24 120 6:00 23 นมโอ๊ตลิ้นจี่ปั่น 52-03-83-0042 1 7 11 23 41 24 120 11:00 23 นมโอ๊ตมะนาวปั่น 52-03-83-0043 1 7 12 23 41 24 120 12:00 23 -Coconut milk 52-03-02-0058 1 7 62 23 -Coconut milk 52-03-03-0058 1 7 62 23 41 -Coconut Americano 52-21-02-0068 1 2 3 4 5 62 23 -Coconut Soda 52-05-02-0090 1 62 13 23 -Coconut Lychee Soda 52-05-02-0093 1 62 11 13 23 -Coconut Pepsi 52-05-02-0091 1 62 14 13 23 -Coconut Smoothie 52-05-03-0092 1 62 23 41 -Coconut Chocolate milk 52-03-02-0059 1 7 15 62 23 -Coconut Chocolate milk 52-03-03-0059 1 7 15 62 23 41 -Coconut Matcha latte 52-02-02-0060 1 8 9 7 62 23 -Coconut Matcha latte 52-02-03-0060 1 8 9 7 62 23 41 -Coconut Matcha 52-02-02-0061 1 8 9 62 23 -Coconut Matcha 52-02-03-0061 1 8 9 62 23 41 -Coconut Thai Milk Tea 52-02-02-0062 1 10 7 62 23 -Coconut Thai Milk Tea 52-02-03-0062 1 10 7 62 23 41 -Coconut Thai Black Tea 52-02-02-0063 1 10 62 23 -Coconut Thai Black Tea 52-02-03-0063 1 10 62 23 41 -Coconut Jasmine milk tea 52-02-02-0064 1 10 7 62 23 -Coconut Jasmine milk tea 52-02-03-0064 1 10 7 62 23 41 -Coconut Jasmine tea 52-02-02-0065 1 10 62 23 -Coconut Jasmine tea 52-02-03-0065 1 10 62 23 41 +Coconut milk 52-03-02-0058 1 7 62 23 24 120 12:00 23 +Coconut milk 52-03-03-0058 1 7 62 23 41 24 120 13:00 23 +Coconut Americano 52-21-02-0068 1 2 3 4 5 62 23 24 120 14:00 23 +Coconut Soda 52-05-02-0090 1 62 13 23 24 120 15:00 23 +Coconut Lychee Soda 52-05-02-0093 1 62 11 13 23 24 120 16:00 23 +Coconut Pepsi 52-05-02-0091 1 62 14 13 23 24 120 17:00 23 +Coconut Smoothie 52-05-03-0092 1 62 23 41 24 120 18:00 23 +Coconut Chocolate milk 52-03-02-0059 1 7 15 62 23 24 120 19:00 23 +Coconut Chocolate milk 52-03-03-0059 1 7 15 62 23 41 24 120 20:00 23 +Coconut Matcha latte 52-02-02-0060 1 8 9 7 62 23 24 120 21:00 23 +Coconut Matcha latte 52-02-03-0060 1 8 9 7 62 23 41 24 120 22:00 23 +Coconut Matcha 52-02-02-0061 1 8 9 62 23 24 120 23:00 23 +Coconut Matcha 52-02-03-0061 1 8 9 62 23 41 24 120 0:00 23 +Coconut Thai Milk Tea 52-02-02-0062 1 10 7 62 23 24 120 1:00 23 +Coconut Thai Milk Tea 52-02-03-0062 1 10 7 62 23 41 24 120 2:00 23 +Coconut Thai Black Tea 52-02-02-0063 1 10 62 23 24 120 3:00 23 +Coconut Thai Black Tea 52-02-03-0063 1 10 62 23 41 24 120 4:00 23 +Coconut Jasmine milk tea 52-02-02-0064 1 10 7 62 23 24 120 5:00 23 +Coconut Jasmine milk tea 52-02-03-0064 1 10 7 62 23 41 24 120 6:00 23 +Coconut Jasmine tea 52-02-02-0065 1 10 62 23 24 120 7:00 23 +Coconut Jasmine tea 52-02-03-0065 1 10 62 23 41 24 120 8:00 23 diff --git a/inter/sgp/image/page_drink_picture2_n/bn_iced_milk_coconut.png b/inter/sgp/image/page_drink_picture2_n/bn_iced_milk_coconut.png new file mode 100644 index 0000000000000000000000000000000000000000..f2dad87caac8f6860162c4179ca8b3ea3574170f GIT binary patch literal 20946 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%0AfzBkR2BNKA) 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 Mng$whHHWDG0e!Q}NdN!< literal 0 HcmV?d00001 diff --git a/inter/sgp/xml/menu_new_layout_gen_v2.py b/inter/sgp/xml/menu_new_layout_gen_v2.py index 8f735869..ae3ef5db 100644 --- a/inter/sgp/xml/menu_new_layout_gen_v2.py +++ b/inter/sgp/xml/menu_new_layout_gen_v2.py @@ -84,6 +84,7 @@ gradePD2Sugar = getOverlayGradeSugar(pd_code_2) gradePD3Sugar = getOverlayGradeSugar(pd_code_3) + overlay_string_for_topping_first_open = "" ### print("gradePD1 ", gradePD1, "gradePD2 ", gradePD2, "gradePD3 ", gradePD3) print("gradePD1 ", gradePD1Sugar, "gradePD2 ", gradePD2Sugar, "gradePD3 ", gradePD3Sugar) @@ -106,10 +107,13 @@ if overlay_string2 != "": out_xml( '\t ' + overlay_tag2 + ' \r\n') + overlay_string_for_topping_first_open = overlay_string2 elif overlay_string3 != "": out_xml( '\t ' + overlay_tag3 + ' \r\n') + overlay_string_for_topping_first_open = overlay_string3 elif overlay_string1 != "": out_xml( '\t ' + overlay_tag1 + ' \r\n') + overlay_string_for_topping_first_open = overlay_string1 out_xml( '\t "/mnt/sdcard/coffeevending/wav/click.wav" \r\n') @@ -123,6 +127,8 @@ #out_xml( '\t\tVar DrinkDescription = "' + spl[ idx_of_thai_des].replace("\\n", " ") + '"\r\n') out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n') + + out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n') out_xml( '\t\tVar PriceD1 = $' + str_hot_product_code + '.Price\r\n') @@ -264,7 +270,8 @@ - + out_xml( '\t\tVar OverlayMenuFilter = "' + overlay_string_for_topping_first_open + '\"\r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n') diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index 241fe0d2..f69262d4 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -25,7 +25,7 @@ Var PayType = "newpay" EndIf - Var DirImageDoing = "ROOT/taobin_project/inter/aus/image/page_doing" + Var DirImageDoing = CountryRootPath + "/image/page_doing" Var SelectDrink = Seeker.selected_a_drink Var ExtendData = Seeker.ExtendData @@ -77,18 +77,7 @@ Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" - ; Play Sound #zone - If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" - EndIf - If SoundBackToSchoolType = 2 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" - EndIf - Var PlaySoundLag = RootPathSoundBackToSchool + "thankyou.wav" - EndIf - + Play PlaySoundLag Var IMG_CNT = DirImageDoing + "/img2.png" @@ -405,6 +394,7 @@ Var VideoPlayFile = DirImageDoing + "/tao_adv1.png" Var PictureFile = brew_txt1 EndIf + Var CampaignEnable = 0 @@ -421,171 +411,23 @@ Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1 - ; echo 1 > /mnt/sdcard/game_enable - READ_FILE "/mnt/sdcard/game_enable" game_mode_str - STRCONTAIN "1" game_mode_str game_mode_enable - DEBUGVAR game_mode_enable - - - If GameEnableFromTrickerEv = 1 Then - Var game_mode_enable = "true" - EndIf - - If GameOverrideDisable = 1 Then - Var game_mode_enable = "false" - EndIf - - READ_FILE "/mnt/sdcard/game_disable" game_mode_str - STRCONTAIN "1" game_mode_str game_mode_disable - DEBUGVAR game_mode_disable - - If game_mode_disable = "true" Then - Var game_mode_enable = "false" - EndIf - DEBUGVAR GameEnableFromTrickerEv DEBUGVAR GameOverrideDisable DEBUGVAR Seeker - If game_mode_enable = "true" Then - - - DEBUGVAR GameInstalled - - If GameInstalled = "true" Then - If Seeker.TNumberTaobinCredit = "" Then - Var TelephoneNumber = "0899999999" - - If Seeker.TNumberTaobinMember = "" Then - Else - Var TelephoneNumber = Seeker.TNumberTaobinMember - EndIf - - Else - Var TelephoneNumber = Seeker.TNumberTaobinCredit - EndIf - - StrLen TelephoneNumber TelNumLen - - DEBUGVAR TelephoneNumber - DEBUGVAR TelNumLen - - If TelNumLen = 10 Then - - ; reset - WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" "" - ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" - APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n" - - If TelephoneNumber = "0899999999" Then - ; Coupon or customer not input phone number. - Var ACCString !assigned SprintFmt("ACC: ""\r\n", "") - Else - - Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber) - EndIf - - DEBUGVAR ACCString - - If show_eng = "true" Then - Var LangString = "LANG: "EN"\r\n" - Else - Var LangString = "LANG: "TH"\r\n" - EndIf - - ; reset - WRITE_FILE "/mnt/sdcard/taobingame_acc.yaml" "" - APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" ACCString - APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" LangString - ; - - Var Game01Enable = 1 - Else - ; reset - WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" "" - ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" - APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n" - - Var ACCString !assigned SprintFmt("ACC: ""\r\n", "") - DEBUGVAR ACCString - - If show_eng = "true" Then - Var LangString = "LANG: "EN"\r\n" - Else - Var LangString = "LANG: "TH"\r\n" - EndIf - - ; reset - WRITE_FILE "/mnt/sdcard/taobingame_acc.yaml" "" - APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" ACCString - APPEND_FILE "/mnt/sdcard/taobingame_acc.yaml" LangString - ; - - Var Game01Enable = 1 - EndIf - EndIf - EndIf - - - + DEBUGVAR Game01Enable DEBUGVAR BREW_CNT - If Game01Enable = 1 Then - If BREW_CNT > 75 Then - Var ButtonGameCountDown = BREW_CNT - 60 - If ButtonGameCountDown > 10 Then - Var ButtonGameCountDown = 10 - EndIf - - Var ButtonGameCountDownState = "PressForever" - Else - Var Game01Enable = 0 - Var ButtonGameCountDownState = "Invisible" - Var ButtonGamePressToPlayState = "Invisible" - - Var ButtonGameCountDown = 0 - EndIf - - Else - Var ButtonGameCountDown = 0 - Var ButtonGameCountDownState = "Invisible" - EndIf - - DEBUGVAR ButtonGameCountDown - + + Var ButtonGameCountDown = 0 + Var ButtonGameCountDownState = "Invisible" + + Var ButtonGameCountDown = 0 + Var ButtonGameCountDownState = "Invisible" Var ButtonGamePressToPlayState = "Invisible" - ; BREW_CNT > 15 ( pre-time ) + 60 ( Game Time ) Game01Enable - ; BREW_CNT > 15 ( pre-time ) + 50 ( Game Time ) + 10 (Debound Time) Game01Enable - - If Game01Enable = 1 Then - - If ButtonGameCountDownState = "Enable" Then - If BREW_CNT < 75 Then - If Game01Enable = 1 Then - SAVELOG "Game01Enable set zero event open 2" - EndIf - Var Game01Enable = 0 - Var ButtonGameCountDownState = "Invisible" - Var ButtonGamePressToPlayState = "Invisible" - EndIf - EndIf - - If BREW_CNT > 70 Then - - Else - If Game01Enable = 1 Then - SAVELOG "Game01Enable set zero event open 1" - EndIf - Var Game01Enable = 0 - Var ButtonGamePressToPlayState = "Invisible" - - EndIf - EndIf - - CashlessReq SUCCESS @@ -670,8 +512,6 @@ Var SessionID2 = SessionID2 + ExtendData DEBUGVAR SessionID2 - DEBUGVAR SessionID2 - Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumber = "0899999999" @@ -701,7 +541,6 @@ Var SessionID = "" GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - ;Var Timeout = 0 Var ActionOKCase = 2 SAVELOG "back_to_main from line > 204." @@ -726,20 +565,6 @@ Var Timeout = Timeout + 1 - If Timeout < 2 Then - If Game01Enable = 0 Then - If game_mode_enable = "true" Then - If BREW_CNT > 75 Then - SAVELOG "Button game enable from EventTimeout" - Var Game01Enable = 1 - Var ButtonGameCountDownState = "Invisible" - Var ButtonGamePressToPlayState = "Enable" - - EndIf - EndIf - EndIf - - EndIf DEBUGVAR MachineState_Result DEBUGVAR BREW_COUNT_DOWN_FROM_APP @@ -758,12 +583,6 @@ EndIf Endif - ;If Simulation = "true" Then - ; If CountDownBrewing = 0 Then - ; ;Open "ROOT/taobin_project/xml/page_drinkok.xml" - ; EndIf - ;EndIf - If SelectMenuBetweenBrewEnable1 = "Enable" Then If Timeout = 5 Then @@ -773,18 +592,7 @@ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3" - ; Play Sound #zone - If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" - EndIf - If SoundBackToSchoolType = 2 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" - EndIf - Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav" - EndIf - + PlayLong PlaySoundLag EndIf EndIf @@ -801,14 +609,6 @@ EndIf EndIf - ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - ;If CountDownBrewing = 0 Then - ; ;Open "ROOT/taobin_project/xml/page_drinkok.xml" - ;EndIf - Var ShowCountDownBrewing = CountDownBrewing @@ -1002,9 +802,6 @@ EndIf - ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" - - Var ServiceType = "coffee" Var ServiceCredit = SelectDrink Var SuggestID = "" @@ -1014,11 +811,6 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;If Seeker.CodeChannel = 0 Then - ; SAVELOG "back_to_main from line > 357." - ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - ;EndIf - Var waitAckPay = 2 Var Timeout = 5 Var ActionOKCase = 1 @@ -1082,9 +874,6 @@ EndIf EndIf - If MachineState_Result = 1 Then - ;Var MachineState_Result = 2 - EndIf If MachineState_Result = 1 Then DEBUGVAR PaySuccessWithDaemonTask @@ -1289,26 +1078,13 @@ - - - - - - - ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" - - ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - - ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" - ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" - EndIf EndIf If MachineStage = "close-maintenance" Then If MachineState_Result = 0 Then - SAVELOG "back_to_main from line > 663." + SAVELOG "back_to_main from line > 1087." Var MachineState_Result = 2 EndIf EndIf @@ -1698,14 +1474,8 @@ VideoPlayFile - + +;include="ROOT/taobin_project/inc/video.inc" diff --git a/inter/sgp/xml/page_catalog_group_appfast.lxml b/inter/sgp/xml/page_catalog_group_appfast.lxml index fb48dbd8..b94511fb 100644 --- a/inter/sgp/xml/page_catalog_group_appfast.lxml +++ b/inter/sgp/xml/page_catalog_group_appfast.lxml @@ -753,6 +753,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -871,7 +872,7 @@ 49 - 10 + 117 eval( If $Sum5204021018 = "Disable" Then @@ -1027,6 +1028,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1145,7 +1147,7 @@ 49 - 10 + 117 eval( If $Sum5204021019 = "Disable" Then @@ -1301,6 +1303,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1419,7 +1422,7 @@ 49 - 10 + 117 eval( If $Sum5204021020 = "Disable" Then @@ -1575,6 +1578,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1693,7 +1697,7 @@ 49 - 10 + 117 eval( If $Sum5204021021 = "Disable" Then @@ -1849,6 +1853,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1967,7 +1972,7 @@ 49 - 10 + 117 eval( If $Sum5204021022 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index a275c591..111fc7c3 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -744,6 +744,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -866,7 +867,7 @@ 49 - 10 + 117 eval( If $Sum5201010001 = "Disable" Then @@ -1032,6 +1033,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1154,7 +1156,7 @@ 49 - 10 + 117 eval( If $Sum5221010001 = "Disable" Then @@ -1310,6 +1312,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1432,7 +1435,7 @@ 49 - 10 + 117 eval( If $Sum5211010001 = "Disable" Then @@ -1598,6 +1601,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-31-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1720,7 +1724,7 @@ 49 - 10 + 117 eval( If $Sum5231010001 = "Disable" Then @@ -1876,6 +1880,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1998,7 +2003,7 @@ 49 - 10 + 117 eval( If $Sum52010100035201020001 = "Disable" Then @@ -2173,6 +2178,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2295,7 +2301,7 @@ 49 - 10 + 117 eval( If $Sum52210100035221020001 = "Disable" Then @@ -2451,6 +2457,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2573,7 +2580,7 @@ 49 - 10 + 117 eval( If $Sum5201010013 = "Disable" Then @@ -2729,6 +2736,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2851,7 +2859,7 @@ 49 - 10 + 117 eval( If $Sum5201010020 = "Disable" Then @@ -3007,6 +3015,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3129,7 +3138,7 @@ 49 - 10 + 117 eval( If $Sum5201010043 = "Disable" Then @@ -3285,6 +3294,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3407,7 +3417,7 @@ 49 - 10 + 117 eval( If $Sum5201010046 = "Disable" Then @@ -3563,6 +3573,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3685,7 +3696,7 @@ 49 - 10 + 117 eval( If $Sum5201010049 = "Disable" Then @@ -3841,6 +3852,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3963,7 +3975,7 @@ 49 - 10 + 117 eval( If $Sum5201010022 = "Disable" Then @@ -4119,6 +4131,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4241,7 +4254,7 @@ 49 - 10 + 117 eval( If $Sum5201010024 = "Disable" Then @@ -4397,6 +4410,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4519,7 +4533,7 @@ 49 - 10 + 117 eval( If $Sum5201010026 = "Disable" Then @@ -4675,6 +4689,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4797,7 +4812,7 @@ 49 - 10 + 117 eval( If $Sum5201010028 = "Disable" Then @@ -4953,6 +4968,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5075,7 +5091,7 @@ 49 - 10 + 117 eval( If $Sum5201010033 = "Disable" Then @@ -5231,6 +5247,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5353,7 +5370,7 @@ 49 - 10 + 117 eval( If $Sum5201010036 = "Disable" Then @@ -5509,6 +5526,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5631,7 +5649,7 @@ 49 - 10 + 117 eval( If $Sum5201010037 = "Disable" Then @@ -5787,6 +5805,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5905,7 +5924,7 @@ 49 - 10 + 117 eval( If $Sum5201020041 = "Disable" Then @@ -6071,6 +6090,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0041, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6189,7 +6209,7 @@ 49 - 10 + 117 eval( If $Sum5221020041 = "Disable" Then @@ -6345,6 +6365,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6467,7 +6488,7 @@ 49 - 10 + 117 eval( If $Sum52010100145201020011 = "Disable" Then @@ -6623,6 +6644,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6745,7 +6767,7 @@ 49 - 10 + 117 eval( If $Sum52010100445201020044 = "Disable" Then @@ -6901,6 +6923,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7023,7 +7046,7 @@ 49 - 10 + 117 eval( If $Sum52010100475201020047 = "Disable" Then @@ -7179,6 +7202,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7301,7 +7325,7 @@ 49 - 10 + 117 eval( If $Sum52010100505201020050 = "Disable" Then @@ -7457,6 +7481,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7579,7 +7604,7 @@ 49 - 10 + 117 eval( If $Sum52010100195201020019 = "Disable" Then @@ -7735,6 +7760,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7857,7 +7883,7 @@ 49 - 10 + 117 eval( If $Sum52010100215201020021 = "Disable" Then @@ -8013,6 +8039,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8135,7 +8162,7 @@ 49 - 10 + 117 eval( If $Sum52010100255201020025 = "Disable" Then @@ -8291,6 +8318,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8413,7 +8441,7 @@ 49 - 10 + 117 eval( If $Sum52010100235201020023 = "Disable" Then @@ -8569,6 +8597,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8691,7 +8720,7 @@ 49 - 10 + 117 eval( If $Sum52010100275201020027 = "Disable" Then @@ -8847,6 +8876,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8969,7 +8999,7 @@ 49 - 10 + 117 eval( If $Sum52010100325201020032 = "Disable" Then @@ -9125,6 +9155,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9247,7 +9278,7 @@ 49 - 10 + 117 eval( If $Sum52010100355201020035 = "Disable" Then @@ -9403,6 +9434,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9525,7 +9557,7 @@ 49 - 10 + 117 eval( If $Sum52010100385201020038 = "Disable" Then @@ -9681,6 +9713,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9799,7 +9832,7 @@ 49 - 10 + 117 eval( If $Sum5201020020 = "Disable" Then @@ -9955,6 +9988,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10073,7 +10107,7 @@ 49 - 10 + 117 eval( If $Sum5201020045 = "Disable" Then @@ -10229,6 +10263,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10347,7 +10382,7 @@ 49 - 10 + 117 eval( If $Sum5201020048 = "Disable" Then @@ -10503,6 +10538,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10621,7 +10657,7 @@ 49 - 10 + 117 eval( If $Sum5201020051 = "Disable" Then @@ -10777,6 +10813,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10895,7 +10932,7 @@ 49 - 10 + 117 eval( If $Sum5201020022 = "Disable" Then @@ -11051,6 +11088,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11169,7 +11207,7 @@ 49 - 10 + 117 eval( If $Sum5201020026 = "Disable" Then @@ -11325,6 +11363,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11443,7 +11482,7 @@ 49 - 10 + 117 eval( If $Sum5201020024 = "Disable" Then @@ -11599,6 +11638,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11717,7 +11757,7 @@ 49 - 10 + 117 eval( If $Sum5201020018 = "Disable" Then @@ -11873,6 +11913,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11991,7 +12032,7 @@ 49 - 10 + 117 eval( If $Sum5201020028 = "Disable" Then @@ -12147,6 +12188,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12265,7 +12307,7 @@ 49 - 10 + 117 eval( If $Sum5201020033 = "Disable" Then @@ -12421,6 +12463,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12539,7 +12582,7 @@ 49 - 10 + 117 eval( If $Sum5201020036 = "Disable" Then @@ -12695,6 +12738,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12813,7 +12857,7 @@ 49 - 10 + 117 eval( If $Sum5201020037 = "Disable" Then @@ -12969,6 +13013,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13087,7 +13132,7 @@ 49 - 10 + 117 eval( If $Sum52110200015211030001 = "Disable" Then @@ -13262,6 +13307,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-31-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13380,7 +13426,7 @@ 49 - 10 + 117 eval( If $Sum52310200015231030001 = "Disable" Then @@ -13536,6 +13582,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13658,7 +13705,7 @@ 49 - 10 + 117 eval( If $Sum520101000452010200025201030002 = "Disable" Then @@ -13842,6 +13889,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13964,7 +14012,7 @@ 49 - 10 + 117 eval( If $Sum522101000452210200025221030002 = "Disable" Then @@ -14120,6 +14168,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14242,7 +14291,7 @@ 49 - 10 + 117 eval( If $Sum520101000552110200025211030002 = "Disable" Then @@ -14426,6 +14475,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-31-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14548,7 +14598,7 @@ 49 - 10 + 117 eval( If $Sum522101000552310200025231030002 = "Disable" Then @@ -14704,6 +14754,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14826,7 +14877,7 @@ 49 - 10 + 117 eval( If $Sum520101000652010200035201030003 = "Disable" Then @@ -15010,6 +15061,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15132,7 +15184,7 @@ 49 - 10 + 117 eval( If $Sum522101000652210200035221030003 = "Disable" Then @@ -15288,6 +15340,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15410,7 +15463,7 @@ 49 - 10 + 117 eval( If $Sum520101000752010200045201030004 = "Disable" Then @@ -15594,6 +15647,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15716,7 +15770,7 @@ 49 - 10 + 117 eval( If $Sum522101000752210200045221030004 = "Disable" Then @@ -15872,6 +15926,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15994,7 +16049,7 @@ 49 - 10 + 117 eval( If $Sum520101003152010200315201030031 = "Disable" Then @@ -16178,6 +16233,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0031, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -16300,7 +16356,7 @@ 49 - 10 + 117 eval( If $Sum522101003152210200315221030031 = "Disable" Then @@ -16456,6 +16512,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -16578,7 +16635,7 @@ 49 - 10 + 117 eval( If $Sum520101000852010200055201030005 = "Disable" Then @@ -16734,6 +16791,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -16856,7 +16914,7 @@ 49 - 10 + 117 eval( If $Sum522101000852210200055221030005 = "Disable" Then @@ -17012,6 +17070,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -17134,7 +17193,7 @@ 49 - 10 + 117 eval( If $Sum520101001152010200085201030008 = "Disable" Then @@ -17290,6 +17349,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -17412,7 +17472,7 @@ 49 - 10 + 117 eval( If $Sum522101001152210200085221030008 = "Disable" Then @@ -17568,6 +17628,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -17690,7 +17751,7 @@ 49 - 10 + 117 eval( If $Sum52010100395201020039 = "Disable" Then @@ -17865,6 +17926,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -17987,7 +18049,7 @@ 49 - 10 + 117 eval( If $Sum52210100395221020039 = "Disable" Then @@ -18143,6 +18205,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -18265,7 +18328,7 @@ 49 - 10 + 117 eval( If $Sum520101000952010200065201030006 = "Disable" Then @@ -18421,6 +18484,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -18543,7 +18607,7 @@ 49 - 10 + 117 eval( If $Sum522101000952210200065221030006 = "Disable" Then @@ -18699,6 +18763,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -18821,7 +18886,7 @@ 49 - 10 + 117 eval( If $Sum520101005552010200555201030055 = "Disable" Then @@ -19005,6 +19070,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0055, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -19127,7 +19193,7 @@ 49 - 10 + 117 eval( If $Sum522101005552210200555221030055 = "Disable" Then @@ -19283,6 +19349,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -19405,7 +19472,7 @@ 49 - 10 + 117 eval( If $Sum520101002952010200295201030029 = "Disable" Then @@ -19561,6 +19628,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -19683,7 +19751,7 @@ 49 - 10 + 117 eval( If $Sum522101002952210200295221030029 = "Disable" Then @@ -19839,6 +19907,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -19961,7 +20030,7 @@ 49 - 10 + 117 eval( If $Sum52010100175201020017 = "Disable" Then @@ -20136,6 +20205,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0017, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -20258,7 +20328,7 @@ 49 - 10 + 117 eval( If $Sum52210100175221020017 = "Disable" Then @@ -20414,6 +20484,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -20536,7 +20607,7 @@ 49 - 10 + 117 eval( If $Sum52010100405201020040 = "Disable" Then @@ -20711,6 +20782,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0040, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_5_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -20833,7 +20905,7 @@ 49 - 10 + 117 eval( If $Sum52210100405221020040 = "Disable" Then @@ -20989,6 +21061,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -21111,7 +21184,7 @@ 49 - 10 + 117 eval( If $Sum520101004252010200425201030042 = "Disable" Then @@ -21295,6 +21368,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0042, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -21417,7 +21491,7 @@ 49 - 10 + 117 eval( If $Sum522101004252210200425221030042 = "Disable" Then @@ -21573,6 +21647,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -21695,7 +21770,7 @@ 49 - 10 + 117 eval( If $Sum520101004252010200425201030042 = "Disable" Then @@ -21879,6 +21954,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0042, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -22001,7 +22077,7 @@ 49 - 10 + 117 eval( If $Sum522101004252210200425221030042 = "Disable" Then @@ -22167,6 +22243,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -22285,7 +22362,7 @@ 49 - 10 + 117 eval( If $Sum5221020068 = "Disable" Then @@ -22441,6 +22518,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -22563,7 +22641,7 @@ 49 - 10 + 117 eval( If $Sum522101005752210200575221030057 = "Disable" Then @@ -22719,6 +22797,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -22841,7 +22920,7 @@ 49 - 10 + 117 eval( If $Sum52210100585221020058 = "Disable" Then @@ -22997,6 +23076,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -23119,7 +23199,7 @@ 49 - 10 + 117 eval( If $Sum520101003052010200305201030030 = "Disable" Then @@ -23275,6 +23355,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -23397,7 +23478,7 @@ 49 - 10 + 117 eval( If $Sum522101003052210200305221030030 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_forkid.lxml b/inter/sgp/xml/page_catalog_group_forkid.lxml index 45685f29..f5faae7e 100644 --- a/inter/sgp/xml/page_catalog_group_forkid.lxml +++ b/inter/sgp/xml/page_catalog_group_forkid.lxml @@ -782,6 +782,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -904,7 +905,7 @@ 49 - 10 + 117 eval( If $Sum520301000552030200055203030005 = "Disable" Then @@ -1088,6 +1089,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1210,7 +1212,7 @@ 49 - 10 + 117 eval( If $Sum520301000152030200015203030001 = "Disable" Then @@ -1366,6 +1368,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1488,7 +1491,7 @@ 49 - 10 + 117 eval( If $Sum520301000352030200035203030003 = "Disable" Then @@ -1644,6 +1647,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1762,7 +1766,7 @@ 49 - 10 + 117 eval( If $Sum52030200065203030006 = "Disable" Then @@ -1946,6 +1950,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2068,7 +2073,7 @@ 49 - 10 + 117 eval( If $Sum520301000252030200025203030002 = "Disable" Then @@ -2252,6 +2257,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2374,7 +2380,7 @@ 49 - 10 + 117 eval( If $Sum520301002252030200225203030022 = "Disable" Then @@ -2540,6 +2546,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2658,7 +2665,7 @@ 49 - 10 + 117 eval( If $Sum5203030010 = "Disable" Then @@ -2814,6 +2821,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2932,7 +2940,7 @@ 49 - 10 + 117 eval( If $Sum5203030020 = "Disable" Then @@ -3088,6 +3096,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3206,7 +3215,7 @@ 49 - 10 + 117 eval( If $Sum5203030021 = "Disable" Then @@ -3381,6 +3390,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0041, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3499,7 +3509,7 @@ 49 - 10 + 117 eval( If $Sum52050200415205030041 = "Disable" Then @@ -3655,6 +3665,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3773,7 +3784,7 @@ 49 - 10 + 117 eval( If $Sum52050200085205030008 = "Disable" Then @@ -3939,6 +3950,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0044, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4057,7 +4069,7 @@ 49 - 10 + 117 eval( If $Sum5205020044 = "Disable" Then @@ -4223,6 +4235,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0045, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4341,7 +4354,7 @@ 49 - 10 + 117 eval( If $Sum5205020045 = "Disable" Then @@ -4507,6 +4520,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi2.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4625,7 +4639,7 @@ 49 - 10 + 117 eval( If $Sum5203030009 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_health.lxml b/inter/sgp/xml/page_catalog_group_health.lxml index 71d8448d..3038b032 100644 --- a/inter/sgp/xml/page_catalog_group_health.lxml +++ b/inter/sgp/xml/page_catalog_group_health.lxml @@ -741,6 +741,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -863,7 +864,7 @@ 49 - 10 + 117 eval( If $Sum52010110035201021001 = "Disable" Then @@ -1038,6 +1039,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-1001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1160,7 +1162,7 @@ 49 - 10 + 117 eval( If $Sum52210110035221021001 = "Disable" Then @@ -1316,6 +1318,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1438,7 +1441,7 @@ 49 - 10 + 117 eval( If $Sum52010110045201021002 = "Disable" Then @@ -1613,6 +1616,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-1002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1735,7 +1739,7 @@ 49 - 10 + 117 eval( If $Sum52210110045221021002 = "Disable" Then @@ -1891,6 +1895,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2013,7 +2018,7 @@ 49 - 10 + 117 eval( If $Sum52010110065201021003 = "Disable" Then @@ -2188,6 +2193,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-1003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2310,7 +2316,7 @@ 49 - 10 + 117 eval( If $Sum52210110065221021003 = "Disable" Then @@ -2466,6 +2472,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2588,7 +2595,7 @@ 49 - 10 + 117 eval( If $Sum52010110995201021099 = "Disable" Then @@ -2763,6 +2770,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-1099, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2885,7 +2893,7 @@ 49 - 10 + 117 eval( If $Sum52210110995221021099 = "Disable" Then @@ -3041,6 +3049,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3163,7 +3172,7 @@ 49 - 10 + 117 eval( If $Sum52020110245202021024 = "Disable" Then @@ -3319,6 +3328,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3441,7 +3451,7 @@ 49 - 10 + 117 eval( If $Sum52020110245202021024 = "Disable" Then @@ -3597,6 +3607,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3719,7 +3730,7 @@ 49 - 10 + 117 eval( If $Sum52020110255202021025 = "Disable" Then @@ -3894,6 +3905,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-1026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4016,7 +4028,7 @@ 49 - 10 + 117 eval( If $Sum52020110265202021026 = "Disable" Then @@ -4172,6 +4184,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4294,7 +4307,7 @@ 49 - 10 + 117 eval( If $Sum52020110295202021029 = "Disable" Then @@ -4469,6 +4482,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-1027, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4591,7 +4605,7 @@ 49 - 10 + 117 eval( If $Sum52020110275202021027 = "Disable" Then @@ -4747,6 +4761,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4869,7 +4884,7 @@ 49 - 10 + 117 eval( If $Sum52020110295202021029 = "Disable" Then @@ -5025,6 +5040,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5147,7 +5163,7 @@ 49 - 10 + 117 eval( If $Sum52020110305202021030 = "Disable" Then @@ -5303,6 +5319,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5425,7 +5442,7 @@ 49 - 10 + 117 eval( If $Sum52020110315202021031 = "Disable" Then @@ -5581,6 +5598,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5703,7 +5721,7 @@ 49 - 10 + 117 eval( If $Sum52020110325202021032 = "Disable" Then @@ -5859,6 +5877,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5981,7 +6000,7 @@ 49 - 10 + 117 eval( If $Sum52020110375202021037 = "Disable" Then @@ -6156,6 +6175,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-1002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6278,7 +6298,7 @@ 49 - 10 + 117 eval( If $Sum52030110025203021002 = "Disable" Then @@ -6453,6 +6473,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-1005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6575,7 +6596,7 @@ 49 - 10 + 117 eval( If $Sum52030110055203021005 = "Disable" Then @@ -6750,6 +6771,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-1038, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6872,7 +6894,7 @@ 49 - 10 + 117 eval( If $Sum52020110385202021038 = "Disable" Then @@ -7047,6 +7069,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-1039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7169,7 +7192,7 @@ 49 - 10 + 117 eval( If $Sum52020110395202021039 = "Disable" Then @@ -7344,6 +7367,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-1040, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7466,7 +7490,7 @@ 49 - 10 + 117 eval( If $Sum52020110405202021040 = "Disable" Then @@ -7641,6 +7665,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-1001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7763,7 +7788,7 @@ 49 - 10 + 117 eval( If $Sum52050110015205021001 = "Disable" Then @@ -7929,6 +7954,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-1010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8047,7 +8073,7 @@ 49 - 10 + 117 eval( If $Sum5205021010 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_milk.lxml b/inter/sgp/xml/page_catalog_group_milk.lxml index 90d14f65..f7021ef8 100644 --- a/inter/sgp/xml/page_catalog_group_milk.lxml +++ b/inter/sgp/xml/page_catalog_group_milk.lxml @@ -769,6 +769,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -891,7 +892,7 @@ 49 - 10 + 117 eval( If $Sum520301000552030200055203030005 = "Disable" Then @@ -1075,6 +1076,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1197,7 +1199,7 @@ 49 - 10 + 117 eval( If $Sum520301000152030200015203030001 = "Disable" Then @@ -1381,6 +1383,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1503,7 +1506,7 @@ 49 - 10 + 117 eval( If $Sum520301000452030200045203030004 = "Disable" Then @@ -1659,6 +1662,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1781,7 +1785,7 @@ 49 - 10 + 117 eval( If $Sum520301000352030200035203030003 = "Disable" Then @@ -1937,6 +1941,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2055,7 +2060,7 @@ 49 - 10 + 117 eval( If $Sum52030200065203030006 = "Disable" Then @@ -2239,6 +2244,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2361,7 +2367,7 @@ 49 - 10 + 117 eval( If $Sum520301000252030200025203030002 = "Disable" Then @@ -2536,6 +2542,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2654,7 +2661,7 @@ 49 - 10 + 117 eval( If $Sum52030200595203030059 = "Disable" Then @@ -2820,6 +2827,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2938,7 +2946,7 @@ 49 - 10 + 117 eval( If $Sum5203030010 = "Disable" Then @@ -3104,6 +3112,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3222,7 +3231,7 @@ 49 - 10 + 117 eval( If $Sum5203030011 = "Disable" Then @@ -3388,6 +3397,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi2.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3506,7 +3516,7 @@ 49 - 10 + 117 eval( If $Sum5203030009 = "Disable" Then @@ -3662,6 +3672,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3784,7 +3795,7 @@ 49 - 10 + 117 eval( If $Sum520301001952030200195203030019 = "Disable" Then @@ -3940,6 +3951,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4058,7 +4070,7 @@ 49 - 10 + 117 eval( If $Sum5203030020 = "Disable" Then @@ -4214,6 +4226,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4332,7 +4345,7 @@ 49 - 10 + 117 eval( If $Sum5203030021 = "Disable" Then @@ -4392,7 +4405,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_smoothie_MILO.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_smoothie_MILO.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_smoothie_MILO.png" - xmlpro( 52-03-02-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_2_posi1.png") + xmlpro( 52-03-02-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4492,7 +4505,7 @@ If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0048" - Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png") + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter1 DEBUGVAR OverlayMenuFilter1_Value Else @@ -4501,7 +4514,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0048" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -4516,6 +4529,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0048, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4638,7 +4652,7 @@ 49 - 10 + 117 eval( If $Sum520301004852030200485203030048 = "Disable" Then @@ -4804,6 +4818,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4922,7 +4937,7 @@ 49 - 10 + 117 eval( If $Sum5203030049 = "Disable" Then @@ -5106,6 +5121,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5228,7 +5244,7 @@ 49 - 10 + 117 eval( If $Sum520301002252030200225203030022 = "Disable" Then @@ -5412,6 +5428,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5534,7 +5551,7 @@ 49 - 10 + 117 eval( If $Sum520301002552030200255203030025 = "Disable" Then @@ -5690,6 +5707,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5808,7 +5826,7 @@ 49 - 10 + 117 eval( If $Sum5203030026 = "Disable" Then @@ -5992,6 +6010,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0023, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6114,7 +6133,7 @@ 49 - 10 + 117 eval( If $Sum520301002352030200235203030023 = "Disable" Then @@ -6298,6 +6317,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0024, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6420,7 +6440,7 @@ 49 - 10 + 117 eval( If $Sum520301002452030200245203030024 = "Disable" Then @@ -6595,6 +6615,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6713,7 +6734,7 @@ 49 - 10 + 117 eval( If $Sum52030200585203030058 = "Disable" Then @@ -6869,6 +6890,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6987,7 +7009,7 @@ 49 - 10 + 117 eval( If $Sum5203030034 = "Disable" Then @@ -7143,6 +7165,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7265,7 +7288,7 @@ 49 - 10 + 117 eval( If $Sum520301003552030200355203030035 = "Disable" Then @@ -7421,6 +7444,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7543,7 +7567,7 @@ 49 - 10 + 117 eval( If $Sum520301003652030200365203030036 = "Disable" Then @@ -7699,6 +7723,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7817,7 +7842,7 @@ 49 - 10 + 117 eval( If $Sum52030200375203030037 = "Disable" Then @@ -7973,6 +7998,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8095,7 +8121,7 @@ 49 - 10 + 117 eval( If $Sum520301003952030200395203030039 = "Disable" Then @@ -8251,6 +8277,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8373,7 +8400,7 @@ 49 - 10 + 117 eval( If $Sum520301004052030200405203030040 = "Disable" Then @@ -8529,6 +8556,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8651,7 +8679,7 @@ 49 - 10 + 117 eval( If $Sum520301004152030200415203030041 = "Disable" Then @@ -8807,6 +8835,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8929,7 +8958,7 @@ 49 - 10 + 117 eval( If $Sum520301004252030200425203030042 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index 1f8c2227..c2ee4480 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -762,6 +762,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0007, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -880,7 +881,7 @@ 49 - 10 + 117 eval( If $Sum52050200075205030007 = "Disable" Then @@ -1036,6 +1037,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1154,7 +1156,7 @@ 49 - 10 + 117 eval( If $Sum52050200625205030062 = "Disable" Then @@ -1320,6 +1322,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1438,7 +1441,7 @@ 49 - 10 + 117 eval( If $Sum52050200355205030035 = "Disable" Then @@ -1604,6 +1607,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0044, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1722,7 +1726,7 @@ 49 - 10 + 117 eval( If $Sum5205020044 = "Disable" Then @@ -1888,6 +1892,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0045, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2006,7 +2011,7 @@ 49 - 10 + 117 eval( If $Sum5205020045 = "Disable" Then @@ -2181,6 +2186,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_15_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2299,7 +2305,7 @@ 49 - 10 + 117 eval( If $Sum52050200105205030010 = "Disable" Then @@ -2474,6 +2480,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0033, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_5_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2592,7 +2599,7 @@ 49 - 10 + 117 eval( If $Sum52050200335205030033 = "Disable" Then @@ -2748,6 +2755,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2866,7 +2874,7 @@ 49 - 10 + 117 eval( If $Sum52050200225205030022 = "Disable" Then @@ -3022,6 +3030,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3140,7 +3149,7 @@ 49 - 10 + 117 eval( If $Sum5205020012 = "Disable" Then @@ -3315,6 +3324,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0041, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3433,7 +3443,7 @@ 49 - 10 + 117 eval( If $Sum52050200415205030041 = "Disable" Then @@ -3589,6 +3599,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3707,7 +3718,7 @@ 49 - 10 + 117 eval( If $Sum52050200085205030008 = "Disable" Then @@ -3863,6 +3874,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3981,7 +3993,7 @@ 49 - 10 + 117 eval( If $Sum52050200095205030009 = "Disable" Then @@ -4156,6 +4168,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0024, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_13_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4274,7 +4287,7 @@ 49 - 10 + 117 eval( If $Sum52050200245205030024 = "Disable" Then @@ -4449,6 +4462,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4567,7 +4581,7 @@ 49 - 10 + 117 eval( If $Sum52050200255205030025 = "Disable" Then @@ -4742,6 +4756,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0046, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4860,7 +4875,7 @@ 49 - 10 + 117 eval( If $Sum52050200465205030046 = "Disable" Then @@ -5035,6 +5050,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0047, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5153,7 +5169,7 @@ 49 - 10 + 117 eval( If $Sum52050200475205030047 = "Disable" Then @@ -5319,6 +5335,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0053, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5437,7 +5454,7 @@ 49 - 10 + 117 eval( If $Sum5205020053 = "Disable" Then @@ -5603,6 +5620,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0054, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5721,7 +5739,7 @@ 49 - 10 + 117 eval( If $Sum5205020054 = "Disable" Then @@ -5887,6 +5905,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6005,7 +6024,7 @@ 49 - 10 + 117 eval( If $Sum5205020091 = "Disable" Then @@ -6161,6 +6180,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6279,7 +6299,7 @@ 49 - 10 + 117 eval( If $Sum52050200745205030074 = "Disable" Then @@ -6435,6 +6455,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6553,7 +6574,7 @@ 49 - 10 + 117 eval( If $Sum52050200755205030075 = "Disable" Then @@ -6709,6 +6730,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6827,7 +6849,7 @@ 49 - 10 + 117 eval( If $Sum5205020076 = "Disable" Then @@ -6983,6 +7005,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7101,7 +7124,7 @@ 49 - 10 + 117 eval( If $Sum5205020077 = "Disable" Then @@ -7257,6 +7280,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7375,7 +7399,7 @@ 49 - 10 + 117 eval( If $Sum52050200385205030038 = "Disable" Then @@ -7531,6 +7555,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7649,7 +7674,7 @@ 49 - 10 + 117 eval( If $Sum52050200395205030039 = "Disable" Then @@ -7815,6 +7840,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0051, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7933,7 +7959,7 @@ 49 - 10 + 117 eval( If $Sum5205020051 = "Disable" Then @@ -8099,6 +8125,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0052, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8217,7 +8244,7 @@ 49 - 10 + 117 eval( If $Sum5205020052 = "Disable" Then @@ -8373,6 +8400,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8491,7 +8519,7 @@ 49 - 10 + 117 eval( If $Sum5205020060 = "Disable" Then @@ -8647,6 +8675,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8765,7 +8794,7 @@ 49 - 10 + 117 eval( If $Sum5205020063 = "Disable" Then @@ -8921,6 +8950,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9039,7 +9069,7 @@ 49 - 10 + 117 eval( If $Sum5205020064 = "Disable" Then @@ -9195,6 +9225,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9313,7 +9344,7 @@ 49 - 10 + 117 eval( If $Sum5205020065 = "Disable" Then @@ -9469,6 +9500,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9587,7 +9619,7 @@ 49 - 10 + 117 eval( If $Sum5205020066 = "Disable" Then @@ -9743,6 +9775,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9861,7 +9894,7 @@ 49 - 10 + 117 eval( If $Sum5205020067 = "Disable" Then @@ -10017,6 +10050,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10135,7 +10169,7 @@ 49 - 10 + 117 eval( If $Sum5205020068 = "Disable" Then @@ -10301,6 +10335,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10419,7 +10454,7 @@ 49 - 10 + 117 eval( If $Sum5205020093 = "Disable" Then @@ -10585,6 +10620,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10703,7 +10739,7 @@ 49 - 10 + 117 eval( If $Sum5205020090 = "Disable" Then @@ -10869,6 +10905,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0014, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10987,7 +11024,7 @@ 49 - 10 + 117 eval( If $Sum5205020014 = "Disable" Then @@ -11153,6 +11190,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0015, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11271,7 +11309,7 @@ 49 - 10 + 117 eval( If $Sum5205020015 = "Disable" Then @@ -11437,6 +11475,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0034, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11555,7 +11594,7 @@ 49 - 10 + 117 eval( If $Sum52050200345205030034 = "Disable" Then @@ -11711,6 +11750,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11829,7 +11869,7 @@ 49 - 10 + 117 eval( If $Sum52050200035205030003 = "Disable" Then @@ -11985,6 +12025,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12103,7 +12144,7 @@ 49 - 10 + 117 eval( If $Sum52050200045205030004 = "Disable" Then @@ -12259,6 +12300,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12377,7 +12419,7 @@ 49 - 10 + 117 eval( If $Sum52050200025205030002 = "Disable" Then @@ -12533,6 +12575,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12651,7 +12694,7 @@ 49 - 10 + 117 eval( If $Sum5205020005 = "Disable" Then @@ -12835,6 +12878,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12957,7 +13001,7 @@ 49 - 10 + 117 eval( If $Sum520501000152050200015205030001 = "Disable" Then @@ -13132,6 +13176,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13250,7 +13295,7 @@ 49 - 10 + 117 eval( If $Sum52050200265205030026 = "Disable" Then @@ -13425,6 +13470,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0032, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13543,7 +13589,7 @@ 49 - 10 + 117 eval( If $Sum52050200325205030032 = "Disable" Then @@ -13699,6 +13745,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13821,7 +13868,7 @@ 49 - 10 + 117 eval( If $Sum5206010002 = "Disable" Then @@ -13987,6 +14034,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-03-0040, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14105,7 +14153,7 @@ 49 - 10 + 117 eval( If $Sum5205030040 = "Disable" Then @@ -14271,6 +14319,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14389,7 +14438,7 @@ 49 - 10 + 117 eval( If $Sum5205030092 = "Disable" Then @@ -14545,6 +14594,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14667,7 +14717,7 @@ 49 - 10 + 117 eval( If $Sum5206010001 = "Disable" Then @@ -14823,6 +14873,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14945,7 +14996,7 @@ 49 - 10 + 117 eval( If $Sum5206010002 = "Disable" Then @@ -15101,6 +15152,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15219,7 +15271,7 @@ 49 - 10 + 117 eval( If $Sum5205020017 = "Disable" Then @@ -15385,6 +15437,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0016, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -15503,7 +15556,7 @@ 49 - 10 + 117 eval( If $Sum5205020016 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index 23b62e67..b38396c7 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -748,6 +748,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -866,7 +867,7 @@ 49 - 10 + 117 eval( If $Sum5203030026 = "Disable" Then @@ -1022,6 +1023,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1144,7 +1146,7 @@ 49 - 10 + 117 eval( If $Sum5201010001 = "Disable" Then @@ -1310,6 +1312,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1432,7 +1435,7 @@ 49 - 10 + 117 eval( If $Sum5221010001 = "Disable" Then @@ -1588,6 +1591,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1710,7 +1714,7 @@ 49 - 10 + 117 eval( If $Sum52010100035201020001 = "Disable" Then @@ -1885,6 +1889,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2007,7 +2012,7 @@ 49 - 10 + 117 eval( If $Sum52210100035221020001 = "Disable" Then @@ -2163,6 +2168,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2285,7 +2291,7 @@ 49 - 10 + 117 eval( If $Sum5201010013 = "Disable" Then @@ -2441,6 +2447,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2563,7 +2570,7 @@ 49 - 10 + 117 eval( If $Sum5201010020 = "Disable" Then @@ -2719,6 +2726,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2841,7 +2849,7 @@ 49 - 10 + 117 eval( If $Sum5201010022 = "Disable" Then @@ -2997,6 +3005,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3119,7 +3128,7 @@ 49 - 10 + 117 eval( If $Sum5201010024 = "Disable" Then @@ -3275,6 +3284,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3397,7 +3407,7 @@ 49 - 10 + 117 eval( If $Sum5201010026 = "Disable" Then @@ -3553,6 +3563,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3675,7 +3686,7 @@ 49 - 10 + 117 eval( If $Sum5201010028 = "Disable" Then @@ -3831,6 +3842,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3953,7 +3965,7 @@ 49 - 10 + 117 eval( If $Sum5201010033 = "Disable" Then @@ -4109,6 +4121,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4231,7 +4244,7 @@ 49 - 10 + 117 eval( If $Sum5201010036 = "Disable" Then @@ -4387,6 +4400,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4509,7 +4523,7 @@ 49 - 10 + 117 eval( If $Sum5201010037 = "Disable" Then @@ -4665,6 +4679,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4787,7 +4802,7 @@ 49 - 10 + 117 eval( If $Sum52010100145201020011 = "Disable" Then @@ -4943,6 +4958,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5065,7 +5081,7 @@ 49 - 10 + 117 eval( If $Sum52010100195201020019 = "Disable" Then @@ -5221,6 +5237,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5343,7 +5360,7 @@ 49 - 10 + 117 eval( If $Sum52010100215201020021 = "Disable" Then @@ -5499,6 +5516,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5621,7 +5639,7 @@ 49 - 10 + 117 eval( If $Sum52010100255201020025 = "Disable" Then @@ -5777,6 +5795,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5899,7 +5918,7 @@ 49 - 10 + 117 eval( If $Sum52010100235201020023 = "Disable" Then @@ -6055,6 +6074,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6177,7 +6197,7 @@ 49 - 10 + 117 eval( If $Sum52010100445201020044 = "Disable" Then @@ -6333,6 +6353,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6455,7 +6476,7 @@ 49 - 10 + 117 eval( If $Sum52010100475201020047 = "Disable" Then @@ -6611,6 +6632,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6733,7 +6755,7 @@ 49 - 10 + 117 eval( If $Sum52010100505201020050 = "Disable" Then @@ -6889,6 +6911,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7011,7 +7034,7 @@ 49 - 10 + 117 eval( If $Sum52010100275201020027 = "Disable" Then @@ -7167,6 +7190,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7289,7 +7313,7 @@ 49 - 10 + 117 eval( If $Sum52010100325201020032 = "Disable" Then @@ -7445,6 +7469,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7567,7 +7592,7 @@ 49 - 10 + 117 eval( If $Sum52010100355201020035 = "Disable" Then @@ -7723,6 +7748,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7845,7 +7871,7 @@ 49 - 10 + 117 eval( If $Sum52010100385201020038 = "Disable" Then @@ -8001,6 +8027,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8123,7 +8150,7 @@ 49 - 10 + 117 eval( If $Sum520101000452010200025201030002 = "Disable" Then @@ -8307,6 +8334,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8429,7 +8457,7 @@ 49 - 10 + 117 eval( If $Sum522101000452210200025221030002 = "Disable" Then @@ -8585,6 +8613,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8707,7 +8736,7 @@ 49 - 10 + 117 eval( If $Sum520201003752020200375202030037 = "Disable" Then @@ -8891,6 +8920,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9013,7 +9043,7 @@ 49 - 10 + 117 eval( If $Sum520201002652020200265202030026 = "Disable" Then @@ -9169,6 +9199,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9291,7 +9322,7 @@ 49 - 10 + 117 eval( If $Sum520201002452020200245202030024 = "Disable" Then @@ -9475,6 +9506,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9597,7 +9629,7 @@ 49 - 10 + 117 eval( If $Sum520301000252030200025203030002 = "Disable" Then @@ -9781,6 +9813,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9903,7 +9936,7 @@ 49 - 10 + 117 eval( If $Sum520301000152030200015203030001 = "Disable" Then @@ -10059,6 +10092,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10177,7 +10211,7 @@ 49 - 10 + 117 eval( If $Sum52030200065203030006 = "Disable" Then @@ -10343,6 +10377,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10461,7 +10496,7 @@ 49 - 10 + 117 eval( If $Sum5203030011 = "Disable" Then @@ -10645,6 +10680,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-02-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10767,7 +10803,7 @@ 49 - 10 + 117 eval( If $Sum520301002252030200225203030022 = "Disable" Then @@ -10933,6 +10969,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi2.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11051,7 +11088,7 @@ 49 - 10 + 117 eval( If $Sum5203030009 = "Disable" Then @@ -11207,6 +11244,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11325,7 +11363,7 @@ 49 - 10 + 117 eval( If $Sum5203030020 = "Disable" Then @@ -11491,6 +11529,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11609,7 +11648,7 @@ 49 - 10 + 117 eval( If $Sum5203030049 = "Disable" Then @@ -11765,6 +11804,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11883,7 +11923,7 @@ 49 - 10 + 117 eval( If $Sum52050200625205030062 = "Disable" Then @@ -12039,6 +12079,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12157,7 +12198,7 @@ 49 - 10 + 117 eval( If $Sum5205020076 = "Disable" Then @@ -12323,6 +12364,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12441,7 +12483,7 @@ 49 - 10 + 117 eval( If $Sum52050200355205030035 = "Disable" Then @@ -12616,6 +12658,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12734,7 +12777,7 @@ 49 - 10 + 117 eval( If $Sum52050200255205030025 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index 1f6742b9..ffcd5f61 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -746,6 +746,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -868,7 +869,7 @@ 49 - 10 + 117 eval( If $Sum520201000152020200015202030001 = "Disable" Then @@ -1024,6 +1025,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1146,7 +1148,7 @@ 49 - 10 + 117 eval( If $Sum520201002052020200205202030020 = "Disable" Then @@ -1330,6 +1332,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0041, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1452,7 +1455,7 @@ 49 - 10 + 117 eval( If $Sum520201004152020200415202030041 = "Disable" Then @@ -1608,6 +1611,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1730,7 +1734,7 @@ 49 - 10 + 117 eval( If $Sum520201001752050200275205030027 = "Disable" Then @@ -1886,6 +1890,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2008,7 +2013,7 @@ 49 - 10 + 117 eval( If $Sum520201000752020200075202030007 = "Disable" Then @@ -2164,6 +2169,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2286,7 +2292,7 @@ 49 - 10 + 117 eval( If $Sum5202010021 = "Disable" Then @@ -2470,6 +2476,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0042, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2592,7 +2599,7 @@ 49 - 10 + 117 eval( If $Sum520201004252020200425202030042 = "Disable" Then @@ -2776,6 +2783,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2898,7 +2906,7 @@ 49 - 10 + 117 eval( If $Sum520201003952020200395202030039 = "Disable" Then @@ -3082,6 +3090,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0040, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3204,7 +3213,7 @@ 49 - 10 + 117 eval( If $Sum520201004052020200405202030040 = "Disable" Then @@ -3379,6 +3388,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0047, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3501,7 +3511,7 @@ 49 - 10 + 117 eval( If $Sum52020100475202020047 = "Disable" Then @@ -3657,6 +3667,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3779,7 +3790,7 @@ 49 - 10 + 117 eval( If $Sum520201000152020200015202030001 = "Disable" Then @@ -3935,6 +3946,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4057,7 +4069,7 @@ 49 - 10 + 117 eval( If $Sum520201002052020200205202030020 = "Disable" Then @@ -4213,6 +4225,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4335,7 +4348,7 @@ 49 - 10 + 117 eval( If $Sum520201001752050200275205030027 = "Disable" Then @@ -4491,6 +4504,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4613,7 +4627,7 @@ 49 - 10 + 117 eval( If $Sum520201000752020200075202030007 = "Disable" Then @@ -4769,6 +4783,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4891,7 +4906,7 @@ 49 - 10 + 117 eval( If $Sum5202010021 = "Disable" Then @@ -5075,6 +5090,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0027, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5197,7 +5213,7 @@ 49 - 10 + 117 eval( If $Sum520201002752020200275202030027 = "Disable" Then @@ -5353,6 +5369,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5475,7 +5492,7 @@ 49 - 10 + 117 eval( If $Sum520201002452020200245202030024 = "Disable" Then @@ -5548,7 +5565,7 @@ Var PD_CODE2 = "52-02-02-0062" Var PD_CODE3 = "52-02-03-0062" ; begin lang - Var aliasName[0] = "Coconut Thai Milk Tea" + Var aliasName[0] = "Coconut\nThai Milk Tea" Var aliasDesc[0] = "Coconut Syrup, Thai Tea, Milk \nWater" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -5650,6 +5667,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5665,9 +5683,9 @@ KanitMediumTTF 0x322B26 - Coconut Thai Milk Tea + Coconut\nThai Milk Tea - Coconut Thai Milk Tea + Coconut\nThai Milk Tea @@ -5768,7 +5786,7 @@ 49 - 10 + 117 eval( If $Sum52020200625202030062 = "Disable" Then @@ -5924,6 +5942,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6046,7 +6065,7 @@ 49 - 10 + 117 eval( If $Sum520201001152020200115202030011 = "Disable" Then @@ -6202,6 +6221,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6324,7 +6344,7 @@ 49 - 10 + 117 eval( If $Sum520201002552020200255202030025 = "Disable" Then @@ -6499,6 +6519,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0045, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6621,7 +6642,7 @@ 49 - 10 + 117 eval( If $Sum52020100455202020045 = "Disable" Then @@ -6796,6 +6817,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6914,7 +6936,7 @@ 49 - 10 + 117 eval( If $Sum52020200655202030065 = "Disable" Then @@ -7089,6 +7111,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0046, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7211,7 +7234,7 @@ 49 - 10 + 117 eval( If $Sum52020100465202020046 = "Disable" Then @@ -7386,6 +7409,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7504,7 +7528,7 @@ 49 - 10 + 117 eval( If $Sum52020200645202030064 = "Disable" Then @@ -7660,6 +7684,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7778,7 +7803,7 @@ 49 - 10 + 117 eval( If $Sum52020200505202030050 = "Disable" Then @@ -7934,6 +7959,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8056,7 +8082,7 @@ 49 - 10 + 117 eval( If $Sum520201000352020200035202030003 = "Disable" Then @@ -8212,6 +8238,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8334,7 +8361,7 @@ 49 - 10 + 117 eval( If $Sum520201000452020200045202030004 = "Disable" Then @@ -8518,6 +8545,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8640,7 +8668,7 @@ 49 - 10 + 117 eval( If $Sum520201002652020200265202030026 = "Disable" Then @@ -8815,6 +8843,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8933,7 +8962,7 @@ 49 - 10 + 117 eval( If $Sum52020200605202030060 = "Disable" Then @@ -9089,6 +9118,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9211,7 +9241,7 @@ 49 - 10 + 117 eval( If $Sum520201003752020200375202030037 = "Disable" Then @@ -9395,6 +9425,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0028, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9517,7 +9548,7 @@ 49 - 10 + 117 eval( If $Sum520201002852020200285202030028 = "Disable" Then @@ -9673,6 +9704,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9795,7 +9827,7 @@ 49 - 10 + 117 eval( If $Sum520201001152020200115202030011 = "Disable" Then @@ -9951,6 +9983,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10073,7 +10106,7 @@ 49 - 10 + 117 eval( If $Sum520201001252020200125202030012 = "Disable" Then @@ -10248,6 +10281,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10366,7 +10400,7 @@ 49 - 10 + 117 eval( If $Sum52020200615202030061 = "Disable" Then @@ -10522,6 +10556,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10644,7 +10679,7 @@ 49 - 10 + 117 eval( If $Sum520201000652020200065202030006 = "Disable" Then @@ -10800,6 +10835,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10922,7 +10958,7 @@ 49 - 10 + 117 eval( If $Sum520201000852020200085202030008 = "Disable" Then @@ -11078,6 +11114,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11200,7 +11237,7 @@ 49 - 10 + 117 eval( If $Sum520201001952020200195202030019 = "Disable" Then @@ -11356,6 +11393,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11478,7 +11516,7 @@ 49 - 10 + 117 eval( If $Sum52020200095202010009 = "Disable" Then @@ -11634,6 +11672,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11756,7 +11795,7 @@ 49 - 10 + 117 eval( If $Sum520201002252020200225202030022 = "Disable" Then @@ -11912,6 +11951,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12034,7 +12074,7 @@ 49 - 10 + 117 eval( If $Sum520201001652020200175202030017 = "Disable" Then @@ -12190,6 +12230,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12312,7 +12353,7 @@ 49 - 10 + 117 eval( If $Sum52020100295202020029 = "Disable" Then @@ -12487,6 +12528,7 @@ Else Var OverlayMenuFilter = "" EndIf + Var OverlayMenuFilter = "xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12605,7 +12647,7 @@ 49 - 10 + 117 eval( If $Sum52020200635202030063 = "Disable" Then @@ -12761,6 +12803,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12883,7 +12926,7 @@ 49 - 10 + 117 eval( If $Sum52020100305202020030 = "Disable" Then @@ -13039,6 +13082,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13161,7 +13205,7 @@ 49 - 10 + 117 eval( If $Sum52020100315202020031 = "Disable" Then @@ -13317,6 +13361,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13439,7 +13484,7 @@ 49 - 10 + 117 eval( If $Sum52020100325202020032 = "Disable" Then @@ -13595,6 +13640,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13717,7 +13763,7 @@ 49 - 10 + 117 eval( If $Sum52020100385202020038 = "Disable" Then diff --git a/inter/sgp/xml/page_catalog_group_whey.lxml b/inter/sgp/xml/page_catalog_group_whey.lxml index f1e59dcc..0e599917 100644 --- a/inter/sgp/xml/page_catalog_group_whey.lxml +++ b/inter/sgp/xml/page_catalog_group_whey.lxml @@ -749,6 +749,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -867,7 +868,7 @@ 49 - 10 + 117 eval( If $Sum5204020001 = "Disable" Then @@ -1023,6 +1024,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1141,7 +1143,7 @@ 49 - 10 + 117 eval( If $Sum5204020016 = "Disable" Then @@ -1297,6 +1299,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1415,7 +1418,7 @@ 49 - 10 + 117 eval( If $Sum5204020002 = "Disable" Then @@ -1571,6 +1574,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1689,7 +1693,7 @@ 49 - 10 + 117 eval( If $Sum5204020003 = "Disable" Then @@ -1845,6 +1849,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1963,7 +1968,7 @@ 49 - 10 + 117 eval( If $Sum5204020013 = "Disable" Then @@ -2119,6 +2124,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2237,7 +2243,7 @@ 49 - 10 + 117 eval( If $Sum5204020018 = "Disable" Then @@ -2393,6 +2399,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2511,7 +2518,7 @@ 49 - 10 + 117 eval( If $Sum5204020004 = "Disable" Then @@ -2667,6 +2674,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2785,7 +2793,7 @@ 49 - 10 + 117 eval( If $Sum5204020055 = "Disable" Then @@ -2941,6 +2949,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3059,7 +3068,7 @@ 49 - 10 + 117 eval( If $Sum5204020005 = "Disable" Then @@ -3215,6 +3224,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3333,7 +3343,7 @@ 49 - 10 + 117 eval( If $Sum5204020015 = "Disable" Then @@ -3489,6 +3499,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3607,7 +3618,7 @@ 49 - 10 + 117 eval( If $Sum5204020006 = "Disable" Then @@ -3763,6 +3774,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3881,7 +3893,7 @@ 49 - 10 + 117 eval( If $Sum5204020008 = "Disable" Then @@ -4037,6 +4049,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4155,7 +4168,7 @@ 49 - 10 + 117 eval( If $Sum5204020017 = "Disable" Then @@ -4311,6 +4324,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4429,7 +4443,7 @@ 49 - 10 + 117 eval( If $Sum5204020009 = "Disable" Then @@ -4585,6 +4599,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4703,7 +4718,7 @@ 49 - 10 + 117 eval( If $Sum5204020010 = "Disable" Then @@ -4859,6 +4874,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4977,7 +4993,7 @@ 49 - 10 + 117 eval( If $Sum5204020011 = "Disable" Then @@ -5133,6 +5149,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" + Var OverlayMenuFilter = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5251,7 +5268,7 @@ 49 - 10 + 117 eval( If $Sum5204020056 = "Disable" Then diff --git a/xml/page_board.xml b/xml/page_board.xml index c280d2ff..e9dbaf89 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -574,6 +574,7 @@ ; ignore collection point Var SettingIgnoreCollectPoint = 0 + Var SettingVideoBrewingUseCommon = 0 Var adver_brewing_en = 1 @@ -823,6 +824,9 @@ ; Singapore disable point Var SettingIgnoreCollectPoint = 1 + Var SettingVideoBrewingUseCommon = 1 + + EndIf ;inter-page-board diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 7f59c9fc..eef4d759 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -16,18 +16,6 @@ Var StepVideo = 1 Var PreviseStepVideo = 90 - ;SAVELOG CountUpBrewing - - ;SAVELOG AnimationOn - ;SAVELOG AnimationVideoPlayTime - ;SAVELOG VideoID1 - ;SAVELOG VideoID2 - ;SAVELOG VideoID3 - ;SAVELOG VideoID4 - ;SAVELOG VideoID5 - ;SAVELOG VideoID6 - ;SAVELOG VideoAnimationCount - Var Timeout = 0 If show_eng = "true" Then @@ -58,18 +46,20 @@ EndIf If InternationalEnable = 1 Then - Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" - Var VideoFileBegin = "TaoBin2_draft02_art" - Var VideoFileEnd = ".mp4" - + Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" Var PictureBegin = "txt_" Var PictureEnd = "_en.png" - - ;inter-play-list - Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" - Var VideoFileBegin = "TaoBin2_draft02_art" - Var VideoFileEnd = ".mp4" + If SettingVideoBrewingUseCommon = 1 Then + Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/inter/common/animation01/" + Var VideoFileBegin = "TaoBin2_draft02_art" + Var VideoFileEnd = ".mp4" + Else + ;inter-play-list + Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" + Var VideoFileBegin = "TaoBin2_draft02_art" + Var VideoFileEnd = ".mp4" + EndIf Var PicturePath = CountryRootPath + "/image/page_doing/" Var PictureBegin = "txt_" @@ -106,10 +96,6 @@ Var PictureFile = PictureFile + PictureEnd - - ;If lidAndStrawOldPageIgnore = "true" Then - ; Var lidAndStrawOldPageIgnore = "false" - If Seeker.PayWithQR = 0 Then @@ -178,7 +164,6 @@ EndIf EndIf - ;EndIf Var LidState = Lid1Status ;Lid1Status @@ -280,11 +265,6 @@ ShowCountDownBrewing -; -; 182 -; 700 -; GIFShowProcess -; diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 3659b6cd..ce1fd1da 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -614,7 +614,7 @@ 938 1080 Center - 72 + 66 KanitMediumTTF 0x513C2F showname diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index 213a8f03..7fce15ed 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -372,7 +372,7 @@ Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + Else Var PayOfflineMode = 0 diff --git a/xml/page_payment_cash-IDR.xml b/xml/page_payment_cash-IDR.xml index f7630efb..6aab323a 100644 --- a/xml/page_payment_cash-IDR.xml +++ b/xml/page_payment_cash-IDR.xml @@ -364,7 +364,6 @@ Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" Else Var PayOfflineMode = 0 @@ -384,16 +383,6 @@ Var SELLONLINE = 1 EndIf - ;If NetworkStatus = "ACTIVATE" Then - ; Var ShowNetworkProblem = "Invisible" - ; Var ShowNetworkProblemText = "" - ; - ;Else - ; Var ShowNetworkProblem = "Enable" - ; Var ShowButtonClick2 = "Invisible" - ; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - ;EndIf - Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index c888c441..3f0437f5 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -370,7 +370,7 @@ Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + Else Var PayOfflineMode = 0 @@ -1618,7 +1618,7 @@ EndIf 938 1080 Center - 72 + 66 KanitMediumTTF 0x513C2F showname diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index c7ee169b..6999eaa4 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -397,8 +397,7 @@ Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - + Else Var PayOfflineMode = 0 diff --git a/xml/sometime/top_spender.xml b/xml/sometime/top_spender.xml index b97381c0..195466a6 100644 --- a/xml/sometime/top_spender.xml +++ b/xml/sometime/top_spender.xml @@ -220,7 +220,7 @@ EndIf Else If TimeDiff <= -20 Then - VAR "capture top spender time!!!" + DEBUGVAR "capture top spender time!!!" If GettingData = "false" Then GETACCEXT dummyPhone 34 Var GettingData = "true" diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 9caf4beb..deb87141 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -155,6 +155,8 @@ Var CountDownReset = 0 Var strTouchScreen = " Reset Touch : disable." + + 1000