Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

2025-02-17 09:12:50 +07:00 · 2025-02-17 09:12:50 +07:00 · ab2c6e6976
commit ab2c6e6976
parent b008ab55fe 62c44f8c17
1068 changed files with 345745 additions and 284584 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 143068
-rw-rw---- 1 root sdcard_rw        0 2024-12-04 17:12 sync_1.file
+total 143868
+-rw-rw---- 1 root sdcard_rw        0 2025-02-17 17:04 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
@ -12,11 +12,11 @@ total 143068
 -rw-rw---- 1 root sdcard_rw  1422061 2024-08-19 16:55 taobin_adv_menu_08.mp4
 -rw-rw---- 1 root sdcard_rw  7247421 2024-11-19 10:41 taobin_adv_menu_09.mp4
 -rw-rw---- 1 root sdcard_rw 11866329 2024-09-02 15:56 taobin_adv_menu_10.mp4
-rw-rw---- 1 root sdcard_rw  1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4
+-rw-rw---- 1 root sdcard_rw  2292329 2025-01-30 17:39 taobin_adv_menu_11.mp4
 -rw-rw---- 1 root sdcard_rw  1151618 2024-06-14 16:56 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
-rw-rw---- 1 root sdcard_rw  2557252 2024-11-20 14:06 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw  2518504 2025-01-30 17:39 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4
--- a/adv/taobin_adv_menu_11.mp4
+++ b/adv/taobin_adv_menu_11.mp4
--- a/adv/taobin_adv_menu_15.mp4
+++ b/adv/taobin_adv_menu_15.mp4
--- a/adv/taobin_adv_menu_20.mp4
+++ b/adv/taobin_adv_menu_20.mp4
--- a/animation01/TaoBin2_draft02_art63.mp4
+++ b/animation01/TaoBin2_draft02_art63.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -273,28 +273,22 @@ PEPSI LYCHEE	12-05-02-0048	1	14	11	23	13					24	120	4:00	23
 เอสเพรสโซ่ช็อต

 Hot Thai Tea café Latte	12-01-01-0029	1	2	3	4	5	6	7	10		24	161	2:41	22
-Hot Taiwanese Tea café Latte	12-01-01-0030	1	2	3	4	5	10				24	136	2:16	26
 Hot Matcha café Latte	12-01-01-0031	1	2	3	4	5	8	9	7		24	140	2:20	19
 Iced Thai Tea café Latte	12-01-02-0029	1	2	3	4	5	6	7	10	23	24	190	3:10	23
-Iced Taiwanese Tea café Latte	12-01-02-0030	1	2	3	4	5	10	23			24	178	2:58	29
-Iced Matcha café Latte	12-01-02-0031	1	2	3	4	5	8	9	7	23	24	204	3:24	25
 Iced Thai Tea café Latte	12-01-03-0029	2	3	4	5	6	7	10	23	41	24	190	3:10	23
 Iced Taiwanese Tea café Latte	12-01-03-0030	1	2	3	4	5	10	23	41		24	178	2:58	29
 Iced Matcha café Latte	12-01-03-0031	2	3	4	5	8	9	7	23	41	24	204	3:24	25
 Hot thai milk tea	12-02-01-0024	1	6	7	10						24	78	1:18	25
-Hot Taiwanese Tea	12-02-01-0025	1	6	7	10						24	90	1:30	29
 Hot matcha latte	12-02-01-0026	1	6	7	8	9					24	149	2:29	36
 HOT MATCHA	12-02-01-0027	1	16	8	9						24	100	14:40	32
 HOT MATCHA LIMENADE	12-02-01-0028	1	8	9	12	16					24	1	1	32
 Iced Thai milk Tea	12-02-02-0024	1	6	7	10	23					24	165	2:45	40
-Iced Taiwanese Tea	12-02-02-0025	1	6	7	10	23					24	104	1:44	25
 Iced matcha latte	12-02-02-0026	1	6	7	8	9	23				24	175	2:55	34
 ICED MATCHA	12-02-02-0027	1	16	8	9	23					24	100	15:40	32
 ICED MATCHA LIMENADE	12-02-02-0028	1	8	9	12	23					24	1	1	32


 Iced Thai milk Tea	12-02-03-0024	1	6	7	10	23	41				24	165	2:45	40
