diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml index d925062f..11aabcce 100644 --- a/xml/event/promotion_mystery_cup_35.xml +++ b/xml/event/promotion_mystery_cup_35.xml @@ -10,6 +10,8 @@ ; On open Var NextPage = "-" + Var OreoGuarantee = 0 + DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_TXT @@ -8961,9 +8963,17 @@ LIMENADE SODA" ) - Random2 0 IndexOfMilk ResultRandomIndex - Var ProductCodeRandom = ListOfMilk[ResultRandomIndex] - DEBUGVAR ListOfMilk[ResultRandomIndex] + If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoMilk ResultRandomIndex + Var ProductCodeRandom = ListOfOreoMilk[ResultRandomIndex] + DEBUGVAR ListOfOreoMilk[ResultRandomIndex] + Var OreoGuarantee = 0 + Else + Random2 0 IndexOfMilk ResultRandomIndex + Var ProductCodeRandom = ListOfMilk[ResultRandomIndex] + DEBUGVAR ListOfMilk[ResultRandomIndex] + EndIf + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -8990,9 +9000,18 @@ LIMENADE SODA" ) - Random2 0 IndexOfTea ResultRandomIndex - Var ProductCodeRandom = ListOfTea[ResultRandomIndex] - DEBUGVAR ListOfTea[ResultRandomIndex] + If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoTea ResultRandomIndex + Var ProductCodeRandom = ListOfOreoTea[ResultRandomIndex] + DEBUGVAR ListOfOreoTea[ResultRandomIndex] + Var OreoGuarantee = 0 + Else + Random2 0 IndexOfTea ResultRandomIndex + Var ProductCodeRandom = ListOfTea[ResultRandomIndex] + DEBUGVAR ListOfTea[ResultRandomIndex] + EndIf + + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -9019,9 +9038,21 @@ LIMENADE SODA" ) +If OreoGuarantee = 4 Then + +Random2 0 IndexOfRateupOreoCoffee ResultRandomIndex + Var ProductCodeRandom = ListOfOreoCoffee[ResultRandomIndex] + DEBUGVAR ListOfOreoCoffee[ResultRandomIndex] + Var OreoGuarantee = 0 + +Else + + Random2 0 IndexOfCoffee ResultRandomIndex Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex] DEBUGVAR ListOfCoffee[ResultRandomIndex] + +EndIf Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -9048,9 +9079,19 @@ LIMENADE SODA" ) + +If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoAll ResultRandomIndex + Var ProductCodeRandom = ListOfOreoAll[ResultRandomIndex] + DEBUGVAR ListOfOreoAll[ResultRandomIndex] + Var OreoGuarantee = 0 +Else + Random2 0 IndexOfAllRandom ResultRandomIndex Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex] DEBUGVAR ListOfAllRandom[ResultRandomIndex] +EndIf + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -9099,7 +9140,9 @@ LIMENADE SODA" Var BigButtonEnable = "Invisible" + Var OreoGuarantee = OreoGuarantee + 1 DEBUGVAR BigButtonEnable + DEBUGVAR OreoGuarantee ; Enable all 4 buttons Var SubRandMilkButtonEnable = "Enable" @@ -9126,28 +9169,54 @@ LIMENADE SODA" Var IndexOfTea = 0 Var IndexOfCoffee = 0 + Var IndexOfRateupOreoAll = 0 + Var IndexOfRateupOreoMilk = 0 + Var IndexOfRateupOreoTea = 0 + Var IndexOfRateupOreoCoffee = 0 + ; Oreo smoothie volcano If $12-99-03-0020.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0020" Var ListOfMilk[IndexOfMilk] = "12-99-03-0020" - Var IndexOfAllRandom = IndexOfAllRandom + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0020" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0020" + + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Pink milk oreo volcano If $12-99-03-0021.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0021" Var ListOfMilk[IndexOfMilk] = "12-99-03-0021" - Var IndexOfAllRandom = IndexOfAllRandom + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0021" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0021" + + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Choco oreo volcano If $12-99-03-0022.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0022" Var ListOfMilk[IndexOfMilk] = "12-99-03-0022" + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0022" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0022" + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Caramel milk oreo volcano @@ -9156,6 +9225,11 @@ LIMENADE SODA" Var ListOfMilk[IndexOfMilk] = "12-99-03-0023" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0023" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0023" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Thai milk tea oreo smoothie @@ -9164,6 +9238,11 @@ LIMENADE SODA" Var ListOfTea[IndexOfTea] = "12-99-03-0024" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfTea = IndexOfTea + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0024" + Var ListOfOreoTea[IndexOfRateupOreoTea] = "12-99-03-0024" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoTea = IndexOfRateupOreoTea + 1 EndIf ; Cafe late oreo smoothie @@ -9172,6 +9251,11 @@ LIMENADE SODA" Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0025" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfCoffee = IndexOfCoffee + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0025" + Var ListOfOreoCoffee[IndexOfRateupOreoCoffee] = "12-99-03-0025" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoCoffee = IndexOfRateupOreoCoffee + 1 EndIf ; Strawberry milk oreo volcano @@ -9188,6 +9272,11 @@ LIMENADE SODA" Var ListOfMilk[IndexOfMilk] = "12-99-03-0027" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0027" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0027" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Bana^2 milk oreo volcano @@ -9196,6 +9285,11 @@ LIMENADE SODA" Var ListOfMilk[IndexOfMilk] = "12-99-03-0028" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0028" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0028" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; HOJICHA Oreo smoothie @@ -9204,6 +9298,11 @@ LIMENADE SODA" Var ListOfTea[IndexOfTea] = "12-99-03-0029" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfTea = IndexOfTea + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0029" + Var ListOfOreoTea[IndexOfRateupOreoTea] = "12-99-03-0029" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoTea = IndexOfRateupOreoTea + 1 EndIf ; Thai milk tea smoothie diff --git a/xml/event/promotion_onclick3.inc b/xml/event/promotion_onclick3.inc index f0245678..992ea4bf 100644 --- a/xml/event/promotion_onclick3.inc +++ b/xml/event/promotion_onclick3.inc @@ -1,5 +1,7 @@ -Var BigButtonEnable = "Invisible" + Var BigButtonEnable = "Invisible" + Var OreoGuarantee = OreoGuarantee + 1 DEBUGVAR BigButtonEnable + DEBUGVAR OreoGuarantee ; Enable all 4 buttons Var SubRandMilkButtonEnable = "Enable" @@ -26,28 +28,54 @@ Var BigButtonEnable = "Invisible" Var IndexOfTea = 0 Var IndexOfCoffee = 0 + Var IndexOfRateupOreoAll = 0 + Var IndexOfRateupOreoMilk = 0 + Var IndexOfRateupOreoTea = 0 + Var IndexOfRateupOreoCoffee = 0 + ; Oreo smoothie volcano If $12-99-03-0020.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0020" Var ListOfMilk[IndexOfMilk] = "12-99-03-0020" - Var IndexOfAllRandom = IndexOfAllRandom + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0020" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0020" + + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Pink milk oreo volcano If $12-99-03-0021.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0021" Var ListOfMilk[IndexOfMilk] = "12-99-03-0021" - Var IndexOfAllRandom = IndexOfAllRandom + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0021" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0021" + + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Choco oreo volcano If $12-99-03-0022.Button = "Enable" Then Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0022" Var ListOfMilk[IndexOfMilk] = "12-99-03-0022" + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0022" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0022" + Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Caramel milk oreo volcano @@ -56,6 +84,11 @@ Var BigButtonEnable = "Invisible" Var ListOfMilk[IndexOfMilk] = "12-99-03-0023" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0023" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0023" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Thai milk tea oreo smoothie @@ -64,6 +97,11 @@ Var BigButtonEnable = "Invisible" Var ListOfTea[IndexOfTea] = "12-99-03-0024" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfTea = IndexOfTea + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0024" + Var ListOfOreoTea[IndexOfRateupOreoTea] = "12-99-03-0024" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoTea = IndexOfRateupOreoTea + 1 EndIf ; Cafe late oreo smoothie @@ -72,6 +110,11 @@ Var BigButtonEnable = "Invisible" Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0025" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfCoffee = IndexOfCoffee + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0025" + Var ListOfOreoCoffee[IndexOfRateupOreoCoffee] = "12-99-03-0025" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoCoffee = IndexOfRateupOreoCoffee + 1 EndIf ; Strawberry milk oreo volcano @@ -88,6 +131,11 @@ Var BigButtonEnable = "Invisible" Var ListOfMilk[IndexOfMilk] = "12-99-03-0027" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 + + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0027" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0027" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Bana^2 milk oreo volcano @@ -96,14 +144,11 @@ Var BigButtonEnable = "Invisible" Var ListOfMilk[IndexOfMilk] = "12-99-03-0028" Var IndexOfAllRandom = IndexOfAllRandom + 1 Var IndexOfMilk = IndexOfMilk + 1 - EndIf - ; HOJICHA Oreo smoothie - If $12-99-03-0029.Button = "Enable" Then - Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0029" - Var ListOfTea[IndexOfTea] = "12-99-03-0029" - Var IndexOfAllRandom = IndexOfAllRandom + 1 - Var IndexOfTea = IndexOfTea + 1 + Var ListOfOreoAll[IndexOfRateupOreoAll] = "12-99-03-0028" + Var ListOfOreoMilk[IndexOfRateupOreoMilk] = "12-99-03-0028" +Var IndexOfRateupOreoAll = IndexOfRateupOreoAll + 1 + Var IndexOfRateupOreoMilk = IndexOfRateupOreoMilk + 1 EndIf ; Thai milk tea smoothie diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc index f524de85..e600330c 100644 --- a/xml/event/promotion_template3.inc +++ b/xml/event/promotion_template3.inc @@ -28,9 +28,17 @@ ) - Random2 0 IndexOfMilk ResultRandomIndex - Var ProductCodeRandom = ListOfMilk[ResultRandomIndex] - DEBUGVAR ListOfMilk[ResultRandomIndex] + If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoMilk ResultRandomIndex + Var ProductCodeRandom = ListOfOreoMilk[ResultRandomIndex] + DEBUGVAR ListOfOreoMilk[ResultRandomIndex] + Var OreoGuarantee = 0 + Else + Random2 0 IndexOfMilk ResultRandomIndex + Var ProductCodeRandom = ListOfMilk[ResultRandomIndex] + DEBUGVAR ListOfMilk[ResultRandomIndex] + EndIf + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -57,9 +65,18 @@ ) - Random2 0 IndexOfTea ResultRandomIndex - Var ProductCodeRandom = ListOfTea[ResultRandomIndex] - DEBUGVAR ListOfTea[ResultRandomIndex] + If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoTea ResultRandomIndex + Var ProductCodeRandom = ListOfOreoTea[ResultRandomIndex] + DEBUGVAR ListOfOreoTea[ResultRandomIndex] + Var OreoGuarantee = 0 + Else + Random2 0 IndexOfTea ResultRandomIndex + Var ProductCodeRandom = ListOfTea[ResultRandomIndex] + DEBUGVAR ListOfTea[ResultRandomIndex] + EndIf + + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -86,9 +103,21 @@ ) +If OreoGuarantee = 4 Then + +Random2 0 IndexOfRateupOreoCoffee ResultRandomIndex + Var ProductCodeRandom = ListOfOreoCoffee[ResultRandomIndex] + DEBUGVAR ListOfOreoCoffee[ResultRandomIndex] + Var OreoGuarantee = 0 + +Else + + Random2 0 IndexOfCoffee ResultRandomIndex Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex] DEBUGVAR ListOfCoffee[ResultRandomIndex] + +EndIf Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml" @@ -115,9 +144,19 @@ ) + +If OreoGuarantee = 4 Then + Random2 0 IndexOfRateupOreoAll ResultRandomIndex + Var ProductCodeRandom = ListOfOreoAll[ResultRandomIndex] + DEBUGVAR ListOfOreoAll[ResultRandomIndex] + Var OreoGuarantee = 0 +Else + Random2 0 IndexOfAllRandom ResultRandomIndex Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex] DEBUGVAR ListOfAllRandom[ResultRandomIndex] +EndIf + Topping "Load" ProductCodeRandom Var OpenFromXML = CurrentXMLFileName2 Open "ROOT/taobin_project/xml/page_topping_select_35.xml"