From 726517b2002ec6dd46e07f89c10fdfe0274243af Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 九月 2025 19:47:26 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复buff报错;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 6b6254a..b74e0cb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -50,7 +50,6 @@
 import PlayerActTurntable
 import PlayerCostRebate
 import PlayerActLunhuidian
-import PlayerActGarbageSorting
 import GY_Query_CrossRealmReg
 import PlayerTongTianLing
 import FunctionNPCCommon
@@ -2888,7 +2887,6 @@
     if costType not in ChConfig.CostRebate_DisableType:
         PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
         PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_UseGold, price)
-        PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_UseGold, price)
     else:
         GameWorld.DebugLog("不计入消费活动的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
         
@@ -3579,7 +3577,6 @@
             #if curPlayer.GetMaxMP() > 0:
             #    curPlayer.SetMP(curPlayer.GetMaxMP())
             
-            FBLogic.OnPlayerLVUp(curPlayer)
             # 记录开服活动冲级数据
             #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
             #神秘限购
@@ -4417,7 +4414,11 @@
 def GetMainLevelPassInfo(curPlayer):
     ## 获取主线关卡过关进度信息
     # @return: chapterID, levelNum, wave
-    return GetMainLevelValue(GetMainLevelPassValue(curPlayer))
+    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelPassValue(curPlayer))
+    if not chapterID and not levelNum:
+        chapterID, levelNum, wave = 1, 1, 0
+        SetMainLevelPassValue(curPlayer, ComMainLevelValue(chapterID, levelNum, wave))
+    return chapterID, levelNum, wave
 
 ## 主线关卡当前进度值 = 章节*10000+关卡编号*100+第x波
 def GetMainLevelNowValue(curPlayer): return curPlayer.GetExAttr2()
@@ -4433,7 +4434,14 @@
 def GetMainLevelNowInfo(curPlayer):
     ## 获取主线关卡当前进度信息
     # @return: chapterID, levelNum, wave
-    return GetMainLevelValue(GetMainLevelNowValue(curPlayer))
+    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelNowValue(curPlayer))
+    if not chapterID and not levelNum:
+        chapterID, levelNum, wave = 1, 1, 1
+        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)
+    if not wave:
+        wave = 1
+        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)
+    return chapterID, levelNum, wave
 
 def ComMainLevelValue(chapterID, levelNum, wave=0): return chapterID * 10000 + levelNum * 100 + wave
 def GetMainLevelValue(value):

--
Gitblit v1.8.0