-Iced Taiwanese Tea	12-02-03-0025	1	6	7	10	23	41				24	104	1:44	25
 Iced matcha latte	12-02-03-0026	1	6	7	8	9	23	41			24	175	2:55	34
 ICED MATCHA	12-02-03-0027	1	16	8	9	23	41				24	100	15:40	32
 ICED MATCHA LIMENADE	12-02-03-0028	1	8	9	12	23	41				24	1	1	32
@ -653,7 +647,6 @@ Hot Taiwanese Tea café Latte	12-01-01-0009	1	2	3	4	5	10				24	136	2:16	26
 Hot Thai Tea café Latte	12-01-01-0010	1	2	3	4	5	6	70	10		24	161	2:41	22
 Hot Kokuto café Latte	12-01-01-0011	1	2	3	4	5	6	70	270		24	125	2:05	17
 Hot Thai Tea café Latte	12-01-01-0029	1	2	3	4	5	6	70	10		24	161	2:41	22
-Hot Taiwanese Tea café Latte	12-01-01-0030	1	2	3	4	5	10				24	136	2:16	26
 Hot Matcha café Latte	12-01-01-0031	1	2	3	4	5	8	9	70		24	140	2:20	19
 อเมริกาโนเมล่อนร้อน	12-01-01-0039	1	2	3	4	5	52				24	120	5:00	23
 Iced Cafe Latte	12-01-02-0002	1	2	3	4	5	6	70	23		24	186	3:06	26
@ -670,8 +663,6 @@ Iced Kokuto café Latte	12-01-02-0008	1	2	3	4	5	6	70	270	23	24	186	3:06	23
 Iced Kokuto café Latte	12-01-03-0008	2	3	4	5	6	70	270	23	41	24	186	3:06	23
 Iced Thai Tea café Latte	12-01-02-0029	1	2	3	4	5	6	70	10	23	24	190	3:10	23
 Iced Thai Tea café Latte	12-01-03-0029	2	3	4	5	6	70	10	23	41	24	190	3:10	23
-Iced Taiwanese Tea café Latte	12-01-02-0030	1	2	3	4	5	10	23			24	178	2:58	29
-Iced Taiwanese Tea café Latte	12-01-03-0030	1	2	3	4	5	10	23	41		24	178	2:58	29
 Iced Matcha café Latte	12-01-02-0031	1	2	3	4	5	8	9	70	23	24	204	3:24	25
 Iced Matcha café Latte	12-01-03-0031	2	3	4	5	8	9	70	23	41	24	204	3:24	25
 อเมริกาโนเมล่อนเย็น	12-01-02-0039	1	2	3	4	5	52	23			24	120	6:00	23
@ -1202,3 +1193,99 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13


 สตรอเบอร์รี่มินต์โซดา	12-05-03-0023	1	19	12	13	23	41				24	120	20:00	23
