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

Browse source

...

This commit is contained in:

Pakin 2023-11-15 10:07:09 +07:00

parent 2f973583a0 a11b7c4b92

commit 99d13aa442

142 changed files with 4821 additions and 153 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/page_brew.png Normal file

View file

Binary file not shown.

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

BIN

image/page_doing/brewing_txt_adv4.png

View file

Binary file not shown.

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

BIN

image/page_doing/brewing_txt_adv4_en.png

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Americano.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Cocoa.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Milk.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Milk_Straw.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_cafe_Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_Mint_pepsi.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_disable_n2/bn_iced_mint_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Americano.png

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Cocoa.png

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Lime_Black_tea.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Lychee_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Matcha_Latte.png

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Milk.png

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Milk_Straw.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Oreo_smoothie.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Plum_limenade_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Strawberry_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_Yuzu_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_cafe_Latte.png

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_Mint_pepsi.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_n/bn_iced_mint_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Icebn_Mint_Americano.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Lychee_lime_soda.png

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Cocoa.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Milk.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Milk_Straw.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Mint cafe Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_Mint_pepsi.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_picture2_n/bn_iced_mint_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Americano.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Cocoa.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Lime_Black_tea.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Matcha_Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Milk.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Milk_Straw.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Oreo_smoothie.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Strawberry_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_Yuzu_Soda.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_cafe_Latte.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_Mint_pepsi.png Normal file

View file

Binary file not shown.

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

BIN

image/page_drink_press_n/bn_iced_mint_lime_soda.png Normal file

View file

Binary file not shown.

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

BIN

inter/common/animation01/TaoBin2_draft02_art10.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art11.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art12.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art13.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art14.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art15.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art16.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art17.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art19.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art2.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art21.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art22.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art23.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art24.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art25.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art26.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art27.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art28.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art3.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art31.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art33.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art34.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art35.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art36.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art4.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art40.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art41.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art42.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art43.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art44.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art45.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art46.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art47.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art48.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art49.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art5.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art50.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art51.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art53.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art55.mp4 Normal file

View file

Binary file not shown.

BIN

inter/common/animation01/TaoBin2_draft02_art57.mp4 Normal file

View file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more