Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

animation01/Menu Description - Sheet1.tsv

@@ -147,6 +147,20 @@ ESPRESSO BLUE DADDY	12-01-01-0020	1	2	36	3	4	5				24	66	1:06	32
 														
 Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 														
+OREO SMOOTHIE VOLCANO	12-03-03-0009	1	17	23							24	110	1:50	53
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
 double espresso	14-11-01-0001	1	2	3	4	5						116	1:56	28

animation01/Menu Description - Sheet1_.tsv

@@ -73,7 +73,6 @@ DRINKING WATER	12-05-02-0016	1	16								24	60	1:00	56
 Ice	12-05-02-0017	1	23								24	32	0:32	28
 Iced water	12-05-02-0018	1	23	16							24	62	1:02	29
 Hot Water	12-05-01-0002	1	16								24	55	0:55	51
-Coke	12-05-02-0019												0:00	#DIV/0!
 Sprite	12-05-02-0020	1	23	18							24	20	0:20	8
 7UP	12-05-02-0021	1	23	18							24	20	0:20	8
 MATCHA SHAKE	12-04-02-0001	1	25	26	9	6	7	23			24	181	3:01	30
@@ -142,10 +141,11 @@ Iced strawberrry tea	12-02-02-0022	1	10	19	23						24	85	1:25	27
 STRAWBERRY SHAKE	12-04-02-0013	1	25	26	19	17	23				24	178	2:58	35
 														
 ETHIOPAI BLUE DADDY DIRTY	12-01-02-0020	1	7	36	2	3	4	5			24	100	22:40	32
-HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	36	2	3	4	5	16			24	88	1:28	32
-ICED AMERICANO BLUE DADDY	12-01-02-0019	1	36	2	3	4	5	23	16		24	133	2:13	32
-ESPRESSO BLUE DADDY	12-01-01-0020	1	36	2	3	4	5				24	66	1:06	32
+HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	2	36	3	4	5	16			24	88	1:28	32
+ICED AMERICANO BLUE DADDY	12-01-02-0019	1	2	36	3	4	5	23	16		24	133	2:13	32
+ESPRESSO BLUE DADDY	12-01-01-0020	1	2	36	3	4	5				24	66	1:06	32
 														
+Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16