+
+เต่าทรงพลังสตรอเบอรีโซดา	12-05-02-0136	1	19	34	13	23					24	100	6:40	32
+เต่าทรงพลังสตรอเบอรีโซดาปั่น	12-05-03-0136	1	19	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังบ๊วยโซดา	12-05-02-0137	1	33	34	13	23					24	100	6:40	32
+เต่าทรงพลังบ๊วยโซดาปั่น	12-05-03-0137	1	33	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังลิ้นจี่โซดา	12-05-02-0138	1	11	34	13	23					24	100	6:40	32
+เต่าทรงพลังลิ้นจี่โซดาปั่น	12-05-03-0138	1	11	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังมะนาวโซดา	12-05-02-0139	1	12	34	13	23					24	100	6:40	32
+เต่าทรงพลังมะนาวโซดาปั่น	12-05-03-0139	1	12	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังคาราเมลโซดา	12-05-02-0140	1	22	34	13	23					24	100	6:40	32
+เต่าทรงพลังคาราเมลโซดาปั่น	12-05-03-0140	1	22	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังสละโซดา	12-05-02-0141	1	21	34	13	23					24	100	6:40	32
+เต่าทรงพลังสละโซดาปั่น	12-05-03-0141	1	21	34	13	23	41				24	100	6:40	32
+เต่าทรงพลัง (เพิ่มปริมาณ)	12-05-02-0142	1	34	13	23						24	100	6:40	32
+เต่าทรงพลังปั่น (เพิ่มปริมาณ)	12-05-03-0142	1	34	13	23	41					24	100	6:40	32
+เต่าพลังโซดา (เพิ่มปริมาณ)	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	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
+
+ฟรุตพันช์เย็น	12-05-02-0144	1	12	21	23						24	100	6:40	32
+ฟรุตพันช์ปั่น	12-05-03-0144	1	12	21	23	41					24	100	6:40	32
+ฟรุตพันช์ยูซุเย็น	12-05-02-0145	1	12	53	23						24	100	6:40	32
+ฟรุตพันช์ยูซุปั่น	12-05-03-0145	1	12	53	23	41					24	100	6:40	32
+ฟรุตพันช์บ๊วยเย็น	12-05-02-0146	1	12	33	23						24	100	6:40	32
+ฟรุตพันช์บ๊วยปั่น	12-05-03-0146	1	12	33	23	41					24	100	6:40	32
+
+
+
+
+STX On The Beach	11-99-05-0001	1	27	28							24	100	6:40	32
+Noxious Nitrous	11-99-05-0002	1	27	28							24	100	7:40	32
+Sea Level RISE	11-99-05-0003	1	27	28							24	100	8:40	32
+Methane Bubbles	11-99-05-0004	1	27	28							24	100	9:40	32
+My Carbon\nFootprint	11-99-05-0005	1	27	28							24	100	10:40	32
+Fossil Fuel	11-99-05-0006	1	27	28							24	100	11:40	32
+Stinky Sulphur	11-99-05-0007	1	27	28							24	100	12:40	32
+Biofuel	11-99-05-0008	1	27	28							24	100	13:40	32
+Coal Story Bro	11-99-05-0009	1	27	28							24	100	14:40	32
+Bangkok\nUnderwater	11-99-05-0010	1	27	28							24	100	15:40	32
+		1	27	28							24	100	16:40	32
+Druzhba Pipe	11-99-05-0012	1	27	28							24	100	17:40	32
+2050	11-99-05-0013	1	27	28							24	100	18:40	32
+Petrol Fumes	11-99-05-0017	1	27	28							24	100	19:40	32
+Big Kid	11-99-05-0018	1	27	28							24	100	20:40	32
+Tailpipe Emissions	11-99-05-0015	1	27	28							24	100	21:40	32
+Greenwash	11-99-05-0014	1	27	28							24	100	22:40	32
+		1	27	28							24	100	23:40	32
+Peach Smash	11-99-05-0019	1	27	28							24	100	0:40	32
+Melon Fizz	11-99-05-0020	1	27	28							24	100	1:40	32
+Yuzu Collins	11-99-05-0021	1	27	28							24	100	2:40	32
+Gin Collins	11-99-05-0022	1	27	28							24	100	3:40	32
+The Floral	11-99-05-0023	1	27	28							24	100	4:40	32
+Combination	11-99-05-0024	1	27	28							24	100	5:40	32
+Ume Ume	11-99-05-0025	1	27	28							24	100	6:40	32
+Like Sex\non The Beach	11-99-05-0026	1	27	28							24	100	7:40	32
+Plum Highball	11-99-05-0027	1	27	28							24	100	8:40	32
+Draft Beer	11-99-05-0028	1	27	28							24	100	9:40	32
+Iced Beer 	11-99-05-0029	1	27	28							24	100	10:40	32
+Summer Chill	11-99-05-0030	1	27	28							24	100	11:40	32
+Neon Spark	11-99-05-0031	1	27	28							24	100	12:40	32
+Yuzu Martini	11-99-05-0032	1	27	28							24	100	13:40	32
+Strawberry Martini	11-99-05-0033	1	27	28							24	100	14:40	32
+Russian Mojito	11-99-05-0034	1	27	28							24	100	15:40	32
+Yuzu Highball	11-99-05-0035	1	27	28							24	100	16:40	32
+Beachy Mint	11-99-05-0036	1	27	28							24	100	17:40	32
+Black Menthe	11-99-05-0037	1	27	28							24	100	18:40	32
+Wakeup Call	11-99-05-0038	1	27	28							24	100	19:40	32
+Almost Umeshu	11-99-05-0039	1	27	28							24	100	20:40	32
+Café Avec Liqueur	11-99-05-0040	1	27	28							24	100	21:40	32
+Espresso Martini	11-99-05-0041	1	27	28							24	100	22:40	32
+		1	27	28							24	100	23:40	32
+Mint Julep	11-99-05-0042	1	27	28							24	100	0:40	32
+Highland Straw Fling	11-99-05-0043	1	27	28							24	100	1:40	32
+Scotch Pineapple Sour	11-99-05-0044	1	27	28							24	100	2:40	32
+Turtle Hole	11-99-05-0045	1	27	28							24	100	3:40	32
+Azalea	11-99-05-0046	1	27	28							24	100	4:40	32
+Turtle of BKK	11-99-05-0047	1	27	28							24	100	5:40	32
+TAO Island Beach	11-99-05-0048	1	27	28							24	100	6:40	32
+Yuzu Fizzy	11-99-05-0049	1	27	28							24	100	7:40	32
+
+กาแฟชานมไต้หวันร้อน	12-01-01-0030	1	2	3	4	5	10				24	100	7:40	32
+กาแฟชานมไต้หวันเย็น	12-01-02-0030	1	2	3	4	5	10	23			24	100	7:40	32
+กาแฟชานมไต้หวันปั่น	12-01-03-0030	1	2	3	4	5	10	23	41		24	100	7:40	32
+กาแฟชานมไต้หวันร้อน	12-21-01-0030	1	2	3	4	5	10				24	100	7:40	32
+กาแฟชานมไต้หวันเย็น	12-21-02-0030	1	2	3	4	5	10	23			24	100	7:40	32
+กาแฟชานมไต้หวันปั่น	12-21-03-0030	1	2	3	4	5	10	23	41		24	100	7:40	32
+ชานมไต้หวันร้อน	12-02-01-0025	1	1	6	70	10					24	100	7:40	32
+ชานมไต้หวันเย็น	12-02-02-0025	1	1	6	70	10	23				24	100	7:40	32
+ชานมไต้หวันปั่น	12-02-03-0025	1	1	6	70	10	23	41			24	100	7:40	32
+ชานมไต้หวันโกโก้ร้อน	12-02-01-0089	1	1	6	70	15	10				24	100	7:40	32
+ชานมไต้หวันโกโก้เย็น	12-02-02-0089	1	1	6	70	15	10	23			24	100	7:40	32
+ชานมไต้หวันโกโก้ปั่น	12-02-03-0089	1	1	6	70	15	10	23	41		24	100	7:40	32
--- a/boxid/173249/upload.sh
+++ b/boxid/173249/upload.sh
@ -1,2 +1,6 @@
 ~//project/cofffeemachineConfig/script/tb_send_file.sh 173249 ~/project/taobin_project/boxid/173249/FixPrice10Bath.ev /taobin_project/speical/call_from_topping.ev dc lo 
