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

2024-12-25 10:09:16 +07:00 · 2024-12-25 10:09:16 +07:00 · c6d1a1c6d7
commit c6d1a1c6d7
parent a92068fb72 5eeb32683a
1299 changed files with 47601 additions and 22302 deletions
--- a/inter/tha/animation01/play_list.tsv
+++ b/inter/tha/animation01/play_list.tsv
@ -1188,3 +1188,17 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13

 โอวันตินรถโรงเรียน\nภูเขาไฟ	12-03-03-0094	1	51	17	23	41					24	66	5:06	32
 โอวันตินรถโรงเรียน\nซุปเปอร์ภูเขาไฟ	12-03-03-0095	1	51	17	23	41					24	66	5:06	32
+
+โกโก้สตรอเบอร์รี่ร้อน	12-03-01-0010	1	19	15	6	7					24	135	2:15	44
+โกโก้สตรอเบอร์รี่เย็น	12-03-02-0010	1	19	15	17	23					24	135	2:15	44
+โกโก้สตรอเบอร์รี่ปั่น	12-03-03-0010	1	19	15	17	23	41				24	135	2:15	44
+
+กาแฟสตรอเบอร์รี่ร้อน	12-01-01-0074	1	2	3	5	19	7				24	135	2:15	44
+กาแฟสตรอเบอร์รี่เย็น	12-01-02-0074	1	2	3	5	19	7	23			24	135	2:15	44
+กาแฟสตรอเบอร์รี่ปั่น	12-01-03-0074	1	2	3	5	19	7	41			24	135	2:15	44
+กาแฟสตรอเบอร์รี่ร้อน	12-21-01-0074	1	2	3	5	19	7				24	135	2:15	44
+กาแฟสตรอเบอร์รี่เย็น	12-21-02-0074	1	2	3	5	19	7	23			24	135	2:15	44
+กาแฟสตรอเบอร์รี่ปั่น	12-21-03-0074	1	2	3	5	19	7	41			24	135	2:15	44
+
+
+สตรอเบอร์รี่มินต์โซดา	12-05-03-0023	1	19	12	13	23	41				24	120	20:00	23
--- a/inter/tha/image/before_member/bn_change_pass_mmr.png
+++ b/inter/tha/image/before_member/bn_change_pass_mmr.png
--- a/inter/tha/image/before_member/bn_check_coupon_mmr.png
+++ b/inter/tha/image/before_member/bn_check_coupon_mmr.png
--- a/inter/tha/image/before_member/bn_topup_credit_mmr.png
+++ b/inter/tha/image/before_member/bn_topup_credit_mmr.png
--- a/inter/tha/image/before_member/bp_change_pass_mmr.png
+++ b/inter/tha/image/before_member/bp_change_pass_mmr.png
--- a/inter/tha/image/before_member/bp_check_coupon_mmr.png
+++ b/inter/tha/image/before_member/bp_check_coupon_mmr.png
--- a/inter/tha/image/before_member/bp_topup_credit_mmr.png
+++ b/inter/tha/image/before_member/bp_topup_credit_mmr.png
--- a/inter/tha/image/collect_point1_mmr/bn_back.png
+++ b/inter/tha/image/collect_point1_mmr/bn_back.png
--- a/inter/tha/image/collect_point1_mmr/bn_ignore.png
+++ b/inter/tha/image/collect_point1_mmr/bn_ignore.png
--- a/inter/tha/image/collect_point1_mmr/bn_negative.png
+++ b/inter/tha/image/collect_point1_mmr/bn_negative.png
--- a/inter/tha/image/collect_point1_mmr/bn_negative2.png
+++ b/inter/tha/image/collect_point1_mmr/bn_negative2.png
--- a/inter/tha/image/collect_point1_mmr/bn_positive.png
+++ b/inter/tha/image/collect_point1_mmr/bn_positive.png
--- a/inter/tha/image/collect_point1_mmr/bp_back.png
+++ b/inter/tha/image/collect_point1_mmr/bp_back.png
--- a/inter/tha/image/collect_point1_mmr/bp_negative.png
+++ b/inter/tha/image/collect_point1_mmr/bp_negative.png
--- a/inter/tha/image/collect_point1_mmr/bp_negative2.png
+++ b/inter/tha/image/collect_point1_mmr/bp_negative2.png
--- a/inter/tha/image/collect_point1_mmr/bp_positive.png
+++ b/inter/tha/image/collect_point1_mmr/bp_positive.png
--- a/inter/tha/image/collect_point1_mmr/img2_eng.png
+++ b/inter/tha/image/collect_point1_mmr/img2_eng.png
--- a/inter/tha/image/collect_point1_mmr/img3.png
+++ b/inter/tha/image/collect_point1_mmr/img3.png
--- a/inter/tha/image/collect_point1_mmr/img4.png
+++ b/inter/tha/image/collect_point1_mmr/img4.png
--- a/inter/tha/image/collect_point1_mmr/text_1.png
+++ b/inter/tha/image/collect_point1_mmr/text_1.png
--- a/inter/tha/image/collect_point1_mmr/text_2.png
+++ b/inter/tha/image/collect_point1_mmr/text_2.png
--- a/inter/tha/image/collect_point1_mmr/text_3.png
+++ b/inter/tha/image/collect_point1_mmr/text_3.png
--- a/inter/tha/image/collect_point1_mmr/text_4.png
+++ b/inter/tha/image/collect_point1_mmr/text_4.png
--- a/inter/tha/image/collect_point1_mmr/text_5.png
+++ b/inter/tha/image/collect_point1_mmr/text_5.png
--- a/inter/tha/image/collect_point1_mmr/text_6.png
+++ b/inter/tha/image/collect_point1_mmr/text_6.png
--- a/inter/tha/image/collect_point1_mmr/text_7.png
+++ b/inter/tha/image/collect_point1_mmr/text_7.png
--- a/inter/tha/image/collect_point1_mmr/text_edit-1.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit-1.png
--- a/inter/tha/image/collect_point1_mmr/text_edit.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit.png
--- a/inter/tha/image/collect_point1_mmr/text_edit2.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit2.png
--- a/inter/tha/image/collectiing_mmr/Businessman_sorry.png
+++ b/inter/tha/image/collectiing_mmr/Businessman_sorry.png
--- a/inter/tha/image/collectiing_mmr/Businessman_sorry2.png
+++ b/inter/tha/image/collectiing_mmr/Businessman_sorry2.png
--- a/inter/tha/image/collectiing_mmr/Exit.png
+++ b/inter/tha/image/collectiing_mmr/Exit.png
--- a/inter/tha/image/collectiing_mmr/Group.png
+++ b/inter/tha/image/collectiing_mmr/Group.png
--- a/inter/tha/image/collectiing_mmr/PinFailed.png
+++ b/inter/tha/image/collectiing_mmr/PinFailed.png
--- a/inter/tha/image/collectiing_mmr/PinSuccess.png
+++ b/inter/tha/image/collectiing_mmr/PinSuccess.png
--- a/inter/tha/image/collectiing_mmr/alpha.png
+++ b/inter/tha/image/collectiing_mmr/alpha.png
--- a/inter/tha/image/collectiing_mmr/bd_confirm.png
+++ b/inter/tha/image/collectiing_mmr/bd_confirm.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_ccard1.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_ccard1.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeAEON.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeAEON.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeAIS.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeAIS.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeDtac.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeDtac.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeKBANK.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeKBANK.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeLH.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeLH.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeLotus.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeLotus.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeMCard.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeMCard.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeRabbit.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeRabbit.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeThe1.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeThe1.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeTrue.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeTrue.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_dolfin.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_dolfin.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_lazpay.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_lazpay.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_linepay.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_linepay.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_make.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_make.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_maxme.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_maxme.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_shoppy.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_shoppy.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_true.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_true.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_wechat.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_wechat.png
--- a/inter/tha/image/collectiing_mmr/bn_0.png
+++ b/inter/tha/image/collectiing_mmr/bn_0.png
--- a/inter/tha/image/collectiing_mmr/bn_1.png
+++ b/inter/tha/image/collectiing_mmr/bn_1.png
--- a/inter/tha/image/collectiing_mmr/bn_2.png
+++ b/inter/tha/image/collectiing_mmr/bn_2.png
--- a/inter/tha/image/collectiing_mmr/bn_3.png
+++ b/inter/tha/image/collectiing_mmr/bn_3.png
--- a/inter/tha/image/collectiing_mmr/bn_4.png
+++ b/inter/tha/image/collectiing_mmr/bn_4.png
--- a/inter/tha/image/collectiing_mmr/bn_5.png
+++ b/inter/tha/image/collectiing_mmr/bn_5.png
--- a/inter/tha/image/collectiing_mmr/bn_6.png
+++ b/inter/tha/image/collectiing_mmr/bn_6.png
--- a/inter/tha/image/collectiing_mmr/bn_7.png
+++ b/inter/tha/image/collectiing_mmr/bn_7.png
--- a/inter/tha/image/collectiing_mmr/bn_8.png
+++ b/inter/tha/image/collectiing_mmr/bn_8.png
--- a/inter/tha/image/collectiing_mmr/bn_9.png
+++ b/inter/tha/image/collectiing_mmr/bn_9.png
--- a/inter/tha/image/collectiing_mmr/bn_back-1.png
+++ b/inter/tha/image/collectiing_mmr/bn_back-1.png
--- a/inter/tha/image/collectiing_mmr/bn_back.png
+++ b/inter/tha/image/collectiing_mmr/bn_back.png
--- a/inter/tha/image/collectiing_mmr/bn_back2.png
+++ b/inter/tha/image/collectiing_mmr/bn_back2.png
--- a/inter/tha/image/collectiing_mmr/bn_back3.png
+++ b/inter/tha/image/collectiing_mmr/bn_back3.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel2.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel2.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel3.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel3.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel4.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel4.png
--- a/inter/tha/image/collectiing_mmr/bn_catalog.png
+++ b/inter/tha/image/collectiing_mmr/bn_catalog.png
--- a/inter/tha/image/collectiing_mmr/bn_close.png
+++ b/inter/tha/image/collectiing_mmr/bn_close.png
--- a/inter/tha/image/collectiing_mmr/bn_confirm.png
+++ b/inter/tha/image/collectiing_mmr/bn_confirm.png
--- a/inter/tha/image/collectiing_mmr/bn_confirm2.png
+++ b/inter/tha/image/collectiing_mmr/bn_confirm2.png
--- a/inter/tha/image/collectiing_mmr/bn_continue.png
+++ b/inter/tha/image/collectiing_mmr/bn_continue.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open2-1.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open2-1.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open2.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open2.png
--- a/inter/tha/image/collectiing_mmr/bn_getPin.png
+++ b/inter/tha/image/collectiing_mmr/bn_getPin.png
--- a/inter/tha/image/collectiing_mmr/bn_getSMSPage.png
+++ b/inter/tha/image/collectiing_mmr/bn_getSMSPage.png
--- a/inter/tha/image/collectiing_mmr/bn_ignore.png
+++ b/inter/tha/image/collectiing_mmr/bn_ignore.png
--- a/inter/tha/image/collectiing_mmr/bn_number.png
+++ b/inter/tha/image/collectiing_mmr/bn_number.png
--- a/inter/tha/image/collectiing_mmr/bn_other.png
+++ b/inter/tha/image/collectiing_mmr/bn_other.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_ccard1.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_ccard1.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeAEON.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeAEON.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeAIS.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeAIS.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeDtac.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeDtac.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeKBANK.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeKBANK.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeLH.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeLH.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeLotus.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeLotus.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeMCard.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeMCard.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeRabbit.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeRabbit.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeThe1.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeThe1.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeTrue.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeTrue.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeXXX.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeXXX.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_dolfin.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_dolfin.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_lazpay.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_lazpay.png
--- a/Show more
+++ b/Show more