diff --git a/animation01/TaoBin2_draft02_art81.mp4 b/animation01/TaoBin2_draft02_art81.mp4 index 4faa5d13..901e66f9 100755 Binary files a/animation01/TaoBin2_draft02_art81.mp4 and b/animation01/TaoBin2_draft02_art81.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index bc51c7fd..d1878443 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -897,23 +897,23 @@ Iced Thai Tea café Latte 12-01-03-0029 2 3 4 5 6 70 10 23 41 24 190 3:10 23 -RandomCup1 12-99-03-0019 1 81 81 81 81 81 81 81 81 24 120 17:00 23 -RandomCup2 12-99-03-0020 1 82 82 82 82 82 82 82 82 24 120 17:00 23 -RandomCup3 12-99-03-0021 1 83 83 83 83 83 83 83 83 24 120 17:00 23 -RandomCup4 12-99-03-0022 1 84 84 84 84 84 84 84 84 24 120 17:00 23 -RandomCup5 12-99-03-0023 1 81 81 81 81 81 81 81 81 24 120 17:00 23 -RandomCup6 12-99-03-0024 1 82 82 82 82 82 82 82 82 24 120 17:00 23 -RandomCup7 12-99-03-0025 1 83 83 83 83 83 83 83 83 24 120 17:00 23 -RandomCup8 12-99-03-0026 1 84 84 84 84 84 84 84 84 24 120 17:00 23 -RandomCup9 12-99-03-0027 1 81 81 81 81 81 81 81 81 24 120 17:00 23 -RandomCup10 12-99-03-0028 1 82 82 82 82 82 82 82 82 24 120 17:00 23 -RandomCup11 12-99-03-0033 1 83 83 83 83 83 83 83 83 24 120 17:00 23 -RandomCup12 12-99-03-0037 1 84 84 84 84 84 84 84 84 24 120 17:00 23 -RandomCup13 12-99-03-0038 1 81 81 81 81 81 81 81 81 24 120 17:00 23 -RandomCup14 12-99-03-0041 1 82 82 82 82 82 82 82 82 24 120 17:00 23 -RandomCup15 12-99-03-0042 1 83 83 83 83 83 83 83 83 24 120 17:00 23 -RandomCup16 12-99-03-0043 1 84 84 84 84 84 84 84 84 24 120 17:00 23 -RandomCup17 12-99-03-0046 1 81 81 81 81 81 81 81 81 24 120 17:00 23 -RandomCup18 12-99-03-0048 1 82 82 82 82 82 82 82 82 24 120 17:00 23 -RandomCup19 12-99-03-0049 1 83 83 83 83 83 83 83 83 24 120 17:00 23 -RandomCup20 12-99-03-0050 1 84 84 84 84 84 84 84 84 24 120 17:00 23 +RandomCup1 12-99-03-0020 1 81 81 81 81 81 81 81 81 24 120 17:00 23 +RandomCup2 12-99-03-0021 1 82 82 82 82 82 82 82 82 24 120 17:00 23 +RandomCup3 12-99-03-0022 1 83 83 83 83 83 83 83 83 24 120 17:00 23 +RandomCup4 12-99-03-0023 1 84 84 84 84 84 84 84 84 24 120 17:00 23 +RandomCup5 12-99-03-0024 1 81 81 81 81 81 81 81 81 24 120 17:00 23 +RandomCup6 12-99-03-0025 1 82 82 82 82 82 82 82 82 24 120 17:00 23 +RandomCup7 12-99-03-0026 1 83 83 83 83 83 83 83 83 24 120 17:00 23 +RandomCup8 12-99-03-0027 1 84 84 84 84 84 84 84 84 24 120 17:00 23 +RandomCup9 12-99-03-0028 1 81 81 81 81 81 81 81 81 24 120 17:00 23 +RandomCup10 12-99-03-0029 1 82 82 82 82 82 82 82 82 24 120 17:00 23 +RandomCup11 12-99-03-0030 1 83 83 83 83 83 83 83 83 24 120 17:00 23 +RandomCup12 12-99-03-0031 1 84 84 84 84 84 84 84 84 24 120 17:00 23 +RandomCup13 12-99-03-0032 1 81 81 81 81 81 81 81 81 24 120 17:00 23 +RandomCup14 12-99-03-0033 1 82 82 82 82 82 82 82 82 24 120 17:00 23 +RandomCup15 12-99-03-0034 1 83 83 83 83 83 83 83 83 24 120 17:00 23 +RandomCup16 12-99-03-0035 1 84 84 84 84 84 84 84 84 24 120 17:00 23 +RandomCup17 12-99-03-0036 1 81 81 81 81 81 81 81 81 24 120 17:00 23 +RandomCup18 12-99-03-0037 1 82 82 82 82 82 82 82 82 24 120 17:00 23 +RandomCup19 12-99-03-0038 1 83 83 83 83 83 83 83 83 24 120 17:00 23 +RandomCup20 12-99-03-0039 1 84 84 84 84 84 84 84 84 24 120 17:00 23 diff --git a/image/page_doing/txt_81.png b/image/page_doing/txt_81.png index 6d319fd9..cafedcca 100644 Binary files a/image/page_doing/txt_81.png and b/image/page_doing/txt_81.png differ diff --git a/image/page_doing/txt_81_en.png b/image/page_doing/txt_81_en.png index 242ed985..23974e21 100644 Binary files a/image/page_doing/txt_81_en.png and b/image/page_doing/txt_81_en.png differ diff --git a/image/page_doing/txt_82.png b/image/page_doing/txt_82.png index 6d319fd9..cafedcca 100644 Binary files a/image/page_doing/txt_82.png and b/image/page_doing/txt_82.png differ diff --git a/image/page_doing/txt_82_en.png b/image/page_doing/txt_82_en.png index 242ed985..23974e21 100644 Binary files a/image/page_doing/txt_82_en.png and b/image/page_doing/txt_82_en.png differ diff --git a/image/page_doing/txt_83.png b/image/page_doing/txt_83.png index 6d319fd9..cafedcca 100644 Binary files a/image/page_doing/txt_83.png and b/image/page_doing/txt_83.png differ diff --git a/image/page_doing/txt_83_en.png b/image/page_doing/txt_83_en.png index 242ed985..23974e21 100644 Binary files a/image/page_doing/txt_83_en.png and b/image/page_doing/txt_83_en.png differ diff --git a/image/page_doing/txt_84.png b/image/page_doing/txt_84.png index 6d319fd9..cafedcca 100644 Binary files a/image/page_doing/txt_84.png and b/image/page_doing/txt_84.png differ diff --git a/image/page_doing/txt_84_en.png b/image/page_doing/txt_84_en.png index 242ed985..23974e21 100644 Binary files a/image/page_doing/txt_84_en.png and b/image/page_doing/txt_84_en.png differ diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml index 2b02965d..dce7b57f 100644 --- a/xml/event/promotion_mystery_cup_35.xml +++ b/xml/event/promotion_mystery_cup_35.xml @@ -9291,6 +9291,20 @@ LIMENADE SODA" DEBUGVAR IndexOfCoffee DEBUGVAR IndexOfMilk DEBUGVAR IndexOfTea + + If IndexOfAllRandom = 0 Then + Var SubRandAllButtonEnable = "Disable" + EndIf + + If IndexOfCoffee = 0 Then + Var SubRandCoffButtonEnable = "Disable" + EndIf + If IndexOfMilk = 0 Then + Var SubRandMilkButtonEnable = "Disable" + EndIf + If IndexOfTea = 0 Then + Var SubRandTeaButtonEnable = "Disable" + EndIf Refresh diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index de7e395b..ee3054f0 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -88,11 +88,6 @@ EndIf If BoxID = 173149 Then Var MysteryProEnable = 1 EndIf -If BoxID = 172527 Then - Var MysteryProEnable = 1 -EndIf - -Var MysteryProEnable = 0 If BoxID = 172053 Then Var MysteryProEnable = 1 diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index d68b7950..133ebe23 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -1540,8 +1540,8 @@ 52 881 1080 - 900 -; "auto-all" +; 900 + "auto-all" "Vertical" 1 diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 133ebe23..f49e250f 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -1540,8 +1540,8 @@ 52 881 1080 -; 900 - "auto-all" + 900 +ว "auto-all" "Vertical" 1