Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
|
|
@ -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.
|
|
|
@ -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_
|
||||||
BIN
image/event/mom_cocoa/mom_cocoa_banner_10-12.png
Normal file
|
After Width: | Height: | Size: 546 KiB |
BIN
image/event/mom_cocoa/mom_cocoa_banner_13-16.png
Normal file
|
After Width: | Height: | Size: 546 KiB |
BIN
image/new_vending_info/backtohome_testcoin.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
image/new_vending_info/backtohome_testcoin_bp.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
image/new_vending_info/checkin.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
image/new_vending_info/checkinheader.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
BIN
image/new_vending_info/checkinplasewait.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
image/new_vending_info/checkinplasewait2.png
Normal file
|
After Width: | Height: | Size: 32 KiB |
BIN
image/new_vending_info/messagebankfail.png
Normal file
|
After Width: | Height: | Size: 4.4 KiB |
BIN
image/new_vending_info/messagecoinfail.png
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
BIN
image/new_vending_info/messagetestallsuccess.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
image/new_vending_info/messsagechangefail.png
Normal file
|
After Width: | Height: | Size: 4.4 KiB |
BIN
image/new_vending_info/personguildline.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
image/new_vending_info/retrycheckin.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/new_vending_info/retryprocess_testcoin.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
image/new_vending_info/retryprocess_testcoin_bp.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
image/new_vending_info/sendcheckin.png
Normal file
|
After Width: | Height: | Size: 2 KiB |
BIN
image/new_vending_info/sendpicturecheckinbackhome.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
image/new_vending_info/sendpicturecheckinprocess.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/sendpicturecheckinsuccess.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
image/new_vending_info/startcapture.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
image/new_vending_info/test_bank_20.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/test_bank_coin_plasewait.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
image/new_vending_info/test_bank_header_page.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
image/new_vending_info/test_change_10.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
image/new_vending_info/test_change_10_page.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/test_change_10_page_bn.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/test_change_10_page_bp.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
image/new_vending_info/test_change_header_page.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
image/new_vending_info/test_coin_10_bath.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
image/new_vending_info/test_coin_5_bath.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
image/new_vending_info/test_coin_backmain_page.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
image/new_vending_info/test_coin_cancel.png
Normal file
|
After Width: | Height: | Size: 2 KiB |
BIN
image/new_vending_info/test_coin_cancel_page.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
image/new_vending_info/test_coin_header_page.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
image/new_vending_info/test_success_coinbank_header_page.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/testcoin_10_fail.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/new_vending_info/testcoin_10_foc.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
image/new_vending_info/testcoin_10_nor.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
image/new_vending_info/testcoin_10_succ.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
image/new_vending_info/testcoin_20_fail.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
image/new_vending_info/testcoin_20_foc.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
image/new_vending_info/testcoin_20_nor.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
image/new_vending_info/testcoin_20_succ.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
image/new_vending_info/testcoin_5_fail.png
Normal file
|
After Width: | Height: | Size: 3 KiB |
BIN
image/new_vending_info/testcoin_5_foc.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/new_vending_info/testcoin_5_succ.png
Normal file
|
After Width: | Height: | Size: 4.4 KiB |
BIN
image/new_vending_info/testcoin_change_fail.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
image/new_vending_info/testcoin_change_foc.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
image/new_vending_info/testcoin_change_nor.png
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
BIN
image/new_vending_info/testcoin_change_succ.png
Normal file
|
After Width: | Height: | Size: 5.1 KiB |
BIN
image/new_vending_info/testcoinbank_header.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
image/new_vending_info/testcoinbankwait.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
image/new_vending_info/testmoney.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
image/new_vending_info/undotest_testcoin.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
image/new_vending_info/undotest_testcoin_bp.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
image/page_drink_disable_n2/CocoaNoMilk_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 106 KiB |
BIN
image/page_drink_disable_n2/IcedBabyCocoa_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
image/page_drink_disable_n2/IcedCocoax2_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
image/page_drink_disable_n2/IcedCocoax3_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
image/page_drink_disable_n2/IcedCocoax4_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 104 KiB |
BIN
image/page_drink_disable_n2/bn_hot_Banana_Mocha.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
|
After Width: | Height: | Size: 13 KiB |
BIN
image/page_drink_n/CocoaNoMilk_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 109 KiB |
BIN
image/page_drink_n/IcedBabyCocoa_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 108 KiB |
BIN
image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png
Normal file
|
After Width: | Height: | Size: 108 KiB |
BIN
image/page_drink_n/IcedCocoax2_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 109 KiB |
BIN
image/page_drink_n/IcedCocoax3_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 109 KiB |
BIN
image/page_drink_n/IcedCocoax4_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 108 KiB |
BIN
image/page_drink_n/bn_hot_Banana_Mocha.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 9.9 KiB |
BIN
image/page_drink_picture2_n/CocoaNoMilk_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
image/page_drink_picture2_n/IcedBabyCocoa_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
BIN
image/page_drink_picture2_n/IcedCocoax1_mom_cocoacocoa.png
Normal file
|
After Width: | Height: | Size: 30 KiB |
BIN
image/page_drink_picture2_n/IcedCocoax2_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 30 KiB |
BIN
image/page_drink_picture2_n/IcedCocoax3_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 31 KiB |
BIN
image/page_drink_picture2_n/IcedCocoax4_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 15 KiB |
BIN
image/page_drink_picture2_n/bn_hot_Banana_Mocha.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 26 KiB |
BIN
image/page_drink_press_n/CocoaNoMilk_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
image/page_drink_press_n/IcedBabyCocoa_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_press_n/IcedCocoax1_mom_cocoacocoa.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_press_n/IcedCocoax2_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_press_n/IcedCocoax3_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_press_n/IcedCocoax4_mom_cocoa.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_press_n/bn_hot_Banana_Mocha.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 9.8 KiB |
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||