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:
wanlop run 2024-08-27 21:42:56 +07:00
commit 169a2b4ae7
43 changed files with 12356 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inter/aus/animation01/play_list.tsv
View file

@ -892,9 +892,9 @@ Caramel Cheesecake Splendor 51-03-03-0054 1 63 53 22 17 23 41 24 120 17:00 23
Mint Cheesecake Symphony 51-03-03-0055 1 63 53 59 17 23 41 24 120 17:00 23
Melon Cheesecake Sonata 51-03-03-0056 1 63 53 52 17 23 41 24 120 17:00 23
Banana Cheesecake Royale 51-03-03-0057 1 63 53 56 17 23 41 24 120 17:00 23
CARAMEL MILK \nBISCOFF VOLCANO 51-03-03-0045 1 22 17 23 40 41 24 120 17:00 23
STRAWBERRY MILK \nBISCOFF VOLCANO 51-03-03-0046 1 19 17 23 40 41 24 120 17:00 23
Mint MILK \nBISCOFF VOLCANO 51-03-03-0047 1 59 17 23 40 41 24 120 17:00 23
CARAMEL MILK \nBISCOFF VOLCANO 51-03-03-0045 1 22 17 23 41 24 120 17:00 23
STRAWBERRY MILK \nBISCOFF VOLCANO 51-03-03-0046 1 19 17 23 41 24 120 17:00 23
Mint MILK \nBISCOFF VOLCANO 51-03-03-0047 1 59 17 23 41 24 120 17:00 23
STX On The Beach 51-99-05-0001 1 27 28 24 120 17:00 23
Noxious Nitrous 51-99-05-0002 1 27 28 24 120 17:00 23

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

BIN
inter/aus/image/event/anniversary_1st.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 KiB

9
inter/aus/image/event/image_template2
View file

@ -1,6 +1,3 @@
normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
normal_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
press_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png

4
inter/aus/menu/lang.tsv
View file

@ -327,6 +327,10 @@ TextID Note English Thai
800072 Water Tank restart.
800073 Restart Shot coffee count
800074 Disc module not close completely แขนปิดไม่สนิท
800075 Adjust ice weight Adjust ice weight
Soda System
800100 stop หยุด

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

2
inter/aus/xml/event/out_put_file2.txt
View file

@ -1 +1 @@
/event/promotion_2.xml
/event/promotion_anniversary_1st.lxml

12166
inter/aus/xml/event/promotion_anniversary_1st.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2
inter/aus/xml/event/promotion_onclick2.inc
View file

@ -1 +1 @@
Open "ROOT/taobin_project/xml/page_catalog_momday.xml"
; Do nothing

30
inter/aus/xml/event/promotion_template2.inc
View file

@ -3,33 +3,9 @@
<X> 42 </X>
<Y> 520 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
Else
Var return = ###normal_thai
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = ###press_eng
Else
Var return = ###press_thai
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = ###disable_eng
Else
Var return = ###disable_thai
EndIf
)
</FilenameDisable>
<Filename> ###normal_eng </Filename>
<FilenamePress> ###press_eng </FilenamePress>
<FilenameDisable> ###disable_eng </FilenameDisable>
<EventOnClick>
###EventOnClick

4
inter/aus/xml/event/script_common_for_open_promotion_xml.ev
View file

@ -14,6 +14,10 @@ If WestfieldCatalogFlag = 1 Then
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_westfield.lxml"
EndIf
If AnniverseryPro = 1 Then
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_anniversary_1st.lxml"
EndIf
If OpenFromPageBoard = 1 Then
OpenInst 2 RecommendPage
Else

17
inter/aus/xml/event/tricker.ev
View file

@ -15,12 +15,23 @@ Var WinterWarmersCatalogFlag = 0
Var WestfieldCatalogFlag = 0
Var XMLLiveInfoEnable = 1
; 2 - 29 Sep
Var AnniverseryPro = 0
If BoxID = 200004 Then
Var NewCollectPointFlag = 1
If SystemDateMonthInt = 9 Then
If SystemDateDayInt >= 2 Then
If SystemDateDayInt <= 29 then
Var AnniverseryPro = 1
EndIf
EndIf
EndIf
Var XMLLiveInfoEnable = 1
If BoxID = 200027 Then
Var AnniverseryPro = 1
EndIf
If BoxID = 210308 Then
Var WestfieldCatalogFlag = 1

4
inter/aus/xml/page_catalog_group_recommend.lxml
View file

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