diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 704af8be..f65df26c 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -738,11 +738,11 @@ Iced Caramel milk 12-03-83-0001 1 22 170 23 41 24 113 1:53 36 Hot Caramel cocoa 12-03-81-0004 1 15 22 6 70 24 145 2:25 35 Hot Caramel milk 12-03-81-0001 1 22 6 70 24 84 1:24 27 CHOCOLATE SHAKE 12-04-82-0002 1 25 26 6 70 15 23 24 219 3:39 36 -Hot Caramel Latte 12-01-81-00070 1 22 2 3 4 5 70 24 135 2:15 22 +Hot Caramel Latte 12-01-81-0007 1 22 2 3 4 5 70 24 135 2:15 22 Hot Taiwanese Tea café Latte 12-01-81-0009 1 2 3 4 5 10 24 136 2:16 26 Hot Thai Tea café Latte 12-01-81-0010 1 2 3 4 5 6 70 10 24 161 2:41 22 -Iced Thai Tea café Latte 12-01-82-00070 1 2 3 4 5 6 70 10 23 24 190 3:10 23 -Iced Thai Tea café Latte 12-01-83-00070 2 3 4 5 6 70 10 23 41 24 190 3:10 23 +Iced Thai Tea café Latte 12-01-82-0007 1 2 3 4 5 6 70 10 23 24 190 3:10 23 +Iced Thai Tea café Latte 12-01-83-0007 2 3 4 5 6 70 10 23 41 24 190 3:10 23 Iced matcha latte 12-02-82-0004 1 6 70 8 9 23 24 175 2:55 34 Iced matcha latte 12-02-83-0004 1 6 70 8 9 23 41 24 175 2:55 34 Hot matcha latte 12-02-81-0004 1 6 70 8 9 24 149 2:29 36 @@ -768,10 +768,10 @@ STRAWBERRY SHAKE 12-04-82-0003 1 25 26 19 170 23 24 178 2:58 35 ESPRESSO SHAKE 12-04-82-0004 1 25 26 2 3 4 5 170 23 24 230 3:50 28 THAI TEA SHAKE 12-04-82-0005 1 25 26 6 70 10 23 24 223 3:43 37 KOKUTO SHAKE 12-04-82-0006 1 25 26 26 170 23 24 180 3:00 35 -BLUEBERRY SHAKE 12-04-82-00070 1 25 26 20 170 23 24 171 2:51 33 +BLUEBERRY SHAKE 12-04-82-0007 1 25 26 20 170 23 24 171 2:51 33 CARAMEL SHAKE 12-04-82-0009 1 25 26 22 170 23 24 196 3:16 38 MILK SHAKE 12-04-82-0010 1 25 26 6 70 23 24 120 2:00 23 -Mango milk 12-03-82-00070 1 31 70 31 23 24 100 4:40 32 +Mango milk 12-03-82-0007 1 31 70 31 23 24 100 4:40 32 STRAWBERRY SHAKE 12-04-82-0013 1 25 26 19 170 23 24 178 2:58 35 ETHIOPAI BLUE DADDY DIRTY 12-01-82-0020 1 70 42 2 3 4 5 24 100 22:40 32 OREO SMOOTHIE VOLCANO 12-03-83-0009 1 170 23 40 41 24 110 1:50 53 @@ -803,14 +803,14 @@ Iced matcha latte 12-02-82-0026 1 6 70 8 9 23 24 175 2:55 34 Iced matcha latte 12-02-83-0026 1 6 70 8 9 23 41 24 175 2:55 34 THAI TEA SHAKE 12-04-82-0015 1 25 26 6 70 10 23 24 223 3:43 37 MATCHA SHAKE 12-04-82-0016 1 25 26 9 6 70 23 24 181 3:01 30 -TAIWANESE TEA SHAKE 12-04-82-00170 1 25 26 10 170 23 24 1970 5:50 39 +TAIWANESE TEA SHAKE 12-04-82-0017 1 25 26 10 170 23 24 1970 5:50 39 Pure beauty 12-01-82-0033 1 70 48 2 3 4 5 24 100 22:40 32 Geisha 12-01-82-0036 1 70 49 2 3 4 5 24 100 22:40 32 โอวัลตินปั่นภูเขาไฟ 12-03-83-0020 1 51 170 23 41 24 66 2:06 32 โอวัลตินร้อน 12-03-81-0019 1 51 170 16 24 66 3:06 32 โอวัลตินเย็น 12-03-82-0019 1 51 170 23 24 66 4:06 32 โอวัลตินปั่น 12-03-83-0019 1 51 170 23 41 24 66 5:06 32 -ROSALYN ALMOST DIRTY 12-01-82-00370 1 70 50 2 3 4 5 24 66 6:06 32 +ROSALYN ALMOST DIRTY 12-01-82-0037 1 70 50 2 3 4 5 24 66 6:06 32 นมเมล่อน 12-03-83-0022 1 170 52 23 41 24 1 1 32 โกโก้โอดิบภูเขาไฟ 12-03-83-0021 1 51 15 170 23 41 51 24 66 5:06 32 นมเมล่อน 12-03-81-0022 1 170 52 24 1 1 32 @@ -854,8 +854,8 @@ Iced Caramel café Latte 12-01-02-0004 1 22 2 3 4 5 70 23 24 182 3:02 25 Iced Caramel café Latte 12-01-03-0004 1 22 2 3 4 5 70 23 41 24 182 3:02 25 Iced Matcha café Latte 12-01-02-0005 1 2 3 4 5 8 9 70 23 24 204 3:24 25 Iced Matcha café Latte 12-01-03-0005 2 3 4 5 8 9 70 23 41 24 204 3:24 25 -Iced Thai Tea café Latte 12-01-02-00070 1 2 3 4 5 6 70 10 23 24 190 3:10 23 -Iced Thai Tea café Latte 12-01-03-00070 2 3 4 5 6 70 10 23 41 24 190 3:10 23 +Iced Thai Tea café Latte 12-01-02-0007 1 2 3 4 5 6 70 10 23 24 190 3:10 23 +Iced Thai Tea café Latte 12-01-03-0007 2 3 4 5 6 70 10 23 41 24 190 3:10 23 Iced Kokuto café Latte 12-01-02-0008 1 2 3 4 5 6 70 270 23 24 186 3:06 23 Iced Kokuto café Latte 12-01-03-0008 2 3 4 5 6 70 270 23 41 24 186 3:06 23 Iced Thai Tea café Latte 12-01-02-0029 1 2 3 4 5 6 70 10 23 24 190 3:10 23 @@ -869,11 +869,11 @@ Iced Espresso 12-11-02-0001 1 2 3 4 5 6 70 23 24 208 3:28 29 Iced Espresso 12-11-03-0001 1 2 3 4 5 6 70 23 41 24 208 3:28 29 Iced Cappuccino 12-11-02-0002 1 2 3 4 5 6 70 23 24 190 3:10 27 Iced Cappuccino 12-11-03-0002 1 2 3 4 5 6 70 23 41 24 190 3:10 27 -โฮจิฉะลาเต้ร้อน 12-02-81-00370 1 6 55 16 24 1 1 32 -โฮจิฉะลาเต้เย็น 12-02-82-00370 1 6 55 16 23 24 1 1 32 -nUll 12-02-83-00370 24 1 1 32 -โฮจิฉะลาเต้ร้อน 12-02-81-10370 1 6 55 16 24 1 1 32 -โฮจิฉะลาเต้เย็น 12-02-82-10370 1 6 55 16 23 24 1 1 32 +โฮจิฉะลาเต้ร้อน 12-02-81-0037 1 6 55 16 24 1 1 32 +โฮจิฉะลาเต้เย็น 12-02-82-0037 1 6 55 16 23 24 1 1 32 +nUll 12-02-83-0037 24 1 1 32 +โฮจิฉะลาเต้ร้อน 12-02-81-1037 1 6 55 16 24 1 1 32 +โฮจิฉะลาเต้เย็น 12-02-82-1037 1 6 55 16 23 24 1 1 32 ลาเต้ร้อน 12-01-01-1004 1 2 3 4 5 6 70 24 1 1 32 มอคค่าร้อน 12-01-01-1006 1 2 3 4 5 15 70 24 1 1 32 คาปูชิโน่ร้อน 12-01-01-1099 1 2 3 4 5 6 70 24 1 1 32 @@ -896,7 +896,7 @@ CHOPIN ALMOST DIRTY 12-01-82-0045 1 70 570 2 3 4 5 24 49 1 23 HOT BANANA CAFE LATTE 12-01-01-0042 1 56 3 4 5 16 24 49 1 23 ICED BANANA CAFE LATTE 12-01-02-0042 1 56 3 4 5 23 24 49 1 23 BANANA CAFE LATTE 12-01-03-0042 1 56 3 4 5 23 41 24 49 1 23 -สตอเบอร์รี่ปั่นโอริโอ้ภูเขาไฟ 12-03-83-00270 1 170 23 19 40 41 24 120 7:00 23 +สตอเบอร์รี่ปั่นโอริโอ้ภูเขาไฟ 12-03-83-0027 1 170 23 19 40 41 24 120 7:00 23 เมล่อนปั่นโอริโอ้ภูเขาไฟ 12-03-83-0028 1 170 23 52 40 41 24 120 8:00 23 นมกล้วยปั่นโอริโอ้ภูเขาไฟ 12-03-83-0029 1 170 23 56 40 41 24 120 9:00 23 โกโก้ปั่นโอริโอ้ภูเขาไฟ 12-03-83-0030 1 170 23 15 40 41 24 120 10:00 23 diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 8e06ea52..1dc7d994 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -9,15 +9,7 @@ If OpenFromPageBoard = 1 Then Var BigButtonEnable = "Enable" OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml" Var OpenFromPageBoard = 0 - EndIf - - - If TamatianEnable = 1 Then - - Var BigButtonEnable = "Enable" - OpenInst 2 "ROOT/taobin_project/xml/event/promotion_Tamatian.xml" - Var OpenFromPageBoard = 0 - + Else OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" @@ -29,31 +21,11 @@ Else Var BigButtonEnable = "Enable" Open "ROOT/taobin_project/xml/event/promotion_pepween.xml" - ;If NetworkStatus = "DEACTIVE" Then - ; Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - - ;Else - ; If NetworkStatus = "DOWN" Then - ; Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - ; - ; Else - - ; Var BigButtonEnable = "Enable" - ; Open "ROOT/taobin_project/xml/event/promotion_pepween.xml" - - ; EndIf - - ;EndIf Else - If TamatianEnable = 1 Then - Var BigButtonEnable = "Enable" - Open "ROOT/taobin_project/xml/event/promotion_Tamatian.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" EndIf diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index b70e3bf1..abddbc68 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -44,40 +44,11 @@ Var MayDayRunEnable = 0 ; Enable Milk Choice Vegan Var MilkChoiceVeganEnable = 0 -If SystemDateMonthInt = 9 Then - If SystemDateDayInt > 5 Then - If SystemDateDayInt < 17 Then - Var MayDayRunEnable = 1 - EndIf - EndIf -EndIf -If SystemDateMonthInt = 9 Then - If SystemDateDayInt > 15 Then - - Var GameEnableFromTrickerEv = 1 - - If SystemDateDayInt < 30 Then - Var TamatianEnable = 1 - EndIf - If SystemDateDayInt = 30 Then - Var TamatianEnable = 1 - EndIf - EndIf - - - -EndIf - If SystemDateMonthInt = 10 Then - If SystemDateDayInt < 16 Then - Var GameEnableFromTrickerEv = 1 - EndIf - - If SystemDateDayInt > 15 Then Var PepweenEnable = 1 EndIf @@ -96,50 +67,32 @@ If SystemDateMonthInt = 11 Then EndIf -If MelonSyrupEnable = "false" Then - Var MayDayRunEnable = 0 -EndIf - - - -If BoxID = 173149 Then - Var MomDayEnable = 0 -EndIf - - - -If BoxID = 200001 Then -EndIf If BoxID = 173149 Then Var PepweenEnable = 1 - Var GameEnableFromTrickerEv = 1 + Var MilkChoiceVeganEnable = 1 EndIf -If BoxID = 172053 Then - Var GameEnableFromTrickerEv = 1 -EndIf - -If BoxID = 172644 Then - Var GameEnableFromTrickerEv = 1 -EndIf - - If BoxID = 176757 Then Var PepweenEnable = 1 - Var GameEnableFromTrickerEv = 1 + Var MilkChoiceVeganEnable = 1 EndIf -If BoxID = 176277 Then - Var GameEnableFromTrickerEv = 1 + + +If BoxID = 172053 Then + Var PepweenEnable = 1 EndIf -If BoxID = 174565 Then - Var GameEnableFromTrickerEv = 1 +If BoxID = 172644 Then + Var PepweenEnable = 1 + Var MilkChoiceVeganEnable = 1 EndIf +Var GameEnableFromTrickerEv = 1 + Var MayDayRunEnable = 0 If BoxID = 33170 Then @@ -152,19 +105,7 @@ EndIf Var adver_brewing_video_full_file_name = "" -DEBUGVAR TamatianEnable -If TamatianEnable = 1 Then - If BrewingAdvPlayfileSize = "" Then - GetFileSizeK "taobin_project/video/event_2.mp4" BrewingAdvPlayfileSize - EndIf - - DEBUGVAR BrewingAdvPlayfileSize - - If BrewingAdvPlayfileSize = 23054056 Then - Var adver_brewing_video_full_file_name = "ROOT/taobin_project/video/event_2.mp4" - EndIf - DEBUGVAR adver_brewing_video_full_file_name -EndIf + If InternationalEnable = 1 Then diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 260a9b14..4f7cff95 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.73" - Var XMLPageVersionInt = 773 + Var XMLPageVersion = "7.74" + Var XMLPageVersionInt = 774 ;Oreo Var OreoGuarantee = 0