Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
|
|
@ -1,3 +1,3 @@
|
|||
normal_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
|
||||
press_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
|
||||
disable_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
|
||||
normal_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
|
||||
press_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
|
||||
disable_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
|
||||
press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
|
||||
disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
|
||||
normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
|
||||
press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
|
||||
disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
|
||||
|
|
|
|||
BIN
image/event/school_ovaltine/school_ovaltine2.png
Normal file
|
After Width: | Height: | Size: 586 KiB |
BIN
image/event/taiwanese_tea/taiwanese_tea_banner.png
Normal file
|
After Width: | Height: | Size: 620 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese _Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 75 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese _Tea_Strawberry.png
Normal file
|
After Width: | Height: | Size: 75 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 76 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 75 KiB |
BIN
image/page_drink_disable_n2/bn_Taiwanese_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 70 KiB |
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 70 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_n/bn_Taiwanese _Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 80 KiB |
BIN
image/page_drink_n/bn_Taiwanese _Tea_Strawberry.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Milk_Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Milk_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Milk_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Milk_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 80 KiB |
BIN
image/page_drink_n/bn_Taiwanese_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 12 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese _Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese _Tea_Strawberry.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_picture2_n/bn_Taiwanese_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_picture2_n/bn_taiwan_milk_tea.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
image/page_drink_picture2_n/bn_taiwan_milk_tea_cocoa.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
image/page_drink_picture2_n/bn_taiwanese Tea Cafe Latte.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese _Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 80 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese _Tea_Strawberry.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Coconut.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Tea_Lychee.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Tea_Salak.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
BIN
image/page_drink_press_n/bn_Taiwanese_Tea_Yuzu.png
Normal file
|
After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 76 KiB |