From 30c4497d2b484c04efe98bbb98ba00817761a624 Mon Sep 17 00:00:00 2001 From: Pakin Date: Wed, 14 Aug 2024 12:27:50 +0700 Subject: [PATCH] WTC+SGP: collect pt, WIP collect pt3 --- inter/sgp/menu/lang.tsv | 8 +- inter/sgp/xml/page_collect_point_1.lxml | 7 + inter/sgp/xml/page_collect_point_2.lxml | 21 ++- inter/sgp/xml/page_collect_point_error.lxml | 15 ++- .../sgp/image/collect_point1_en/text_edit.png | Bin 0 -> 3945 bytes .../sgp/xml/page_topping_select6_blue.lxml | 122 ++++++------------ 6 files changed, 87 insertions(+), 86 deletions(-) create mode 100644 inter/whatthecup/sgp/image/collect_point1_en/text_edit.png diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index 751976c1..9fc9739c 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -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 ปกติ diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml index d43d8007..6247594d 100644 --- a/inter/sgp/xml/page_collect_point_1.lxml +++ b/inter/sgp/xml/page_collect_point_1.lxml @@ -499,6 +499,8 @@ Var ShowCountDownBrewing = CountDownBrewing + DEBUGVAR DebugBypassCollectPt2 + ; percent If ShowCountDownAsPercent = 1 Then Var XPercent = InitCNT - ShowCountDownBrewing @@ -1188,7 +1190,12 @@ EndIf + + Var DebugBypassCollectPt2 = 1 + DEBUGVAR DebugBypassCollectPt2 + + \ No newline at end of file diff --git a/inter/sgp/xml/page_collect_point_2.lxml b/inter/sgp/xml/page_collect_point_2.lxml index 7310a674..e64ce595 100644 --- a/inter/sgp/xml/page_collect_point_2.lxml +++ b/inter/sgp/xml/page_collect_point_2.lxml @@ -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 @@ -391,7 +410,7 @@ 153 88 RobotoBold - 0x513C2F + HeadlineColor XPercent diff --git a/inter/sgp/xml/page_collect_point_error.lxml b/inter/sgp/xml/page_collect_point_error.lxml index 05be6c3e..8aaf0aaf 100644 --- a/inter/sgp/xml/page_collect_point_error.lxml +++ b/inter/sgp/xml/page_collect_point_error.lxml @@ -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 + 1000 @@ -54,7 +65,7 @@ 0 380 - "ROOT/taobin_project/image/collectiing/alpha.png" + AlphaBg @@ -65,7 +76,7 @@ 158 665 - Var( DirImage + "/img_popup4.png" ) + Var( DirImageStatic + "/img_popup4.png" ) diff --git a/inter/whatthecup/sgp/image/collect_point1_en/text_edit.png b/inter/whatthecup/sgp/image/collect_point1_en/text_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..36cafc85205beeea691c5fbbec7288181b813779 GIT binary patch literal 3945 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 -; -; 43 -; 8 -; 60 -; 42 -; 000081 -; + + 43 + 8 + 60 + 42 + 000081 + @@ -1740,13 +1740,13 @@ Var OverlayMenuFilter = OverlayMenuFilter2_Value -; -; 40 -; 8 -; 60 -; 42 -; 000082 -; + + 40 + 8 + 60 + 42 + 000082 + @@ -1854,54 +1854,18 @@ Var OverlayMenuFilter = OverlayMenuFilter3_Value -; -; 26 -; 8 -; 75 -; 42 -; 000083 -; + + 26 + 8 + 75 + 42 + 000083 + -; type - -; -; 460 -; 80 -; KanitRegularTTF -; 28 -; text_hot_color -; "Hot" -; - -; -; 630 -; 80 -; KanitRegularTTF -; 28 -; text_cold_color -; eval( -; If normal_button_state = "Enable" Then -; Var return = "Normal" -; Else -; Var return = "Iced" -; EndIf -;) -; - -; -; 822 -; 80 -; KanitRegularTTF -; 28 -; text_blender_color -; "Blend" -; - -; price - 520 + 510 85 KanitRegularTTF 23 @@ -1910,7 +1874,7 @@ - 700 + 690 85 KanitRegularTTF 23 @@ -1922,7 +1886,7 @@ ; x for blend rng. - 882 + text_show_blend_x 85 KanitRegularTTF 23 @@ -3383,13 +3347,13 @@ EndIf -; -; 53 -; 16 -; 120 -; 42 -; 000074 -; + + 53 + 16 + 120 + 42 + 000074 + @@ -3708,11 +3672,11 @@ -; -; 64 -; 19 -; 000073 -; + + 64 + 19 + 000073 +