diff --git a/image/page_drink_disable_n2/bn__hot_americano_light_opus_one.png b/image/page_drink_disable_n2/bn__hot_americano_light_opus_one.png new file mode 100644 index 00000000..687c18d1 Binary files /dev/null and b/image/page_drink_disable_n2/bn__hot_americano_light_opus_one.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_geisha.png b/image/page_drink_disable_n2/bn_dirty_light_geisha.png index b513aa5e..4092815f 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_geisha.png and b/image/page_drink_disable_n2/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_opus_one.png b/image/page_drink_disable_n2/bn_dirty_light_opus_one.png index e8b6da2e..1fbc1b5b 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_opus_one.png and b/image/page_drink_disable_n2/bn_dirty_light_opus_one.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png index af8dea20..a9e0bb16 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png and b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png index 8a959fb8..9e9616ac 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png b/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png index db946c23..5092d905 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png differ diff --git a/image/page_drink_n/bn__hot_americano_light_opus_one.png b/image/page_drink_n/bn__hot_americano_light_opus_one.png new file mode 100644 index 00000000..4947e2c7 Binary files /dev/null and b/image/page_drink_n/bn__hot_americano_light_opus_one.png differ diff --git a/image/page_drink_n/bn_dirty_light_geisha.png b/image/page_drink_n/bn_dirty_light_geisha.png index b449ac0f..6a99c5bd 100644 Binary files a/image/page_drink_n/bn_dirty_light_geisha.png and b/image/page_drink_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_n/bn_dirty_light_opus_one.png b/image/page_drink_n/bn_dirty_light_opus_one.png index 36153b0f..cd099940 100644 Binary files a/image/page_drink_n/bn_dirty_light_opus_one.png and b/image/page_drink_n/bn_dirty_light_opus_one.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_geisha.png b/image/page_drink_n/bn_hot_americano_light_geisha.png index 16e5c768..99c88cd0 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_geisha.png and b/image/page_drink_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_geisha.png b/image/page_drink_n/bn_hot_espresso_light_geisha.png index a40a0b1f..b997ae87 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_opus_one.png b/image/page_drink_n/bn_hot_espresso_light_opus_one.png index 5f464c4f..49ba3910 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_opus_one.png and b/image/page_drink_n/bn_hot_espresso_light_opus_one.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_geisha.png b/image/page_drink_picture2_n/bn_dirty_light_geisha.png index 25a72152..e7e7d2e6 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_geisha.png and b/image/page_drink_picture2_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_opus_one.png b/image/page_drink_picture2_n/bn_dirty_light_opus_one.png index c1cf87fa..4bd46fa0 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_opus_one.png and b/image/page_drink_picture2_n/bn_dirty_light_opus_one.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png index 63cd56dd..a2dc0b62 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png and b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png b/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png index 838cab1b..b13b284d 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png and b/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png index 4a01d8d7..df648a3d 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png b/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png index e6af527a..f994df41 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png differ diff --git a/image/page_drink_press_n/bn__hot_americano_light_opus_one.png b/image/page_drink_press_n/bn__hot_americano_light_opus_one.png new file mode 100644 index 00000000..60588a21 Binary files /dev/null and b/image/page_drink_press_n/bn__hot_americano_light_opus_one.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_geisha.png b/image/page_drink_press_n/bn_dirty_light_geisha.png index 705e709d..7256a432 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_geisha.png and b/image/page_drink_press_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_opus_one.png b/image/page_drink_press_n/bn_dirty_light_opus_one.png index c6488e71..0ff03299 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_opus_one.png and b/image/page_drink_press_n/bn_dirty_light_opus_one.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_geisha.png b/image/page_drink_press_n/bn_hot_americano_light_geisha.png index 079e9a1a..b510aab8 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_geisha.png and b/image/page_drink_press_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png index d6621729..7562ff0e 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png b/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png index 0c150536..318fe8be 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png and b/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png differ diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index 877c5118..d194d49a 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -78,13 +78,9 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr -Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" -Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" -Var InstanceTabOpenFile14 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" -Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" TabMenuVisibleInst 99 diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index 4f29f9d3..ea36e556 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -66,14 +66,17 @@ If CupOnArm = "true" Then If RecommendTimeOut > 9 Then SAVELOG "COA9" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate EndIf Else If RecommendTimeOut > 30 Then SAVELOG "COA30" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate + EndIf EndIf EndIf diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml index 85537449..6c45cdfe 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml @@ -66,14 +66,17 @@ If CupOnArm = "true" Then If RecommendTimeOut > 9 Then SAVELOG "COA9" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate EndIf Else If RecommendTimeOut > 30 Then SAVELOG "COA30" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate + EndIf EndIf EndIf diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt index 02259926..caa896c2 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt @@ -68,14 +68,17 @@ If CupOnArm = "true" Then If RecommendTimeOut > 9 Then SAVELOG "COA9" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate EndIf Else If RecommendTimeOut > 30 Then SAVELOG "COA30" + Var NextPageAlternate = NextPage Var NextPage = "-" - Open NextPage + Open NextPageAlternate + EndIf EndIf EndIf