Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
cbba25c311
32 changed files with 1396 additions and 32 deletions
|
|
@ -75,6 +75,14 @@
|
|||
Var PictureBegin = "txt_"
|
||||
Var PictureEnd = "_en.png"
|
||||
|
||||
;inter-has-alter-anim
|
||||
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||
;check LanguageShow
|
||||
If LanguageShow = "ENG" Then
|
||||
Var PicturePath = "ROOT/taobin_project/image/page_doing/"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
|
||||
|
|
@ -132,7 +140,14 @@
|
|||
|
||||
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue