diff --git a/inter/sgp/xml/event/dummy_layout_promotion.py b/inter/sgp/xml/event/dummy_layout_promotion.py index a547b79f..6f4d4ce3 100644 --- a/inter/sgp/xml/event/dummy_layout_promotion.py +++ b/inter/sgp/xml/event/dummy_layout_promotion.py @@ -434,26 +434,44 @@ if "multi_promotion" in param: print("reorder mode") order_list = promotion_config["reorder"] print(json.dumps(order_list, indent=2), " while ", json.dumps(filter_sm, indent=2)) - buffer_key = "" - # sort by has_order - for filtered in filter_sm: - print("try reorder", filtered, order_list) - # get index from order - expect_index = order_list.index(filtered) - # interact_idx[0] = expect_index - print("get expect = ", expect_index) - current_index = filter_sm.index(filtered) - # interact_idx[1] = current_index - print("get current = ", current_index) - is_matched_index = expect_index != -1 and expect_index == current_index - print(f"check match {filtered}: ", not is_matched_index) - if not is_matched_index: - print(f"swap current={filtered}@{current_index} to position@{expect_index} was {filter_sm[expect_index]}") - buffer_key = filter_sm[expect_index] - filter_sm[expect_index] = filtered - filter_sm[current_index] = buffer_key - buffer_key = "" + # buffer_key = "" + # new_sorted_list = [ + # "", + # "", + # "", + # "" + # ] + + filter_sm = order_list + + # sort by has_order + # for filtered in filter_sm: + # print("try reorder", filtered, order_list) + # # get index from order + # expect_index = order_list.index(filtered) + # # interact_idx[0] = expect_index + # print("get expect = ", expect_index) + # current_index = filter_sm.index(filtered) + # # interact_idx[1] = current_index + # print("get current = ", current_index) + # is_matched_index = expect_index != -1 and expect_index == current_index + # print(f"check match {filtered}: ", not is_matched_index) + + + # # apply to new list + # new_sorted_list[expect_index] = filtered + + + + # if not is_matched_index: + # print(f"swap current={filtered}@{current_index} to position@{expect_index} was {filter_sm[expect_index]}") + # buffer_key = filter_sm[expect_index] + # filter_sm[expect_index] = filtered + # filter_sm[current_index] = buffer_key + # buffer_key = "" + + # print("final reorder \n\n",filter_sm,order_list,"\n\n", new_sorted_list ,"\n\n") # try get block generated_block_buffer = "" for sm_menu in filter_sm: @@ -470,8 +488,8 @@ if "multi_promotion" in param: curr_sm_block = curr_sm_block.replace(",$Sum", ",Disable=Invisible,$Sum").replace("\\n", "\\\\n") generated_block_buffer += curr_sm_block - if "52-05-02-0076" in sm_menu: - print("52-05-02-0076", generated_block_buffer) + # if "52-05-02-0076" in sm_menu: + # print("52-05-02-0076", generated_block_buffer) except: print("Cannot find store block for ", sm_menu) pass diff --git a/inter/sgp/xml/event/multi_promotion_config_season1.json b/inter/sgp/xml/event/multi_promotion_config_season1.json index 36592fda..4fb9e233 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season1.json +++ b/inter/sgp/xml/event/multi_promotion_config_season1.json @@ -15,7 +15,7 @@ "reorder": [ "-.52-05-02-0076.-.sm", "52-21-01-0004.52-21-02-0002.52-21-03-0002.sm", - "52-02-01-0024.52-02-02-0024.52-02-03-0024.sm", + "52-02-01-0039.52-02-02-0039.52-02-03-0039.sm", "-.52-05-02-0025.52-05-03-0025.sm" ] }, 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 ea2ab7ad..08453e06 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 @@ -1831,17 +1831,17 @@ eval( 22 225 296 - Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,Disable=Invisible,$Sum520201002652020200265202030026) + Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,$Sum520201002652020200265202030026)