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

2024-04-05 12:56:06 +07:00 · 2024-04-05 12:56:06 +07:00 · e0d7d1c66a
commit e0d7d1c66a
parent 6fe1036f95 0ec08d81a6
2 changed files with 1399 additions and 645 deletions
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -357,6 +357,7 @@ If taobin_nopro = "true" Then
 	Var ProBadValentineEnable = 0
 	Var FreeEnergyDrink = 0
 	Var MondayBananaPro = 0
+	Var FreeFirePro = 0
 	Var TeaTimePro = 0

 	Var PepsiSecondCup30Enable = 0
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml