Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-11-05 10:49:38 +07:00
commit cf704f72fe
316 changed files with 86713 additions and 44137 deletions

View file

@ -2161,7 +2161,7 @@ PRICE "Reset" "-"
;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml"
Else
If BeerTrapEnable = "true" Then
If CocktailShow = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
Else
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"