diff --git a/font/PepsiOwners2/PepsiOwners2-Compressed220909.ttf b/font/PepsiOwners2/PepsiOwners2-Compressed220909.ttf new file mode 100644 index 00000000..1514a8cb Binary files /dev/null and b/font/PepsiOwners2/PepsiOwners2-Compressed220909.ttf differ diff --git a/font/PepsiOwners2/PepsiOwners2-Extended220909.ttf b/font/PepsiOwners2/PepsiOwners2-Extended220909.ttf new file mode 100644 index 00000000..429a1d2f Binary files /dev/null and b/font/PepsiOwners2/PepsiOwners2-Extended220909.ttf differ diff --git a/font/PepsiOwners2/PepsiOwners2-Regular220909.ttf b/font/PepsiOwners2/PepsiOwners2-Regular220909.ttf new file mode 100644 index 00000000..1c069522 Binary files /dev/null and b/font/PepsiOwners2/PepsiOwners2-Regular220909.ttf differ diff --git a/inter/sgp/image/page_member/qr_regis.png b/inter/sgp/image/page_member/qr_regis.png index 3c8b7da6..ffd63fd5 100644 Binary files a/inter/sgp/image/page_member/qr_regis.png and b/inter/sgp/image/page_member/qr_regis.png differ diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml index 6d9383dd..e51628df 100644 --- a/inter/sgp/xml/page_collect_point_1.lxml +++ b/inter/sgp/xml/page_collect_point_1.lxml @@ -11,8 +11,8 @@ ; jump If IgnoreCollectPointByMe = 1 Then Var IgnoreCollectPointByMe = 0 - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf If Seeker.CodeChannel = 1 Then If Seeker.CollectPointMain = 0 Then @@ -20,10 +20,10 @@ Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf EndIf - + If SettingIgnoreCollectPoint = 1 Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf Var ShowErrorText = "Invisible" @@ -35,7 +35,7 @@ Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_en" ;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" @@ -81,7 +81,7 @@ Var CampaingRef1 = "" Var CampaingRef2 = "" - + SUBSTRING CampaingRef 0 6 CampaingRef1 SUBSTRING CampaingRef 12 18 CampaingRef2 @@ -131,7 +131,7 @@ Var PepweenCollectPoint = 0 EndIf EndIf - + DEBUGVAR PepweenCollectPoint DEBUGVAR ProBadValentineEnable @@ -143,13 +143,13 @@ DEBUGVAR ProThaiTeaEnable DEBUGVAR FromProThaiTea DEBUGVAR FromProYuzu - + If Seeker.TNumberTaobinCredit = "" Then - + If web_telnumOK = "" Then - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -160,7 +160,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -180,16 +180,16 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" + Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" EndIf EndIf @@ -221,7 +221,7 @@ If PepweenEnable = 1 Then If PepweenCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 - Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" + Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" EndIf EndIf @@ -278,7 +278,7 @@ GETACCEXT Param1 23 EndIf - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" EndIf Else @@ -296,7 +296,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -306,10 +306,10 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber DEBUGVAR PepweenCollectPoint - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP DEBUGVAR MyMintEnable @@ -319,7 +319,7 @@ If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" + Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" EndIf EndIf @@ -339,7 +339,7 @@ Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml" EndIf EndIf - + DEBUGVAR ProYuzuEnable DEBUGVAR FromProYuzu If ProYuzuEnable = 1 Then @@ -396,7 +396,7 @@ If PepweenCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 - Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" + Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" Else If UseSGPCollectFlag = 1 Then @@ -405,7 +405,7 @@ Else GETACCEXT Param1 23 EndIf - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" EndIf EndIf @@ -416,7 +416,7 @@ If SGPSimMode = "Enable" Then If BREW_CNT = 0 Then Var BREW_CNT = 20 - + EndIf @@ -492,10 +492,10 @@ 1000 - + Var CountDownBrewing = BREW_CNT - + Var ShowCountDownBrewing = CountDownBrewing @@ -511,20 +511,20 @@ DEBUGVAR XPercent Var XPercent = XPercent / InitCNT EndIf - + DEBUGVAR XPercent EndIf - + StrLen TelephoneNumber TelNumLen If TelNumLen > 0 Then Var ShowTextNumber = "Invisible" - + Else ; Add Var TimeOutPlay = TimeOutPlay + 1 If TimeOutPlay > 10 Then Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -533,17 +533,17 @@ ; EndIf - + DEBUGVAR Timeout Var Timeout = Timeout + 1 If Timeout > 30 Then SAVELOG "collect_point1-p107." - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf If Timeout = 18 Then @@ -561,7 +561,7 @@ Refresh TimerReset - + @@ -587,13 +587,13 @@ bp_NumPad1 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "1" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -603,9 +603,9 @@ TimerReset Refresh - - + + @@ -617,13 +617,13 @@ bp_NumPad2 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "2" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -642,13 +642,13 @@ bp_NumPad3 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "3" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -667,13 +667,13 @@ bp_NumPad4 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "4" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -692,13 +692,13 @@ bp_NumPad5 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "5" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -717,13 +717,13 @@ bp_NumPad6 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "6" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -742,13 +742,13 @@ bp_NumPad7 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "7" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -767,13 +767,13 @@ bp_NumPad8 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "8" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -792,13 +792,13 @@ bp_NumPad9 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "9" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -807,7 +807,7 @@ TimerReset Refresh - + @@ -818,13 +818,13 @@ bp_NumPad0 "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -843,24 +843,24 @@ bp_NumPadBack "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Trim TelephoneNumber -1 StrLen TelephoneNumber TelNumLen - If TelNumLen < 10 Then + If TelNumLen < 10 Then Var Tel_Confirm_State = "Invisible" EndIf - - - If TelNumLen = 0 Then + + + If TelNumLen = 0 Then Var ShowTextNumber = "Enable" EndIf TimerReset Refresh - + @@ -884,11 +884,11 @@ Var( DirImage + "/bp_negative.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + ; goto lid straw - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -903,9 +903,9 @@ Var( DirImage + "/bn_positive.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + + - If Tel_Confirm_Flag = 1 Then @@ -921,7 +921,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -940,17 +940,17 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + If ChildrenFree = 1 Then Var Seeker.TNumberTaobinMember = TelephoneNumber - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - - Var Param1 = TelephoneNumber + "/" + + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP DEBUGVAR FruityRayaEnable @@ -981,7 +981,7 @@ If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" + Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" EndIf EndIf @@ -1033,7 +1033,7 @@ If PepweenCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 - Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" + Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" Else If UseSGPCollectFlag = 1 Then Var Param1 = "SG/" + Param1 @@ -1042,13 +1042,13 @@ Else GETACCEXT Param1 23 EndIf - ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.lxml" EndIf - Else + Else - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage2 = "ROOT/taobin_project/image/collectiing" @@ -1061,7 +1061,7 @@ Var Tel_Confirm_State = "Invisible" Refresh - + EndIf @@ -1165,11 +1165,11 @@ ShowErrorText text_show_error - - - - Open "/media/bt/xml/security_alarm.xml" + + + + Open "/media/bt/xml/security_alarm.xml" If MachineStage = "drink-success" Then @@ -1186,7 +1186,12 @@ Var DebugBypassCollectPt2 = 1 DEBUGVAR DebugBypassCollectPt2 + + Var TaobinLevel = "2" + Var CoffeePoint = 55 + + - \ 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 e64ce595..55be3f3f 100644 --- a/inter/sgp/xml/page_collect_point_2.lxml +++ b/inter/sgp/xml/page_collect_point_2.lxml @@ -10,7 +10,7 @@ Var Timeout = 0 SAVELOG UnitTestType - + If UnitTestType = "1" Then Var CoffeePoint = 10 Open "ROOT/taobin_project/xml/page_show_consent.xml" @@ -22,12 +22,12 @@ Var Seeker.TaobinErrorNetwork = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" - + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" - + Else Var DirImage = "ROOT/taobin_project/image/collectiing" @@ -42,6 +42,10 @@ Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber + Var TaobinLevel = 2 + Var CoffeePointRank = 55 + DEBUGVAR TaobinLevel + ; reset Var DebugBypassCollectPt2 = 0 @@ -75,10 +79,10 @@ Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png" EndIf EndIf - + 1000 - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing @@ -93,51 +97,51 @@ DEBUGVAR XPercent Var XPercent = XPercent / InitCNT EndIf - + DEBUGVAR XPercent EndIf Var Timeout = Timeout + 1 If Timeout > 30 Then - - + + Var TaobinLevel = 0 - Var CoffeePoint = 1 + Var CoffeePoint = 1 Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = ParamCP - + Var TelephoneNumber = TelephoneNumberX - + Var Seeker.TNumberTaobinMember= TelephoneNumber DEBUGVAR "Try open collect.error timeout30" Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" - - + + EndIf TimerReset Refresh - + - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" If StepGetPoint = 0 Then If PdpaAsk = 0 Then - Open "ROOT/taobin_project/xml/page_show_consent.xml" + Open "ROOT/taobin_project/xml/page_show_consent.xml" Else Var StepGetPoint = 1 - + Var TelephoneNumber = TelephoneNumberX - + If UseSGPCollectFlag = 1 Then GETACCEXT Param1 35 Else @@ -145,21 +149,21 @@ EndIf Var Ext1a = "" - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.xml" EndIf Else - + If Ext1a = "" Then - + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" - + Else If Ext1a = "ok" Then @@ -180,7 +184,7 @@ INT PointTaobinTmp INT TaobinPDPA - + DEBUGVAR TaobinName Var CatchNotMember = 0 If TaobinName = "" Then @@ -213,7 +217,7 @@ Var TNumberTaobinMemberXXX = TelephoneNumber ;Var PointTaobinTmp = 4 - + Var PointTaobin = PointTaobinTmp Var pTaobin = PointTaobin @@ -235,14 +239,14 @@ Var Seeker.PointTaobinStr = ParamCP Var Seeker.TNumberTaobinMember = TelephoneNumberX - + Var CoffeePointRank = Ext1b INT CoffeePointRank Var CoffeePoint1 = Ext1c INT CoffeePoint1 - + Var CoffeePoint = PointTaobin + CoffeePoint1 Var CoffeePointOld = CoffeePoint1 @@ -250,7 +254,7 @@ Var CoffeePointRank = CoffeePointRank + 0 Else Var CoffeePointRank = CoffeePointRank + PointTaobin - EndIf + EndIf Var CoffeePointRankTmp = CoffeePointRank @@ -261,13 +265,13 @@ ;inter-xml-open If CountryName = "Malaysia" Then - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" EndIf ;inter-xml-open If CountryName = "Indonesia" Then - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" - EndIf + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml" + EndIf ;inter-xml-open If CountryName = "Australia" Then @@ -276,71 +280,71 @@ Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml" Open pageCollectPoint Else - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf - + EndIf ;inter-xml-open If CountryName = "Singapore" Then DEBUGVAR "Try open collect3.sgp" - Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml" - EndIf + Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml" + EndIf - Open "ROOT/taobin_project/xml/page_show_consent.xml" + Open "ROOT/taobin_project/xml/page_show_consent.xml" EndIf If PayAmount >= 20 Then If TaobinPromoX = "p2.no_otp" Then - Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" + Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" EndIf If TaobinPromoX = "p2.unused" Then - Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" + Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" EndIf - + EndIf If NewCollectPoint = 1 Then Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" Else - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf Else - + Var Seeker.TaobinErrorNetwork = 1 - + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" EndIf - - - + + + EndIf EndIf - + + + - - Var Seeker.TaobinErrorNetwork = 1 - + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml" - - + + If MachineStage = "drink-success" Then @@ -416,4 +420,3 @@ - \ No newline at end of file diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml index 0bc15824..8a792f43 100644 --- a/inter/sgp/xml/page_collect_point_3.lxml +++ b/inter/sgp/xml/page_collect_point_3.lxml @@ -26,7 +26,7 @@ DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumberX - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/display_point_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" @@ -38,7 +38,7 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf - + Var CoffeePointTmp = CoffeePoint If CoffeePoint > 54 Then @@ -46,11 +46,11 @@ Var CoffeePointTmp = 55 EndIf - - + + Var pImage = CoffeePointTmp * 20 Var pImage = pImage / 55 - Var pImageStr = "/taobinPoint55.png" + Var pImageStr = "/taobinPoint55.png" If UsePepsiTheme = 1 Then Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr @@ -70,7 +70,7 @@ - + Var TaobinExpireDay = "" @@ -78,14 +78,14 @@ Var TaobinExpireMonthX = "" Var TaobinExpireYear = "" - + SPLIT TaobinExpire "/" 1 TaobinExpireDay SPLIT TaobinExpire "/" 2 TaobinExpireMonth SPLIT TaobinExpire "/" 3 TaobinExpireYear - If show_eng = "true" Then + If show_eng = "true" Then If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "Jan" @@ -152,7 +152,7 @@ Var TaobinExpireYear = TaobinExpireYear + 0 - Else + Else If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "ม.ค." @@ -229,17 +229,17 @@ Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear - + If TaobinLevel = "1" Then Var PointMaskState = "Enable" EndIf - - If show_eng = "true" Then + + If show_eng = "true" Then Var TaobinLevelDesc3 = "You have coupons " Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons @@ -253,124 +253,69 @@ ;EndIf If TaobinLevel = "2" Then - Var TaobinLevelDesc1 = "Walking turtle level" + Var TaobinLevelDesc1 = "CUPPING" + Var TaobinLevelDesc1Cont = "GOOD!" + + Var TaobinLevelDesc1More = "BRONZE LEVEL" Var PointDiff = 150 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level" - Var TaobinLeveImg = "/taoLevel2.png" + Var TaobinLeveImg = "/WTCLevel1.png" If CoffeePointRank > 149 Then - ;Var TaobinLeveImg = "/taoLevel3.png" + Var TaobinLeveImg = "/WTCLevel2.png" - ;Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc1 = "CUPPING" + Var TaobinLevelDesc1Cont = "BETTER!" + + + Var TaobinLevelDesc1More = "SILVER LEVEL" Var TaobinLevelDesc2 = "" - ;Var CoffeePointRank = CoffeePointRank - 150 + Var CoffeePointRank = CoffeePointRank - 150 EndIf EndIf If TaobinLevel = "3" Then - Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - + ;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp + Var PointDiff = 350 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" - Var TaobinLeveImg = "/taoLevel3.png" + Var TaobinLeveImg = "/WTCLevel2.png" If CoffeePointRank > 349 Then - ;Var TaobinLeveImg = "/taoLevel4.png" + Var TaobinLeveImg = "/WTCLevel3.png" - ;Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc1 = "CUPPING" + Var TaobinLevelDesc1Cont = "BEST!" + + Var TaobinLevelDesc1More = "GOLD LEVEL" Var TaobinLevelDesc2 = "" - ;Var CoffeePointRank = CoffeePointRank - 350 + Var CoffeePointRank = CoffeePointRank - 350 EndIf EndIf If TaobinLevel = "4" Then - Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp - + ;Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp + Var TaobinLevelDesc2 = "" - Var TaobinLeveImg = "/taoLevel4.png" + Var TaobinLeveImg = "/WTCLevel3.png" EndIf - - - Else - - Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ " - Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons - Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ" - - ;If TaobinLevel = "1" Then - ; Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าขี้อาย" - ; Var TaobinLevelDesc2 = "" - - ; Var TaobinLeveImg = "/taoLevel1.png" - ;EndIf - - If TaobinLevel = "2" Then - Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ" - Var PointDiff = 150 - CoffeePointRank - Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง " - Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก" - - Var TaobinLeveImg = "/taoLevel2.png" - - If CoffeePointRank > 149 Then - ;Var TaobinLeveImg = "/taoLevel3.png" - - ;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " - Var TaobinLevelDesc2 = "" - ;Var CoffeePointRank = CoffeePointRank - 150 - - EndIf - - EndIf - - If TaobinLevel = "3" Then - Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp - - Var PointDiff = 350 - CoffeePointRank - Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง " - Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า" - - Var TaobinLeveImg = "/taoLevel3.png" - - If CoffeePointRank > 349 Then - ;Var TaobinLeveImg = "/taoLevel4.png" - - ;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " - Var TaobinLevelDesc2 = "" - ;Var CoffeePointRank = CoffeePointRank - 350 - - EndIf - - EndIf - - If TaobinLevel = "4" Then - Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp - - Var TaobinLevelDesc2 = "" - - Var TaobinLeveImg = "/taoLevel4.png" - EndIf - - EndIf - + Var CheckCoupons = 0 Var MakeDrinkState = 0 @@ -380,24 +325,24 @@ Var ShellXCol3 = 365 Var ShellXCol4 = 462 Var ShellXCol5 = 557 - Var ShellXCol6 = 652 - Var ShellXCol7 = 747 - Var ShellXCol8 = 842 + Var ShellXCol6 = 662 + Var ShellXCol7 = 757 + Var ShellXCol8 = 852 ; 1-8 - Var ShellYRow1 = 1037 + Var ShellYRow1 = 1047 ; 9-16 - Var ShellYRow2 = 1120 + Var ShellYRow2 = 1130 ; 17-24 - Var ShellYRow3 = 1203 + Var ShellYRow3 = 1213 ; 25-32 - Var ShellYRow4 = 1282 + Var ShellYRow4 = 1292 ; 33-40 - Var ShellYRow5 = 1365 + Var ShellYRow5 = 1375 ; 41-48 - Var ShellYRow6 = 1448 + Var ShellYRow6 = 1458 ; 49-55 - Var ShellYRow7 = 1531 + Var ShellYRow7 = 1541 Var taobinP1 = "Invisible" @@ -461,7 +406,7 @@ Var taobinP53 = "Invisible" Var taobinP54 = "Invisible" Var taobinP55 = "Invisible" - + Var taobinImgP1 = "/taobinPN.png" Var taobinImgP2 = "/taobinPN.png" @@ -877,20 +822,20 @@ Var CheckCouponState = "Disable" EndIf - + Var PointEndDate = "" GetDateEndOfMonth PointEndDate DEBUGVAR PointEndDate Var xPointEndDate = 570 - If show_eng = "true" Then + If show_eng = "true" Then Var xPointEndDate = 618 EndIf Var Point2XState = "Invisible" Var Point2XImage = "" - If Point2X = 1 Then - Var Point2XState = "Enable" + If Point2X = 1 Then + Var Point2XState = "Enable" If Seeker.CampaignPayChanel = "kbank" Then Var Point2XImage = "/text9.png" EndIf @@ -900,7 +845,7 @@ If Seeker.CampaignPayChanel = "dolfin" Then Var Point2XImage = "/text11.png" EndIf - + EndIf ;inter-from-consent @@ -911,17 +856,17 @@ ;inter-from-consent If CountryName = "Indonesia" Then Var Seeker.FromConsent = 0 - EndIf + EndIf ;inter-from-consent If CountryName = "Australia" Then Var Seeker.FromConsent = 0 - EndIf + EndIf ;inter-from-consent If CountryName = "Singapore" Then Var Seeker.FromConsent = 0 - EndIf + EndIf Var AlphaBg = "ROOT/taobin_project/image/display_point/alpha.png" @@ -962,10 +907,10 @@ Var Free1 = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/free1.png" EndIf - + 1000 - + Var CountDownBrewing = BREW_CNT @@ -981,7 +926,7 @@ DEBUGVAR XPercent Var XPercent = XPercent / InitCNT EndIf - + DEBUGVAR XPercent EndIf @@ -997,36 +942,36 @@ If CoffeePoint > 54 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - + EndIf EndIf - + TimerReset Refresh - + - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" If CheckCoupons = 1 Then Var MakeDrinkState = 1 - Var CouponPage = 1 + Var CouponPage = 1 Var CouponInfo1 = Ext1a Var CouponInfo2 = Ext1b Var CouponInfo3 = Ext1c @@ -1037,14 +982,14 @@ Var CouponInfo8 = Ext1h Var CouponInfo9 = Ext1i Var CouponInfo10 = Ext1j - + Var TelephoneNumber = TelephoneNumberX GETACCEXT TelephoneNumber 13 - Var CheckCoupons = 2 + Var CheckCoupons = 2 Else - If CheckCoupons = 2 Then + If CheckCoupons = 2 Then Var TaobinCredit = Ext1b @@ -1052,15 +997,15 @@ Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml" Open ChackMemberPage Else - Open "ROOT/taobin_project/xml/page_check_member2.xml" + Open "ROOT/taobin_project/xml/page_check_member2.xml" EndIf EndIf - + EndIf - + @@ -1095,7 +1040,6 @@ ; - 108 665 @@ -1109,24 +1053,50 @@ - - 243 - 722 - Var( DirImage + "/text7.png" ) - +; +; 483 +; 700 +; Var( DirImage + "/text7.png" ) +; + + +; +; 483 +; 750 +; 38 +; PepsiExtend +; HeadlineColor +; TaobinLevelDesc1 +; + + + 483 + 730 + 20 + PepsiExtend + WTCMediumBlueColor + "MEMBERSHIP\nSTATUS:" + + + +; +; 483 +; 900 +; Var( DirImage + "/text4.png" ) +; + + + 483 + 930 + 20 + PepsiExtend + WTCMediumBlueColor + "TOTAL BALANCE:" + 243 - 860 - Var( DirImage + "/text4.png" ) - - - - - - - 625 734 Var( DirImage + TaobinLeveImg ) @@ -1148,7 +1118,7 @@ ClosePressFilename "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; goto lid straw ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -1157,7 +1127,7 @@ Open "ROOT/taobin_project/inter/sgp/xml/page_check_member.lxml" EndIf - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else If CoffeePoint > 54 Then @@ -1165,7 +1135,7 @@ EndIf - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -1555,8 +1525,8 @@ ; free @@ -1567,24 +1537,24 @@ Var( DirImage + taobinImgP55 ) - - 250 - 790 - 20 - 1000 - KanitRegularTTF - 0x746253 - TNumberTaobinMemberXXX - Telnum-mask-3 - +; +; 250 +; 790 +; 20 +; 1000 +; KanitRegularTTF +; 0x746253 +; TNumberTaobinMemberXXX +; Telnum-mask-3 +; - 250 - 890 - 50 + 720 + 930 + 20 120 - KanitRegularTTF - 0xDE794E + PepsiExtend + WTCMediumBlueColor CoffeePointRank @@ -1595,15 +1565,37 @@ Var( DirImage + "/pointMask.png" ) -; -; 250 -; 990 -; 25 -; 1000 -; KanitRegularTTF -; 0xDE794E -; TaobinLevelDesc1 -; + + 483 + 800 + 50 + PepsiExtend + HeadlineColor + TaobinLevelDesc1 + + +; TaobinLevelDesc1Cont + + 483 + 838 + 50 + PepsiExtend + HeadlineColor + TaobinLevelDesc1Cont + + + +; TaobinLevelDesc1More + + 483 + 898 + 20 + PepsiExtend + HeadlineColor + TaobinLevelDesc1More + + + ; ; 250 @@ -1703,8 +1695,9 @@ Var taobinP42 = "Enable" Var taobinP50 = "Enable" + + Var taobinP55 = "Enable" - \ No newline at end of file diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml index 7f9cb82c..9942bb15 100644 --- a/inter/sgp/xml/page_member_prompt.lxml +++ b/inter/sgp/xml/page_member_prompt.lxml @@ -36,7 +36,7 @@ Var YesPressButton = ImgDir + "bp_yes.png" Var NoPressButton = ImgDir + "bp_no.png" Var QRImg = ImgDirStatic + "qr_regis.png" - + Var UseSGPCollectFlag = 0 DEBUGVAR YesButton @@ -62,10 +62,10 @@ Var Timeout = 0 ; to-lid-straw SAVELOG "member_prompt.Timeout" - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf Refresh @@ -151,7 +151,7 @@ - 400 + 300 1065 DisplayQR QRImg @@ -159,4 +159,4 @@ ;include="ROOT/taobin_project/inc/video.inc" - \ No newline at end of file + diff --git a/inter/whatthecup/sgp/image/display_get_free_en/img_popup1.png b/inter/whatthecup/sgp/image/display_get_free_en/img_popup1.png new file mode 100644 index 00000000..07a76cbc Binary files /dev/null and b/inter/whatthecup/sgp/image/display_get_free_en/img_popup1.png differ diff --git a/inter/whatthecup/sgp/image/display_point_en/WTCLevel1.png b/inter/whatthecup/sgp/image/display_point_en/WTCLevel1.png new file mode 100644 index 00000000..b30223bb Binary files /dev/null and b/inter/whatthecup/sgp/image/display_point_en/WTCLevel1.png differ diff --git a/inter/whatthecup/sgp/image/display_point_en/WTCLevel2.png b/inter/whatthecup/sgp/image/display_point_en/WTCLevel2.png new file mode 100644 index 00000000..addcc3d1 Binary files /dev/null and b/inter/whatthecup/sgp/image/display_point_en/WTCLevel2.png differ diff --git a/inter/whatthecup/sgp/image/display_point_en/WTCLevel3.png b/inter/whatthecup/sgp/image/display_point_en/WTCLevel3.png new file mode 100644 index 00000000..eb6047d2 Binary files /dev/null and b/inter/whatthecup/sgp/image/display_point_en/WTCLevel3.png differ diff --git a/inter/whatthecup/sgp/image/display_point_en/taobinPN.png b/inter/whatthecup/sgp/image/display_point_en/taobinPN.png index 2b32c2d1..7c813ff3 100644 Binary files a/inter/whatthecup/sgp/image/display_point_en/taobinPN.png and b/inter/whatthecup/sgp/image/display_point_en/taobinPN.png differ diff --git a/inter/whatthecup/sgp/image/display_point_en/taobinPO.png b/inter/whatthecup/sgp/image/display_point_en/taobinPO.png index 068fff57..83d7cc8d 100644 Binary files a/inter/whatthecup/sgp/image/display_point_en/taobinPO.png and b/inter/whatthecup/sgp/image/display_point_en/taobinPO.png differ diff --git a/inter/whatthecup/sgp/image/page_member/WTCLevel1.png b/inter/whatthecup/sgp/image/page_member/WTCLevel1.png new file mode 100644 index 00000000..b30223bb Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/WTCLevel1.png differ diff --git a/inter/whatthecup/sgp/image/page_member/WTCLevel2.png b/inter/whatthecup/sgp/image/page_member/WTCLevel2.png new file mode 100644 index 00000000..addcc3d1 Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/WTCLevel2.png differ diff --git a/inter/whatthecup/sgp/image/page_member/WTCLevel3.png b/inter/whatthecup/sgp/image/page_member/WTCLevel3.png new file mode 100644 index 00000000..eb6047d2 Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/WTCLevel3.png differ diff --git a/inter/whatthecup/sgp/image/page_member/free1.png b/inter/whatthecup/sgp/image/page_member/free1.png index c74d43e1..e85b8d85 100644 Binary files a/inter/whatthecup/sgp/image/page_member/free1.png and b/inter/whatthecup/sgp/image/page_member/free1.png differ diff --git a/inter/whatthecup/sgp/image/page_member/qr_regis.png b/inter/whatthecup/sgp/image/page_member/qr_regis.png new file mode 100644 index 00000000..ffd63fd5 Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/qr_regis.png differ diff --git a/inter/whatthecup/sgp/image/page_member/taobinPN.png b/inter/whatthecup/sgp/image/page_member/taobinPN.png new file mode 100644 index 00000000..7c813ff3 Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/taobinPN.png differ diff --git a/inter/whatthecup/sgp/image/page_member/taobinPO.png b/inter/whatthecup/sgp/image/page_member/taobinPO.png new file mode 100644 index 00000000..83d7cc8d Binary files /dev/null and b/inter/whatthecup/sgp/image/page_member/taobinPO.png differ diff --git a/inter/whatthecup/sgp/image/page_member/taobinPoint55.png b/inter/whatthecup/sgp/image/page_member/taobinPoint55.png index 904e4f9d..d7308535 100644 Binary files a/inter/whatthecup/sgp/image/page_member/taobinPoint55.png and b/inter/whatthecup/sgp/image/page_member/taobinPoint55.png differ diff --git a/inter/whatthecup/sgp/xml/page_display_get_free.xml b/inter/whatthecup/sgp/xml/page_display_get_free.xml new file mode 100644 index 00000000..f867bd38 --- /dev/null +++ b/inter/whatthecup/sgp/xml/page_display_get_free.xml @@ -0,0 +1,201 @@ + + "Enable" + 1080 + 1920 + BackgroundColor + SoundVolume + + + ; On open + Var Timeout = 0 + If show_eng = "true" Then + Var DirImage = CountryWTCRootPath + "/image/display_get_free_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/display_get_free" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + + Var MemberState1 = "Enable" + Var MemberState2 = "Invisible" + Var MemberState3 = "Invisible" + + ;Var TaobinLevel = "3" + + DEBUGVAR TaobinLevel + + If TaobinLevel = "1" Then + Var MemberState1 = "Invisible" + Var MemberState2 = "Enable" + Var MemberState3 = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Get_free_drink_faster.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Get_free_drink_faster.mp3" + EndIf + + Else + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/You_mode_it.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/You_mode_it.mp3" + EndIf + + EndIf + + If Seeker.FromConsent = 1 Then + Var MemberState1 = "Invisible" + Var MemberState2 = "Invisible" + Var MemberState3 = "Enable" + EndIf + + + Var img_popup2 = "/img_popup2.png" + Var img_popup3 = "/img_popup3.png" + + ;inter-condition + ;inter-image not use. because customer auto assige member. + If InternationalEnable = 1 Then + + Var MemberState1 = "Enable" + Var MemberState2 = "Invisible" + Var MemberState3 = "Invisible" + EndIf + + + + + + + 1000 + + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + + + Var Timeout = Timeout + 1 + If Timeout > 5 Then + ; goto lid straw + + + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + TimerReset + Refresh + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + ; + + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + 0 + 380 + "ROOT/taobin_project/inter/whatthecup/sgp/image/display_point/alpha.png" + + + + 158 + 665 + MemberState1 + Var( DirImage + "/img_popup1.png" ) + + + + 158 + 665 + MemberState2 + Var( DirImage + img_popup2 ) + + + + 158 + 665 + MemberState3 + Var( DirImage + img_popup3 ) + + + + + +; +; +; 751 +; 413 +; "ROOT/taobin_project/image/page_doing/img2.png" +; +; +; +; XPosiShowCountDownBrew +; 470 +; End +; 153 +; 88 +; RobotoBold +; 0x513C2F +; ShowCountDownBrewing +; + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index bdd0e824..dfaffad2 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -108,6 +108,9 @@ Var InterRegular = "ROOT/taobin_project/font/Inter/Inter-Regular.ttf" + Var PepsiExtend = "ROOT/taobin_project/font/PepsiOwners2/PepsiOwners2-Extended220909.ttf" + + Var countClick = 0 Var RoadShow = "false" @@ -907,6 +910,9 @@ If BoxID = 210604 Then Var SettingIgnoreCollectPoint = 0 EndIf + If BoxID = 210699 Then + Var SettingIgnoreCollectPoint = 0 + EndIf READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg @@ -994,8 +1000,8 @@ Var MinPhoneNumber = 9 Var MaxPhoneNumber = 9 - Var UsePepsiTheme = 1 - Var TargetThemeNum = 2 + ;Var UsePepsiTheme = 0 + ;Var TargetThemeNum = 2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1157,7 +1163,9 @@ EndIf EndIf - TRY "ROOT/taobin_project/xml/profile/run.ev" + If ProYuzu250Enable = 0 Then + TRY "ROOT/taobin_project/xml/profile/run.ev" + EndIf Var NETCORE_LOST_COUNT_UP = 0 diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 5e3af989..45d6c59e 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -2,13 +2,20 @@ "Enable" 1080 1920 - "0xeae6e1" + BackgroundColor SoundVolume + + If UsePepsiTheme = 1 Then + Var WTCGetFree = CountryWTCRootPath + "/xml/page_display_get_free.xml" + Open WTCGetFree + EndIf + + ; On open Var Timeout = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" @@ -31,15 +38,15 @@ Var MemberState2 = "Enable" Var MemberState3 = "Invisible" - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Get_free_drink_faster.mp3" Else PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Get_free_drink_faster.mp3" EndIf - Else + Else - If show_eng = "true" Then + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/You_mode_it.mp3" Else PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/You_mode_it.mp3" @@ -66,25 +73,25 @@ Var MemberState3 = "Invisible" EndIf - - + + 1000 - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing - + Var Timeout = Timeout + 1 If Timeout > 5 Then ; goto lid straw - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml" @@ -92,14 +99,14 @@ TimerReset Refresh - + - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" @@ -169,10 +176,10 @@ Var( DirImage + "/bp_accept.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; goto lid straw - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -199,4 +206,3 @@ - \ No newline at end of file