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-03-12 18:06:45 +07:00
commit 18bff3e4ed
19 changed files with 229 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/event/bad_valentine/bad_valentine_en.mp4
View file

Binary file not shown.

BIN
image/event/bad_valentine/bad_valentine_th.mp4
View file

Binary file not shown.

BIN
image/event/lipit/display_point/bn_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/event/lipit/display_point/bp_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
image/event/lipit/display_point_en/bn_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
image/event/lipit/display_point_en/bp_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
image/event/lipit/pro_lipit_en.mp4
View file

Binary file not shown.

BIN
image/event/lipit/pro_lipit_th.mp4
View file

Binary file not shown.

BIN
image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_en.mp4
View file

Binary file not shown.

BIN
image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_th.mp4
View file

Binary file not shown.

BIN
image/topping2/bn_powerup1baht.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

BIN
image/topping2/bp_powerup1baht.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

BIN
image/topping2_en/bn_powerup1baht.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
image/topping2_en/bp_powerup1baht.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

16
xml/event/lipit/page_collect_point_pro_lipit_2.xml
View file

@ -89,6 +89,7 @@
Var TaobinName = Ext1b Var TaobinName = Ext1b
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
Var Seeker.IsAlreadyGetReward = Ext1c
If TaobinName = "" Then If TaobinName = "" Then
Var Seeker.IsLineMember = 0 Var Seeker.IsLineMember = 0
Else Else
@ -115,6 +116,21 @@
EndIf EndIf
EndIf EndIf
If Seeker.IsAlreadyGetReward = 1 Then
SAVELOG "Already get reward skip to normal collect point."
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf
EndIf
Var Seeker.PointTaobinStr = ParamCP Var Seeker.PointTaobinStr = ParamCP
Var Seeker.TNumberTaobinMember = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumberX

21
xml/event/lipit/page_collect_point_pro_lipit_3.xml
View file