+~//project/cofffeemachineConfig/script/tb_send_file.sh 200001 ~/project/taobin_project/boxid/173249/FixPrice10Bath.ev /taobin_project/speical/call_from_topping.ev dc lo 

+
+
+mkdir /mnt/sdcard/coffeevending/taobin_project/speical
--- a/image/clean_feedback/bn_feedback_level_1.png
+++ b/image/clean_feedback/bn_feedback_level_1.png
--- a/image/clean_feedback/bn_feedback_level_1_en.png
+++ b/image/clean_feedback/bn_feedback_level_1_en.png
--- a/image/clean_feedback/bn_feedback_level_2.png
+++ b/image/clean_feedback/bn_feedback_level_2.png
--- a/image/clean_feedback/bn_feedback_level_2_en.png
+++ b/image/clean_feedback/bn_feedback_level_2_en.png
--- a/image/clean_feedback/bn_feedback_level_3.png
+++ b/image/clean_feedback/bn_feedback_level_3.png
--- a/image/clean_feedback/bn_feedback_level_3_en.png
+++ b/image/clean_feedback/bn_feedback_level_3_en.png
--- a/image/clean_feedback/bn_feedback_level_4.png
+++ b/image/clean_feedback/bn_feedback_level_4.png
--- a/image/clean_feedback/bn_feedback_level_4_en.png
+++ b/image/clean_feedback/bn_feedback_level_4_en.png
--- a/image/clean_feedback/bn_feedback_level_5.png
+++ b/image/clean_feedback/bn_feedback_level_5.png
--- a/image/clean_feedback/bn_feedback_level_5_en.png
+++ b/image/clean_feedback/bn_feedback_level_5_en.png
--- a/image/clean_feedback/bp_feedback_level_1.png
+++ b/image/clean_feedback/bp_feedback_level_1.png
--- a/image/clean_feedback/bp_feedback_level_1_en.png
+++ b/image/clean_feedback/bp_feedback_level_1_en.png
--- a/image/clean_feedback/bp_feedback_level_2.png
+++ b/image/clean_feedback/bp_feedback_level_2.png
--- a/image/clean_feedback/bp_feedback_level_2_en.png
+++ b/image/clean_feedback/bp_feedback_level_2_en.png
--- a/image/clean_feedback/bp_feedback_level_3.png
+++ b/image/clean_feedback/bp_feedback_level_3.png
--- a/image/clean_feedback/bp_feedback_level_3_en.png
+++ b/image/clean_feedback/bp_feedback_level_3_en.png
--- a/image/clean_feedback/bp_feedback_level_4.png
+++ b/image/clean_feedback/bp_feedback_level_4.png
--- a/image/clean_feedback/bp_feedback_level_4_en.png
+++ b/image/clean_feedback/bp_feedback_level_4_en.png
--- a/image/clean_feedback/bp_feedback_level_5.png
+++ b/image/clean_feedback/bp_feedback_level_5.png
--- a/image/clean_feedback/bp_feedback_level_5_en.png
+++ b/image/clean_feedback/bp_feedback_level_5_en.png
--- a/image/clean_feedback/exit_icon.png
+++ b/image/clean_feedback/exit_icon.png
--- a/image/clean_feedback/popup_bg.png
+++ b/image/clean_feedback/popup_bg.png
--- 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/image_template3
+++ b/image/event/image_template3
@ -1,4 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-normal_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-disable_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-disable_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
-press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
-disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
+normal_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+normal_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+press_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+press_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+disable_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+disable_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.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/event/ovaltine_school/ovaltine_school.png
+++ b/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/red_string_of_fate/red_string_of_fate.mp4
+++ b/image/event/red_string_of_fate/red_string_of_fate.mp4
--- a/image/event/red_string_of_fate/red_string_of_fate.png
+++ b/image/event/red_string_of_fate/red_string_of_fate.png
--- a/image/event/swensen/bn_swensen_pay_code.png
+++ b/image/event/swensen/bn_swensen_pay_code.png
--- a/image/page3/bg1.png
+++ b/image/page3/bg1.png
--- 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/brewing_txt_adv15.png
+++ b/image/page_doing/brewing_txt_adv15.png
--- a/image/page_doing/brewing_txt_adv17.png
+++ b/image/page_doing/brewing_txt_adv17.png
--- a/image/page_doing/brewing_txt_adv17_en.png
+++ b/image/page_doing/brewing_txt_adv17_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/Show more
+++ b/Show more