diff --git a/image/page_drink/bn_Lychee_lime_soda.png b/image/page_drink/bn_Lychee_lime_soda.png new file mode 100644 index 00000000..17b33c26 Binary files /dev/null and b/image/page_drink/bn_Lychee_lime_soda.png differ diff --git a/image/page_drink/bn_blueberry_tea.png b/image/page_drink/bn_blueberry_tea.png index ba35aa1a..d6c26e92 100644 Binary files a/image/page_drink/bn_blueberry_tea.png and b/image/page_drink/bn_blueberry_tea.png differ diff --git a/image/page_drink/bn_chrysanthemum_tea.png b/image/page_drink/bn_chrysanthemum_tea.png index f3f23e0d..56e95d52 100644 Binary files a/image/page_drink/bn_chrysanthemum_tea.png and b/image/page_drink/bn_chrysanthemum_tea.png differ diff --git a/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png index f6d073e8..961a2fdc 100644 Binary files a/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png and b/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink/bn_hot_blueberry_tea.png b/image/page_drink/bn_hot_blueberry_tea.png index 601240b4..7885e25f 100644 Binary files a/image/page_drink/bn_hot_blueberry_tea.png and b/image/page_drink/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink/bn_hot_lemonate.png b/image/page_drink/bn_hot_lemonate.png index de002548..99b20a8c 100644 Binary files a/image/page_drink/bn_hot_lemonate.png and b/image/page_drink/bn_hot_lemonate.png differ diff --git a/image/page_drink/bn_hot_lime_tea.png b/image/page_drink/bn_hot_lime_tea.png index 17c707db..59b0fde3 100644 Binary files a/image/page_drink/bn_hot_lime_tea.png and b/image/page_drink/bn_hot_lime_tea.png differ diff --git a/image/page_drink/bn_hot_lychee_tea.png b/image/page_drink/bn_hot_lychee_tea.png index c85b096e..c98c7dfc 100644 Binary files a/image/page_drink/bn_hot_lychee_tea.png and b/image/page_drink/bn_hot_lychee_tea.png differ diff --git a/image/page_drink/bn_hot_strawberry_tea.png b/image/page_drink/bn_hot_strawberry_tea.png index 5b804515..7ae53fa9 100644 Binary files a/image/page_drink/bn_hot_strawberry_tea.png and b/image/page_drink/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink/bn_hot_thai_tea.png b/image/page_drink/bn_hot_thai_tea.png index c7a9285e..cb88f88b 100644 Binary files a/image/page_drink/bn_hot_thai_tea.png and b/image/page_drink/bn_hot_thai_tea.png differ diff --git a/image/page_drink/bn_iced_7up.png b/image/page_drink/bn_iced_7up.png index 580ee5ee..e7ffce0d 100644 Binary files a/image/page_drink/bn_iced_7up.png and b/image/page_drink/bn_iced_7up.png differ diff --git a/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png b/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png index cf061445..e62fec3c 100644 Binary files a/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png and b/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink/bn_iced_Cokecola.png b/image/page_drink/bn_iced_Cokecola.png index bb50ca3a..ba1f6cc5 100644 Binary files a/image/page_drink/bn_iced_Cokecola.png and b/image/page_drink/bn_iced_Cokecola.png differ diff --git a/image/page_drink/bn_iced_Lychee.png b/image/page_drink/bn_iced_Lychee.png index 9f13d896..cef51969 100644 Binary files a/image/page_drink/bn_iced_Lychee.png and b/image/page_drink/bn_iced_Lychee.png differ diff --git a/image/page_drink/bn_iced_Lychee_soda.png b/image/page_drink/bn_iced_Lychee_soda.png index ac2210a6..ebb41339 100644 Binary files a/image/page_drink/bn_iced_Lychee_soda.png and b/image/page_drink/bn_iced_Lychee_soda.png differ diff --git a/image/page_drink/bn_iced_black_tea.png b/image/page_drink/bn_iced_black_tea.png index b9fe89b0..ac6d6b71 100644 Binary files a/image/page_drink/bn_iced_black_tea.png and b/image/page_drink/bn_iced_black_tea.png differ diff --git a/image/page_drink/bn_iced_blueberry.png b/image/page_drink/bn_iced_blueberry.png index 2976d8a3..d5268025 100644 Binary files a/image/page_drink/bn_iced_blueberry.png and b/image/page_drink/bn_iced_blueberry.png differ diff --git a/image/page_drink/bn_iced_blueberry_soda.png b/image/page_drink/bn_iced_blueberry_soda.png index b1228ffb..15e42b8a 100644 Binary files a/image/page_drink/bn_iced_blueberry_soda.png and b/image/page_drink/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink/bn_iced_cola.png b/image/page_drink/bn_iced_cola.png index b5830594..a6acbd25 100644 Binary files a/image/page_drink/bn_iced_cola.png and b/image/page_drink/bn_iced_cola.png differ diff --git a/image/page_drink/bn_iced_lemonade.png b/image/page_drink/bn_iced_lemonade.png index 1d13969b..0bd78ef4 100644 Binary files a/image/page_drink/bn_iced_lemonade.png and b/image/page_drink/bn_iced_lemonade.png differ diff --git a/image/page_drink/bn_iced_lemonade_soda.png b/image/page_drink/bn_iced_lemonade_soda.png index 0ec602bd..a2242a7f 100644 Binary files a/image/page_drink/bn_iced_lemonade_soda.png and b/image/page_drink/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink/bn_iced_matcha_milk_tea.png b/image/page_drink/bn_iced_matcha_milk_tea.png index a2d5560d..962e4ef2 100644 Binary files a/image/page_drink/bn_iced_matcha_milk_tea.png and b/image/page_drink/bn_iced_matcha_milk_tea.png differ diff --git a/image/page_drink/bn_iced_soda.png b/image/page_drink/bn_iced_soda.png index b0a8201a..9d1352ef 100644 Binary files a/image/page_drink/bn_iced_soda.png and b/image/page_drink/bn_iced_soda.png differ diff --git a/image/page_drink/bn_iced_sprite.png b/image/page_drink/bn_iced_sprite.png index 723aacc4..4730096b 100644 Binary files a/image/page_drink/bn_iced_sprite.png and b/image/page_drink/bn_iced_sprite.png differ diff --git a/image/page_drink/bn_iced_strawberry.png b/image/page_drink/bn_iced_strawberry.png index 0206d139..434c0332 100644 Binary files a/image/page_drink/bn_iced_strawberry.png and b/image/page_drink/bn_iced_strawberry.png differ diff --git a/image/page_drink/bn_iced_strawberry_soda.png b/image/page_drink/bn_iced_strawberry_soda.png index cd483607..fb150014 100644 Binary files a/image/page_drink/bn_iced_strawberry_soda.png and b/image/page_drink/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink/bn_iced_taiwan_milk_tea.png b/image/page_drink/bn_iced_taiwan_milk_tea.png index d7af09f6..32be78a9 100644 Binary files a/image/page_drink/bn_iced_taiwan_milk_tea.png and b/image/page_drink/bn_iced_taiwan_milk_tea.png differ diff --git a/image/page_drink/bn_iced_thai_milk_tea.png b/image/page_drink/bn_iced_thai_milk_tea.png index 1344f559..77e46a1a 100644 Binary files a/image/page_drink/bn_iced_thai_milk_tea.png and b/image/page_drink/bn_iced_thai_milk_tea.png differ diff --git a/image/page_drink/bn_lime_tea.png b/image/page_drink/bn_lime_tea.png index 42cf31a2..98733300 100644 Binary files a/image/page_drink/bn_lime_tea.png and b/image/page_drink/bn_lime_tea.png differ diff --git a/image/page_drink/bn_lychee_tea.png b/image/page_drink/bn_lychee_tea.png index a40cbb23..214fdae4 100644 Binary files a/image/page_drink/bn_lychee_tea.png and b/image/page_drink/bn_lychee_tea.png differ diff --git a/image/page_drink/bn_protein_Blueberry.png b/image/page_drink/bn_protein_Blueberry.png index 33745b22..b6b3ae35 100644 Binary files a/image/page_drink/bn_protein_Blueberry.png and b/image/page_drink/bn_protein_Blueberry.png differ diff --git a/image/page_drink/bn_sala.png b/image/page_drink/bn_sala.png index a0374c88..764f5af3 100644 Binary files a/image/page_drink/bn_sala.png and b/image/page_drink/bn_sala.png differ diff --git a/image/page_drink/bn_sala_lime.png b/image/page_drink/bn_sala_lime.png index 4fa18cee..4c2f4596 100644 Binary files a/image/page_drink/bn_sala_lime.png and b/image/page_drink/bn_sala_lime.png differ diff --git a/image/page_drink/bn_sala_lime_soda.png b/image/page_drink/bn_sala_lime_soda.png index 5015079a..b838aa35 100644 Binary files a/image/page_drink/bn_sala_lime_soda.png and b/image/page_drink/bn_sala_lime_soda.png differ diff --git a/image/page_drink/bn_sala_soda.png b/image/page_drink/bn_sala_soda.png index 04f816f3..1d47697e 100644 Binary files a/image/page_drink/bn_sala_soda.png and b/image/page_drink/bn_sala_soda.png differ diff --git a/image/page_drink/bn_soda.png b/image/page_drink/bn_soda.png index 5d802945..f0e90d5c 100644 Binary files a/image/page_drink/bn_soda.png and b/image/page_drink/bn_soda.png differ diff --git a/image/page_drink/bn_strawberry_lime_soda.png b/image/page_drink/bn_strawberry_lime_soda.png new file mode 100644 index 00000000..21b1bffb Binary files /dev/null and b/image/page_drink/bn_strawberry_lime_soda.png differ diff --git a/image/page_drink/bn_strawberry_thai_tea.png b/image/page_drink/bn_strawberry_thai_tea.png index 31bb76a0..cfec1ed1 100644 Binary files a/image/page_drink/bn_strawberry_thai_tea.png and b/image/page_drink/bn_strawberry_thai_tea.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png b/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png index e19da3bd..a300d6bc 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png and b/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Forever_Love.png b/image/page_drink_disable/bn_Alcohol_Forever_Love.png index 89ed6ba9..f7c9f635 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Forever_Love.png and b/image/page_drink_disable/bn_Alcohol_Forever_Love.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Gale_Jail.png b/image/page_drink_disable/bn_Alcohol_Gale_Jail.png index d9e8f287..d08743bc 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Gale_Jail.png and b/image/page_drink_disable/bn_Alcohol_Gale_Jail.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png b/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png index 6b661b08..59fe9826 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png and b/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png differ diff --git a/image/page_drink_disable/bn_Alcohol_ILYSB.png b/image/page_drink_disable/bn_Alcohol_ILYSB.png index 450a60f2..e1b70596 100644 Binary files a/image/page_drink_disable/bn_Alcohol_ILYSB.png and b/image/page_drink_disable/bn_Alcohol_ILYSB.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Love_Potion.png b/image/page_drink_disable/bn_Alcohol_Love_Potion.png index 889ebbe2..a3978c07 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Love_Potion.png and b/image/page_drink_disable/bn_Alcohol_Love_Potion.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png b/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png index cac99e84..9c61f8f8 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png and b/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png differ diff --git a/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png b/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png index a5cd1515..b2112524 100644 Binary files a/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png and b/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png differ diff --git a/image/page_drink_disable/bn_Lychee_lime_soda.png b/image/page_drink_disable/bn_Lychee_lime_soda.png new file mode 100644 index 00000000..622aab75 Binary files /dev/null and b/image/page_drink_disable/bn_Lychee_lime_soda.png differ diff --git a/image/page_drink_disable/bn_blueberry_tea.png b/image/page_drink_disable/bn_blueberry_tea.png index 95af3d41..ac11f39e 100644 Binary files a/image/page_drink_disable/bn_blueberry_tea.png and b/image/page_drink_disable/bn_blueberry_tea.png differ diff --git a/image/page_drink_disable/bn_chrysanthemum_tea.png b/image/page_drink_disable/bn_chrysanthemum_tea.png index 4996bcf7..e36a979c 100644 Binary files a/image/page_drink_disable/bn_chrysanthemum_tea.png and b/image/page_drink_disable/bn_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png index 4835c301..2c8ddeeb 100644 Binary files a/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png and b/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_disable/bn_hot_blueberry_tea.png b/image/page_drink_disable/bn_hot_blueberry_tea.png index 6dfd182d..3c5da2be 100644 Binary files a/image/page_drink_disable/bn_hot_blueberry_tea.png and b/image/page_drink_disable/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_disable/bn_hot_chrysanthemum_tea.png b/image/page_drink_disable/bn_hot_chrysanthemum_tea.png index 71b4a387..ba2fe27d 100644 Binary files a/image/page_drink_disable/bn_hot_chrysanthemum_tea.png and b/image/page_drink_disable/bn_hot_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable/bn_hot_lemonate.png b/image/page_drink_disable/bn_hot_lemonate.png index e2b00699..70dc34c1 100644 Binary files a/image/page_drink_disable/bn_hot_lemonate.png and b/image/page_drink_disable/bn_hot_lemonate.png differ diff --git a/image/page_drink_disable/bn_hot_lime_tea.png b/image/page_drink_disable/bn_hot_lime_tea.png index bd34be0b..4efbd7d0 100644 Binary files a/image/page_drink_disable/bn_hot_lime_tea.png and b/image/page_drink_disable/bn_hot_lime_tea.png differ diff --git a/image/page_drink_disable/bn_hot_lychee_tea.png b/image/page_drink_disable/bn_hot_lychee_tea.png index b3a79f6e..20c5cb84 100644 Binary files a/image/page_drink_disable/bn_hot_lychee_tea.png and b/image/page_drink_disable/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_disable/bn_hot_matcha_milk_tea.png b/image/page_drink_disable/bn_hot_matcha_milk_tea.png index a055d688..007108f0 100644 Binary files a/image/page_drink_disable/bn_hot_matcha_milk_tea.png and b/image/page_drink_disable/bn_hot_matcha_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_strawberry_tea.png b/image/page_drink_disable/bn_hot_strawberry_tea.png index aa16e00f..44b4e4b6 100644 Binary files a/image/page_drink_disable/bn_hot_strawberry_tea.png and b/image/page_drink_disable/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_disable/bn_hot_taiwan_milk_tea.png b/image/page_drink_disable/bn_hot_taiwan_milk_tea.png index ec2e6893..90ca823a 100644 Binary files a/image/page_drink_disable/bn_hot_taiwan_milk_tea.png and b/image/page_drink_disable/bn_hot_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_thai_milk_tea.png b/image/page_drink_disable/bn_hot_thai_milk_tea.png index dad5aa9e..c6dcdfdc 100644 Binary files a/image/page_drink_disable/bn_hot_thai_milk_tea.png and b/image/page_drink_disable/bn_hot_thai_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_thai_tea.png b/image/page_drink_disable/bn_hot_thai_tea.png index 351d4ab2..19e95296 100644 Binary files a/image/page_drink_disable/bn_hot_thai_tea.png and b/image/page_drink_disable/bn_hot_thai_tea.png differ diff --git a/image/page_drink_disable/bn_hot_water.png b/image/page_drink_disable/bn_hot_water.png index 398cf17c..ddd658bd 100644 Binary files a/image/page_drink_disable/bn_hot_water.png and b/image/page_drink_disable/bn_hot_water.png differ diff --git a/image/page_drink_disable/bn_iced.png b/image/page_drink_disable/bn_iced.png index adc0b3cc..e1e64da7 100644 Binary files a/image/page_drink_disable/bn_iced.png and b/image/page_drink_disable/bn_iced.png differ diff --git a/image/page_drink_disable/bn_iced_7up.png b/image/page_drink_disable/bn_iced_7up.png index 405066a0..f5e1bfff 100644 Binary files a/image/page_drink_disable/bn_iced_7up.png and b/image/page_drink_disable/bn_iced_7up.png differ diff --git a/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png b/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png index 0d93aac1..af0fa53f 100644 Binary files a/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png and b/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_disable/bn_iced_Cokecola.png b/image/page_drink_disable/bn_iced_Cokecola.png index 8d7fa7b0..68555674 100644 Binary files a/image/page_drink_disable/bn_iced_Cokecola.png and b/image/page_drink_disable/bn_iced_Cokecola.png differ diff --git a/image/page_drink_disable/bn_iced_black_tea.png b/image/page_drink_disable/bn_iced_black_tea.png index 5fbc3053..c4615f16 100644 Binary files a/image/page_drink_disable/bn_iced_black_tea.png and b/image/page_drink_disable/bn_iced_black_tea.png differ diff --git a/image/page_drink_disable/bn_iced_blueberry.png b/image/page_drink_disable/bn_iced_blueberry.png index 8ecf982f..789011b9 100644 Binary files a/image/page_drink_disable/bn_iced_blueberry.png and b/image/page_drink_disable/bn_iced_blueberry.png differ diff --git a/image/page_drink_disable/bn_iced_blueberry_soda.png b/image/page_drink_disable/bn_iced_blueberry_soda.png index 0a983854..2349ea8c 100644 Binary files a/image/page_drink_disable/bn_iced_blueberry_soda.png and b/image/page_drink_disable/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink_disable/bn_iced_cola.png b/image/page_drink_disable/bn_iced_cola.png index 236242ab..6e62f490 100644 Binary files a/image/page_drink_disable/bn_iced_cola.png and b/image/page_drink_disable/bn_iced_cola.png differ diff --git a/image/page_drink_disable/bn_iced_lemonade.png b/image/page_drink_disable/bn_iced_lemonade.png index 17188872..61965eb6 100644 Binary files a/image/page_drink_disable/bn_iced_lemonade.png and b/image/page_drink_disable/bn_iced_lemonade.png differ diff --git a/image/page_drink_disable/bn_iced_lemonade_soda.png b/image/page_drink_disable/bn_iced_lemonade_soda.png index b81d63e7..8a0fba8a 100644 Binary files a/image/page_drink_disable/bn_iced_lemonade_soda.png and b/image/page_drink_disable/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink_disable/bn_iced_matcha_milk_tea.png b/image/page_drink_disable/bn_iced_matcha_milk_tea.png index 72ae0a2a..06bfeeaa 100644 Binary files a/image/page_drink_disable/bn_iced_matcha_milk_tea.png and b/image/page_drink_disable/bn_iced_matcha_milk_tea.png differ diff --git a/image/page_drink_disable/bn_iced_soda.png b/image/page_drink_disable/bn_iced_soda.png index 86395492..c2380b67 100644 Binary files a/image/page_drink_disable/bn_iced_soda.png and b/image/page_drink_disable/bn_iced_soda.png differ diff --git a/image/page_drink_disable/bn_iced_sprite.png b/image/page_drink_disable/bn_iced_sprite.png index e42d9d45..6b2de505 100644 Binary files a/image/page_drink_disable/bn_iced_sprite.png and b/image/page_drink_disable/bn_iced_sprite.png differ diff --git a/image/page_drink_disable/bn_iced_strawberry_soda.png b/image/page_drink_disable/bn_iced_strawberry_soda.png index 91632faf..cd1c35b1 100644 Binary files a/image/page_drink_disable/bn_iced_strawberry_soda.png and b/image/page_drink_disable/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink_disable/bn_iced_taiwan_milk_tea.png b/image/page_drink_disable/bn_iced_taiwan_milk_tea.png index 0f379aa9..13ccf1a3 100644 Binary files a/image/page_drink_disable/bn_iced_taiwan_milk_tea.png and b/image/page_drink_disable/bn_iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable/bn_iced_thai_milk_tea.png b/image/page_drink_disable/bn_iced_thai_milk_tea.png index dc2ac8a4..7f2c4496 100644 Binary files a/image/page_drink_disable/bn_iced_thai_milk_tea.png and b/image/page_drink_disable/bn_iced_thai_milk_tea.png differ diff --git a/image/page_drink_disable/bn_lime_tea.png b/image/page_drink_disable/bn_lime_tea.png index c91b00e6..b0b49682 100644 Binary files a/image/page_drink_disable/bn_lime_tea.png and b/image/page_drink_disable/bn_lime_tea.png differ diff --git a/image/page_drink_disable/bn_lychee_tea.png b/image/page_drink_disable/bn_lychee_tea.png index 74e94388..51b33d82 100644 Binary files a/image/page_drink_disable/bn_lychee_tea.png and b/image/page_drink_disable/bn_lychee_tea.png differ diff --git a/image/page_drink_disable/bn_protein_Blueberry.png b/image/page_drink_disable/bn_protein_Blueberry.png index 49eb43eb..139681f4 100644 Binary files a/image/page_drink_disable/bn_protein_Blueberry.png and b/image/page_drink_disable/bn_protein_Blueberry.png differ diff --git a/image/page_drink_disable/bn_protein_Chocolate.png b/image/page_drink_disable/bn_protein_Chocolate.png index b18d631f..81c250c2 100644 Binary files a/image/page_drink_disable/bn_protein_Chocolate.png and b/image/page_drink_disable/bn_protein_Chocolate.png differ diff --git a/image/page_drink_disable/bn_protein_Matcha.png b/image/page_drink_disable/bn_protein_Matcha.png index 35b27b5f..c1cb8b0a 100644 Binary files a/image/page_drink_disable/bn_protein_Matcha.png and b/image/page_drink_disable/bn_protein_Matcha.png differ diff --git a/image/page_drink_disable/bn_protein_Strawberry.png b/image/page_drink_disable/bn_protein_Strawberry.png index 5a398e04..d1b871bb 100644 Binary files a/image/page_drink_disable/bn_protein_Strawberry.png and b/image/page_drink_disable/bn_protein_Strawberry.png differ diff --git a/image/page_drink_disable/bn_protein_Taiwantea.png b/image/page_drink_disable/bn_protein_Taiwantea.png index a0d2881b..af7f42af 100644 Binary files a/image/page_drink_disable/bn_protein_Taiwantea.png and b/image/page_drink_disable/bn_protein_Taiwantea.png differ diff --git a/image/page_drink_disable/bn_protein_Thaitea.png b/image/page_drink_disable/bn_protein_Thaitea.png index cceed7de..1c07f0e5 100644 Binary files a/image/page_drink_disable/bn_protein_Thaitea.png and b/image/page_drink_disable/bn_protein_Thaitea.png differ diff --git a/image/page_drink_disable/bn_protein_caramel.png b/image/page_drink_disable/bn_protein_caramel.png index ad969d73..29c5f00f 100644 Binary files a/image/page_drink_disable/bn_protein_caramel.png and b/image/page_drink_disable/bn_protein_caramel.png differ diff --git a/image/page_drink_disable/bn_protein_espresso.png b/image/page_drink_disable/bn_protein_espresso.png index 00abdaad..97e3d2cb 100644 Binary files a/image/page_drink_disable/bn_protein_espresso.png and b/image/page_drink_disable/bn_protein_espresso.png differ diff --git a/image/page_drink_disable/bn_protein_isolated.png b/image/page_drink_disable/bn_protein_isolated.png index 5cc23ef6..6e9d365f 100644 Binary files a/image/page_drink_disable/bn_protein_isolated.png and b/image/page_drink_disable/bn_protein_isolated.png differ diff --git a/image/page_drink_disable/bn_protein_kokuto.png b/image/page_drink_disable/bn_protein_kokuto.png index 79857d6c..35ea1615 100644 Binary files a/image/page_drink_disable/bn_protein_kokuto.png and b/image/page_drink_disable/bn_protein_kokuto.png differ diff --git a/image/page_drink_disable/bn_protein_milk.png b/image/page_drink_disable/bn_protein_milk.png index e168fabe..dd2b75c1 100644 Binary files a/image/page_drink_disable/bn_protein_milk.png and b/image/page_drink_disable/bn_protein_milk.png differ diff --git a/image/page_drink_disable/bn_sala_lime_soda.png b/image/page_drink_disable/bn_sala_lime_soda.png index 2f3fd48d..44d4f79f 100644 Binary files a/image/page_drink_disable/bn_sala_lime_soda.png and b/image/page_drink_disable/bn_sala_lime_soda.png differ diff --git a/image/page_drink_disable/bn_sala_soda.png b/image/page_drink_disable/bn_sala_soda.png index 0a960e65..dcdd1757 100644 Binary files a/image/page_drink_disable/bn_sala_soda.png and b/image/page_drink_disable/bn_sala_soda.png differ diff --git a/image/page_drink_disable/bn_soda.png b/image/page_drink_disable/bn_soda.png index 1554e48c..ce1155a8 100644 Binary files a/image/page_drink_disable/bn_soda.png and b/image/page_drink_disable/bn_soda.png differ diff --git a/image/page_drink_disable/bn_strawberry_lime_soda.png b/image/page_drink_disable/bn_strawberry_lime_soda.png new file mode 100644 index 00000000..5abb428a Binary files /dev/null and b/image/page_drink_disable/bn_strawberry_lime_soda.png differ diff --git a/image/page_drink_disable/bn_strawberry_thai_tea.png b/image/page_drink_disable/bn_strawberry_thai_tea.png index 6d8fbb52..73f4d991 100644 Binary files a/image/page_drink_disable/bn_strawberry_thai_tea.png and b/image/page_drink_disable/bn_strawberry_thai_tea.png differ diff --git a/image/page_drink_disable/bn_water_cool.png b/image/page_drink_disable/bn_water_cool.png index 1d1f3a39..54e775a6 100644 Binary files a/image/page_drink_disable/bn_water_cool.png and b/image/page_drink_disable/bn_water_cool.png differ diff --git a/image/page_drink_disable/bn_water_roomtemp.png b/image/page_drink_disable/bn_water_roomtemp.png index c634a71c..f3fc4829 100644 Binary files a/image/page_drink_disable/bn_water_roomtemp.png and b/image/page_drink_disable/bn_water_roomtemp.png differ diff --git a/image/page_drink_press/bn_Lychee_lime_soda.png b/image/page_drink_press/bn_Lychee_lime_soda.png new file mode 100644 index 00000000..0ae423e3 Binary files /dev/null and b/image/page_drink_press/bn_Lychee_lime_soda.png differ diff --git a/image/page_drink_press/bn_blueberry_tea.png b/image/page_drink_press/bn_blueberry_tea.png index 770ad717..87f53fed 100644 Binary files a/image/page_drink_press/bn_blueberry_tea.png and b/image/page_drink_press/bn_blueberry_tea.png differ diff --git a/image/page_drink_press/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_press/bn_hot_Black_Sugar_Milk_Tea.png index d618a687..85927120 100644 Binary files a/image/page_drink_press/bn_hot_Black_Sugar_Milk_Tea.png and b/image/page_drink_press/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_press/bn_hot_blueberry_tea.png b/image/page_drink_press/bn_hot_blueberry_tea.png index 9c3398ec..45eb61fa 100644 Binary files a/image/page_drink_press/bn_hot_blueberry_tea.png and b/image/page_drink_press/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_press/bn_hot_lemonate.png b/image/page_drink_press/bn_hot_lemonate.png index 3a268c72..05710a57 100644 Binary files a/image/page_drink_press/bn_hot_lemonate.png and b/image/page_drink_press/bn_hot_lemonate.png differ diff --git a/image/page_drink_press/bn_hot_lime_tea.png b/image/page_drink_press/bn_hot_lime_tea.png index b78c963d..79ff4d15 100644 Binary files a/image/page_drink_press/bn_hot_lime_tea.png and b/image/page_drink_press/bn_hot_lime_tea.png differ diff --git a/image/page_drink_press/bn_hot_lychee_tea.png b/image/page_drink_press/bn_hot_lychee_tea.png index 0d866b95..a03ba55e 100644 Binary files a/image/page_drink_press/bn_hot_lychee_tea.png and b/image/page_drink_press/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_press/bn_hot_strawberry_tea.png b/image/page_drink_press/bn_hot_strawberry_tea.png index 4c533a91..28a5b1fe 100644 Binary files a/image/page_drink_press/bn_hot_strawberry_tea.png and b/image/page_drink_press/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_press/bn_hot_thai_tea.png b/image/page_drink_press/bn_hot_thai_tea.png index 3b59dba9..3d9123af 100644 Binary files a/image/page_drink_press/bn_hot_thai_tea.png and b/image/page_drink_press/bn_hot_thai_tea.png differ diff --git a/image/page_drink_press/bn_iced_7up.png b/image/page_drink_press/bn_iced_7up.png index d9fbd4bc..c3df6163 100644 Binary files a/image/page_drink_press/bn_iced_7up.png and b/image/page_drink_press/bn_iced_7up.png differ diff --git a/image/page_drink_press/bn_iced_Black_Sugar_Milk_Tea.png b/image/page_drink_press/bn_iced_Black_Sugar_Milk_Tea.png index fd7ffd41..e04ecd5e 100644 Binary files a/image/page_drink_press/bn_iced_Black_Sugar_Milk_Tea.png and b/image/page_drink_press/bn_iced_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_press/bn_iced_Cokecola.png b/image/page_drink_press/bn_iced_Cokecola.png index 8ff411e3..97483908 100644 Binary files a/image/page_drink_press/bn_iced_Cokecola.png and b/image/page_drink_press/bn_iced_Cokecola.png differ diff --git a/image/page_drink_press/bn_iced_Lychee.png b/image/page_drink_press/bn_iced_Lychee.png index 0f2672d4..4d96dcb9 100644 Binary files a/image/page_drink_press/bn_iced_Lychee.png and b/image/page_drink_press/bn_iced_Lychee.png differ diff --git a/image/page_drink_press/bn_iced_Lychee_soda.png b/image/page_drink_press/bn_iced_Lychee_soda.png index ac8f6f8f..a7c85dbb 100644 Binary files a/image/page_drink_press/bn_iced_Lychee_soda.png and b/image/page_drink_press/bn_iced_Lychee_soda.png differ diff --git a/image/page_drink_press/bn_iced_black_tea.png b/image/page_drink_press/bn_iced_black_tea.png index 1bc524b9..4d3b3a02 100644 Binary files a/image/page_drink_press/bn_iced_black_tea.png and b/image/page_drink_press/bn_iced_black_tea.png differ diff --git a/image/page_drink_press/bn_iced_blueberry.png b/image/page_drink_press/bn_iced_blueberry.png index 070cc372..49bf0807 100644 Binary files a/image/page_drink_press/bn_iced_blueberry.png and b/image/page_drink_press/bn_iced_blueberry.png differ diff --git a/image/page_drink_press/bn_iced_blueberry_soda.png b/image/page_drink_press/bn_iced_blueberry_soda.png index c6d7923e..89259049 100644 Binary files a/image/page_drink_press/bn_iced_blueberry_soda.png and b/image/page_drink_press/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink_press/bn_iced_cola.png b/image/page_drink_press/bn_iced_cola.png index 60a6ee03..79819b9a 100644 Binary files a/image/page_drink_press/bn_iced_cola.png and b/image/page_drink_press/bn_iced_cola.png differ diff --git a/image/page_drink_press/bn_iced_lemonade.png b/image/page_drink_press/bn_iced_lemonade.png index 7fe9f4d2..157cebf8 100644 Binary files a/image/page_drink_press/bn_iced_lemonade.png and b/image/page_drink_press/bn_iced_lemonade.png differ diff --git a/image/page_drink_press/bn_iced_lemonade_soda.png b/image/page_drink_press/bn_iced_lemonade_soda.png index 4d26606b..9230389f 100644 Binary files a/image/page_drink_press/bn_iced_lemonade_soda.png and b/image/page_drink_press/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink_press/bn_iced_soda.png b/image/page_drink_press/bn_iced_soda.png index 8d0ea21a..099cfc44 100644 Binary files a/image/page_drink_press/bn_iced_soda.png and b/image/page_drink_press/bn_iced_soda.png differ diff --git a/image/page_drink_press/bn_iced_sprite.png b/image/page_drink_press/bn_iced_sprite.png index 663b9863..23405304 100644 Binary files a/image/page_drink_press/bn_iced_sprite.png and b/image/page_drink_press/bn_iced_sprite.png differ diff --git a/image/page_drink_press/bn_iced_strawberry.png b/image/page_drink_press/bn_iced_strawberry.png index b7583f09..bd62e094 100644 Binary files a/image/page_drink_press/bn_iced_strawberry.png and b/image/page_drink_press/bn_iced_strawberry.png differ diff --git a/image/page_drink_press/bn_iced_strawberry_soda.png b/image/page_drink_press/bn_iced_strawberry_soda.png index f3b2248c..e6445be0 100644 Binary files a/image/page_drink_press/bn_iced_strawberry_soda.png and b/image/page_drink_press/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink_press/bn_lime_tea.png b/image/page_drink_press/bn_lime_tea.png index e3215eb7..ba48483b 100644 Binary files a/image/page_drink_press/bn_lime_tea.png and b/image/page_drink_press/bn_lime_tea.png differ diff --git a/image/page_drink_press/bn_lychee_tea.png b/image/page_drink_press/bn_lychee_tea.png index 4bf5c47e..ee8f01c5 100644 Binary files a/image/page_drink_press/bn_lychee_tea.png and b/image/page_drink_press/bn_lychee_tea.png differ diff --git a/image/page_drink_press/bn_sala_lime.png b/image/page_drink_press/bn_sala_lime.png index 41f4eb36..0a977af1 100644 Binary files a/image/page_drink_press/bn_sala_lime.png and b/image/page_drink_press/bn_sala_lime.png differ diff --git a/image/page_drink_press/bn_sala_lime_soda.png b/image/page_drink_press/bn_sala_lime_soda.png index 393a2658..c07319e1 100644 Binary files a/image/page_drink_press/bn_sala_lime_soda.png and b/image/page_drink_press/bn_sala_lime_soda.png differ diff --git a/image/page_drink_press/bn_soda.png b/image/page_drink_press/bn_soda.png index c6d10f09..215a198e 100644 Binary files a/image/page_drink_press/bn_soda.png and b/image/page_drink_press/bn_soda.png differ diff --git a/image/page_drink_press/bn_strawberry_lime_soda.png b/image/page_drink_press/bn_strawberry_lime_soda.png new file mode 100644 index 00000000..7a8d21be Binary files /dev/null and b/image/page_drink_press/bn_strawberry_lime_soda.png differ diff --git a/image/page_drink_press/bn_strawberry_thai_tea.png b/image/page_drink_press/bn_strawberry_thai_tea.png index f58e4098..8034341f 100644 Binary files a/image/page_drink_press/bn_strawberry_thai_tea.png and b/image/page_drink_press/bn_strawberry_thai_tea.png differ diff --git a/image/page_drink_select/bn_Lychee_lime_soda.png b/image/page_drink_select/bn_Lychee_lime_soda.png new file mode 100644 index 00000000..ac91113c Binary files /dev/null and b/image/page_drink_select/bn_Lychee_lime_soda.png differ diff --git a/image/page_drink_select/bn_blueberry_tea.png b/image/page_drink_select/bn_blueberry_tea.png index 3a637896..2c04408c 100644 Binary files a/image/page_drink_select/bn_blueberry_tea.png and b/image/page_drink_select/bn_blueberry_tea.png differ diff --git a/image/page_drink_select/bn_chrysanthemum_tea.png b/image/page_drink_select/bn_chrysanthemum_tea.png index 926766ff..5c378629 100644 Binary files a/image/page_drink_select/bn_chrysanthemum_tea.png and b/image/page_drink_select/bn_chrysanthemum_tea.png differ diff --git a/image/page_drink_select/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_select/bn_hot_Black_Sugar_Milk_Tea.png index 8347b976..91d6456e 100644 Binary files a/image/page_drink_select/bn_hot_Black_Sugar_Milk_Tea.png and b/image/page_drink_select/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_select/bn_hot_blueberry_tea.png b/image/page_drink_select/bn_hot_blueberry_tea.png index af836c5e..f94403bc 100644 Binary files a/image/page_drink_select/bn_hot_blueberry_tea.png and b/image/page_drink_select/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_select/bn_hot_chrysanthemum_tea.png b/image/page_drink_select/bn_hot_chrysanthemum_tea.png index 495df115..737584f6 100644 Binary files a/image/page_drink_select/bn_hot_chrysanthemum_tea.png and b/image/page_drink_select/bn_hot_chrysanthemum_tea.png differ diff --git a/image/page_drink_select/bn_hot_lemon_tea.png b/image/page_drink_select/bn_hot_lemon_tea.png index 32f0cc11..298f4bd6 100644 Binary files a/image/page_drink_select/bn_hot_lemon_tea.png and b/image/page_drink_select/bn_hot_lemon_tea.png differ diff --git a/image/page_drink_select/bn_hot_lemonate.png b/image/page_drink_select/bn_hot_lemonate.png index 64ae0fd3..c98f13e3 100644 Binary files a/image/page_drink_select/bn_hot_lemonate.png and b/image/page_drink_select/bn_hot_lemonate.png differ diff --git a/image/page_drink_select/bn_hot_lychee_tea.png b/image/page_drink_select/bn_hot_lychee_tea.png index 6d711f8a..c255d083 100644 Binary files a/image/page_drink_select/bn_hot_lychee_tea.png and b/image/page_drink_select/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_select/bn_hot_matcha_milk_tea.png b/image/page_drink_select/bn_hot_matcha_milk_tea.png index 3832524a..70cbe5e7 100644 Binary files a/image/page_drink_select/bn_hot_matcha_milk_tea.png and b/image/page_drink_select/bn_hot_matcha_milk_tea.png differ diff --git a/image/page_drink_select/bn_hot_strawberry_tea.png b/image/page_drink_select/bn_hot_strawberry_tea.png index e72ef5e9..f1fac49d 100644 Binary files a/image/page_drink_select/bn_hot_strawberry_tea.png and b/image/page_drink_select/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_select/bn_hot_taiwan_milk_tea.png b/image/page_drink_select/bn_hot_taiwan_milk_tea.png index a5824b5d..d1d480be 100644 Binary files a/image/page_drink_select/bn_hot_taiwan_milk_tea.png and b/image/page_drink_select/bn_hot_taiwan_milk_tea.png differ diff --git a/image/page_drink_select/bn_hot_thai_milk_tea.png b/image/page_drink_select/bn_hot_thai_milk_tea.png index d86a7d22..06df4b46 100644 Binary files a/image/page_drink_select/bn_hot_thai_milk_tea.png and b/image/page_drink_select/bn_hot_thai_milk_tea.png differ diff --git a/image/page_drink_select/bn_hot_thai_tea.png b/image/page_drink_select/bn_hot_thai_tea.png index 422fa1dd..6ed90326 100644 Binary files a/image/page_drink_select/bn_hot_thai_tea.png and b/image/page_drink_select/bn_hot_thai_tea.png differ diff --git a/image/page_drink_select/bn_hot_water.png b/image/page_drink_select/bn_hot_water.png index 6d6d7f96..97903366 100644 Binary files a/image/page_drink_select/bn_hot_water.png and b/image/page_drink_select/bn_hot_water.png differ diff --git a/image/page_drink_select/bn_iced.png b/image/page_drink_select/bn_iced.png index 9ffc7633..0177c0fc 100644 Binary files a/image/page_drink_select/bn_iced.png and b/image/page_drink_select/bn_iced.png differ diff --git a/image/page_drink_select/bn_iced_7up.png b/image/page_drink_select/bn_iced_7up.png index a13ff143..b001f3fd 100644 Binary files a/image/page_drink_select/bn_iced_7up.png and b/image/page_drink_select/bn_iced_7up.png differ diff --git a/image/page_drink_select/bn_iced_Black_Sugar_Milk_Tea.png b/image/page_drink_select/bn_iced_Black_Sugar_Milk_Tea.png index 1a699c35..6dd567a8 100644 Binary files a/image/page_drink_select/bn_iced_Black_Sugar_Milk_Tea.png and b/image/page_drink_select/bn_iced_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_select/bn_iced_Cokecola.png b/image/page_drink_select/bn_iced_Cokecola.png index 6d9b4441..57f95856 100644 Binary files a/image/page_drink_select/bn_iced_Cokecola.png and b/image/page_drink_select/bn_iced_Cokecola.png differ diff --git a/image/page_drink_select/bn_iced_Lychee.png b/image/page_drink_select/bn_iced_Lychee.png index e9d6d346..0491a52d 100644 Binary files a/image/page_drink_select/bn_iced_Lychee.png and b/image/page_drink_select/bn_iced_Lychee.png differ diff --git a/image/page_drink_select/bn_iced_Lychee_soda.png b/image/page_drink_select/bn_iced_Lychee_soda.png index 058950de..71704157 100644 Binary files a/image/page_drink_select/bn_iced_Lychee_soda.png and b/image/page_drink_select/bn_iced_Lychee_soda.png differ diff --git a/image/page_drink_select/bn_iced_black_tea.png b/image/page_drink_select/bn_iced_black_tea.png index a5fabb73..e3447aa2 100644 Binary files a/image/page_drink_select/bn_iced_black_tea.png and b/image/page_drink_select/bn_iced_black_tea.png differ diff --git a/image/page_drink_select/bn_iced_blueberry.png b/image/page_drink_select/bn_iced_blueberry.png index 47b0057f..83e95d5b 100644 Binary files a/image/page_drink_select/bn_iced_blueberry.png and b/image/page_drink_select/bn_iced_blueberry.png differ diff --git a/image/page_drink_select/bn_iced_blueberry_soda.png b/image/page_drink_select/bn_iced_blueberry_soda.png index 01ab9a2b..5e46babe 100644 Binary files a/image/page_drink_select/bn_iced_blueberry_soda.png and b/image/page_drink_select/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink_select/bn_iced_cola.png b/image/page_drink_select/bn_iced_cola.png index 71f1e8be..58f5da3d 100644 Binary files a/image/page_drink_select/bn_iced_cola.png and b/image/page_drink_select/bn_iced_cola.png differ diff --git a/image/page_drink_select/bn_iced_lemonade.png b/image/page_drink_select/bn_iced_lemonade.png index d653caa8..11147615 100644 Binary files a/image/page_drink_select/bn_iced_lemonade.png and b/image/page_drink_select/bn_iced_lemonade.png differ diff --git a/image/page_drink_select/bn_iced_lemonade_soda.png b/image/page_drink_select/bn_iced_lemonade_soda.png index f8871ae9..044bba70 100644 Binary files a/image/page_drink_select/bn_iced_lemonade_soda.png and b/image/page_drink_select/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink_select/bn_iced_matcha_milk_tea.png b/image/page_drink_select/bn_iced_matcha_milk_tea.png index 2716602b..147b4dcf 100644 Binary files a/image/page_drink_select/bn_iced_matcha_milk_tea.png and b/image/page_drink_select/bn_iced_matcha_milk_tea.png differ diff --git a/image/page_drink_select/bn_iced_soda.png b/image/page_drink_select/bn_iced_soda.png index db5a2843..7628ec3b 100644 Binary files a/image/page_drink_select/bn_iced_soda.png and b/image/page_drink_select/bn_iced_soda.png differ diff --git a/image/page_drink_select/bn_iced_sprite.png b/image/page_drink_select/bn_iced_sprite.png index 4b64a8af..88cba55d 100644 Binary files a/image/page_drink_select/bn_iced_sprite.png and b/image/page_drink_select/bn_iced_sprite.png differ diff --git a/image/page_drink_select/bn_iced_strawberry.png b/image/page_drink_select/bn_iced_strawberry.png index dc1bca70..d360d3fa 100644 Binary files a/image/page_drink_select/bn_iced_strawberry.png and b/image/page_drink_select/bn_iced_strawberry.png differ diff --git a/image/page_drink_select/bn_iced_strawberry_soda.png b/image/page_drink_select/bn_iced_strawberry_soda.png index 305c1707..16fc4710 100644 Binary files a/image/page_drink_select/bn_iced_strawberry_soda.png and b/image/page_drink_select/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink_select/bn_iced_taiwan_milk_tea.png b/image/page_drink_select/bn_iced_taiwan_milk_tea.png index 77614989..fe0b9c6e 100644 Binary files a/image/page_drink_select/bn_iced_taiwan_milk_tea.png and b/image/page_drink_select/bn_iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_select/bn_iced_thai_milk_tea.png b/image/page_drink_select/bn_iced_thai_milk_tea.png index 6408f695..4b04928d 100644 Binary files a/image/page_drink_select/bn_iced_thai_milk_tea.png and b/image/page_drink_select/bn_iced_thai_milk_tea.png differ diff --git a/image/page_drink_select/bn_lemon_thai_tea.png b/image/page_drink_select/bn_lemon_thai_tea.png index c85ed409..7f9f2730 100644 Binary files a/image/page_drink_select/bn_lemon_thai_tea.png and b/image/page_drink_select/bn_lemon_thai_tea.png differ diff --git a/image/page_drink_select/bn_lychee_tea.png b/image/page_drink_select/bn_lychee_tea.png index 02234cd5..9e730850 100644 Binary files a/image/page_drink_select/bn_lychee_tea.png and b/image/page_drink_select/bn_lychee_tea.png differ diff --git a/image/page_drink_select/bn_sala.png b/image/page_drink_select/bn_sala.png index cfc89a6e..e996b190 100644 Binary files a/image/page_drink_select/bn_sala.png and b/image/page_drink_select/bn_sala.png differ diff --git a/image/page_drink_select/bn_sala_lime.png b/image/page_drink_select/bn_sala_lime.png index 9b7bf89e..f04d78af 100644 Binary files a/image/page_drink_select/bn_sala_lime.png and b/image/page_drink_select/bn_sala_lime.png differ diff --git a/image/page_drink_select/bn_sala_lime_soda.png b/image/page_drink_select/bn_sala_lime_soda.png index a43886d7..28307012 100644 Binary files a/image/page_drink_select/bn_sala_lime_soda.png and b/image/page_drink_select/bn_sala_lime_soda.png differ diff --git a/image/page_drink_select/bn_sala_soda.png b/image/page_drink_select/bn_sala_soda.png index 74bb8e21..efe0cfc2 100644 Binary files a/image/page_drink_select/bn_sala_soda.png and b/image/page_drink_select/bn_sala_soda.png differ diff --git a/image/page_drink_select/bn_soda.png b/image/page_drink_select/bn_soda.png index 47a667c4..4c9f270f 100644 Binary files a/image/page_drink_select/bn_soda.png and b/image/page_drink_select/bn_soda.png differ diff --git a/image/page_drink_select/bn_strawberry_lime_soda.png b/image/page_drink_select/bn_strawberry_lime_soda.png new file mode 100644 index 00000000..6a6b9052 Binary files /dev/null and b/image/page_drink_select/bn_strawberry_lime_soda.png differ diff --git a/image/page_drink_select/bn_strawberry_thai_tea.png b/image/page_drink_select/bn_strawberry_thai_tea.png index 46c3276e..ce7d1b18 100644 Binary files a/image/page_drink_select/bn_strawberry_thai_tea.png and b/image/page_drink_select/bn_strawberry_thai_tea.png differ diff --git a/image/page_drink_select/bn_water_cool.png b/image/page_drink_select/bn_water_cool.png index ad27c31b..7f24b268 100644 Binary files a/image/page_drink_select/bn_water_cool.png and b/image/page_drink_select/bn_water_cool.png differ diff --git a/image/page_drink_select/bn_water_roomtemp.png b/image/page_drink_select/bn_water_roomtemp.png index 2c56c616..93e0359e 100644 Binary files a/image/page_drink_select/bn_water_roomtemp.png and b/image/page_drink_select/bn_water_roomtemp.png differ diff --git a/video/taobin_adv1.mp4 b/video/taobin_adv1.mp4 index 59a076bb..016221aa 100644 Binary files a/video/taobin_adv1.mp4 and b/video/taobin_adv1.mp4 differ diff --git a/xml/menu_gen_alter.py b/xml/menu_gen_alter.py index 836051f3..f91b626c 100644 --- a/xml/menu_gen_alter.py +++ b/xml/menu_gen_alter.py @@ -1,32 +1,27 @@ - if menu_count >= 16: - scroll_height = 1725 - else: - scroll_height = 1400 out_xml(' \r\n') - out_xml(' 0 \r\n') - out_xml(' 520 \r\n') + out_xml(' 10 \r\n') + out_xml(' 497 \r\n') out_xml(' 1080 \r\n') - out_xml(' 1400 \r\n') out_xml(' "auto" \r\n') out_xml(' "Vertical" \r\n') - + out_xml(' 4 \r\n') + for i in range( menu_count): i_str = str(i + 1) out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n') out_xml( '\r\n') + out_xml('\t 33 \r\n') + out_xml('\t 22 \r\n') out_xml('\t 225 \r\n') out_xml('\t 296 \r\n') - - out_xml( '\t\r\n') - if RoadShow : - out_xml( '\t\r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t200\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "Free!" \r\n') - out_xml( '\t\r\n') - else: - out_xml( '\t\r\n') - out_xml( '\t 182 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t "Hurr" \r\n') - out_xml( '\t150\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t $' + product_code[i] + '.Price \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t 164 \r\n') - out_xml( '\t 12 \r\n') - out_xml( '\t20\r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "฿"" \r\n') - out_xml( '\t\r\n') - out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 214 \r\n') - out_xml( '\t 26 \r\n') - out_xml( '\t220\r\n') - out_xml( '\t "bound" \r\n') - out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') - out_xml( '\t $' + product_code[i] + '.Name \r\n') + out_xml( '\t 182 \r\n') + out_xml( '\t 12 \r\n') + out_xml( '\t ShowPrice \r\n') + out_xml( '\t "Hurr" \r\n') + out_xml( '\t150\r\n') + out_xml( '\t 27 \r\n') + out_xml( '\t KanitTTF \r\n') + out_xml( '\t 0xB78F24 \r\n') + out_xml( '\t $' + product_code[i] + '.Price \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') - out_xml( '\t 16 \r\n') - out_xml( '\t 246 \r\n') + out_xml( '\t 164 \r\n') + out_xml( '\t 12 \r\n') + out_xml( '\t ShowPrice \r\n') + out_xml( '\t20\r\n') + out_xml( '\t 27 \r\n') + out_xml( '\t KanitTTF \r\n') + out_xml( '\t 0xB78F24 \r\n') + out_xml( '\t "฿"" \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 190 \r\n') + out_xml( '\t 24 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showthaiText \r\n') + out_xml( '\t $' + product_code[i] + '.Name \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 246 \r\n') out_xml( '\t 14 \r\n') out_xml( '\t220\r\n') out_xml( '\t KanitMediumTTF \r\n') out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showthaiText \r\n') out_xml( '\t $' + product_code[i] + '.description \r\n') out_xml( '\t\r\n') + + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 190 \r\n') + out_xml( '\t 22 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t "multi2" \r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x322B26 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t $' + product_code[i] + '.NameE \r\n') + out_xml( '\t\r\n') + + out_xml( '\t\r\n') + out_xml( '\t 16 \r\n') + out_xml( '\t 246 \r\n') + out_xml( '\t 14 \r\n') + out_xml( '\t220\r\n') + out_xml( '\t KanitMediumTTF \r\n') + out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t showengText \r\n') + out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') + out_xml( '\t\r\n') out_xml( '\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index d51abca6..614daeee 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -83,7 +83,7 @@ SAVELOG ShowPrice - + Var CountDownShowButton = 35 1000 @@ -127,13 +127,13 @@ ;SAVELOG CountDownShowButton ;SAVELOG ShowButtonClickFull - If CountDownShowButton = 28 Then + If CountDownShowButton = 31 Then Var ShowButtonClickFull = "Enable" Var ShowButtonClick = "Invisible" Refresh EndIf - If CountDownShowButton = 10 Then + If CountDownShowButton = 9 Then Var ShowButtonClick = "Enable" Var ShowButtonClickFull = "Invisible" @@ -146,7 +146,7 @@ SAVELOG ShowButtonClick - Var CountDownShowButton = 30 + Var CountDownShowButton = 35 Refresh diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml index 55955245..f2e6fa72 100644 --- a/xml/page_catalog_choose_drink1.pml +++ b/xml/page_catalog_choose_drink1.pml @@ -61,7 +61,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" - + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then Var Menu7Selected = "Invisible" diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 51d5f838..bdb820c1 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -35,7 +35,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" - + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then Var Menu7Selected = "Invisible" diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml index 4b0c48fb..b292832f 100644 --- a/xml/page_catalog_choose_drink2.pml +++ b/xml/page_catalog_choose_drink2.pml @@ -73,6 +73,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then Var Menu7Selected = "Invisible" @@ -95,7 +96,7 @@ diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 76549dcd..9dd015d1 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -35,6 +35,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then Var Menu7Selected = "Invisible" @@ -230,17 +231,20 @@ - 0 + 10 497 1080 - 1500 - 1670 + "auto" "Vertical" + 4 ; button i=1 11-99-01-0001 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0001.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0001.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0001.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0001.descriptionE + + ; button i=2 11-99-01-0101 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0101.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0101.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0101.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0101.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0101.descriptionE + + ; button i=3 11-99-01-0002 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0002.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0002.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0002.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0002.descriptionE + + ; button i=4 11-99-01-0003 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0003.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0003.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0003.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0003.descriptionE + + ; button i=5 11-99-01-0004 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0004.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0004.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0004.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0004.descriptionE + + ; button i=6 11-99-01-0005 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0005.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0005.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0005.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0005.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0005.descriptionE + + ; button i=7 11-99-01-0006 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0006.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0006.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0006.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0006.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0006.descriptionE + + ; button i=8 11-99-01-0008 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0008.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0008.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0008.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0008.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0008.descriptionE + + ; button i=9 11-99-01-0010 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0010.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0010.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0010.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0010.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0010.descriptionE + + ; button i=10 11-99-01-0011 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-01-0011.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-01-0011.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-01-0011.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0011.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0011.descriptionE + + ; button i=11 11-99-02-0001 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0001.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0001.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0001.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0001.descriptionE + + ; button i=12 11-99-02-0002 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0002.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0002.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0002.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0002.descriptionE + + ; button i=13 11-99-02-0003 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0003.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0003.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0003.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0003.descriptionE + + ; button i=14 11-99-02-0004 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0004.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0004.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0004.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0004.descriptionE + + ; button i=15 11-99-02-0005 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0005.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0005.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0005.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0005.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0005.descriptionE + + ; button i=16 11-99-02-0006 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0006.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0006.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0006.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0006.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0006.descriptionE + + ; button i=17 11-99-02-0007 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0007.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0007.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0007.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0007.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0007.descriptionE + + ; button i=18 11-99-02-0009 - + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-99-02-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-99-02-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0009.descriptionE + + ; button i=19 11-99-02-0011 - - 226 - 32 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0001.Price - - - 208 - 32 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 60 - 210 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0001.Name - - - 60 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0001.description - - - 60 - 210 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0001.NameE - - - 60 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0001.descriptionE - - - 483 - 32 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0101.Price - - - 465 - 32 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 317 - 210 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0101.Name - - - 317 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0101.description - - - 317 - 210 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0101.NameE - - - 317 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0101.descriptionE - - - 740 - 32 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0002.Price - - - 722 - 32 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 574 - 210 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0002.Name - - - 574 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0002.description - - - 574 - 210 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0002.NameE - - - 574 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0002.descriptionE - - - 997 - 32 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0003.Price - - - 979 - 32 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 831 - 210 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0003.Name - - - 831 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0003.description - - - 831 - 210 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0003.NameE - - - 831 - 266 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0003.descriptionE - - - 226 - 360 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0004.Price - - - 208 - 360 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 60 - 538 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0004.Name - - - 60 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0004.description - - - 60 - 538 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0004.NameE - - - 60 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0004.descriptionE - - - 483 - 360 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0005.Price - - - 465 - 360 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 317 - 538 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0005.Name - - - 317 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0005.description - - - 317 - 538 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0005.NameE - - - 317 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0005.descriptionE - - - 740 - 360 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0006.Price - - - 722 - 360 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 574 - 538 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0006.Name - - - 574 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0006.description - - - 574 - 538 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0006.NameE - - - 574 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0006.descriptionE - - - 997 - 360 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0008.Price - - - 979 - 360 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 831 - 538 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0008.Name - - - 831 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0008.description - - - 831 - 538 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0008.NameE - - - 831 - 594 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0008.descriptionE - - - 226 - 688 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0010.Price - - - 208 - 688 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 60 - 866 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0010.Name - - - 60 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0010.description - - - 60 - 866 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0010.NameE - - - 60 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0010.descriptionE - - - 483 - 688 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-01-0011.Price - - - 465 - 688 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 317 - 866 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-01-0011.Name - - - 317 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-01-0011.description - - - 317 - 866 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-01-0011.NameE - - - 317 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-01-0011.descriptionE - - - 740 - 688 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0001.Price - - - 722 - 688 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 574 - 866 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0001.Name - - - 574 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0001.description - - - 574 - 866 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0001.NameE - - - 574 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0001.descriptionE - - - 997 - 688 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0002.Price - - - 979 - 688 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 831 - 866 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0002.Name - - - 831 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0002.description - - - 831 - 866 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0002.NameE - - - 831 - 922 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0002.descriptionE - - - 226 - 1016 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0003.Price - - - 208 - 1016 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 60 - 1194 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0003.Name - - - 60 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0003.description - - - 60 - 1194 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0003.NameE - - - 60 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0003.descriptionE - - - 483 - 1016 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0004.Price - - - 465 - 1016 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 317 - 1194 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0004.Name - - - 317 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0004.description - - - 317 - 1194 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0004.NameE - - - 317 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0004.descriptionE - - - 740 - 1016 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0005.Price - - - 722 - 1016 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 574 - 1194 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0005.Name - - - 574 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0005.description - - - 574 - 1194 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0005.NameE - - - 574 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0005.descriptionE - - - 997 - 1016 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0006.Price - - - 979 - 1016 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 831 - 1194 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0006.Name - - - 831 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0006.description - - - 831 - 1194 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0006.NameE - - - 831 - 1250 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0006.descriptionE - - - 226 - 1344 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0007.Price - - - 208 - 1344 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 60 - 1522 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0007.Name - - - 60 - 1578 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0007.description - - - 60 - 1522 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0007.NameE - - - 60 - 1578 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0007.descriptionE - - - 483 - 1344 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $11-99-02-0009.Price - - - 465 - 1344 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 317 - 1522 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $11-99-02-0009.Name - - - 317 - 1578 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $11-99-02-0009.description - - - 317 - 1522 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $11-99-02-0009.NameE - - - 317 - 1578 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $11-99-02-0009.descriptionE - - - 740 - 1344 + 182 + 12 ShowPrice "Hurr" 150 @@ -1819,8 +1914,8 @@ $11-99-02-0011.Price - 722 - 1344 + 164 + 12 ShowPrice 20 27 @@ -1829,8 +1924,8 @@ "฿"" - 574 - 1522 + 16 + 190 24 220 "multi2" @@ -1840,8 +1935,8 @@ $11-99-02-0011.Name - 574 - 1578 + 16 + 246 14 220 KanitMediumTTF @@ -1850,8 +1945,8 @@ $11-99-02-0011.description - 574 - 1522 + 16 + 190 22 220 "multi2" @@ -1861,8 +1956,8 @@ $11-99-02-0011.NameE - 574 - 1578 + 16 + 246 14 220 KanitMediumTTF @@ -1870,6 +1965,7 @@ showengText $11-99-02-0011.descriptionE + diff --git a/xml/page_catalog_choose_drink2_ext.xml b/xml/page_catalog_choose_drink2_ext.xml index bd2e1e6e..ba01ee64 100644 --- a/xml/page_catalog_choose_drink2_ext.xml +++ b/xml/page_catalog_choose_drink2_ext.xml @@ -150,23 +150,23 @@ - 0 - 520 + 10 + 497 1080 - 1400 "auto" "Vertical" + 4 ; button i=1 11-99-01-0010 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -195,7 +196,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -203,36 +205,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0010.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0010.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0010.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0010.descriptionE + ; button i=2 11-99-01-0001 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -261,7 +287,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -269,36 +296,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0001.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0001.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0001.descriptionE + ; button i=3 11-99-01-0002 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -327,7 +378,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -335,36 +387,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0002.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0002.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0002.descriptionE + ; button i=4 11-99-01-0004 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -393,7 +469,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -401,36 +478,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0004.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0004.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0004.descriptionE + ; button i=5 11-99-01-0007 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -459,7 +560,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -467,36 +569,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0007.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0007.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0007.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0007.descriptionE + ; button i=6 11-99-01-0017 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -525,7 +651,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -533,36 +660,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0017.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0017.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0017.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0017.descriptionE + ; button i=7 11-99-01-0003 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -591,7 +742,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -599,36 +751,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-01-0003.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-01-0003.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-01-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-01-0003.descriptionE + ; button i=8 11-99-02-0006 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -657,7 +833,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -665,36 +842,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0006.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0006.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0006.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0006.descriptionE + ; button i=9 11-99-02-0024 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -723,7 +924,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -731,36 +933,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0024.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0024.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0024.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0024.descriptionE + ; button i=10 11-99-02-0001 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -789,7 +1015,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -797,36 +1024,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0001.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0001.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0001.descriptionE + ; button i=11 11-99-02-0003 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -855,7 +1106,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -863,36 +1115,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0003.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0003.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0003.descriptionE + ; button i=12 11-99-02-0006 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -921,7 +1197,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -929,36 +1206,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0006.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0006.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0006.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0006.descriptionE + ; button i=13 11-99-02-0024 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -987,7 +1288,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -995,36 +1297,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0024.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0024.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0024.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0024.descriptionE + ; button i=14 11-99-02-0001 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -1053,7 +1379,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -1061,36 +1388,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0001.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0001.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0001.descriptionE + ; button i=15 11-99-02-0003 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -1119,7 +1470,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -1127,36 +1479,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0003.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0003.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0003.descriptionE + ; button i=16 11-99-02-0007 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -1185,7 +1561,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -1193,36 +1570,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0007.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0007.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0007.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0007.descriptionE + ; button i=17 11-99-02-0030 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -1251,7 +1652,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -1259,36 +1661,59 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0030.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0030.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0030.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0030.descriptionE + ; button i=18 11-99-02-0002 + 33 + 22 225 296 - - 182 - 12 + 182 + 12 + ShowPrice "Hurr" 150 27 @@ -1317,7 +1743,8 @@ 164 - 12 + 12 + ShowPrice 20 27 KanitTTF @@ -1325,24 +1752,47 @@ "฿"" - 16 - 214 - 26 + 16 + 190 + 24 220 - "bound" + "multi2" KanitMediumTTF 0x322B26 + showthaiText $11-99-02-0002.Name - 16 - 246 + 16 + 246 14 220 KanitMediumTTF 0x6F5F51 + showthaiText $11-99-02-0002.description + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-99-02-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-99-02-0002.descriptionE + diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml index 7d74489b..3ababca8 100644 --- a/xml/page_catalog_choose_drink3.pml +++ b/xml/page_catalog_choose_drink3.pml @@ -69,12 +69,15 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" - + Var Menu8Selected = "Invisible" + If CocktailShow = "true" Then Var Menu7Selected = "Invisible" Var Menu8Selected = "Enable" EndIf + + 60000 diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index c7c98bdb..ffe7353c 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -34,12 +34,15 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" - + Var Menu8Selected = "Invisible" + If CocktailShow = "true" Then Var Menu7Selected = "Invisible" Var Menu8Selected = "Enable" EndIf + + 60000 diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml index 2ce8bfae..5a7141c8 100644 --- a/xml/page_catalog_choose_drink4.pml +++ b/xml/page_catalog_choose_drink4.pml @@ -17,6 +17,8 @@ product_code.append('11-99-02-0013') product_code.append('11-99-02-0014') + product_code.append('11-99-02-0015') + product_code.append('11-99-03-0002') product_code.append('11-99-02-0016') #product_code.append('11-99-02-0013') @@ -57,6 +59,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index dde8e48c..f633c23e 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -34,6 +34,7 @@ Var Menu5Selected = "Invisible" Var Menu6Selected = "Enable" Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" If CocktailShow = "true" Then @@ -420,10 +421,56 @@ Open "ROOT/taobin_project/xml/page_topping_alter.xml" - ; button i=9 11-99-02-0016 + ; button i=9 11-99-02-0015 + ; button i=10 11-99-03-0002 + + ; button i=11 11-99-02-0016 +