@ -17,6 +17,7 @@
Var PointMaskState = "Invisible" Var PointMaskState = "Invisible"
Var showRandomBtnState = "Invisible" Var showRandomBtnState = "Invisible"
Var showCloseBtnState = "Enable"
Var CoffeePointStr = CoffeePoint Var CoffeePointStr = CoffeePoint
@ -191,6 +192,7 @@
If PointCount = 10 Then If PointCount = 10 Then
Var showRandomBtnState = "Enable" Var showRandomBtnState = "Enable"
Var showCloseBtnState = "Invisible"
EndIf EndIf
Var CurrentPointSlot = newPointIndex + 1 Var CurrentPointSlot = newPointIndex + 1
@ -578,6 +580,25 @@
</Button> </Button>
<Button>
<X> 610 </X>
<Y> 1660 </Y>
<State> showCloseBtnState </State>
<Filename> Var( DirImage + "/bn_close.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Var CurrentPointCheck = "check"
Var val3 = "X"
AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
Var UpdatePoint = 1
</EventClick>
</Button>
; ;
<Image> <Image>

38
xml/event/tricker.ev
View file

@ -209,7 +209,7 @@ If SystemDateMonthInt = 4 Then
Var MondayBananaPro = 1 Var MondayBananaPro = 1
EndIf EndIf
If SystemDateDayInt <= 12 Then If SystemDateDayInt <= 5 Then
Var LipitPro = 1 Var LipitPro = 1
EndIf EndIf
@ -243,15 +243,15 @@ If BoxID = 201316 Then
Var NewFlowPaymentCode = 1 Var NewFlowPaymentCode = 1
EndIf EndIf
If BoxID = 105005 Then ; If BoxID = 105005 Then
Var PepsiSecondCup30Enable = 1 ; Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1 ; Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1 ; Var NewFlowPaymentCode = 1
;
Var LipitPro = 0 ; Var LipitPro = 0
Var MondayBananaPro = 1 ; Var MondayBananaPro = 1
Var FreeEnergyDrink = 0 ; Var FreeEnergyDrink = 0
EndIf ; EndIf
If BoxID = 172644 Then If BoxID = 172644 Then
Var ProPeachEnable = 1 Var ProPeachEnable = 1
@ -263,6 +263,15 @@ If BoxID = 176757 Then
Var MondayBananaPro = 1 Var MondayBananaPro = 1
Var LipitPro = 1 Var LipitPro = 1
Var FreeEnergyDrink = 1 Var FreeEnergyDrink = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 173149 Then
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 0
Var MondayBananaPro = 1
Var LipitPro = 1
Var FreeEnergyDrink = 1
EndIf EndIf
@ -320,7 +329,9 @@ If InternationalEnable = 1 Then
Var FreeEnergyDrink = 0 Var FreeEnergyDrink = 0
EndIf EndIf
If XMLProfile = "taobin_notopup" Then STRCONTAIN "taobin_nopro" XMLProfile taobin_nopro
If taobin_nopro = "true" Then
Var MilkChoiceVeganEnable = 0 Var MilkChoiceVeganEnable = 0
Var GameEnableFromTrickerEv = 0 Var GameEnableFromTrickerEv = 0
Var TamatianEnable = 0 Var TamatianEnable = 0
@ -335,6 +346,11 @@ If XMLProfile = "taobin_notopup" Then
Var ProPeachEnable = 0 Var ProPeachEnable = 0
Var ProBadValentineEnable = 0 Var ProBadValentineEnable = 0
Var FreeEnergyDrink = 0 Var FreeEnergyDrink = 0
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var FromPepsiSecondCup30 = 0
EndIf EndIf
If BananaSyrupEnable = "true" Then If BananaSyrupEnable = "true" Then

7
xml/page_collect_point_1.xml
View file

@ -241,8 +241,8 @@
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
Else Else
GETACCEXT Param1 23 GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf
@ -744,6 +744,9 @@
GETACCEXT TelephoneNumber 32 GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
Else
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf

314
xml/page_topping_select7.xml
View file

@ -4815,6 +4815,166 @@
</Block> </Block>
;
;
;
;
;
;
;
;
;
;
;
;
;
;
;-BEGIN
;
;-BEGIN Lid straw
<Block>
<Width> 986 </Width>
<Height> 240 </Height>
<MarginTop> 20 </MarginTop>
<State> ShowLidStraw </State>
<Image>
<Filename> bg_strawlid </Filename>
</Image>
; straw left
<Button>
<X> 40 </X>
<Y> 72 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
If StrawState = "Press" Then
Var StrawState = "Enable"
Var Seeker.thankStrawFlag = 0
Else
Var StrawState = "Press"
Var Seeker.thankStrawFlag = 1
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 896 </X>
<Y> 79 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
If StrawState = "Press" Then
Var StrawState = "Enable"
Var Seeker.thankStrawFlag = 0
Else
Var StrawState = "Press"
Var Seeker.thankStrawFlag = 1
EndIf
Refresh
</EventClick>
</Button>
; LID left
<Button>
<X> 40 </X>
<Y> 148 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID pic"
If LidState = "Press" Then
Var LidState = "Enable"
Var Seeker.thankLidFlag = 0
Else
Var LidState = "Press"
Var Seeker.thankLidFlag = 1
EndIf
DEBUGVAR SugarState1
Refresh
</EventClick>
</Button>
<Button>
<X> 896 </X>
<Y> 155 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID cb"
If LidState = "Press" Then
Var LidState = "Enable"
Var Seeker.thankLidFlag = 0
Else
Var LidState = "Press"
Var Seeker.thankLidFlag = 1
EndIf
Refresh
</EventClick>
</Button>
<Image>
<State> StrawDeactiveButton </State>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text20.png" ) </Filename>
</Image>
<Image>
<State> LidDeactiveButton </State>
<X> 602 </X>
<Y> 150 </Y>
<Filename> Var( DirImage + "/text21.png" ) </Filename>
</Image>
</Block>
;-END
;
;
; ;
; ;
; ;
@ -5962,160 +6122,6 @@
</ListView1> </ListView1>
</Block> </Block>
;
;
;
;
;
;
;
;
;
;
;
;
;
;
;-BEGIN
;
;-BEGIN Lid straw
<Block>
<Width> 986 </Width>
<Height> 240 </Height>
<MarginTop> 20 </MarginTop>
<State> ShowLidStraw </State>
<Image>
<Filename> bg_strawlid </Filename>
</Image>
; straw left
<Button>
<X> 40 </X>
<Y> 72 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
If StrawState = "Press" Then
Var StrawState = "Enable"
Var Seeker.thankStrawFlag = 0
Else
Var StrawState = "Press"
Var Seeker.thankStrawFlag = 1
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 896 </X>
<Y> 79 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
If StrawState = "Press" Then
Var StrawState = "Enable"
Var Seeker.thankStrawFlag = 0
Else
Var StrawState = "Press"
Var Seeker.thankStrawFlag = 1
EndIf
Refresh
</EventClick>
</Button>
; LID left
<Button>
<X> 40 </X>
<Y> 148 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID pic"
If LidState = "Press" Then
Var LidState = "Enable"
Var Seeker.thankLidFlag = 0
Else
Var LidState = "Press"
Var Seeker.thankLidFlag = 1
EndIf
DEBUGVAR SugarState1
Refresh
</EventClick>
</Button>
<Button>
<X> 896 </X>
<Y> 155 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID cb"
If LidState = "Press" Then
Var LidState = "Enable"
Var Seeker.thankLidFlag = 0
Else
Var LidState = "Press"
Var Seeker.thankLidFlag = 1
EndIf
Refresh
</EventClick>
</Button>
<Image>
<State> StrawDeactiveButton </State>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text20.png" ) </Filename>
</Image>
<Image>
<State> LidDeactiveButton </State>
<X> 602 </X>
<Y> 150 </Y>
<Filename> Var( DirImage + "/text21.png" ) </Filename>
</Image>
</Block>
;-END
;
;
; ;
; ;