Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -165,6 +165,10 @@
|
|||
|
||||
DEBUGVAR SaveSelectDrinkRoadShow
|
||||
|
||||
|
||||
DEBUGVAR ShowPrice
|
||||
DEBUGVAR RoadShow
|
||||
|
||||
If ShowPrice = "Invisible" Then
|
||||
Var PriceDrinkTmpShow = "Free"
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
BIN
inter/tha/image/clean_feedback/bn_feedback_level_1.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_1_en.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_2.png
Normal file
|
After Width: | Height: | Size: 9 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_2_en.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_3.png
Normal file
|
After Width: | Height: | Size: 7.9 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_3_en.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_4.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_4_en.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_5.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
inter/tha/image/clean_feedback/bn_feedback_level_5_en.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_1.png
Normal file
|
After Width: | Height: | Size: 9.4 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_1_en.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_2.png
Normal file
|
After Width: | Height: | Size: 9 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_2_en.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_3.png
Normal file
|
After Width: | Height: | Size: 8.2 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_3_en.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_4.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_4_en.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_5.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
inter/tha/image/clean_feedback/bp_feedback_level_5_en.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
inter/tha/image/clean_feedback/exit_icon.png
Normal file
|
After Width: | Height: | Size: 714 B |
BIN
inter/tha/image/clean_feedback/popup_bg.png
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
BIN
inter/tha/image/dummy.png
Normal file
|
After Width: | Height: | Size: 126 B |
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
BIN
inter/tha/image/event/ovaltine_school/ovaltine_school.png
Normal file
|
After Width: | Height: | Size: 425 KiB |
BIN
inter/tha/image/event/red_string_of_fate/red_string_of_fate.mp4
Executable file
BIN
inter/tha/image/event/red_string_of_fate/red_string_of_fate.png
Normal file
|
After Width: | Height: | Size: 332 KiB |
BIN
inter/tha/image/event/strawberry_series/strawberry_series.mp4
Executable file
BIN
inter/tha/image/event/strawberry_series/strawberry_series.png
Normal file
|
After Width: | Height: | Size: 345 KiB |
BIN
inter/tha/image/menu_overlay_set/button_overlay__posi1.png
Normal file
|
After Width: | Height: | Size: 126 B |
BIN
inter/tha/image/menu_overlay_set/button_overlay__posi2.png
Normal file
|
After Width: | Height: | Size: 126 B |
|
Before Width: | Height: | Size: 993 B After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 62 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 64 KiB |
|
After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 63 KiB |
|
After Width: | Height: | Size: 67 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 63 KiB |
|
After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 72 KiB |
|
After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 51 KiB |
BIN
inter/tha/image/page_drink_disable_n2/bn_iced_pepsi_extra.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
BIN
inter/tha/image/page_drink_n/bn_Strawberr_milk_Oreo_smoothie.png
Normal file
|
After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 70 KiB |
BIN
inter/tha/image/page_drink_n/bn_hot_Strawberry_caramel_latte.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 72 KiB |