From c615417ddd01508caebc533b4fa21ed961d4bf06 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 20 十二月 2025 21:52:57 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(吕玲绮突破2潜能;张飞突破2、4潜能;刘备突破2潜能;黄月英突破2、6、7潜能;增加效果5508;优化效果5005;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
index 0d0d6e2..e66e055 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -34,6 +34,7 @@
 import ItemCommon
 import PlayerHero
 import PyGameData
+import PlayerTask
 import ChConfig
 
 import random
@@ -160,6 +161,8 @@
     
     selectLibItemDict = {} # 重新选择的心愿物品汇总 {libID:[wishID, ...], ...}
     for wishID in reqSelectWishIDList:
+        if not wishID:
+            continue
         libItemIpyData = IpyGameDataPY.GetIpyGameDataByCondition("TreasureItemLib", {"ID":wishID}, False)
         if not libItemIpyData:
             return
@@ -494,11 +497,15 @@
             
             getGridResult.append(gridNum)
             GameWorld.DebugLog("    本次产出: gridNum=%s, %s, doCount=%s" % (gridNum, getGridResult, doCount), playerID)
-            if gridNum in luckyGridNumList and addLuck:
-                if gridNum == setLuckyGridNum or updLuck >= maxLuck:
-                    updLuck = 0
+            if gridNum in luckyGridNumList or updLuck >= maxLuck:
+                if addLuck:
+                    if gridNum == setLuckyGridNum or updLuck >= maxLuck:
+                        updLuck = 0
+                    else:
+                        updLuck = stageLuck # 直接切换到下一阶段幸运
                 else:
-                    updLuck = stageLuck # 直接切换到下一阶段幸运
+                    updLuck = 0
+                    GameWorld.DebugLog("    不加幸运时强制重置幸运值: gridNum=%s,updLuck=%s" % (gridNum, updLuck), playerID)
                 GameWorld.DebugLog("    【产出幸运格子】: gridNum=%s,updLuck=%s" % (gridNum, updLuck), playerID)
             if wishLibID:
                 GameWorld.DebugLog("    【产出的是心愿库物品】: gridNum=%s,wishLibID=%s" % (gridNum, wishLibID), playerID)
@@ -627,6 +634,7 @@
         PlayerControl.GiveMoney(curPlayer, addScoreType, addScore * treasureCount)
         
     if treasureType in TreasureType_HeroCallList:
+        PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_HeroCall, treasureCount)
         PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_HeroCall, treasureCount)
         heroCallCnt = GetHeroCallCnt(curPlayer)
         if OpenServerActivity.GetOSAState(curPlayer, ShareDefine.Def_BT_OSA_HeroCall) == 1:

--
Gitblit v1.8.0