Merge branch 'masterpiece' into sgp_blue
This commit is contained in:
commit
8db9008a9f
25 changed files with 14175 additions and 1116 deletions
|
|
@ -697,6 +697,10 @@
|
|||
Var UseSlideShowVideo = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 210011 Then
|
||||
Var UseSlideShowVideo = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 200002 Then
|
||||
Var UseSlideShowVideo = 1
|
||||
EndIf
|
||||
|
|
@ -957,6 +961,8 @@
|
|||
|
||||
Var PriceUnitText = "Price in DH"
|
||||
|
||||
Var cups_sold_text = "Cups Sold Worldwide"
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
|
|
@ -980,7 +986,6 @@
|
|||
Var MinPhoneNumber = 9
|
||||
Var MaxPhoneNumber = 9
|
||||
|
||||
Var UsePepsiTheme = 1
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue