Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
70586c95cb
79 changed files with 14251 additions and 9627 deletions
|
|
@ -31,7 +31,7 @@ Else
|
|||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
||||
If taobin_nopro = "true" Then
|
||||
|
||||
|
||||
Else
|
||||
|
||||
If CoconutMilkPro = 1 Then
|
||||
|
|
@ -74,7 +74,7 @@ Else
|
|||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/v3/event/script_open_promotion_v3.ev"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue