Merge branch 'masterpiece' into masterpiece_omakase

2024-07-12 11:17:14 +07:00 · 2024-07-12 11:17:14 +07:00 · f1d30da71c
commit f1d30da71c
parent 9b79d3b295 ed414e748b
332 changed files with 90124 additions and 6727 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1071,3 +1071,16 @@ PEPSI COCONUT SMOOTHIE	12-05-03-0091	1	23	62	14	41

 Iced Mocha	12-01-02-0064	1	2	3	4	5	15	7	59	23	24	167	2:47	23
 Iced Mocha	12-21-02-0064	1	2	3	4	5	15	7	59	23	24	167	2:47	23
+
+
+
+
+เป๊ปซี่โกโก้โอริโอ้ภูเขาไฟ	12-99-03-0067	1	15	40	14	23	41				24	120	2:00	23
+เป๊ปซี่โกโก้โอริโอ้ภูเขาไฟ	12-99-03-0068	1	15	40	14	23	41				24	120	2:00	23
+
+
+
+
+12-04-02-0056	โอรีโอ้โปรตีน	1	25	26	6	40					24	120	2:00	23
+12-04-02-0057	ชามะลิโปรตีน	1	25	26	58						24	120	2:00	23
+12-04-02-0058	เต่าทรงพลังโปรตีน	1	25	26	34						24	120	2:00	23
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-normal_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-press_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-press_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-disable_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-disable_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
+normal_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+normal_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+press_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+press_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+disable_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+disable_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-normal_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-press_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-press_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-disable_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-disable_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
--- a/image/event/passion_mint/passion_mint_th.png
+++ b/image/event/passion_mint/passion_mint_th.png
--- a/image/page_doing/brewing_txt_adv2.png
+++ b/image/page_doing/brewing_txt_adv2.png
--- a/image/page_doing/brewing_txt_adv2_en.png
+++ b/image/page_doing/brewing_txt_adv2_en.png
--- a/image/page_doing/brewing_txt_adv4.png
+++ b/image/page_doing/brewing_txt_adv4.png
--- a/image/page_doing/brewing_txt_adv4_en.png
+++ b/image/page_doing/brewing_txt_adv4_en.png
--- a/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
+++ b/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
--- a/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
+++ b/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
--- a/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
--- a/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
+++ b/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Smoothie_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Smoothie_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_pepsi.png
+++ b/image/page_drink_disable_n2/bn_Mint_pepsi.png
--- a/image/page_drink_disable_n2/bn_Mint_pepsi_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_pepsi_passion.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Bananna_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Bananna_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Energy_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Energy_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Lychee_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Matcha_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Matcha_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Melon_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Melon_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Milk_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Milk_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Mint_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Mint_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Plum_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Plum_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Salak_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Salak_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Smoothie_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Smoothie_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Pepsi_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_almost_dirty_normal_coffee.png
+++ b/image/page_drink_disable_n2/bn_almost_dirty_normal_coffee.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png
--- a/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png
--- a/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png
--- a/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png
--- a/image/page_drink_disable_n2/bn_iced_7up_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png
--- a/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png
--- a/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png
--- a/image/page_drink_n/BN_Yuzu_Mint_Soda_passion.png
+++ b/image/page_drink_n/BN_Yuzu_Mint_Soda_passion.png
--- a/image/page_drink_n/Mint_SuperVocano_passion.png
+++ b/image/page_drink_n/Mint_SuperVocano_passion.png
--- a/image/page_drink_n/bn_7UP_Coconut_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Coconut_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Energy_PLUM_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Energy_PLUM_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_Lychee_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_lime_sala_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_lime_sala_lucky_draw_x2.png
--- a/image/page_drink_n/bn_7UP_soda_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_7UP_soda_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Iced_Mint_Latte_passion.png
+++ b/image/page_drink_n/bn_Iced_Mint_Latte_passion.png
--- a/image/page_drink_n/bn_Iced_Mint_Mocha_passion.png
+++ b/image/page_drink_n/bn_Iced_Mint_Mocha_passion.png
--- a/image/page_drink_n/bn_Matcha_latte_mint_smoothie_passion.png
+++ b/image/page_drink_n/bn_Matcha_latte_mint_smoothie_passion.png
--- a/image/page_drink_n/bn_Mint_Americano_passion.png
+++ b/image/page_drink_n/bn_Mint_Americano_passion.png
--- a/image/page_drink_n/bn_Mint_Cocoa_passion.png
+++ b/image/page_drink_n/bn_Mint_Cocoa_passion.png
--- a/image/page_drink_n/bn_Mint_Milk_Straw_Smoothie_passion.png
+++ b/image/page_drink_n/bn_Mint_Milk_Straw_Smoothie_passion.png
--- a/image/page_drink_n/bn_Mint_Strawberry_Soda_passion.png
+++ b/image/page_drink_n/bn_Mint_Strawberry_Soda_passion.png
--- a/image/page_drink_n/bn_Mint_pepsi_passion.png
+++ b/image/page_drink_n/bn_Mint_pepsi_passion.png
--- a/image/page_drink_n/bn_Pepsi_Bananna_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Bananna_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Energy_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Energy_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Jasmine_Tea_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Lychee_Salak_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Lychee_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Matcha_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Matcha_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Melon_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Melon_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Milk_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Milk_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Mint_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Mint_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Plum_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Plum_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Plum_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Salak_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Salak_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Smoothie_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Smoothie_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Strawberry_Lime_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_n/bn_Pepsi_lucky_draw_x2.png
+++ b/image/page_drink_n/bn_Pepsi_lucky_draw_x2.png
--- a/image/page_drink_n/bn_almost_dirty_normal_coffee.png
+++ b/image/page_drink_n/bn_almost_dirty_normal_coffee.png
--- a/image/page_drink_n/bn_iced_7up_Energy_LIME.png
+++ b/image/page_drink_n/bn_iced_7up_Energy_LIME.png
--- a/Show more
+++ b/Show more