merge from masterpiece

2025-04-04 14:34:43 +07:00 · 2025-04-04 14:34:43 +07:00 · 736af0e6dc
commit 736af0e6dc
parent 845c5f1637
65 changed files with 481100 additions and 1087 deletions
--- a/inter/sgp/xml/event/tricker.ev
+++ b/inter/sgp/xml/event/tricker.ev
@ -8,6 +8,7 @@


 Var SeasonPassMode = 0
+Var New_PaymentInter = 0

 If SystemDateMonthInt = 7 Then
    If SystemDateDayInt > 28 Then
@ -37,3 +38,7 @@ If SeasonPassMode = 1 Then
    Var SeasonPassFile = CountryRootPath + "xml/event/season_pass/season_pass.ev"
    TRY SeasonPassFile
 EndIf
+
+
+
+DEBUGVAR New_PaymentInter
--- a/inter/sgp/xml/page_brewing3_blue.lxml
+++ b/inter/sgp/xml/page_brewing3_blue.lxml
@ -6,6 +6,12 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>

+    If New_PaymentInter = 1 Then
+        Open "ROOT/taobin_project/inter/sgp/xml/page_NewBrewing3_blue.lxml"
+    EndIf
+
+
+
 	Var SendNotiPaySuccess = 2

 	Var GetMoreStrawCount = 2
--- a/inter/sgp/xml/page_catalog_group_milk.lxml
+++ b/inter/sgp/xml/page_catalog_group_milk.lxml
--- a/inter/sgp/xml/page_catalog_group_recommend.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend.lxml
--- a/inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml