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

This commit is contained in:
Pakin 2025-01-27 13:10:44 +07:00
commit 7bfd9cee75
515 changed files with 193280 additions and 121960 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -146,7 +146,7 @@
; under line
<Image>
<X> 0 </X>
<Y> 358 </Y>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
</Image>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -165,6 +165,10 @@
DEBUGVAR SaveSelectDrinkRoadShow
DEBUGVAR ShowPrice
DEBUGVAR RoadShow
If ShowPrice = "Invisible" Then
Var PriceDrinkTmpShow = "Free"
EndIf

View file

@ -3,7 +3,7 @@
DEBUGVAR LastTimeUseChannel10InMinute
DEBUGVAR CurrentXMLFileName0
SAVELOG "powder schedule version 1.05"
SAVELOG "powder schedule version 1.07"
DEBUGVAR PowderPayPushLowScheduleTurnOn10
@ -77,6 +77,7 @@ Else
If PowderScheduleForCh10 = "powder-run" Then
Var PowderScheduleForCh10 = "wait-low-test"
__CMD "CLI" "arm_id=1,arm_position=posi_ice_e" "-" "-"
__CMD "CLI" "powder-set-channel-for-low-push-stage=10,powder-set-time-for-low-push-stage=8,powder-low-push=xml" "-" "-"
DEBUGVAR PowderScheduleForCh10

View file

@ -1,5 +1,5 @@
SAVELOG "RoadShow.ev 201648 201667 201576 Jan 15-19 "
SAVELOG "RoadShow.ev 200435 201316 jan 25 "
Var RoadShow = "false"
@ -14,31 +14,16 @@ If SystemDateYearInt = 2025 Then
Var RoadShowBoxID = 0
If BoxID = 201648 Then
If BoxID = 201316 Then
Var RoadShowBoxID = 1
EndIf
If BoxID = 201667 Then
Var RoadShowBoxID = 1
EndIf
If BoxID = 201576 Then
If BoxID = 200435 Then
Var RoadShowBoxID = 1
EndIf
If RoadShowBoxID = 1 Then
If SystemDateDayInt = 15 Then
Var RoadShow = "true"
EndIf
If SystemDateDayInt = 16 Then
Var RoadShow = "true"
EndIf
If SystemDateDayInt = 17 Then
Var RoadShow = "true"
EndIf
If SystemDateDayInt = 18 Then
Var RoadShow = "true"
EndIf
If SystemDateDayInt = 19 Then
If SystemDateDayInt = 25 Then
Var RoadShow = "true"
EndIf
EndIf

View file

@ -1,9 +1,10 @@
DEBUGVAR LastTimeUseChannel10InMinute
DEBUGVAR CurrentXMLFileName0
SAVELOG "powder schedule version 1.06"
SAVELOG "powder schedule version 1.07"
DEBUGVAR PowderPayPushLowScheduleTurnOn10
@ -78,6 +79,7 @@ Else
If PowderScheduleForCh10 = "powder-run" Then
Var PowderScheduleForCh10 = "wait-low-test"
__CMD "CLI" "arm_id=1,arm_position=posi_ice_e" "-" "-"
__CMD "CLI" "powder-set-channel-for-low-push-stage=10,powder-set-time-for-low-push-stage=2,powder-low-push=xml" "-" "-"
DEBUGVAR PowderScheduleForCh10

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
inter/tha/image/dummy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 B

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
normal_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
press_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
press_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
disable_eng=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_en.png
disable_thai=ROOT/taobin_project/image/event/12_day_12_menu/12_day_12_menu_th.png
normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png

View file

@ -1,4 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
normal_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
disable_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
disable_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
normal_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
normal_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
press_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
press_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
disable_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
disable_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 993 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 83 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 83 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Before After
Before After

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