diff --git a/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml b/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml index aa3fde4f..61b08397 100644 --- a/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml +++ b/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml @@ -10,6 +10,9 @@ Var Timeout = 0 DEBUGVAR TelephoneNumber DEBUGVAR FromFruityRaya + DEBUGVAR Seeker.VendingCode + DEBUGVAR Seeker.FruityRaya + DEBUGVAR Seeker.UseFruityRayaCode Var Cid = 43 Var param1 = "" @@ -22,7 +25,14 @@ Else ; Telephone must not empty - AddData Cid TelephoneNumber param1 param2 param3 + If Seeker.CodeChannel = 1 Then + Var Seeker.UseFruityRayaCode = 1 + Var Seeker.FruityRaya = 1 + Else + Var Seeker.FruityRaya = 1 + Var Seeker.UseFruityRayaCode = 0 + AddData Cid TelephoneNumber param1 param2 param3 + EndIf EndIf EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index 1cadc2d0..26c50e7b 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -14,18 +14,16 @@ Var FromFruityRaya = 0 Var DisableUntilServerPartOK = 1 -If DisableUntilServerPartOK = 0 Then - If SystemDateMonthInt = 3 Then - If SystemDateDayInt >= 29 Then - Var FruityRayaEnable = 1 - EndIf - EndIf - - If SystemDateMonthInt = 4 Then +If SystemDateMonthInt = 3 Then + If SystemDateDayInt >= 27 Then Var FruityRayaEnable = 1 EndIf EndIf +If SystemDateMonthInt = 4 Then + Var FruityRayaEnable = 1 +EndIf + If BoxID = 177746 Then Var FruityRayaEnable = 1 diff --git a/xml/page_board.xml b/xml/page_board.xml index 955e8c12..8de41590 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -389,7 +389,7 @@ - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev" + Var showCart = "Invisible" @@ -857,13 +857,13 @@ Else Var LanguageObjectShow = "Invisible" Var NoLangObjectShow = "Enable" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" Var RootPath = "ROOT/taobin_project/" EndIf + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev" Var StrXMLPageVer = "ver=" + XMLPageVersionInt diff --git a/xml/page_payment.xml b/xml/page_payment.xml index eb61baf5..d45de801 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -413,11 +413,7 @@ ; fruit_raya If FromFruityRaya = 1 Then Var Seeker.VendingCode = "RAYA" - Var Seeker.IntVendingCampaign = 0 Var Seeker.FreeVendingCampaign = 0 - Var Seeker.CodeChannel = 1 - Var Seeker.CodeNumber = IDNum - EndIf