diff --git a/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie-1.png b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie-1.png new file mode 100644 index 00000000..83b33eb7 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie-1.png differ diff --git a/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png new file mode 100644 index 00000000..02b70055 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png differ diff --git a/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png b/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png new file mode 100644 index 00000000..30ee24d2 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png differ diff --git a/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png b/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png index c07e7b1c..668bb469 100644 Binary files a/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png and b/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png differ diff --git a/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png b/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png index 426ae726..6141917d 100644 Binary files a/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png and b/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png differ diff --git a/inter/sgp/image/event/season_pass/bn_hot_mocha-1.png b/inter/sgp/image/event/season_pass/bn_hot_mocha-1.png new file mode 100644 index 00000000..8db9c035 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_hot_mocha-1.png differ diff --git a/inter/sgp/image/event/season_pass/bn_hot_mocha.png b/inter/sgp/image/event/season_pass/bn_hot_mocha.png new file mode 100644 index 00000000..9b9e8450 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_hot_mocha.png differ diff --git a/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie-1.png b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie-1.png new file mode 100644 index 00000000..5d40e1b9 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie-1.png differ diff --git a/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png new file mode 100644 index 00000000..8ca30e81 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png differ diff --git a/inter/sgp/image/event/season_pass/bn_protein_Chocolate-1.png b/inter/sgp/image/event/season_pass/bn_protein_Chocolate-1.png new file mode 100644 index 00000000..4dadddd3 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_protein_Chocolate-1.png differ diff --git a/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png b/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png new file mode 100644 index 00000000..bb5c82bb Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png differ diff --git a/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png b/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png index 8a7353ca..ad20ec40 100644 Binary files a/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png and b/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png differ diff --git a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark-1.png b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark-1.png new file mode 100644 index 00000000..080632bb Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark-1.png differ diff --git a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..5c7af2ed Binary files /dev/null and b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png differ diff --git a/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png b/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png new file mode 100644 index 00000000..6af465f3 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png differ diff --git a/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png b/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png new file mode 100644 index 00000000..0b9dae8d Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png differ diff --git a/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png b/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png index ddd2b3bc..3727faff 100644 Binary files a/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png and b/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png differ diff --git a/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png b/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png index d5f95c7b..4f1ee656 100644 Binary files a/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png and b/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png differ diff --git a/inter/sgp/image/event/season_pass/bp_hot_mocha.png b/inter/sgp/image/event/season_pass/bp_hot_mocha.png new file mode 100644 index 00000000..2e21e1db Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_hot_mocha.png differ diff --git a/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png b/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png new file mode 100644 index 00000000..b44368ff Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png differ diff --git a/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png b/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png new file mode 100644 index 00000000..92a66927 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png differ diff --git a/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png b/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png index b29ab096..54174e7d 100644 Binary files a/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png and b/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png differ diff --git a/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png b/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png new file mode 100644 index 00000000..b8d955a4 Binary files /dev/null and b/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/Ice unavalible.png b/inter/sgp/image/event/season_pass/drink_option_en/Ice unavalible.png new file mode 100644 index 00000000..b3b58265 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/Ice unavalible.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/blend.png b/inter/sgp/image/event/season_pass/drink_option_en/blend.png new file mode 100644 index 00000000..8cc3e4dd Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/blend.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png b/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png new file mode 100644 index 00000000..f8a04fb0 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/cold.png b/inter/sgp/image/event/season_pass/drink_option_en/cold.png new file mode 100644 index 00000000..41b23225 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/cold.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png b/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png new file mode 100644 index 00000000..78e49325 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/hot.png b/inter/sgp/image/event/season_pass/drink_option_en/hot.png new file mode 100644 index 00000000..f0074d05 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/hot.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png b/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png new file mode 100644 index 00000000..96523367 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/normal.png b/inter/sgp/image/event/season_pass/drink_option_en/normal.png new file mode 100644 index 00000000..508a25c3 Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/normal.png differ diff --git a/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png b/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png new file mode 100644 index 00000000..6f05e21a Binary files /dev/null and b/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png differ diff --git a/inter/sgp/xml/event/dummy_layout_promotion.py b/inter/sgp/xml/event/dummy_layout_promotion.py index f750c97b..ea70899e 100644 --- a/inter/sgp/xml/event/dummy_layout_promotion.py +++ b/inter/sgp/xml/event/dummy_layout_promotion.py @@ -370,12 +370,12 @@ if "multi_promotion" in param: promotion_block_str = f"\r\n\r\n\t Flag( {','.join(pd_dot_btn)},Disable=Invisible,{product_code_state}) \r\n\t 33 \r\n\t 22 \r\n\t 484 \r\n\t 602 \r\n" # insert overlay tag - # promotion_block_str += season_pass_menu_big_btn_ui[f"{product_code}.overlay"] - # try: - # template = template.replace(";#Overlay", season_pass_menu_big_btn_ui[f"{product_code}.overlay"]) - # except: - # print("Overlay not found for "+product_code) - # pass + # promotion_block_str += season_pass_menu_big_btn_ui[f"{product_code}.overlay"].replace("menu_overlay_set", "event/menu_overlay_set") + try: + template = template.replace(";#Overlay", season_pass_menu_big_btn_ui[f"{product_code}.overlay"].replace("menu_overlay_set", "event/menu_overlay_set")) + except: + print("Overlay not found for "+product_code) + pass if "dev" in param: @@ -397,14 +397,14 @@ if "multi_promotion" in param: # # print("after replace\n", template) - try: - # get overlay - overlay_original_tag = season_pass_menu_big_btn_ui[f"{product_code}.overlay"] - # print(f"[OverlayClone] {product_code} --- "+overlay_original_tag+".") - overlay_new_path = " ".join(overlay_original_tag.split(' ')[3:-1]).replace("menu_overlay_set", "event/menu_overlay_set").replace(")","") - template += f"\t\r\n\t 10 \r\n\t 10 \r\n\t {overlay_new_path} \r\n\t\r\n" - except: - print("\t\t> Overlay not found for "+product_code+"\n") + # try: + # # get overlay + # overlay_original_tag = season_pass_menu_big_btn_ui[f"{product_code}.overlay"] + # # print(f"[OverlayClone] {product_code} --- "+overlay_original_tag+".") + # overlay_new_path = " ".join(overlay_original_tag.split(' ')[3:-1]).replace("menu_overlay_set", "event/menu_overlay_set").replace(")","") + # template += f"\t\r\n\t 10 \r\n\t 10 \r\n\t {overlay_new_path} \r\n\t\r\n" + # except: + # print("\t\t> Overlay not found for "+product_code+"\n") diff --git a/inter/sgp/xml/event/multi_promotion_config_season2.json b/inter/sgp/xml/event/multi_promotion_config_season2.json index 0a88fc6f..8e6dbb45 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season2.json +++ b/inter/sgp/xml/event/multi_promotion_config_season2.json @@ -4,12 +4,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s2.52-21-01-0006.52-21-02-0003.52-21-03-0003", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } }, @@ -18,12 +18,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s2.##-##-##-####.##-##-##-####.52-03-03-0049", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } }, @@ -32,12 +32,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s2.52-02-01-0039.52-02-02-0039.52-02-03-0039", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } } diff --git a/inter/sgp/xml/event/multi_promotion_config_season3.json b/inter/sgp/xml/event/multi_promotion_config_season3.json index 4a20640d..e50eeb44 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season3.json +++ b/inter/sgp/xml/event/multi_promotion_config_season3.json @@ -4,12 +4,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s3.52-21-01-0005.52-31-02-0002.52-31-03-0002", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } }, @@ -18,12 +18,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s3.##-##-##-####.52-04-02-0002.##-##-##-####", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } }, @@ -32,12 +32,12 @@ "template": "/event/promotion_template.inc", "product_code_key": "s3.##-##-##-####.##-##-##-####.52-03-03-0027", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png", + "normal_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png", + "press_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png", + "press_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png", + "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png", + "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" } } diff --git a/inter/sgp/xml/event/promotion_template.inc b/inter/sgp/xml/event/promotion_template.inc index 1374e171..3fb1923f 100644 --- a/inter/sgp/xml/event/promotion_template.inc +++ b/inter/sgp/xml/event/promotion_template.inc @@ -1,5 +1,6 @@ 16 @@ -384,14 +386,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 $52-21-01-0007.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -407,8 +413,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-21-02-0004.Button @@ -425,8 +433,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-21-03-0004.Button @@ -510,14 +520,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_catalog_3_posi1.png" - -;endblock1 +;endblock1 ;block2 Flag( 52-03-03-0009.Button,Disable=Invisible,$Sum5203030009) @@ -525,38 +530,40 @@ 22 484 602 - - 16 @@ -675,17 +682,36 @@ KanitMediumTTF 0x322B26 - OREO SMOOTHIE \nVOLCANO + OREO SMOOTHIE โอริโอ้ปั่นภูเขาไฟ - OREO SMOOTHIE \nVOLCANO + OREO SMOOTHIE โอริโอ้ปั่นภูเขาไฟ โอริโอ้ปั่นภูเขาไฟ + + + 16 + 390 + 33 + 333 + "multi2" + KanitMediumTTF + 0x322B26 + + VOLCANO + + VOLCANO + + + + + + 16 - 450 + 465 25 333 KanitMediumTTF @@ -702,14 +728,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -725,8 +755,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" "Invisible" @@ -743,8 +775,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-03-03-0009.Button @@ -824,14 +858,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeC/button_overlay_catalog_9_posi2.png" - -;endblock2 +;endblock2 ;block3 Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,$Sum520201002652020200265202030026) @@ -839,38 +868,40 @@ 22 484 602 - - 16 @@ -1034,14 +1065,16 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 $52-02-01-0026.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -1057,8 +1090,8 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-02-02-0026.Button @@ -1075,8 +1108,8 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-02-03-0026.Button @@ -1160,20 +1193,15 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png" - -;endblock3 -;block4-expand - - "Enable" - 1032 - 636 - +;endblock3 +;block4-expand + + "Enable" + 1032 + 636 + eval( If CountEnablePromotion > 2 Then @@ -1183,13 +1211,13 @@ eval( EndIf Var return = max_count ) - - 0 - 0 - 1032 - 636 - "auto" - "Vertical" + + 0 + 0 + 1032 + 636 + "auto" + "Vertical" eval( If CountEnablePromotion > 2 Then @@ -1199,11 +1227,11 @@ eval( EndIf Var return = column_count ) - - + + ; ==================> Len = 3 ; 52-21-01-0004 52-21-02-0002 52-21-03-0002 @@ -1314,7 +1342,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0004" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") @@ -1323,7 +1351,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -1332,7 +1360,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-21-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -1621,7 +1649,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0076" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") @@ -1906,7 +1934,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0025" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") @@ -1915,7 +1943,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0025" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png") @@ -2200,7 +2228,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-02-01-0039" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-02-01-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -2209,7 +2237,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0039" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -2218,7 +2246,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0039" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -2397,44 +2425,44 @@ eval( center-vertical-horizontal - - - -;endblock4-expand - -; Cart - - - - - -;BigLogoLayout - - - - - + + + +;endblock4-expand + +; Cart + + + + + +;BigLogoLayout + + + + + diff --git a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml index ea9a4654..db3f1dc4 100644 --- a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml +++ b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml @@ -1,187 +1,187 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $52-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - -;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml" - - - - 4 - 10 - 497 - 1080 - "auto" - "Vertical" - 2 - -;dummy_layout.inc + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $52-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + +;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml" + + + + 4 + 10 + 497 + 1080 + "auto" + "Vertical" + 2 + +;dummy_layout.inc ;block1 Flag( 52-21-01-0006.Button,52-21-02-0003.Button,52-21-03-0003.Button,Disable=Invisible,$Sum522101000652210200035221030003) @@ -189,38 +189,40 @@ 22 484 602 - - 16 @@ -384,14 +386,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 $52-21-01-0006.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -407,8 +413,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-21-02-0003.Button @@ -425,8 +433,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-21-03-0003.Button @@ -510,14 +520,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png" - -;endblock1 +;endblock1 ;block2 Flag( 52-03-03-0049.Button,Disable=Invisible,$Sum5203030049) @@ -525,38 +530,40 @@ 22 484 602 - - 16 @@ -675,17 +682,36 @@ KanitMediumTTF 0x322B26 - MILO SMOOTHIE \nVOLCANO + MILO SMOOTHIE โอวัลตินปั่นภูเขาไฟ - MILO SMOOTHIE \nVOLCANO + MILO SMOOTHIE โอวัลตินปั่นภูเขาไฟ โอวัลตินปั่นภูเขาไฟ + + + 16 + 390 + 33 + 333 + "multi2" + KanitMediumTTF + 0x322B26 + + VOLCANO + + VOLCANO + + + + + + 16 - 450 + 465 25 333 KanitMediumTTF @@ -702,14 +728,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -725,8 +755,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" "Invisible" @@ -743,8 +775,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-03-03-0049.Button @@ -824,14 +858,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeD/button_overlay_catalog_14_posi1.png" - -;endblock2 +;endblock2 ;block3 Flag( 52-02-01-0039.Button,52-02-02-0039.Button,52-02-03-0039.Button,Disable=Invisible,$Sum520201003952020200395202030039) @@ -839,38 +868,40 @@ 22 484 602 - - 16 @@ -1034,14 +1065,16 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 $52-02-01-0039.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -1057,8 +1090,8 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-02-02-0039.Button @@ -1075,8 +1108,8 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-02-03-0039.Button @@ -1160,20 +1193,15 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeC/button_overlay_catalog_3_posi1.png" - -;endblock3 -;block4-expand - - "Enable" - 1032 - 636 - +;endblock3 +;block4-expand + + "Enable" + 1032 + 636 + eval( If CountEnablePromotion > 2 Then @@ -1183,13 +1211,13 @@ eval( EndIf Var return = max_count ) - - 0 - 0 - 1032 - 636 - "auto" - "Vertical" + + 0 + 0 + 1032 + 636 + "auto" + "Vertical" eval( If CountEnablePromotion > 2 Then @@ -1199,11 +1227,11 @@ eval( EndIf Var return = column_count ) - - + + ; ==================> Len = 3 ; 52-02-01-0026 52-02-02-0026 52-02-03-0026 @@ -1314,7 +1342,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-02-01-0026" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-02-01-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -1323,7 +1351,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0026" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -1332,7 +1360,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0026" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -1621,7 +1649,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0005" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") @@ -1630,7 +1658,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-31-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-31-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") @@ -1639,7 +1667,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-31-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-31-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -1928,7 +1956,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0045" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0045, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") @@ -2213,7 +2241,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0074" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0074, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png") @@ -2222,7 +2250,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0074" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0074, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png") @@ -2397,44 +2425,44 @@ eval( center-vertical-horizontal - - - -;endblock4-expand - -; Cart - - - - - -;BigLogoLayout - - - - - + + + +;endblock4-expand + +; Cart + + + + + +;BigLogoLayout + + + + + diff --git a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml index 9eb8a263..4b9472f2 100644 --- a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml +++ b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml @@ -1,187 +1,187 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $52-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - -;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml" - - - - 4 - 10 - 497 - 1080 - "auto" - "Vertical" - 2 - -;dummy_layout.inc + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $52-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + +;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml" + + + + 4 + 10 + 497 + 1080 + "auto" + "Vertical" + 2 + +;dummy_layout.inc ;block1 Flag( 52-21-01-0005.Button,52-31-02-0002.Button,52-31-03-0002.Button,Disable=Invisible,$Sum522101000552310200025231030002) @@ -189,38 +189,40 @@ 22 484 602 - - 16 @@ -384,14 +386,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 $52-21-01-0005.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -407,8 +413,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-31-02-0002.Button @@ -425,8 +433,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-31-03-0002.Button @@ -510,14 +520,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png" - -;endblock1 +;endblock1 ;block2 Flag( 52-04-02-0002.Button,Disable=Invisible,$Sum5204020002) @@ -525,38 +530,40 @@ 22 484 602 - - 16 @@ -702,14 +709,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -725,8 +736,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" $52-04-02-0002.Button @@ -743,8 +756,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" "Invisible" @@ -824,14 +839,9 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeC/button_overlay_catalog_3_posi2.png" - -;endblock2 +;endblock2 ;block3 Flag( 52-03-03-0027.Button,Disable=Invisible,$Sum5203030027) @@ -839,38 +849,40 @@ 22 484 602 - - 16 @@ -989,17 +1001,36 @@ KanitMediumTTF 0x322B26 - STRAWBERRY MILK \nOREO VOLCANO - สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ - STRAWBERRY MILK \nOREO VOLCANO - สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ + STRAWBERRY MILK + สตอเบอร์รี่ปั่น + STRAWBERRY MILK + สตอเบอร์รี่ปั่น - สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ + สตอเบอร์รี่ปั่น + + + 16 + 390 + 33 + 333 + "multi2" + KanitMediumTTF + 0x322B26 + + OREO VOLCANO + โอริโอ้ภูเขาไฟ + OREO VOLCANO + โอริโอ้ภูเขาไฟ + + โอริโอ้ภูเขาไฟ + + + 16 - 450 + 465 25 333 KanitMediumTTF @@ -1016,14 +1047,18 @@ 16 538 - Var( DirImage2 + "option_deactive.png" ) + 390 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" 16 538 + 134 + 44 "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" 86 @@ -1039,8 +1074,10 @@ 146 538 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" "Invisible" @@ -1057,8 +1094,10 @@ 276 538 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) + 134 + 44 + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" + "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" $52-03-03-0027.Button @@ -1138,20 +1177,15 @@ center-vertical-horizontal - - 10 - 10 - "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeD/button_overlay_catalog_16_posi1.png" - -;endblock3 -;block4-expand - - "Enable" - 1032 - 636 - +;endblock3 +;block4-expand + + "Enable" + 1032 + 636 + eval( If CountEnablePromotion > 2 Then @@ -1161,13 +1195,13 @@ eval( EndIf Var return = max_count ) - - 0 - 0 - 1032 - 636 - "auto" - "Vertical" + + 0 + 0 + 1032 + 636 + "auto" + "Vertical" eval( If CountEnablePromotion > 2 Then @@ -1177,11 +1211,11 @@ eval( EndIf Var return = column_count ) - - + + ; ==================> Len = 3 ; 52-21-01-0003 52-21-02-0001 - @@ -1292,7 +1326,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0003" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1301,7 +1335,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0001" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1590,7 +1624,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-02-01-0039" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-02-01-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -1599,7 +1633,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0039" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -1608,7 +1642,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0039" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -1897,7 +1931,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0033" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0033, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") @@ -1906,7 +1940,7 @@ eval( Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0033" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0033, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") @@ -2191,7 +2225,7 @@ eval( Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0117" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -2366,44 +2400,44 @@ eval( center-vertical-horizontal - - - -;endblock4-expand - -; Cart - - - - - -;BigLogoLayout - - - - - + + + +;endblock4-expand + +; Cart + + + + + +;BigLogoLayout + + + + + diff --git a/inter/sgp/xml/menu_new_layout_gen_v2.py b/inter/sgp/xml/menu_new_layout_gen_v2.py index 119922a0..2eb3bff6 100644 --- a/inter/sgp/xml/menu_new_layout_gen_v2.py +++ b/inter/sgp/xml/menu_new_layout_gen_v2.py @@ -36,7 +36,7 @@ "append": appendValueInMap } - def cloneTextExport(key: str | list, mods=None, remove=None, replace=None): + def cloneTextExport(key: str | list, mods=None, remove=None, replace=None, block_output=False, block_append=False): return { "source": season_pass_menu_big_btn_ui, "key": key, @@ -45,7 +45,9 @@ "remove": removePartOfText, "remove_target": remove, "replace_by": replace, - "modifiers": mods + "modifiers": mods, + "no_output": block_output, + "no_append": block_append } @@ -188,6 +190,7 @@ if "sm" in spl[idx_img][8]: is_sm = True + if pd_code_1.startswith('52-01') or pd_code_2.startswith('52-01') or pd_code_3.startswith('52-01'): is_v1 = True @@ -494,12 +497,22 @@ out_xml( '\t 16 \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t 264 \r\n',export_to=cloneTextExport(menu_key, lambda y_pos: y_pos * 2 + 10)) - if multi_pro_gen and gen_ss and not is_sm: + if gen_ss and (not is_sm or ", " in spl[idx_img][8]): # expect season mode - out_xml('\t 390 \r\n',export_to=cloneTextExport(menu_key)) - out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key)) + out_xml('\t 390 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + else: + if gen_ss: + print("use normal: caused by multi_pro_gen=",multi_pro_gen,",is_sm=", is_sm ) + + + + out_xml( '\t Var( DirImage2 + "option_deactive.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + + if gen_ss and (not is_sm or ", " in spl[idx_img][8]): + out_xml('\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" \r\n', export_to=cloneTextExport(menu_key, block_output=True)) + - out_xml( '\t Var( DirImage2 + "option_deactive.png" ) \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) ice_tab_hot_show = True @@ -518,15 +531,20 @@ menu_key, lambda y_pos: y_pos * 2 + 10)) - if multi_pro_gen and gen_ss and not is_sm: + if gen_ss and (not is_sm or ", " in spl[idx_img][8]): # expect season mode - out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key)) - out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key)) + out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t ' + shw + ' \r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t Var( DirImage2 + "hot_db.png" ) \r\n',export_to=cloneTextExport(menu_key)) + out_xml( '\t Var( DirImage2 + "hot.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + out_xml( '\t Var( DirImage2 + "hot_db.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + + if gen_ss and (not is_sm or "," in spl[idx_img][8]): + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) @@ -585,17 +603,22 @@ menu_key, lambda y_pos: y_pos * 2 + 10)) - if multi_pro_gen and gen_ss and not is_sm: + if gen_ss and (not is_sm or ", " in spl[idx_img][8]): # expect season mode - out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key)) - out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key)) + out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) if pd_code_2 == "51-05-02-0016": out_xml( '\t Var( DirImage2 + "normal.png" ) \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n',export_to=cloneTextExport(menu_key)) else: - out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n',export_to=cloneTextExport(menu_key)) + out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + + if gen_ss and (not is_sm or "," in spl[idx_img][8]): + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t ' + shw + ' \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) @@ -653,13 +676,18 @@ mods=lambda y_pos: y_pos * 2 + 10 )) - if multi_pro_gen and gen_ss and not is_sm: + if gen_ss and (not is_sm or ", " in spl[idx_img][8]): # expect season mode - out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key)) - out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key)) + out_xml('\t 134 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml('\t 44 \r\n',export_to=cloneTextExport(menu_key, block_output=True)) - out_xml( '\t Var( DirImage2 + "blend.png" ) \r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t Var( DirImage2 + "blend_db.png" ) \r\n',export_to=cloneTextExport(menu_key)) + out_xml( '\t Var( DirImage2 + "blend.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + out_xml( '\t Var( DirImage2 + "blend_db.png" ) \r\n',export_to=cloneTextExport(menu_key, block_append=True)) + + if gen_ss and (not is_sm or "," in spl[idx_img][8]): + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + out_xml( '\t ' + shw + ' \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) @@ -801,13 +829,13 @@ out_xml( '\t "disable-show" \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t $Sum' + str_con_var +' \r\n',export_to=cloneTextExport(menu_key)) - if multi_pro_gen and gen_ss and not is_sm: - out_xml('\t 0x322B26 ',export_to=cloneTextExport(menu_key)) - out_xml( '\t \"UNAVAILABLE\" \r\n',export_to=cloneTextExport(menu_key)) - else: - out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t\t 000013 \r\n',export_to=cloneTextExport(menu_key)) - out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) + # if gen_ss and not is_sm: + # out_xml('\t 0x322B26 ',export_to=cloneTextExport(menu_key, block_output=True)) + # out_xml( '\t \"UNAVAILABLE\" \r\n',export_to=cloneTextExport(menu_key, block_output=True)) + + out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) + out_xml( '\t\t 000013 \r\n',export_to=cloneTextExport(menu_key)) + out_xml( '\t\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t center-vertical-horizontal \r\n',export_to=cloneTextExport(menu_key)) diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml index 047817b6..db33af5d 100644 --- a/inter/sgp/xml/page_member_prompt.lxml +++ b/inter/sgp/xml/page_member_prompt.lxml @@ -77,7 +77,7 @@ Var DisplayPrompt = "Invisible" Var DisplayQR = "Enable" - Var Timeout = 18 + Var Timeout = 15 diff --git a/xml/page_board.xml b/xml/page_board.xml index 26271b2a..0e6133a1 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -830,7 +830,7 @@ Var CountryShortName = "sgp" Var TextPriceMenuSize = 12 - Var TextPriceMenuY = 264 + Var TextPriceMenuY = 266 Var TextPriceMenuBlendX = 180 Var TextPriceMenuHotX = 48 Var ShowButtonClick2 = "Enable" @@ -1433,12 +1433,16 @@ If TaobinOnlineX = "true" Then + If CountDownShowButton < 33 Then + If CountryName = "Singapore" Then + Var ShowButtonClick2 = "Invisible" + Refresh + EndIf + EndIf + If CountDownShowButton = 31 Then Var ShowButtonClickFull = "Enable" Var ShowButtonClick = "Invisible" - If CountryName = "Singapore" Then - Var ShowButtonClick2 = "Invisible" - EndIf Refresh EndIf