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

This commit is contained in:
Kenta420 2024-06-17 16:36:15 +07:00
commit 984cffa657
20 changed files with 3720 additions and 597 deletions

View file

@ -8,12 +8,10 @@
Var NewCollectPointFlag = 0
Var WinterWarmersCatalogFlag = 0
Var WinterWarmersCatalogFlag = 1
Var XMLLiveInfoEnable = 0
Var CocktailShow = "true"
DEBUGVAR Propepsi99Enable
DEBUGVAR DisplayFormatFull

View file

@ -1,9 +1,8 @@
If WinterWarmersCatalogFlag = 1 Then
Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
Open catalogFile
Else
Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml"
EndIf
If CocktailShow = "true" Then
Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml"
Open catalogFile
EndIf
Open catalogFile

File diff suppressed because it is too large Load diff

View file

@ -1850,6 +1850,11 @@
DEBUGVAR toppingID2price1
DEBUGVAR toppingID2price2
DEBUGVAR toppingID2price3
DEBUGVAR toppingID9price1
DEBUGVAR toppingID9price2
DEBUGVAR toppingID9price3
DEBUGVAR toppingID9price4
Function 2
EndIf