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

Browse source

...

This commit is contained in:

miggaze 2022-04-04 12:32:54 +07:00

parent f6ca11fb44 0329fdb5d4

commit 91d6b38262

70 changed files with 6072 additions and 930 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

image/drink_option/blend_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 486 B

BIN

image/drink_option/cold_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 535 B

BIN

image/drink_option/hot_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 601 B

BIN

image/drink_option_en/blend_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 661 B

BIN

image/drink_option_en/cold_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 643 B

BIN

image/drink_option_en/hot_db.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 525 B

BIN

image/page_doing/txt_46.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 24 KiB

BIN

image/page_doing/txt_46_en.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 26 KiB

BIN

image/page_drink_disable_n/bn_iced_soda.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.5 KiB

BIN

image/page_drink_n/bn_iced_soda.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

image/page_drink_press_n/bn_iced_soda.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

image/topping2/bt_cold.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/topping2/bt_cold_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/topping2/bt_cold_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 883 B

BIN

image/topping2/bt_cold_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

image/topping2/bt_hot.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

BIN

image/topping2/bt_hot_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

image/topping2/bt_hot_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

image/topping2/bt_hot_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

image/topping2/bt_smoothie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

image/topping2/bt_smoothie_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

image/topping2/bt_smoothie_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

image/topping2/bt_smoothie_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

image/topping2/drink_select_type.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.9 KiB

BIN

image/topping2_en/bt_cold.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

BIN

image/topping2_en/bt_cold_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

image/topping2_en/bt_cold_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 932 B

BIN

image/topping2_en/bt_cold_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

image/topping2_en/bt_hot.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

image/topping2_en/bt_hot_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

image/topping2_en/bt_hot_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

image/topping2_en/bt_hot_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/topping2_en/bt_smoothie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

image/topping2_en/bt_smoothie_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

image/topping2_en/bt_smoothie_disable2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/topping2_en/bt_smoothie_selected.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB