Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

2023-01-09 19:38:25 +07:00 · 2023-01-09 19:38:25 +07:00 · d8c3c104f3
commit d8c3c104f3
parent 263fd4f4b6 847b15b0a7
138 changed files with 4907 additions and 593 deletions
--- a/image/bg_main_menu2.png
+++ b/image/bg_main_menu2.png
--- a/image/lang/lang_bg_bottom.png
+++ b/image/lang/lang_bg_bottom.png
--- a/image/lang/lang_bg_center.png
+++ b/image/lang/lang_bg_center.png
--- a/image/lang/lang_bg_top.png
+++ b/image/lang/lang_bg_top.png
--- a/image/page_campaign/video_desc.mp4
+++ b/image/page_campaign/video_desc.mp4
--- a/image/page_doing/brewing_txt_adv1.png
+++ b/image/page_doing/brewing_txt_adv1.png
--- a/image/page_doing/brewing_txt_adv1_en.png
+++ b/image/page_doing/brewing_txt_adv1_en.png
--- a/image/page_doing/brewing_txt_adv2.png
+++ b/image/page_doing/brewing_txt_adv2.png
--- a/image/page_doing/brewing_txt_adv2_en.png
+++ b/image/page_doing/brewing_txt_adv2_en.png
--- a/image/page_doing/tao_adv1.png
+++ b/image/page_doing/tao_adv1.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_disable_n2/bn_Banana_milk.png
+++ b/image/page_drink_disable_n2/bn_Banana_milk.png
--- a/image/page_drink_disable_n2/bn_ChocoBanana_milk.png
+++ b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png
--- a/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
--- a/image/page_drink_disable_n2/bn_Melon_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Melon_smoothie.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Pinky
+++ b/image/page_drink_disable_n2/bn_Pinky
--- a/image/page_drink_disable_n2/bn_Yuzu_americano.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_americano.png
--- a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png
--- a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_black.png
+++ b/image/page_drink_disable_n2/bn_iced_black.png
--- a/image/page_drink_disable_n2/bn_iced_soda_black.png
+++ b/image/page_drink_disable_n2/bn_iced_soda_black.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_n/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_n/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_n/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_n/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_n/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_n/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_n/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_n/bn_Alcohol_Long_Night.png
--- a/image/page_drink_n/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_n/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_n/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_n/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_n/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_n/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_n/bn_Banana_milk.png
+++ b/image/page_drink_n/bn_Banana_milk.png
--- a/image/page_drink_n/bn_ChocoBanana_milk.png
+++ b/image/page_drink_n/bn_ChocoBanana_milk.png
--- a/image/page_drink_n/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_n/bn_ChocoYuzu_milk.png
--- a/image/page_drink_n/bn_Melon_smoothie.png
+++ b/image/page_drink_n/bn_Melon_smoothie.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_n/bn_Pinky
+++ b/image/page_drink_n/bn_Pinky
--- a/image/page_drink_n/bn_Yuzu_americano.png
+++ b/image/page_drink_n/bn_Yuzu_americano.png
--- a/image/page_drink_n/bn_Yuzu_smoothie.png
+++ b/image/page_drink_n/bn_Yuzu_smoothie.png
--- a/image/page_drink_n/bn_hot_Banana_cafe_latte.png
+++ b/image/page_drink_n/bn_hot_Banana_cafe_latte.png
--- a/image/page_drink_n/bn_hot_lychee_espresso.png
+++ b/image/page_drink_n/bn_hot_lychee_espresso.png
--- a/image/page_drink_n/bn_hot_yuzu_tea.png
+++ b/image/page_drink_n/bn_hot_yuzu_tea.png
--- a/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png
+++ b/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png
--- a/image/page_drink_n/bn_iced_americano_soda.png
+++ b/image/page_drink_n/bn_iced_americano_soda.png
--- a/image/page_drink_n/bn_iced_black.png
+++ b/image/page_drink_n/bn_iced_black.png
--- a/image/page_drink_n/bn_iced_soda_black.png
+++ b/image/page_drink_n/bn_iced_soda_black.png
--- a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_n/bn_iced_yuzu_soda.png
+++ b/image/page_drink_n/bn_iced_yuzu_soda.png
--- a/image/page_drink_n/bn_melon_americano.png
+++ b/image/page_drink_n/bn_melon_americano.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png
--- a/image/page_drink_picture2_n/bn_Melon_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Melon_smoothie.png
--- a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Yuzu_americano.png
+++ b/image/page_drink_picture2_n/bn_Yuzu_americano.png
--- a/image/page_drink_picture2_n/bn_Yuzu_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Yuzu_smoothie.png
--- a/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png
--- a/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_black.png
+++ b/image/page_drink_picture2_n/bn_iced_black.png
--- a/image/page_drink_picture2_n/bn_iced_soda_black.png
+++ b/image/page_drink_picture2_n/bn_iced_soda_black.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_press_n/Component
+++ b/image/page_drink_press_n/Component
--- a/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_press_n/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_press_n/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_press_n/bn_Alcohol_ILYSB.png
+++ b/image/page_drink_press_n/bn_Alcohol_ILYSB.png
--- a/image/page_drink_press_n/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_press_n/bn_Alcohol_Long_Night.png
--- a/image/page_drink_press_n/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_press_n/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_press_n/bn_Banana_milk.png
+++ b/image/page_drink_press_n/bn_Banana_milk.png
--- a/image/page_drink_press_n/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_press_n/bn_ChocoYuzu_milk.png
--- a/image/page_drink_press_n/bn_Melon_smoothie.png
+++ b/image/page_drink_press_n/bn_Melon_smoothie.png
--- a/image/page_drink_press_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_press_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_press_n/bn_Yuzu_americano.png
+++ b/image/page_drink_press_n/bn_Yuzu_americano.png
--- a/image/page_drink_press_n/bn_Yuzu_smoothie.png
+++ b/image/page_drink_press_n/bn_Yuzu_smoothie.png
--- a/image/page_drink_press_n/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_press_n/bn_hot_Yuzu_tea.png
--- a/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png
+++ b/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png
--- a/image/page_drink_press_n/bn_iced_black.png
+++ b/image/page_drink_press_n/bn_iced_black.png
--- a/Show more
+++ b/Show more