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-14 16:11:27 +07:00
commit fa8ac80021
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
xml/page_thankyou.xml
View file

@ -394,6 +394,13 @@
EndIf EndIf
If Seeker.FreeVendingCampaign = 1 Then If Seeker.FreeVendingCampaign = 1 Then
If Seeker.CollectPointPromotion = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else
If Seeker.CollectPointMain = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else Else
If CART_INDEX >= 2 Then If CART_INDEX >= 2 Then
@ -412,6 +419,14 @@
; Open "ROOT/taobin_project/xml/page_collect_point_1.xml" ; Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
;EndIf ;EndIf
If Seeker.CollectPointPromotion = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else
If Seeker.CollectPointMain = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else Else
If CART_INDEX >= 2 Then If CART_INDEX >= 2 Then

12
xml/sold_cup_count.xml
View file

@ -77,7 +77,7 @@
</Image> </Image>
<Image> <Image>
<X> 393 </X> <X> 383 </X>
<Y> 450 </Y> <Y> 450 </Y>
<Filename> "ROOT/taobin_project/image/sold_cup/rectangle.png" </Filename> <Filename> "ROOT/taobin_project/image/sold_cup/rectangle.png" </Filename>
</Image> </Image>
@ -155,7 +155,7 @@
</FlipNumber> </FlipNumber>
<FlipNumber> <FlipNumber>
<X> 393 </X> <X> 383 </X>
<Y> 450 </Y> <Y> 450 </Y>
<Width> 94 </Width> <Width> 94 </Width>
<Height> 126 </Height> <Height> 126 </Height>
@ -245,12 +245,12 @@
<Width>400</Width> <Width>400</Width>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x523D30 </Color> <Color> 0x523D30 </Color>
<Value> "เสิร์ฟแล้ว (sold cup )" </Value> <Value> "เสิร์ฟแล้ว ( SOLD CUP )" </Value>
</Text> </Text>
<Text> <Text>
<X> 367 </X> <X> 355 </X>
<Y> 400 </Y> <Y> 430 </Y>
<Size> 130 </Size> <Size> 130 </Size>
<Width>50</Width> <Width>50</Width>
<Height>220</Height> <Height>220</Height>
@ -261,7 +261,7 @@
<Text> <Text>
<X> 695 </X> <X> 695 </X>
<Y> 400 </Y> <Y> 430 </Y>
<Size> 130 </Size> <Size> 130 </Size>
<Width>50</Width> <Width>50</Width>
<Height>220</Height> <Height>220</Height>