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

2025-01-27 13:10:44 +07:00 · 2025-01-27 13:10:44 +07:00 · 7bfd9cee75
commit 7bfd9cee75
parent 3cd7d0bb27 b0b4afe922
515 changed files with 193280 additions and 121960 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1220,4 +1220,7 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13
 เต่าพลังโซดา (เพิ่มปริมาณ)	12-05-02-0143	1	34	13	23						24	100	6:40	32
 เต่าพลังโซดาปั่น (เพิ่มปริมาณ)	12-05-03-0143	1	34	13	23	41					24	100	6:40	32

-PEPSI EXTRA	12-05-02-0133	1	23	14							24	49	0:49	23
+PEPSI EXTRA	12-05-02-0133	1	23	14							24	100	6:40	32
+ เพียงพบสบตารัก	12-03-03-0100	1	19	12	15	51	17	23	41		24	100	6:40	32
+ วิวาห์หวาน	12-03-03-0101	1	12	51	17	23	41				24	100	6:40	32
+ ดั่งรักนิรันด์	12-03-03-0102	1	19	12	51	23	41				24	100	6:40	32
--- a/image/display_point_mmr/bn_useCoupon.png
+++ b/image/display_point_mmr/bn_useCoupon.png
--- a/image/display_point_mmr/bp_useCoupon.png
+++ b/image/display_point_mmr/bp_useCoupon.png
--- a/image/event/lucky_draw_ads/bn_close_mmr.png
+++ b/image/event/lucky_draw_ads/bn_close_mmr.png
--- a/image/event/lucky_draw_ads/bp_close_mmr.png
+++ b/image/event/lucky_draw_ads/bp_close_mmr.png
--- a/image/event/ovaltine_school/ovaltine_school.mp4
+++ b/image/event/ovaltine_school/ovaltine_school.mp4
--- a/image/page_doing/brewing_txt_adv14.png
+++ b/image/page_doing/brewing_txt_adv14.png
--- a/image/page_doing/brewing_txt_adv14_en.png
+++ b/image/page_doing/brewing_txt_adv14_en.png
--- a/image/page_doing_mmr/txt_10_mmr.png
+++ b/image/page_doing_mmr/txt_10_mmr.png
--- a/image/page_doing_mmr/txt_11_mmr.png
+++ b/image/page_doing_mmr/txt_11_mmr.png
--- a/image/page_doing_mmr/txt_12_mmr.png
+++ b/image/page_doing_mmr/txt_12_mmr.png
--- a/image/page_doing_mmr/txt_13_mmr.png
+++ b/image/page_doing_mmr/txt_13_mmr.png
--- a/image/page_doing_mmr/txt_14_mmr.png
+++ b/image/page_doing_mmr/txt_14_mmr.png
--- a/image/page_doing_mmr/txt_15_mmr.png
+++ b/image/page_doing_mmr/txt_15_mmr.png
--- a/image/page_doing_mmr/txt_16_mmr.png
+++ b/image/page_doing_mmr/txt_16_mmr.png
--- a/image/page_doing_mmr/txt_17_mmr.png
+++ b/image/page_doing_mmr/txt_17_mmr.png
--- a/image/page_doing_mmr/txt_18_mmr.png
+++ b/image/page_doing_mmr/txt_18_mmr.png
--- a/image/page_doing_mmr/txt_19_mmr.png
+++ b/image/page_doing_mmr/txt_19_mmr.png
--- a/image/page_doing_mmr/txt_1_mmr.png
+++ b/image/page_doing_mmr/txt_1_mmr.png
--- a/image/page_doing_mmr/txt_20_mmr.png
+++ b/image/page_doing_mmr/txt_20_mmr.png
--- a/image/page_doing_mmr/txt_21_mmr.png
+++ b/image/page_doing_mmr/txt_21_mmr.png
--- a/image/page_doing_mmr/txt_22_mmr.png
+++ b/image/page_doing_mmr/txt_22_mmr.png
--- a/image/page_doing_mmr/txt_23_mmr.png
+++ b/image/page_doing_mmr/txt_23_mmr.png
--- a/image/page_doing_mmr/txt_25_mmr.png
+++ b/image/page_doing_mmr/txt_25_mmr.png
--- a/image/page_doing_mmr/txt_26_mmr.png
+++ b/image/page_doing_mmr/txt_26_mmr.png
--- a/image/page_doing_mmr/txt_27_mmr.png
+++ b/image/page_doing_mmr/txt_27_mmr.png
--- a/image/page_doing_mmr/txt_2_mmr.png
+++ b/image/page_doing_mmr/txt_2_mmr.png
--- a/image/page_doing_mmr/txt_31_mmr.png
+++ b/image/page_doing_mmr/txt_31_mmr.png
--- a/image/page_doing_mmr/txt_32_mmr.png
+++ b/image/page_doing_mmr/txt_32_mmr.png
--- a/image/page_doing_mmr/txt_33_mmr.png
+++ b/image/page_doing_mmr/txt_33_mmr.png
--- a/image/page_doing_mmr/txt_34_mmr.png
+++ b/image/page_doing_mmr/txt_34_mmr.png
--- a/image/page_doing_mmr/txt_35_mmr.png
+++ b/image/page_doing_mmr/txt_35_mmr.png
--- a/image/page_doing_mmr/txt_36_mmr.png
+++ b/image/page_doing_mmr/txt_36_mmr.png
--- a/image/page_doing_mmr/txt_37_mmr.png
+++ b/image/page_doing_mmr/txt_37_mmr.png
--- a/image/page_doing_mmr/txt_3_mmr.png
+++ b/image/page_doing_mmr/txt_3_mmr.png
--- a/image/page_doing_mmr/txt_40_mmr.png
+++ b/image/page_doing_mmr/txt_40_mmr.png
--- a/image/page_doing_mmr/txt_41_mmr.png
+++ b/image/page_doing_mmr/txt_41_mmr.png
--- a/image/page_doing_mmr/txt_42_mmr.png
+++ b/image/page_doing_mmr/txt_42_mmr.png
--- a/image/page_doing_mmr/txt_43_mmr.png
+++ b/image/page_doing_mmr/txt_43_mmr.png
--- a/image/page_doing_mmr/txt_44_mmr.png
+++ b/image/page_doing_mmr/txt_44_mmr.png
--- a/image/page_doing_mmr/txt_45_mmr.png
+++ b/image/page_doing_mmr/txt_45_mmr.png
--- a/image/page_doing_mmr/txt_46_mmr.png
+++ b/image/page_doing_mmr/txt_46_mmr.png
--- a/image/page_doing_mmr/txt_47_mmr.png
+++ b/image/page_doing_mmr/txt_47_mmr.png
--- a/image/page_doing_mmr/txt_48_mmr.png
+++ b/image/page_doing_mmr/txt_48_mmr.png
--- a/image/page_doing_mmr/txt_49_mmr.png
+++ b/image/page_doing_mmr/txt_49_mmr.png
--- a/image/page_doing_mmr/txt_4_mmr.png
+++ b/image/page_doing_mmr/txt_4_mmr.png
--- a/image/page_doing_mmr/txt_50_mmr.png
+++ b/image/page_doing_mmr/txt_50_mmr.png
--- a/image/page_doing_mmr/txt_51_mmr.png
+++ b/image/page_doing_mmr/txt_51_mmr.png
--- a/image/page_doing_mmr/txt_52_mmr.png
+++ b/image/page_doing_mmr/txt_52_mmr.png
--- a/image/page_doing_mmr/txt_53_mmr.png
+++ b/image/page_doing_mmr/txt_53_mmr.png
--- a/image/page_doing_mmr/txt_55_mmr.png
+++ b/image/page_doing_mmr/txt_55_mmr.png
--- a/image/page_doing_mmr/txt_56_mmr.png
+++ b/image/page_doing_mmr/txt_56_mmr.png
--- a/image/page_doing_mmr/txt_57_mmr.png
+++ b/image/page_doing_mmr/txt_57_mmr.png
--- a/image/page_doing_mmr/txt_59_mmr.png
+++ b/image/page_doing_mmr/txt_59_mmr.png
--- a/image/page_doing_mmr/txt_5_mmr.png
+++ b/image/page_doing_mmr/txt_5_mmr.png
--- a/image/page_doing_mmr/txt_60_mmr.png
+++ b/image/page_doing_mmr/txt_60_mmr.png
--- a/image/page_doing_mmr/txt_61_mmr.png
+++ b/image/page_doing_mmr/txt_61_mmr.png
--- a/image/page_doing_mmr/txt_62_mmr.png
+++ b/image/page_doing_mmr/txt_62_mmr.png
--- a/image/page_doing_mmr/txt_63_mmr.png
+++ b/image/page_doing_mmr/txt_63_mmr.png
--- a/image/page_doing_mmr/txt_6_mmr.png
+++ b/image/page_doing_mmr/txt_6_mmr.png
--- a/image/page_doing_mmr/txt_70_mmr.png
+++ b/image/page_doing_mmr/txt_70_mmr.png
--- a/image/page_doing_mmr/txt_7_mmr.png
+++ b/image/page_doing_mmr/txt_7_mmr.png
--- a/image/page_doing_mmr/txt_81_mmr.png
+++ b/image/page_doing_mmr/txt_81_mmr.png
--- a/image/page_doing_mmr/txt_8_mmr.png
+++ b/image/page_doing_mmr/txt_8_mmr.png
--- a/image/page_doing_mmr/txt_9_mmr.png
+++ b/image/page_doing_mmr/txt_9_mmr.png
--- a/image/page_drink_disable_n2/IcedCocoax2.png
+++ b/image/page_drink_disable_n2/IcedCocoax2.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_caramel.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel.png
--- a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra.png
--- a/image/page_drink_disable_n2/bn_iced_milk.png
+++ b/image/page_drink_disable_n2/bn_iced_milk.png
--- a/image/page_drink_disable_n2/bn_iced_milk_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_ovaltine.png
+++ b/image/page_drink_disable_n2/bn_iced_ovaltine.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_disable_n2/bn_pink_milk.png
+++ b/image/page_drink_disable_n2/bn_pink_milk.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano.png
--- a/image/page_drink_n/IcedCocoax2.png
+++ b/image/page_drink_n/IcedCocoax2.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_n/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_n/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_n/bn_iced_caramel.png
+++ b/image/page_drink_n/bn_iced_caramel.png
--- a/image/page_drink_n/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_n/bn_iced_caramel_cocoa.png
--- a/image/page_drink_n/bn_iced_cocoa.png
+++ b/image/page_drink_n/bn_iced_cocoa.png
--- a/image/page_drink_n/bn_iced_energy_drink_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_soda_Extra.png
+++ b/image/page_drink_n/bn_iced_energy_drink_soda_Extra.png
--- a/image/page_drink_n/bn_iced_milk.png
+++ b/image/page_drink_n/bn_iced_milk.png
--- a/image/page_drink_n/bn_iced_milk_coconut.png
+++ b/image/page_drink_n/bn_iced_milk_coconut.png
--- a/Show more
+++ b/Show more