Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project
BIN
image/bg_main_menu2.png
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
image/lang/lang_bg_bottom.png
Normal file
|
After Width: | Height: | Size: 648 B |
BIN
image/lang/lang_bg_center.png
Normal file
|
After Width: | Height: | Size: 246 B |
BIN
image/lang/lang_bg_top.png
Normal file
|
After Width: | Height: | Size: 644 B |
BIN
image/page_doing/brewing_txt_adv1.png
Normal file
|
After Width: | Height: | Size: 23 KiB |
BIN
image/page_doing/brewing_txt_adv1_en.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
BIN
image/page_doing/brewing_txt_adv2.png
Normal file
|
After Width: | Height: | Size: 39 KiB |
BIN
image/page_doing/brewing_txt_adv2_en.png
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
image/page_doing/tao_adv1.png
Normal file
|
After Width: | Height: | Size: 135 KiB |
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.7 KiB |
BIN
image/page_drink_disable_n2/bn_Banana_milk.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
image/page_drink_disable_n2/bn_ChocoBanana_milk.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
Normal file
|
After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
BIN
image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
image/page_drink_disable_n2/bn_Pinky Promise.png
Normal file
|
After Width: | Height: | Size: 5 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
BIN
image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
BIN
image/page_drink_disable_n2/bn_iced_black.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
image/page_drink_disable_n2/bn_iced_soda_black.png
Normal file
|
After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 9 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.7 KiB |
BIN
image/page_drink_n/bn_Banana_milk.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
BIN
image/page_drink_n/bn_ChocoBanana_milk.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
image/page_drink_n/bn_ChocoYuzu_milk.png
Normal file
|
After Width: | Height: | Size: 8 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
BIN
image/page_drink_n/bn_PinkOreo_smoothie.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_n/bn_Pinky Promise.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
BIN
image/page_drink_n/bn_hot_Banana_cafe_latte.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 8.1 KiB |
BIN
image/page_drink_n/bn_hot_yuzu_tea.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 13 KiB |
BIN
image/page_drink_n/bn_iced_black.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
image/page_drink_n/bn_iced_soda_black.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_ChocoYuzu_milk.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
BIN
image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_hot_Yuzu_tea.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_iced_black.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
image/page_drink_picture2_n/bn_iced_soda_black.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_press_n/Component 3.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.8 KiB |
BIN
image/page_drink_press_n/bn_Banana_milk.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
BIN
image/page_drink_press_n/bn_ChocoYuzu_milk.png
Normal file
|
After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
BIN
image/page_drink_press_n/bn_PinkOreo_smoothie.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
BIN
image/page_drink_press_n/bn_hot_Yuzu_tea.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 10 KiB |
BIN
image/page_drink_press_n/bn_iced_black.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |