Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

2020-12-30 14:20:20 +07:00 · 2020-12-30 14:20:20 +07:00 · c810007e28
commit c810007e28
parent 9250e20a4b 2002701787
264 changed files with 9349 additions and 4963 deletions
--- a/image/adv_img_1.png
+++ b/image/adv_img_1.png
--- a/image/adv_img_2.png
+++ b/image/adv_img_2.png
--- a/image/animation/blink_star.gif
+++ b/image/animation/blink_star.gif
--- a/image/page2/bn_cocktail.png
+++ b/image/page2/bn_cocktail.png
--- a/image/page2/bp_cocktail.png
+++ b/image/page2/bp_cocktail.png
--- a/image/page2_en/page2/bn_cocktail.png
+++ b/image/page2_en/page2/bn_cocktail.png
--- a/image/page2_en/page2/bp_Cocktail.png
+++ b/image/page2_en/page2/bp_Cocktail.png
--- a/image/page3/bn_cocktail.png
+++ b/image/page3/bn_cocktail.png
--- a/image/page3/bp_cocktail.png
+++ b/image/page3/bp_cocktail.png
--- a/image/page3_en/bn_cocktail.png
+++ b/image/page3_en/bn_cocktail.png
--- a/image/page3_en/bp_cocktail.png
+++ b/image/page3_en/bp_cocktail.png
--- a/image/page_drink/Rectangle
+++ b/image/page_drink/Rectangle
--- a/image/page_drink/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink/bn_Alcohol_Forever_Love.png
--- a/image/page_drink/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink/bn_Alcohol_ILYSB.png
+++ b/image/page_drink/bn_Alcohol_ILYSB.png
--- a/image/page_drink/bn_Alcohol_Long_Night.png
+++ b/image/page_drink/bn_Alcohol_Long_Night.png
--- a/image/page_drink/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink/bn_Alcohol_Love_Potion.png
--- a/image/page_drink/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink/bn_Lychee_lime_soda.png
+++ b/image/page_drink/bn_Lychee_lime_soda.png
--- a/image/page_drink/bn_blueberry_tea.png
+++ b/image/page_drink/bn_blueberry_tea.png
--- a/image/page_drink/bn_chrysanthemum_tea.png
+++ b/image/page_drink/bn_chrysanthemum_tea.png
--- a/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png
+++ b/image/page_drink/bn_hot_Black_Sugar_Milk_Tea.png
--- a/image/page_drink/bn_hot_blueberry_tea.png
+++ b/image/page_drink/bn_hot_blueberry_tea.png
--- a/image/page_drink/bn_hot_lemonate.png
+++ b/image/page_drink/bn_hot_lemonate.png
--- a/image/page_drink/bn_hot_lime_tea.png
+++ b/image/page_drink/bn_hot_lime_tea.png
--- a/image/page_drink/bn_hot_lychee_tea.png
+++ b/image/page_drink/bn_hot_lychee_tea.png
--- a/image/page_drink/bn_hot_strawberry_tea.png
+++ b/image/page_drink/bn_hot_strawberry_tea.png
--- a/image/page_drink/bn_hot_thai_tea.png
+++ b/image/page_drink/bn_hot_thai_tea.png
--- a/image/page_drink/bn_iced_7up.png
+++ b/image/page_drink/bn_iced_7up.png
--- a/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png
+++ b/image/page_drink/bn_iced_Black_Sugar_Milk_Tea.png
--- a/image/page_drink/bn_iced_Cokecola.png
+++ b/image/page_drink/bn_iced_Cokecola.png
--- a/image/page_drink/bn_iced_Lychee.png
+++ b/image/page_drink/bn_iced_Lychee.png
--- a/image/page_drink/bn_iced_Lychee_soda.png
+++ b/image/page_drink/bn_iced_Lychee_soda.png
--- a/image/page_drink/bn_iced_black_tea.png
+++ b/image/page_drink/bn_iced_black_tea.png
--- a/image/page_drink/bn_iced_blueberry.png
+++ b/image/page_drink/bn_iced_blueberry.png
--- a/image/page_drink/bn_iced_blueberry_soda.png
+++ b/image/page_drink/bn_iced_blueberry_soda.png
--- a/image/page_drink/bn_iced_cola.png
+++ b/image/page_drink/bn_iced_cola.png
--- a/image/page_drink/bn_iced_lemonade.png
+++ b/image/page_drink/bn_iced_lemonade.png
--- a/image/page_drink/bn_iced_lemonade_soda.png
+++ b/image/page_drink/bn_iced_lemonade_soda.png
--- a/image/page_drink/bn_iced_matcha_milk_tea.png
+++ b/image/page_drink/bn_iced_matcha_milk_tea.png
--- a/image/page_drink/bn_iced_pepsi.png
+++ b/image/page_drink/bn_iced_pepsi.png
--- a/image/page_drink/bn_iced_pepsi_max.png
+++ b/image/page_drink/bn_iced_pepsi_max.png
--- a/image/page_drink/bn_iced_soda.png
+++ b/image/page_drink/bn_iced_soda.png
--- a/image/page_drink/bn_iced_sprite.png
+++ b/image/page_drink/bn_iced_sprite.png
--- a/image/page_drink/bn_iced_strawberry.png
+++ b/image/page_drink/bn_iced_strawberry.png
--- a/image/page_drink/bn_iced_strawberry_soda.png
+++ b/image/page_drink/bn_iced_strawberry_soda.png
--- a/image/page_drink/bn_iced_taiwan_milk_tea.png
+++ b/image/page_drink/bn_iced_taiwan_milk_tea.png
--- a/image/page_drink/bn_iced_thai_milk_tea.png
+++ b/image/page_drink/bn_iced_thai_milk_tea.png
--- a/image/page_drink/bn_lime_tea.png
+++ b/image/page_drink/bn_lime_tea.png
--- a/image/page_drink/bn_lychee_tea.png
+++ b/image/page_drink/bn_lychee_tea.png
--- a/image/page_drink/bn_protein_Blueberry.png
+++ b/image/page_drink/bn_protein_Blueberry.png
--- a/image/page_drink/bn_protein_isolated.png
+++ b/image/page_drink/bn_protein_isolated.png
--- a/image/page_drink/bn_sala.png
+++ b/image/page_drink/bn_sala.png
--- a/image/page_drink/bn_sala_lime.png
+++ b/image/page_drink/bn_sala_lime.png
--- a/image/page_drink/bn_sala_lime_soda.png
+++ b/image/page_drink/bn_sala_lime_soda.png
--- a/image/page_drink/bn_sala_soda.png
+++ b/image/page_drink/bn_sala_soda.png
--- a/image/page_drink/bn_soda.png
+++ b/image/page_drink/bn_soda.png
--- a/image/page_drink/bn_strawberry_lime_soda.png
+++ b/image/page_drink/bn_strawberry_lime_soda.png
--- a/image/page_drink/bn_strawberry_thai_tea.png
+++ b/image/page_drink/bn_strawberry_thai_tea.png
--- a/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_disable/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_disable/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_disable/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_disable/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_disable/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_disable/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_disable/bn_Alcohol_ILYSB.png
+++ b/image/page_drink_disable/bn_Alcohol_ILYSB.png
--- a/image/page_drink_disable/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_disable/bn_Alcohol_Long_Night.png
--- a/image/page_drink_disable/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_disable/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_disable/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_disable/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_disable/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_disable/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_disable/bn_Lychee_lime_soda.png
+++ b/image/page_drink_disable/bn_Lychee_lime_soda.png
--- a/image/page_drink_disable/bn_blueberry_tea.png
+++ b/image/page_drink_disable/bn_blueberry_tea.png
--- a/image/page_drink_disable/bn_chrysanthemum_tea.png
+++ b/image/page_drink_disable/bn_chrysanthemum_tea.png
--- a/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png
+++ b/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png
--- a/image/page_drink_disable/bn_hot_blueberry_tea.png
+++ b/image/page_drink_disable/bn_hot_blueberry_tea.png
--- a/image/page_drink_disable/bn_hot_chrysanthemum_tea.png
+++ b/image/page_drink_disable/bn_hot_chrysanthemum_tea.png
--- a/image/page_drink_disable/bn_hot_lemonate.png
+++ b/image/page_drink_disable/bn_hot_lemonate.png
--- a/image/page_drink_disable/bn_hot_lime_tea.png
+++ b/image/page_drink_disable/bn_hot_lime_tea.png
--- a/image/page_drink_disable/bn_hot_lychee_tea.png
+++ b/image/page_drink_disable/bn_hot_lychee_tea.png
--- a/image/page_drink_disable/bn_hot_matcha_milk_tea.png
+++ b/image/page_drink_disable/bn_hot_matcha_milk_tea.png
--- a/image/page_drink_disable/bn_hot_strawberry_tea.png
+++ b/image/page_drink_disable/bn_hot_strawberry_tea.png
--- a/image/page_drink_disable/bn_hot_taiwan_milk_tea.png
+++ b/image/page_drink_disable/bn_hot_taiwan_milk_tea.png
--- a/image/page_drink_disable/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_disable/bn_hot_thai_milk_tea.png
--- a/image/page_drink_disable/bn_hot_thai_tea.png
+++ b/image/page_drink_disable/bn_hot_thai_tea.png
--- a/image/page_drink_disable/bn_hot_water.png
+++ b/image/page_drink_disable/bn_hot_water.png
--- a/image/page_drink_disable/bn_iced.png
+++ b/image/page_drink_disable/bn_iced.png
--- a/image/page_drink_disable/bn_iced_7up.png
+++ b/image/page_drink_disable/bn_iced_7up.png
--- a/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png
+++ b/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png
--- a/image/page_drink_disable/bn_iced_Cokecola.png
+++ b/image/page_drink_disable/bn_iced_Cokecola.png
--- a/image/page_drink_disable/bn_iced_black_tea.png
+++ b/image/page_drink_disable/bn_iced_black_tea.png
--- a/image/page_drink_disable/bn_iced_blueberry.png
+++ b/image/page_drink_disable/bn_iced_blueberry.png
--- a/image/page_drink_disable/bn_iced_blueberry_soda.png
+++ b/image/page_drink_disable/bn_iced_blueberry_soda.png
--- a/image/page_drink_disable/bn_iced_cola.png
+++ b/image/page_drink_disable/bn_iced_cola.png
--- a/image/page_drink_disable/bn_iced_lemonade.png
+++ b/image/page_drink_disable/bn_iced_lemonade.png
--- a/image/page_drink_disable/bn_iced_lemonade_soda.png
+++ b/image/page_drink_disable/bn_iced_lemonade_soda.png
--- a/image/page_drink_disable/bn_iced_matcha_milk_tea.png
+++ b/image/page_drink_disable/bn_iced_matcha_milk_tea.png
--- a/image/page_drink_disable/bn_iced_soda.png
+++ b/image/page_drink_disable/bn_iced_soda.png
--- a/Show more
+++ b/Show more