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

This commit is contained in:
Pakin 2024-08-02 13:44:36 +07:00
commit 361f205771
153 changed files with 52720 additions and 2131 deletions

View file

@ -1094,3 +1094,11 @@ Iced Mocha 12-21-02-0064 1 2 3 4 5 15 7 59 23 24 167 2:47 23
12-05-02-0118 7UP BANANA 1 18 56 23 13 24 120 2:00 23 12-05-02-0118 7UP BANANA 1 18 56 23 13 24 120 2:00 23
12-05-02-0119 7UP MELON 1 18 52 23 13 24 120 2:00 23 12-05-02-0119 7UP MELON 1 18 52 23 13 24 120 2:00 23
12-05-02-0120 7UP PEACH 1 18 60 23 12 24 120 2:00 23 12-05-02-0120 7UP PEACH 1 18 60 23 12 24 120 2:00 23
12-03-02-0065 โกโก้ตัวมัม 1 15 17 23 24 120 2:00 23
12-03-02-0067 โกโก้ตัวมารดา 1 15 17 23 24 120 2:00 23
12-03-02-0066 โกโก้ตัวมาเท้อ 1 15 17 23 24 120 2:00 23
12-03-01-0068 โกโก้ตัวสูตินรีร้อน 1 15 26 24 120 2:00 23
12-03-02-0068 โกโก้ตัวสูตินรีเย็น 1 15 26 23 24 120 2:00 23
12-03-02-0069 โกโก้ตัวแม่ลูกอ่อน 1 15 17 23 24 120 2:00 23

Can't render this file because it has a wrong number of fields in line 40.

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png normal_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png normal_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png press_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png press_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png disable_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png disable_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -12124,8 +12124,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -12124,8 +12124,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -689,8 +689,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -12092,8 +12092,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -700,8 +700,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -700,8 +700,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

View file

@ -31,8 +31,7 @@
<EventTimeout> <EventTimeout>
;SAVELOG MachineErrorDetail ;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetail + " / " Var MachineErrorDetailAll = MachineErrorDetailEng
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
If MachineStage = "show-menu" Then If MachineStage = "show-menu" Then

Some files were not shown because too many files have changed in this diff Show more