diff --git a/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png index 7e35e1d8..19797d4b 100644 Binary files a/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png and b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png index 6d5418ab..2fd6e038 100644 Binary files a/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png and b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_blacktea.png b/image/page_drink_disable_n2/bn_hot_blacktea.png index 2bbf7d5c..524d4243 100644 Binary files a/image/page_drink_disable_n2/bn_hot_blacktea.png and b/image/page_drink_disable_n2/bn_hot_blacktea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png index d3a4c8e1..8a1d3d9e 100644 Binary files a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png index 18783231..7189add7 100644 Binary files a/image/page_drink_disable_n2/bn_hot_latte_Healthy.png and b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png index df142368..a1f562a4 100644 Binary files a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png index 194e46ed..23afe160 100644 Binary files a/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png index cba73338..697988df 100644 Binary files a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png index 8e77f7ed..865ea871 100644 Binary files a/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png index 4dca57c2..3d1fba27 100644 Binary files a/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png and b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png index e1adb504..2a2365d9 100644 Binary files a/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png index a97bbdc2..e2c7ce38 100644 Binary files a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png index a4da1faa..bb82f09e 100644 Binary files a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png index b410c647..08c11d66 100644 Binary files a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png and b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png index 1a38bcfb..630a5c4e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_Healthy.png b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png index 444c2525..3eb78327 100644 Binary files a/image/page_drink_disable_n2/bn_iced_milk_Healthy.png and b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_limande_Healthy.png b/image/page_drink_disable_n2/bn_limande_Healthy.png index f6f9397e..59a87ca9 100644 Binary files a/image/page_drink_disable_n2/bn_limande_Healthy.png and b/image/page_drink_disable_n2/bn_limande_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_Cappu_Healthy.png b/image/page_drink_n/bn_hot_Cappu_Healthy.png index 5fdbd840..2c5aace5 100644 Binary files a/image/page_drink_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_america_no_Healthy.png b/image/page_drink_n/bn_hot_america_no_Healthy.png index bb741299..3c11f6cb 100644 Binary files a/image/page_drink_n/bn_hot_america_no_Healthy.png and b/image/page_drink_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_blacktea.png b/image/page_drink_n/bn_hot_blacktea.png index 7c7cfa68..6e66e347 100644 Binary files a/image/page_drink_n/bn_hot_blacktea.png and b/image/page_drink_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index 63f62ac0..f525d9f0 100644 Binary files a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_latte_Healthy.png b/image/page_drink_n/bn_hot_latte_Healthy.png index 87d8ec11..9d7b5f6b 100644 Binary files a/image/page_drink_n/bn_hot_latte_Healthy.png and b/image/page_drink_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png index 47358c26..cdc1c9fc 100644 Binary files a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png index 5f2612a7..20b605ca 100644 Binary files a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png index 862b48fc..d6b81782 100644 Binary files a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png index bf349dca..6023289d 100644 Binary files a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_mocha_Healthy.png b/image/page_drink_n/bn_hot_mocha_Healthy.png index b48b524a..36328525 100644 Binary files a/image/page_drink_n/bn_hot_mocha_Healthy.png and b/image/page_drink_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png index f9819e0f..6d5038cd 100644 Binary files a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 361a11dd..8797d3a3 100644 Binary files a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png index 0b273b45..09d0d9e5 100644 Binary files a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_cocoa_Healthy.png b/image/page_drink_n/bn_iced_cocoa_Healthy.png index 750cf983..bb6860ee 100644 Binary files a/image/page_drink_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png index 724c09da..88e3af53 100644 Binary files a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_milk_Healthy.png b/image/page_drink_n/bn_iced_milk_Healthy.png index d7f1149e..c14ccbdf 100644 Binary files a/image/page_drink_n/bn_iced_milk_Healthy.png and b/image/page_drink_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_n/bn_limande_Healthy.png b/image/page_drink_n/bn_limande_Healthy.png index 91f64d3b..923ad59f 100644 Binary files a/image/page_drink_n/bn_limande_Healthy.png and b/image/page_drink_n/bn_limande_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png index 1f4862fb..44c406c0 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png index ea907582..b332f1de 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png and b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png index e4c1ac77..d7d06947 100644 Binary files a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png and b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_blacktea.png b/image/page_drink_picture2_n/bn_hot_blacktea.png index 915b9b55..c854c69b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_blacktea.png and b/image/page_drink_picture2_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index 18ba4418..410dc84b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png index 3b830500..10571d48 100644 Binary files a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png and b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png index e8feba75..298c7cd8 100644 Binary files a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png index d50e8c5d..1e66cb38 100644 Binary files a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png index 4553454f..b461140f 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png index b3d83fd4..b821ee93 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png index c790109d..06e30146 100644 Binary files a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index deb3bbd0..757703b4 100644 Binary files a/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png index d26f97c1..f1cae048 100644 Binary files a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png index 3f662bf3..6ea527c2 100644 Binary files a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png index 2f718ab5..9b0dcdbd 100644 Binary files a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png index 6cbb4b27..f9d6d80b 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png index 0085edeb..57faa232 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_Cappu_Healthy.png b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png index bdba71a9..0ba97263 100644 Binary files a/image/page_drink_press_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_america_no_Healthy.png b/image/page_drink_press_n/bn_hot_america_no_Healthy.png index b14a2bbd..167a2691 100644 Binary files a/image/page_drink_press_n/bn_hot_america_no_Healthy.png and b/image/page_drink_press_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_blacktea.png b/image/page_drink_press_n/bn_hot_blacktea.png index e6a1dbcd..a33bafc2 100644 Binary files a/image/page_drink_press_n/bn_hot_blacktea.png and b/image/page_drink_press_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index a23cba1f..905f638b 100644 Binary files a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_latte_Healthy.png b/image/page_drink_press_n/bn_hot_latte_Healthy.png index 4ddd898c..e8816612 100644 Binary files a/image/page_drink_press_n/bn_hot_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png index 93fbc54e..75e74d0e 100644 Binary files a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png index 398cf05e..25e3543f 100644 Binary files a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png index 8cb65059..e8d78ccd 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png index 2e54c867..28767328 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_mocha_Healthy.png b/image/page_drink_press_n/bn_hot_mocha_Healthy.png index a62b1b9c..9619152e 100644 Binary files a/image/page_drink_press_n/bn_hot_mocha_Healthy.png and b/image/page_drink_press_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png index 165a55dd..d1c0be65 100644 Binary files a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 08589488..0e52ed4f 100644 Binary files a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png index d95fd4f7..b6544249 100644 Binary files a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png index 6c3a3e59..87e398f5 100644 Binary files a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png index aafdd356..07fa87c3 100644 Binary files a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_Healthy.png b/image/page_drink_press_n/bn_iced_milk_Healthy.png index c8eeacbf..0370fc8b 100644 Binary files a/image/page_drink_press_n/bn_iced_milk_Healthy.png and b/image/page_drink_press_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_press_n/bn_limande_Healthy.png b/image/page_drink_press_n/bn_limande_Healthy.png index da63a608..9af27553 100644 Binary files a/image/page_drink_press_n/bn_limande_Healthy.png and b/image/page_drink_press_n/bn_limande_Healthy.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 4fc4b945..5f176473 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -975,7 +975,7 @@ Var NextPage = "-" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" TopView "show" diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index 925da627..db0a3261 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -14,6 +14,8 @@ WEB "DISABLE" DEBUGVAR Seeker + Var BGSugarNew = "Enable" + DEBUGVAR video_menu_0 DEBUGVAR SelectDrink @@ -1731,7 +1733,7 @@ 988 156 20 - "Enable" + BGSugarNew ; sugar layout "Enable" @@ -1746,9 +1748,9 @@ 120 79 SugarState1 - Var( DirImage + "/bn_sugar1.png" ) - Var( DirImage + "/bp_sugar1.png" ) - Var( DirImage + "/bu_sugar1.png" ) + Var( DirImage + "/bn_sugarlevel1.png" ) + Var( DirImage + "/bp_sugarlevel1.png" ) + Var( DirImage + "/bu_sugarlevel1.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1781,12 +1783,12 @@ ; sugar2 + +; sugar6 +