pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pakin 2024-09-13 17:45:03 +07:00
commit ac05554539
12 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
adv/sync_1.file
View file

@ -1,5 +1,5 @@
total 245024
-rw-rw---- 1 root sdcard_rw 0 2024-08-28 10:42 sync_1.file
total 248844
-rw-rw---- 1 root sdcard_rw 0 2024-09-13 10:15 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 3647528 2023-09-18 18:44 taobin_adv_01.mp4
-rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4
@ -26,12 +26,12 @@ total 245024
-rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
-rw-rw---- 1 root sdcard_rw 7482104 2024-04-11 15:57 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 8099405 2024-08-20 17:10 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw 3877835 2024-07-12 17:16 taobin_adv_menu_05.mp4
-rw-rw---- 1 root sdcard_rw 5209838 2024-08-30 17:36 taobin_adv_menu_05.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4
-rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4
-rw-rw---- 1 root sdcard_rw 1422061 2024-08-19 16:55 taobin_adv_menu_08.mp4
-rw-rw---- 1 root sdcard_rw 3876868 2024-05-29 09:16 taobin_adv_menu_09.mp4
-rw-rw---- 1 root sdcard_rw 9357158 2024-08-27 15:54 taobin_adv_menu_10.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 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

BIN
adv/taobin_adv_menu_05.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_menu_10.mp4
View file

Binary file not shown.

1
inter/uae_dubai/xml/event/tricker.ev
View file

@ -6,6 +6,7 @@
; Reset flag away.
Var SettingIgnoreCollectPoint = 1
DEBUGVAR Propepsi99Enable
DEBUGVAR DisplayFormatFull

12
ui/lang.tsv
View file

@ -835,9 +835,9 @@
800771 Type number. ใส่ตัวเลข
800772
800773 Exhaust Fan Test ทดสอบพัดลมดูดอากาศ
800774
800775
800776
800774 Check Cam powder ตรวจสอบลูกเบี้ยว
800775 Cam powder test pass ทดสอบผ่าน
800776 Cam powder test fail ทดสอบไม่ผ่าน
810000
810001 Start เริ่มทำงาน
@ -896,7 +896,7 @@
810100 Waste Water Tank ถังน้ำทิ้ง
810101 Coffee Grounds Compressor เครื่องอัดกาแฟ
810101 Espresso Module เครื่องอัดกาแฟ
810102 Ice Module ชุดทำน้ำแข็ง
810103 Whipper Module ชุดหัวชง
810104 Washing Cup ถ้วยล้าง
@ -1063,7 +1063,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
@ -1076,7 +1076,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด

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

2
video/script3_first_brewing.ev
View file

@ -35,7 +35,7 @@ EndIf
;
;
;
Var EDC_ThailandOn = 1
;Var EDC_ThailandOn = 1
;
;

6
video/sync_1.file
View file

@ -1,4 +1,4 @@
total 166420
total 166416
-rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4
-rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4
@ -21,8 +21,8 @@ total 166420
-rw-rw---- 1 root sdcard_rw 1217 2024-07-25 11:20 script1.ev
-rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev
-rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev
-rw-rw---- 1 root sdcard_rw 5591 2024-09-05 12:29 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-09-05 12:29 sync_1.file
-rw-rw---- 1 root sdcard_rw 5592 2024-09-13 10:20 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-09-13 10:20 sync_1.file
-rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4
-rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4
-rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4

7
xml/event/tricker.ev
View file

@ -374,6 +374,11 @@ If BoxID = 173149 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 172053 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 200001 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
@ -394,7 +399,7 @@ EndIf
;
If BoxID > 200000 Then
If BoxID < 200015 Then
If BoxID < 200120 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf

4
xml/page_NewBrewing3.xml
View file

@ -15,9 +15,11 @@
Var CountUpWhenBREW_CNT = 0
DEBUGVAR TxRef1
SAVELOG "page_brewing3.xml"
SAVELOG "page_Newbrewing3.xml"
DEBUGVAR MachineStage
Machine NewPaymentOpenBrewingXML
Var PictureFileTextDesctionState = "Enable"

2
xml/page_board.xml
View file

@ -1264,7 +1264,7 @@
DEBUGVAR CountDownPauseVideo2
Var TimeProfilePrice = 0
;Machine NewPaymentOpenBrewingXMLEnable
</EventOpen>
<EventActionOk>

5
xml/page_get_yourchange.xml
View file

@ -78,6 +78,11 @@
Var imgGetChange = "/imgGetChange-HKG.png"
EndIf
;inter-image
If CountryName = "UnitedArabEmirates Dubai" Then
Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
EndIf
;INT StoreCreditAmount
Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "8.91"
Var XMLPageVersionInt = 891
Var XMLPageVersion = "8.92"
Var XMLPageVersionInt = 892
;Oreo
Var OreoGuarantee = 0