pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

WTC+SGP: collect pt, WIP collect pt3

Browse source
This commit is contained in:
Pakin 2024-08-14 12:27:50 +07:00
parent bf045d2eb4
commit 30c4497d2b
6 changed files with 87 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

8
inter/sgp/menu/lang.tsv
View file

@ -43,7 +43,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
000040 Not sweet ไม่หวาน
Not sweet ไม่หวาน
000041 Little หวานจุบจิบ
000042 Less หวานน้อย
000043 Perfect หวานพอดี
@ -97,7 +97,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=36,Color=0x746253
000073 Pay now ซื้อเลย
Text
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
000074 Cancel ยกเลิก
Text
@ -105,14 +105,14 @@ TextID Note English Thai
000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม
Text
Font=Kanit,Type=Regular,Size=28,Color=0x0025FF
Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
000081 Hot ร้อน
000082 Iced เย็น
000083 Blend ปั่น
Font=Kanit,Type=Regular,Size=24,Color=0x025FF
Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF
000084 Normal ปกติ

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

7
inter/sgp/xml/page_collect_point_1.lxml
View file

@ -499,6 +499,8 @@
Var ShowCountDownBrewing = CountDownBrewing
DEBUGVAR DebugBypassCollectPt2
; percent
If ShowCountDownAsPercent = 1 Then
Var XPercent = InitCNT - ShowCountDownBrewing
@ -1188,7 +1190,12 @@
EndIf
</EventMachine>
<EventUnitTest1>
Var DebugBypassCollectPt2 = 1
DEBUGVAR DebugBypassCollectPt2
</EventUnitTest1>
</Popup>

21
inter/sgp/xml/page_collect_point_2.lxml
View file

@ -36,6 +36,18 @@
DEBUGVAR PayOfflineMode
If DebugBypassCollectPt2 = 1 Then
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
; reset
Var DebugBypassCollectPt2 = 0
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
EndIf
If PayOfflineMode = 1 Then
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
@ -55,6 +67,13 @@
Var ShowCountdown = "Invisible"
Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
If UsePepsiTheme = 1 Then
;Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
;Var DirImage = DirImage + "/image/collectiing_en"
Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
EndIf
EndIf
</EventOpen>
@ -391,7 +410,7 @@
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> XPercent </Value>
</Text>

15
inter/sgp/xml/page_collect_point_error.lxml
View file

@ -14,6 +14,7 @@
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
Var DirImageStatic = "ROOT/taobin_project/image/display_get_free_en/"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
@ -22,6 +23,16 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
EndIf
Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
If UsePepsiTheme = 1 Then
Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
;Var NumImgDir = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImage = DirImage + "/image/display_get_free_en/"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -54,7 +65,7 @@
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
<Filename> AlphaBg </Filename>
</Image>
@ -65,7 +76,7 @@
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
<Filename> Var( DirImageStatic + "/img_popup4.png" )</Filename>
</Image>

BIN
inter/whatthecup/sgp/image/collect_point1_en/text_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

122
inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
View file

@ -1681,13 +1681,13 @@
</EventClick>
;<Language>
; <X> 43 </X>
; <Y> 8 </Y>
; <Width> 60 </Width>
; <Height> 42 </Height>
; <ID> 000081 </ID>
;</Language>
<Language>
<X> 43 </X>
<Y> 8 </Y>
<Width> 60 </Width>
<Height> 42 </Height>
<ID> 000081 </ID>
</Language>
</Button>
@ -1740,13 +1740,13 @@
Var OverlayMenuFilter = OverlayMenuFilter2_Value
</EventClick>
;<Language>
; <X> 40 </X>
; <Y> 8 </Y>
; <Width> 60 </Width>
; <Height> 42 </Height>
; <ID> 000082 </ID>
;</Language>
<Language>
<X> 40 </X>
<Y> 8 </Y>
<Width> 60 </Width>
<Height> 42 </Height>
<ID> 000082 </ID>
</Language>
</Button>
<Button>
@ -1795,13 +1795,13 @@
Var IndexDrinktType = 1
</EventClick>
;<Language>
; <X> 35 </X>
; <Y> 8 </Y>
; <Width> 150 </Width>
; <Height> 42 </Height>
; <ID> 000084 </ID>
;</Language>
<Language>
<X> 35 </X>
<Y> 8 </Y>
<Width> 150 </Width>
<Height> 42 </Height>
<ID> 000084 </ID>
</Language>
</Button>
@ -1854,54 +1854,18 @@
Var OverlayMenuFilter = OverlayMenuFilter3_Value
</EventClick>
;<Language>
; <X> 26 </X>
; <Y> 8 </Y>
; <Width> 75 </Width>
; <Height> 42 </Height>
; <ID> 000083 </ID>
;</Language>
<Language>
<X> 26 </X>
<Y> 8 </Y>
<Width> 75 </Width>
<Height> 42 </Height>
<ID> 000083 </ID>
</Language>
</Button>
; type
;<Text>
;<X> 460 </X>
;<Y> 80 </Y>
;<Font> KanitRegularTTF </Font>
;<Size> 28 </Size>
;<Color> text_hot_color </Color>
;<Value> "Hot" </Value>
;</Text>
;<Text>
;<X> 630 </X>
;<Y> 80 </Y>
;<Font> KanitRegularTTF </Font>
;<Size> 28 </Size>
;<Color> text_cold_color </Color>
;<Value> eval(
; If normal_button_state = "Enable" Then
; Var return = "Normal"
; Else
; Var return = "Iced"
; EndIf
;) </Value>
;</Text>
;<Text>
;<X> 822 </X>
;<Y> 80 </Y>
;<Font> KanitRegularTTF </Font>
;<Size> 28 </Size>
;<Color> text_blender_color </Color>
;<Value> "Blend" </Value>
;</Text>
; price
<Text>
<X> 520 </X>
<X> 510 </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<Size> 23 </Size>
@ -1910,7 +1874,7 @@
</Text>
<Text>
<X> 700 </X>
<X> 690 </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<Size> 23 </Size>
@ -1922,7 +1886,7 @@
; x for blend rng.
<Text>
<X> 882 </X>
<X> text_show_blend_x </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<Size> 23 </Size>
@ -3383,13 +3347,13 @@
EndIf
</EventClick>
;<Language>
; <X> 53 </X>
; <Y> 16 </Y>
; <Width> 120 </Width>
; <Height> 42 </Height>
; <ID> 000074 </ID>
;</Language>
<Language>
<X> 53 </X>
<Y> 16 </Y>
<Width> 120 </Width>
<Height> 42 </Height>
<ID> 000074 </ID>
</Language>
</Button>
@ -3708,11 +3672,11 @@
</EventClick>
;<Language>
; <X> 64 </X>
; <Y> 19 </Y>
; <ID> 000073 </ID>
;</Language>
<Language>
<X> 64 </X>
<Y> 19 </Y>
<ID> 000073 </ID>
</Language>
</Button>