DO cocoa
This commit is contained in:
commit
8a1778dca9
194 changed files with 13130 additions and 20535 deletions
|
|
@ -1207,7 +1207,7 @@
|
|||
If UsePepsiTheme = 1 Then
|
||||
If InternationalEnable = 1 Then
|
||||
; enable-color
|
||||
TRY "ROOT/taobin_project/inter/whatthecup/color_settings.ev"
|
||||
TRY "ROOT/taobin_project/inter/whatthecup/common/color_settings.ev"
|
||||
|
||||
Var MainStartPepsiThemeDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
|
||||
Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
|
||||
|
|
@ -1215,12 +1215,16 @@
|
|||
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
|
||||
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
|
||||
|
||||
<<<<<<< HEAD
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
|
||||
DEBUGVAR VideoMainPage
|
||||
=======
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
|
||||
>>>>>>> c8c472563ab2b038aabfda99f3f3e40812f59375
|
||||
EndIf
|
||||
Else
|
||||
; default-theme
|
||||
TRY "ROOT/taobin_project/inter/whatthecup/default_color_settings.ev"
|
||||
TRY "ROOT/taobin_project/xml/default_color_settings.ev"
|
||||
EndIf
|
||||
|
||||
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue