pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

SGP: fix case swap menu position & brew time percent not update, toggle enable membership flow

Browse source
This commit is contained in:
Pakin 2024-07-19 15:13:16 +07:00
parent 5e109800c0
commit 69217981b3
10 changed files with 258 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

60
inter/sgp/xml/event/dummy_layout_promotion.py
View file

@ -434,26 +434,44 @@ if "multi_promotion" in param:
print("reorder mode") print("reorder mode")
order_list = promotion_config["reorder"] order_list = promotion_config["reorder"]
print(json.dumps(order_list, indent=2), " while ", json.dumps(filter_sm, indent=2)) print(json.dumps(order_list, indent=2), " while ", json.dumps(filter_sm, indent=2))
buffer_key = "" # 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 = ""
# 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 # try get block
generated_block_buffer = "" generated_block_buffer = ""
for sm_menu in filter_sm: 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") curr_sm_block = curr_sm_block.replace(",$Sum", ",Disable=Invisible,$Sum").replace("\\n", "\\\\n")
generated_block_buffer += curr_sm_block generated_block_buffer += curr_sm_block
if "52-05-02-0076" in sm_menu: # if "52-05-02-0076" in sm_menu:
print("52-05-02-0076", generated_block_buffer) # print("52-05-02-0076", generated_block_buffer)
except: except:
print("Cannot find store block for ", sm_menu) print("Cannot find store block for ", sm_menu)
pass pass

2
inter/sgp/xml/event/multi_promotion_config_season1.json
View file

@ -15,7 +15,7 @@
"reorder": [ "reorder": [
"-.52-05-02-0076.-.sm", "-.52-05-02-0076.-.sm",
"52-21-01-0004.52-21-02-0002.52-21-03-0002.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" "-.52-05-02-0025.52-05-03-0025.sm"
] ]
}, },

28
inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
View file

@ -1831,17 +1831,17 @@ eval(
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,Disable=Invisible,$Sum520201002652020200265202030026) </State> <State> Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,$Sum520201002652020200265202030026) </State>
<Button> <Button>
<State> $Sum520201002652020200265202030026 </State> <State> $Sum520201002652020200265202030026 </State>
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_hot_matcha_milk_tea.png" </Filename> <Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_hot_matcha_milk_tea.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_hot_matcha_milk_tea.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" </FilenameDisable>
<OverlayImage> xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea.png" Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $52-02-01-0026.Price Var PriceD1 = $52-02-01-0026.Price
Var PriceD2 = $52-02-02-0026.Price Var PriceD2 = $52-02-02-0026.Price
@ -1851,9 +1851,9 @@ eval(
Var PD_CODE3 = "52-02-03-0026" Var PD_CODE3 = "52-02-03-0026"
; begin lang ; begin lang
Var aliasName[0] = "MATCHA LATTE" Var aliasName[0] = "MATCHA LATTE"
Var aliasDesc[0] = "Green Tea, Milk, Sugar, Ice" Var aliasDesc[0] = "Matcha, Milk"
Var aliasName[1] = "มัทฉะลาเต้" Var aliasName[1] = "มัทฉะลาเต้"
Var aliasDesc[1] = "ชาเชียว นม" Var aliasDesc[1] = "ชาเขียวมัทฉะ และ นมอุ่น"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
@ -1993,12 +1993,12 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>Green Tea, Milk, Sugar, Ice</LanguageSlot1> <LanguageSlot1>Matcha, Milk</LanguageSlot1>
<LanguageSlot2>ชาเชียว นม</LanguageSlot2> <LanguageSlot2>ชาเขียวมัทฉะ และ นมอุ่น</LanguageSlot2>
<LanguageSlot3>Green Tea, Milk, Sugar, Ice</LanguageSlot3> <LanguageSlot3>Matcha, Milk</LanguageSlot3>
<LanguageSlot4>ชาเชียว นม</LanguageSlot4> <LanguageSlot4>ชาเขียวมัทฉะ และ นมอุ่น</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>ชาเชียว นม</LanguageSlot6> <LanguageSlot6>ชาเขียวมัทฉะ และ นมอุ่น</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
<Image> <Image>
@ -2029,7 +2029,7 @@ eval(
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $52-05-02-0045.Button </State> <State> $52-02-02-0026.Button </State>
</Image> </Image>
<Text> <Text>
<X> 113 </X> <X> 113 </X>
@ -2047,7 +2047,7 @@ eval(
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> "Invisible" </State> <State> $52-02-03-0026.Button </State>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuBlendX </X> <X> TextPriceMenuBlendX </X>

298
inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
View file

@ -1217,83 +1217,83 @@ eval(
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
; ==================> Len = 3 ; ==================> Len = 3
; 52-02-01-0039 52-02-02-0039 52-02-03-0039 ; - 52-05-02-0117 -
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( 52-02-01-0039.Button,52-02-02-0039.Button,52-02-03-0039.Button,Disable=Invisible,$Sum520201003952020200395202030039) </State> <State> Flag( 52-05-02-0117.Button,Disable=Invisible,$Sum5205020117) </State>
<Button> <Button>
<State> $Sum520201003952020200395202030039 </State> <State> $Sum5205020117 </State>
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename> <Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_coconut.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </FilenameDisable>
<OverlayImage> xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_3_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png" Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $52-02-01-0039.Price Var PriceD1 = $-.Price
Var PriceD2 = $52-02-02-0039.Price Var PriceD2 = $52-05-02-0117.Price
Var PriceD3 = $52-02-03-0039.Price Var PriceD3 = $-.Price
Var PD_CODE1 = "52-02-01-0039" Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "52-02-02-0039" Var PD_CODE2 = "52-05-02-0117"
Var PD_CODE3 = "52-02-03-0039" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "THAI MILK TEA" Var aliasName[0] = "COCONUT PEPSI"
Var aliasDesc[0] = "Thai tea, Sugar, milk" Var aliasDesc[0] = "Coconut Syrup, Pepsi and Soda"
Var aliasName[1] = "ชานมไทย" Var aliasName[1] = ""
Var aliasDesc[1] = "ชาไทย และ นม" Var aliasDesc[1] = ""
Var aliasName[2] = "-" Var aliasName[2] = ""
Var aliasDesc[2] = "-" Var aliasDesc[2] = ""
Var aliasName[3] = "-" Var aliasName[3] = ""
Var aliasDesc[3] = "-" Var aliasDesc[3] = ""
Var aliasName[4] = "" Var aliasName[4] = ""
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "-" Var aliasName[5] = ""
Var aliasDesc[5] = "-" Var aliasDesc[5] = ""
Var NameLang[0][0] = "Hot THAI MILK TEA" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "Thai tea, Milk, Sugar" Var DescLang[0][0] = ""
Var DescLang[0][1] = "" Var DescLang[0][1] = ""
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced THAI MILK TEA" Var NameLang[1][0] = "Coconut Pepsi"
Var NameLang[1][1] = "" Var NameLang[1][1] = ""
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai tea, Milk, Sugar, Ice" Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda"
Var DescLang[1][1] = "" Var DescLang[1][1] = ""
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
Var DescLang[1][5] = "" Var DescLang[1][5] = ""
Var NameLang[2][0] = "THAI MILK TEA SMOOTHIE" Var NameLang[2][0] = ""
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
Var NameLang[2][2] = "" Var NameLang[2][2] = ""
Var NameLang[2][3] = "" Var NameLang[2][3] = ""
Var NameLang[2][4] = "" Var NameLang[2][4] = ""
Var NameLang[2][5] = "" Var NameLang[2][5] = ""
Var DescLang[2][0] = "Thai tea, Sugar, Milk, Ice" Var DescLang[2][0] = ""
Var DescLang[2][1] = "" Var DescLang[2][1] = ""
Var DescLang[2][2] = "" Var DescLang[2][2] = ""
Var DescLang[2][3] = "" Var DescLang[2][3] = ""
Var DescLang[2][4] = "" Var DescLang[2][4] = ""
Var DescLang[2][5] = "" Var DescLang[2][5] = ""
; end lang ; end lang
Var PD_STAGE_1 = $52-02-01-0039.Button Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $52-02-02-0039.Button Var PD_STAGE_2 = $52-05-02-0117.Button
Var PD_STAGE_3 = $52-02-03-0039.Button Var PD_STAGE_3 = "Disable2"
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
@ -1309,12 +1309,12 @@ eval(
Var DefaultDrinkType = 3 Var DefaultDrinkType = 3
EndIf EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Topping "Load" "52-02-02-0039" Topping "Load" "52-05-02-0117"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "52-02-01-0039" Topping "Load" "-"
Else Else
Topping "Load" "52-02-03-0039" Topping "Load" "-"
EndIf EndIf
EndIf EndIf
@ -1327,33 +1327,15 @@ eval(
Var OverlayMenuFilter2 = "" Var OverlayMenuFilter2 = ""
Var OverlayMenuFilter3 = "" 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")
DEBUGVAR OverlayMenuFilter1
DEBUGVAR OverlayMenuFilter1_Value
Else
Var OverlayMenuFilter = ""
EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Var OverlayMenuFilter2 = "52-02-02-0039" Var OverlayMenuFilter2 = "52-05-02-0117"
Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2
DEBUGVAR OverlayMenuFilter2_Value DEBUGVAR OverlayMenuFilter2_Value
Else Else
Var OverlayMenuFilter = "" Var OverlayMenuFilter = ""
EndIf EndIf
Var OverlayMenuFilter = "xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")"
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")
DEBUGVAR OverlayMenuFilter3
DEBUGVAR OverlayMenuFilter3_Value
Else
Var OverlayMenuFilter = ""
EndIf
Var OverlayMenuFilter = "xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")"
Open "ROOT/taobin_project/xml/page_topping_select6.lxml" Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@ -1369,12 +1351,12 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>THAI MILK TEA</LanguageSlot1> <LanguageSlot1>COCONUT PEPSI</LanguageSlot1>
<LanguageSlot2>ชานมไทย</LanguageSlot2> <LanguageSlot2></LanguageSlot2>
<LanguageSlot3>THAI MILK TEA</LanguageSlot3> <LanguageSlot3>COCONUT PEPSI</LanguageSlot3>
<LanguageSlot4>ชานมไทย</LanguageSlot4> <LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>ชานมไทย</LanguageSlot6> <LanguageSlot6></LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
<Text> <Text>
@ -1385,12 +1367,12 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>Thai tea, Sugar, milk</LanguageSlot1> <LanguageSlot1>Coconut Syrup, Pepsi and Soda</LanguageSlot1>
<LanguageSlot2>ชาไทย และ นม</LanguageSlot2> <LanguageSlot2></LanguageSlot2>
<LanguageSlot3>Thai tea, Sugar, milk</LanguageSlot3> <LanguageSlot3>Coconut Syrup, Pepsi and Soda</LanguageSlot3>
<LanguageSlot4>ชาไทย และ นม</LanguageSlot4> <LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6>ชาไทย และ นม</LanguageSlot6> <LanguageSlot6></LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
<Image> <Image>
@ -1401,7 +1383,7 @@ eval(
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<State> $52-02-01-0039.Button </State> <State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image> </Image>
@ -1413,15 +1395,15 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $52-02-01-0039.Button </State> <State> "Invisible" </State>
<Value> StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $52-21-02-0001.Button </State> <State> $52-05-02-0117.Button </State>
</Image> </Image>
<Text> <Text>
<X> 113 </X> <X> 113 </X>
@ -1431,8 +1413,8 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $52-02-02-0039.Button </State> <State> $52-05-02-0117.Button </State>
<Value> StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $52-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 146 </X> <X> 146 </X>
@ -1449,8 +1431,8 @@ eval(
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $52-02-03-0039.Button </State> <State> "Invisible" </State>
<Value> StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -1459,11 +1441,7 @@ eval(
eval( eval(
If ICE_PROCESS_STATUS = 2 Then If ICE_PROCESS_STATUS = 2 Then
If $Sum520201003952020200395202030039 = "Disable" Then Var ice_tab_process_show = "Invisible"
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else Else
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
@ -1479,10 +1457,10 @@ eval(
<Y> 117 </Y> <Y> 117 </Y>
<State> <State>
eval( eval(
If $Sum520201003952020200395202030039 = "Disable" Then If $Sum5205020117 = "Disable" Then
STRCONTAIN "ERR" $52-02-01-0039.TAG tag1_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $52-02-02-0039.TAG tag2_is_disable STRCONTAIN "ERR" $52-05-02-0117.TAG tag2_is_disable
STRCONTAIN "ERR" $52-02-03-0039.TAG tag3_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible" Var return = "Invisible"
If tag1_is_disable = "true" Then If tag1_is_disable = "true" Then
Var return = "Enable" Var return = "Enable"
@ -1516,7 +1494,7 @@ eval(
<Width> 128 </Width> <Width> 128 </Width>
<Height> 64 </Height> <Height> 64 </Height>
<Mode> "disable-show" </Mode> <Mode> "disable-show" </Mode>
<State> $Sum520201003952020200395202030039 </State> <State> $Sum5205020117 </State>
<Language> <Language>
<ID> 000013 </ID> <ID> 000013 </ID>
</Language> </Language>
@ -1822,83 +1800,83 @@ eval(
</Text> </Text>
</Block> </Block>
; ==================> Len = 3 ; ==================> Len = 3
; - 52-05-02-0117 - ; 52-02-01-0039 52-02-02-0039 52-02-03-0039
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( 52-05-02-0117.Button,Disable=Invisible,$Sum5205020117) </State> <State> Flag( 52-02-01-0039.Button,52-02-02-0039.Button,52-02-03-0039.Button,Disable=Invisible,$Sum520201003952020200395202030039) </State>
<Button> <Button>
<State> $Sum5205020117 </State> <State> $Sum520201003952020200395202030039 </State>
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_coconut.png" </Filename> <Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
<OverlayImage> xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_3_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png" Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $52-02-01-0039.Price
Var PriceD2 = $52-05-02-0117.Price Var PriceD2 = $52-02-02-0039.Price
Var PriceD3 = $-.Price Var PriceD3 = $52-02-03-0039.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "52-02-01-0039"
Var PD_CODE2 = "52-05-02-0117" Var PD_CODE2 = "52-02-02-0039"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "52-02-03-0039"
; begin lang ; begin lang
Var aliasName[0] = "COCONUT PEPSI" Var aliasName[0] = "THAI MILK TEA"
Var aliasDesc[0] = "Coconut Syrup, Pepsi and Soda" Var aliasDesc[0] = "Thai tea, Sugar, milk"
Var aliasName[1] = "" Var aliasName[1] = "ชานมไทย"
Var aliasDesc[1] = "" Var aliasDesc[1] = "ชาไทย และ นม"
Var aliasName[2] = "" Var aliasName[2] = "-"
Var aliasDesc[2] = "" Var aliasDesc[2] = "-"
Var aliasName[3] = "" Var aliasName[3] = "-"
Var aliasDesc[3] = "" Var aliasDesc[3] = "-"
Var aliasName[4] = "" Var aliasName[4] = ""
Var aliasDesc[4] = "" Var aliasDesc[4] = ""
Var aliasName[5] = "" Var aliasName[5] = "-"
Var aliasDesc[5] = "" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = "Hot THAI MILK TEA"
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
Var NameLang[0][3] = "" Var NameLang[0][3] = ""
Var NameLang[0][4] = "" Var NameLang[0][4] = ""
Var NameLang[0][5] = "" Var NameLang[0][5] = ""
Var DescLang[0][0] = "" Var DescLang[0][0] = "Thai tea, Milk, Sugar"
Var DescLang[0][1] = "" Var DescLang[0][1] = ""
Var DescLang[0][2] = "" Var DescLang[0][2] = ""
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "Coconut Pepsi" Var NameLang[1][0] = "Iced THAI MILK TEA"
Var NameLang[1][1] = "" Var NameLang[1][1] = ""
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""
Var NameLang[1][4] = "" Var NameLang[1][4] = ""
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda" Var DescLang[1][0] = "Thai tea, Milk, Sugar, Ice"
Var DescLang[1][1] = "" Var DescLang[1][1] = ""
Var DescLang[1][2] = "" Var DescLang[1][2] = ""
Var DescLang[1][3] = "" Var DescLang[1][3] = ""
Var DescLang[1][4] = "" Var DescLang[1][4] = ""
Var DescLang[1][5] = "" Var DescLang[1][5] = ""
Var NameLang[2][0] = "" Var NameLang[2][0] = "THAI MILK TEA SMOOTHIE"
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
Var NameLang[2][2] = "" Var NameLang[2][2] = ""
Var NameLang[2][3] = "" Var NameLang[2][3] = ""
Var NameLang[2][4] = "" Var NameLang[2][4] = ""
Var NameLang[2][5] = "" Var NameLang[2][5] = ""
Var DescLang[2][0] = "" Var DescLang[2][0] = "Thai tea, Sugar, Milk, Ice"
Var DescLang[2][1] = "" Var DescLang[2][1] = ""
Var DescLang[2][2] = "" Var DescLang[2][2] = ""
Var DescLang[2][3] = "" Var DescLang[2][3] = ""
Var DescLang[2][4] = "" Var DescLang[2][4] = ""
Var DescLang[2][5] = "" Var DescLang[2][5] = ""
; end lang ; end lang
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = $52-02-01-0039.Button
Var PD_STAGE_2 = $52-05-02-0117.Button Var PD_STAGE_2 = $52-02-02-0039.Button
Var PD_STAGE_3 = "Disable2" Var PD_STAGE_3 = $52-02-03-0039.Button
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
@ -1914,12 +1892,12 @@ eval(
Var DefaultDrinkType = 3 Var DefaultDrinkType = 3
EndIf EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Topping "Load" "52-05-02-0117" Topping "Load" "52-02-02-0039"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "-" Topping "Load" "52-02-01-0039"
Else Else
Topping "Load" "-" Topping "Load" "52-02-03-0039"
EndIf EndIf
EndIf EndIf
@ -1932,15 +1910,33 @@ eval(
Var OverlayMenuFilter2 = "" Var OverlayMenuFilter2 = ""
Var OverlayMenuFilter3 = "" 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")
DEBUGVAR OverlayMenuFilter1
DEBUGVAR OverlayMenuFilter1_Value
Else
Var OverlayMenuFilter = ""
EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Var OverlayMenuFilter2 = "52-05-02-0117" Var OverlayMenuFilter2 = "52-02-02-0039"
Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")
DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2
DEBUGVAR OverlayMenuFilter2_Value DEBUGVAR OverlayMenuFilter2_Value
Else Else
Var OverlayMenuFilter = "" Var OverlayMenuFilter = ""
EndIf EndIf
Var OverlayMenuFilter = "xmlpro( 52-05-02-0117, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")"
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")
DEBUGVAR OverlayMenuFilter3
DEBUGVAR OverlayMenuFilter3_Value
Else
Var OverlayMenuFilter = ""
EndIf
Var OverlayMenuFilter = "xmlpro( 52-02-02-0039, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")"
Open "ROOT/taobin_project/xml/page_topping_select6.lxml" Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@ -1956,12 +1952,12 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>COCONUT PEPSI</LanguageSlot1> <LanguageSlot1>THAI MILK TEA</LanguageSlot1>
<LanguageSlot2></LanguageSlot2> <LanguageSlot2>ชานมไทย</LanguageSlot2>
<LanguageSlot3>COCONUT PEPSI</LanguageSlot3> <LanguageSlot3>THAI MILK TEA</LanguageSlot3>
<LanguageSlot4></LanguageSlot4> <LanguageSlot4>ชานมไทย</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6> <LanguageSlot6>ชานมไทย</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
<Text> <Text>
@ -1972,12 +1968,12 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>Coconut Syrup, Pepsi and Soda</LanguageSlot1> <LanguageSlot1>Thai tea, Sugar, milk</LanguageSlot1>
<LanguageSlot2></LanguageSlot2> <LanguageSlot2>ชาไทย และ นม</LanguageSlot2>
<LanguageSlot3>Coconut Syrup, Pepsi and Soda</LanguageSlot3> <LanguageSlot3>Thai tea, Sugar, milk</LanguageSlot3>
<LanguageSlot4></LanguageSlot4> <LanguageSlot4>ชาไทย และ นม</LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6> <LanguageSlot6>ชาไทย และ นม</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
<Image> <Image>
@ -1988,7 +1984,7 @@ eval(
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<State> "Invisible" </State> <State> $52-02-01-0039.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
</Image> </Image>
@ -2000,15 +1996,15 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> $52-02-01-0039.Button </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $52-05-02-0117.Button </State> <State> $52-02-02-0039.Button </State>
</Image> </Image>
<Text> <Text>
<X> 113 </X> <X> 113 </X>
@ -2018,15 +2014,15 @@ eval(
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $52-05-02-0117.Button </State> <State> $52-02-02-0039.Button </State>
<Value> StringFmt( $52-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<State> "Invisible" </State> <State> $52-02-03-0039.Button </State>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuBlendX </X> <X> TextPriceMenuBlendX </X>
@ -2036,8 +2032,8 @@ eval(
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> $52-02-03-0039.Button </State>
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -2046,7 +2042,11 @@ eval(
eval( eval(
If ICE_PROCESS_STATUS = 2 Then If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Invisible" If $Sum520201003952020200395202030039 = "Disable" Then
Var ice_tab_process_show = "Disable"
Else
Var ice_tab_process_show = "Enable"
EndIf
Else Else
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
@ -2062,10 +2062,10 @@ eval(
<Y> 117 </Y> <Y> 117 </Y>
<State> <State>
eval( eval(
If $Sum5205020117 = "Disable" Then If $Sum520201003952020200395202030039 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable STRCONTAIN "ERR" $52-02-01-0039.TAG tag1_is_disable
STRCONTAIN "ERR" $52-05-02-0117.TAG tag2_is_disable STRCONTAIN "ERR" $52-02-02-0039.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable STRCONTAIN "ERR" $52-02-03-0039.TAG tag3_is_disable
Var return = "Invisible" Var return = "Invisible"
If tag1_is_disable = "true" Then If tag1_is_disable = "true" Then
Var return = "Enable" Var return = "Enable"
@ -2099,7 +2099,7 @@ eval(
<Width> 128 </Width> <Width> 128 </Width>
<Height> 64 </Height> <Height> 64 </Height>
<Mode> "disable-show" </Mode> <Mode> "disable-show" </Mode>
<State> $Sum5205020117 </State> <State> $Sum520201003952020200395202030039 </State>
<Language> <Language>
<ID> 000013 </ID> <ID> 000013 </ID>
</Language> </Language>

4
inter/sgp/xml/page_brewing3.lxml
View file

@ -426,6 +426,8 @@
Var ButtonGameCountDownState = "Invisible" Var ButtonGameCountDownState = "Invisible"
Var ButtonGamePressToPlayState = "Invisible" Var ButtonGamePressToPlayState = "Invisible"
Var InitCNT = BREW_CNT
Var ShowPercent = "Invisible" Var ShowPercent = "Invisible"
Var ShowCountdown = "Enable" Var ShowCountdown = "Enable"
@ -598,6 +600,8 @@
EndIf EndIf
Endif Endif
DEBUGVAR BREW_CNT
If SelectMenuBetweenBrewEnable1 = "Enable" Then If SelectMenuBetweenBrewEnable1 = "Enable" Then
If Timeout = 5 Then If Timeout = 5 Then

2
inter/sgp/xml/page_brewing3Conti.xml
View file

@ -186,6 +186,8 @@
DEBUGVAR ButtonGameCountDownState DEBUGVAR ButtonGameCountDownState
Var InitCNT = BREW_CNT
Var ShowPercent = "Invisible" Var ShowPercent = "Invisible"
Var ShowCountdown = "Enable" Var ShowCountdown = "Enable"

2
inter/sgp/xml/page_collect_point_2.lxml
View file

@ -45,6 +45,8 @@
EndIf EndIf
Var InitCNT = BREW_CNT
Var ShowPercent = "Invisible" Var ShowPercent = "Invisible"
Var ShowCountdown = "Enable" Var ShowCountdown = "Enable"

2
inter/sgp/xml/page_collect_point_3.lxml
View file

@ -919,6 +919,8 @@
Var Seeker.FromConsent = 0 Var Seeker.FromConsent = 0
EndIf EndIf
Var InitCNT = BREW_CNT
Var ShowPercent = "Invisible" Var ShowPercent = "Invisible"
Var ShowCountdown = "Enable" Var ShowCountdown = "Enable"

5
xml/page_board.xml
View file

@ -857,7 +857,10 @@
;Var SettingDisableTaobinCode = "false" ;Var SettingDisableTaobinCode = "false"
; Singapore disable point ; Singapore disable point
;Var SettingIgnoreCollectPoint = 1 Var SettingIgnoreCollectPoint = 1
If BoxID = 210604 Then
Var SettingIgnoreCollectPoint = 0
EndIf
Var SettingVideoBrewingUseCommon = 1 Var SettingVideoBrewingUseCommon = 1

49
xml/page_thankyou.xml
View file

@ -380,7 +380,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf EndIf
@ -432,7 +436,12 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else Else
@ -440,7 +449,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf EndIf
@ -461,7 +474,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
@ -478,7 +495,11 @@
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
EndIf EndIf
@ -494,7 +515,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else Else
@ -502,7 +527,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf EndIf
@ -524,7 +553,11 @@
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf EndIf