From d0f5f9922f17f5bff4288173f18a9ed827d95db8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 六月 2019 15:00:13 +0800
Subject: [PATCH] 1 装备评分增加装备掉率参数固定值 DropEquipPer
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 343 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 197 insertions(+), 146 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index a2400c3..75f9138 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -165,6 +165,15 @@
randMaxLV = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_NPCStrengthenMaxLV)
strengthenLV = random.randint(randMinLV, randMaxLV)
+ # 木桩怪最大、平均成长等级处理，直接取归属玩家等级
+ if lvStrengthenType in [1, 2] and curNPC.GetType() in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ owner = None
+ summonPlayerID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_PriWoodPilePlayerID)
+ if summonPlayerID:
+ owner = GameWorld.GetObj(summonPlayerID, IPY_GameWorld.gotPlayer)
+ if owner:
+ strengthenLV = owner.GetLV()
+
if strengthenIpyData.GetCmpNPCBaseLV():
strengthenLV = max(strengthenLV, curNPC.GetLV())
@@ -496,7 +505,7 @@
if ItemCommon.GetIsEquip(itemData):
for _ in xrange(itemCount):
- curItem = ItemControler.GetOutPutItemObj(itemID)
+ curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem, curPlayer=curPlayer)
if curItem:
needSpace += 1
prizeItemList.append(curItem)
@@ -556,27 +565,6 @@
#GameWorld.DebugLog(" totalExp=%s,totalMoney=%s,needSpace=%s,jsonItemList=%s" % (totalExp, totalMoney, needSpace, jsonItemList))
return jsonItemList, totalExp, totalMoney
-def DoVirtualItemDrop(curPlayer, dropItemList, dropPosX, dropPosY):
- ##前端假掉落表现
- gameMap = GameWorld.GetMap()
- index = 0
- for posX, posY in ChConfig.Def_DropItemAreaMatrix:
- resultX = dropPosX + posX
- resultY = dropPosY + posY
- if not gameMap.CanMove(resultX, resultY):
- #玩家不可移动这个点
- continue
- if index > len(dropItemList) - 1:
- break
- itemInfo = dropItemList[index]
- index += 1
- itemID, itemCount, isAuctionItem = itemInfo
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
- dropItemDataStr = ChItem.GetMapDropItemDataStr(curItem)
- SendVirtualItemDrop(curPlayer, itemID, resultX, resultY, dropItemDataStr)
- curItem.Clear()
- return
-
def DoMapDropPrizeItem(curPlayer, prizeItemList, npcID, dropPosX, dropPosY, isDropDisperse=True, isOnlySelfSee=True):
## 奖励物品真实掉落地图，先拆开分散再掉落
@@ -609,7 +597,7 @@
index += 1
if isinstance(curItem, list):
itemID, itemCount, isAuctionItem = curItem
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
+ curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem, curPlayer=curPlayer)
if not curItem:
continue
@@ -621,13 +609,13 @@
def DoGiveItemByVirtualDrop(curPlayer, giveItemList, npcID, dropPosX=0, dropPosY=0, isDropDisperse=True, mailTypeKey="ItemNoPickUp"):
## 给物品并且做假掉落表现，直接先堆叠给物品，再拆开做虚假掉落表现
- mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneMapID)
- lineID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneLineID)
+ mapID = PlayerControl.GetCustomMapID(curPlayer)
+ lineID = PlayerControl.GetCustomLineID(curPlayer)
if not mapID:
mapID = GameWorld.GetGameWorld().GetMapID()
playerID = curPlayer.GetPlayerID()
- mailItemList = []
+ giveItemObjList = []
virtualItemDropList = []
itemControl = ItemControler.PlayerItemControler(curPlayer)
for itemInfo in giveItemList:
@@ -641,17 +629,8 @@
itemID = curItem.GetItemTypeID()
itemCount = curItem.GetCount()
isAuctionItem = ItemControler.GetIsAuctionItem(curItem)
- jsonItem = ItemCommon.GetJsonItem(curItem)
dropItemDataStr = ChItem.GetMapDropItemDataStr(curItem)
- equipInfo = [curItem.GetEquipPlace(), ItemCommon.GetItemClassLV(curItem), curItem.GetItemColor(),
- curItem.GetItemQuality(), curItem.GetUserData()]
- packIndex = ChConfig.GetItemPackType(curItem.GetType())
- if not itemControl.PutInItem(packIndex, curItem, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":npcID}]):
- mailItemList.append(jsonItem)
-
- if npcID:
- serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)
- SendGameServerGoodItemRecord(mapID, lineID, npcID, curPlayer.GetName(), playerID, itemID, equipInfo, serverGroupID)
+ giveItemObjList.append(curItem)
# 散开掉落
if isDropDisperse:
@@ -659,10 +638,8 @@
virtualItemDropList.append([itemID, dropItemDataStr])
else:
virtualItemDropList.append([itemID, dropItemDataStr])
-
- if mailItemList:
- PlayerControl.SendMailByKey(mailTypeKey, [playerID], mailItemList, [mapID])
+ # 先通知掉落，再给物品，因为前端表现弹框需要这个顺序需求
gameMap = GameWorld.GetMap()
index = 0
for posX, posY in ChConfig.Def_DropItemAreaMatrix:
@@ -679,6 +656,24 @@
itemID, dropItemDataStr = virtualItemDropList[index]
index += 1
SendVirtualItemDrop(curPlayer, itemID, resultX, resultY, dropItemDataStr)
+
+ # 再给物品
+ mailItemList = []
+ for itemObj in giveItemObjList:
+ itemID = itemObj.GetItemTypeID()
+ mailItem = ItemCommon.GetMailItemDict(itemObj)
+ equipInfo = [itemObj.GetEquipPlace(), ItemCommon.GetItemClassLV(itemObj), itemObj.GetItemColor(),
+ itemObj.GetSuiteID(), itemObj.GetUserData()]
+ packIndex = ChConfig.GetItemPackType(itemObj.GetType())
+ if not itemControl.PutInItem(packIndex, itemObj, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":npcID}]):
+ mailItemList.append(mailItem)
+
+ if npcID:
+ SendGameServerGoodItemRecord(curPlayer, mapID, lineID, npcID, itemID, equipInfo)
+
+ # 放不下的发邮件
+ if mailItemList:
+ PlayerControl.SendMailByKey(mailTypeKey, [playerID], mailItemList, [mapID])
return
################################### NPC掉落 ###################################
@@ -1018,6 +1013,10 @@
colorMaxDropCntDict = ipyDrop.GetEquipColorMaxDropCount() # {颜色:上限数量,...}
colorSuitRateDict = ipyDrop.GetEquipColorSuitInfo() # 装备颜色对应套装概率 {颜色:套装概率, ...}
colorSuitPlaceKeyInfoDict = ipyDrop.GetEquipPartKeyRateInfo() # 装备部位集合信息 {(颜色,是否套装):部位集合key, ...}
+ colorSuitPartOptimization = ipyDrop.GetColorSuitPartOptimization() # 部位颜色套评分优选掉落，十位代表颜色，个位代表套装
+ optColor, optIsSuit = colorSuitPartOptimization / 10, colorSuitPartOptimization % 10
+ optPlace = None # 优选部位
+
for dropEquipInfo in dropEquipInfoList:
classLV, color = dropEquipInfo[:2]
if color in colorMaxDropCntDict:
@@ -1045,11 +1044,20 @@
GameWorld.ErrLog("未配置颜色是否套装对应部位集合key! npcID=%s,color=%s,isSuit=%s" % (npcID, color, isSuit))
continue
placeKey = colorSuitPlaceKeyInfoDict[colorSuitKey]
+ # 掉落优选部位处理
+ if color == optColor and isSuit == optIsSuit and placeKey in placeKeyListDict and optPlace == None:
+ optPlace = __GetOptimizationEquipPlace(dropPlayer, classLV, optColor, optIsSuit, placeKeyListDict[placeKey])
jobList = itemJobList
if placeKey not in placeKeyListDict:
GameWorld.ErrLog("部位集合key不存在!npcID=%s,placeKey=%s" % (npcID, placeKey))
continue
- placeList = placeKeyListDict[placeKey]
+ if optPlace > 0:
+ GameWorld.DebugLog(" 最终优选部位: %s" % optPlace)
+ placeList = [optPlace]
+ jobList = [dropPlayer.GetJob()]
+ optPlace = 0 # 只有一次性的，置为0
+ else:
+ placeList = placeKeyListDict[placeKey]
randEquipIDList = __GetEquipIDList(npcID, classLV, color, isSuit, placeList, jobList)
if not randEquipIDList:
continue
@@ -1118,6 +1126,42 @@
elif ChConfig.IsGameBoss(npcData):
GameWorld.ErrLog("Boss没有掉落物品,NPCID=%s" % (npcID), dropPlayer.GetPlayerID())
return dropIDList, auctionIDList, dropMoneyCnt, moneyValue
+
+def __GetOptimizationEquipPlace(dropPlayer, classLV, optColor, optIsSuit, optPlaceList):
+ ''' 获取掉落优选部位
+ 几个默认规则
+ 1. 颜色大于指定优选颜色的，无论是否套装都不计算在内
+ 2. 颜色小于指定优选颜色的，无论是否套装都计算在内
+ '''
+ #GameWorld.DebugLog("处理优选部位掉落: classLV=%s,optColor=%s,optIsSuit=%s,optPlaceList=%s" % (classLV, optColor, optIsSuit, optPlaceList))
+ minGSPlace = None
+ minGS = None
+ equipPack = dropPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
+ for optPlace in optPlaceList:
+ ipyData = IpyGameDataPY.GetIpyGameData('EquipPlaceIndexMap', classLV, optPlace)
+ if not ipyData:
+ continue
+ equipIndex = ipyData.GetGridIndex()
+ curEquip = equipPack.GetAt(equipIndex)
+ if not curEquip or curEquip.IsEmpty():
+ #GameWorld.DebugLog(" 没穿装备，直接默认返回该部位: optPlace=%s" % optPlace)
+ return optPlace
+ curColor = curEquip.GetItemColor()
+ curIsSuit = 1 if curEquip.GetSuiteID() else 0
+ if curColor > optColor:
+ # 超过优选指定颜色的不算，无论是否有套装
+ #GameWorld.DebugLog(" 颜色超过优选颜色，不算该部位: optPlace=%s,curColor=%s,curIsSuit=%s" % (optPlace, curColor, curIsSuit))
+ continue
+ if curColor == optColor and curIsSuit >= optIsSuit:
+ # 与优选指定颜色相同，且满足是否套装的不算
+ #GameWorld.DebugLog(" 颜色套装满足优选，不算该部位: optPlace=%s,curColor=%s,curIsSuit=%s" % (optPlace, curColor, curIsSuit))
+ continue
+ curGS = ItemCommon.GetEquipGearScore(curEquip)
+ if minGS == None or curGS < minGS:
+ minGS = curGS
+ minGSPlace = optPlace
+
+ return minGSPlace
def __GetNPCDropDoCountChange(doCount, doCountRate, doCountAdd):
## 获取掉落执行次数变更结果，可能增加 或 减少
@@ -1327,7 +1371,7 @@
return dropItemIDList
-def __GetEquipIDList(npcID, classLV, color, isSuit, placeList, itemJobList):
+def __GetEquipIDList(findID, classLV, color, isSuit, placeList, itemJobList, findType="NPC"):
#存一个满足要求的所有的物品的列表 然后从当中随机选一个
#注： 阶、颜色、套装ID、职业、部位，这5个条件可确认唯一一件装备
key = "%s_%s" % (classLV, color)
@@ -1360,7 +1404,7 @@
placeItemList = filterItemIDDict[itemPlace]
placeItemList.append([itemJob, suiteID, itemID])
PyGameData.g_filterEquipDict[key] = filterItemIDDict
- GameWorld.Log("缓存掉落装备ID: classLV_color=%s, %s, %s" % (key, filterItemIDDict, PyGameData.g_filterEquipDict))
+ GameWorld.Log("缓存产出装备ID: classLV_color=%s, %s, %s" % (key, filterItemIDDict, PyGameData.g_filterEquipDict))
itemIDList = []
for itemPlace, placeItemList in filterItemIDDict.items():
@@ -1376,8 +1420,8 @@
itemIDList.append(itemID)
if not itemIDList:
- GameWorld.ErrLog("找不到可掉落的装备ID: npcID=%s,classLV=%s,color=%s,isSuit=%s,placeList=%s,itemJobList=%s"
- % (npcID, classLV, color, isSuit, placeList, itemJobList))
+ GameWorld.ErrLog("找不到可产出的装备ID: %sID=%s,classLV=%s,color=%s,isSuit=%s,placeList=%s,itemJobList=%s"
+ % (findType, findID, classLV, color, isSuit, placeList, itemJobList))
return itemIDList
def __GetNPCPieRateEquipDrop(ipyDrop, doCnt, equipDropPlus):
@@ -2017,6 +2061,28 @@
return
+#// B4 0F 回收私有专属木桩怪 #tagCMRecyclePriWoodPile
+#
+#struct tagCMRecyclePriWoodPile
+#{
+# tagHead Head;
+# DWORD ObjID;
+#};
+def OnRecyclePriWoodPile(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ objID = clientData.ObjID
+ curNPC = GameWorld.FindNPCByID(objID)
+ if not curNPC:
+ return
+ if curNPC.GetType() not in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ return
+ summonPlayerID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_PriWoodPilePlayerID)
+ if curPlayer.GetPlayerID() != summonPlayerID:
+ #GameWorld.DebugLog("非玩家私有木桩...")
+ return
+ SetDeadEx(curNPC)
+ return
+
#// B4 0C 召唤私有专属木桩怪 #tagCMSummonPriWoodPile
#
#struct tagCMSummonPriWoodPile
@@ -2024,98 +2090,81 @@
# tagHead Head;
# DWORD NPCID;
# BYTE Count; //默认1个，最多5个
+# DWORD HP; //默认0取最大值，其中一个血量数值大于0则用指定血量
+# DWORD HPEx; //默认0取最大值，其中一个血量数值大于0则用指定血量
#};
def OnSummonPriWoodPile(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
npcID = clientData.NPCID
count = clientData.Count
- SummonPriWoodPile(curPlayer, npcID, count)
+ hp = clientData.HP
+ hpEx = clientData.HPEx
+ SummonPriWoodPile(curPlayer, npcID, count, hp, hpEx)
return
-def SummonPriWoodPile(curPlayer, npcID, count):
+def SummonPriWoodPile(curPlayer, npcID, count, hp=0, hpEx=0):
''' 召唤私有专属木桩怪
'''
- if not curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
- GameWorld.DebugLog("玩家当前不是在自定义场景中，不允许招木桩!")
- return
-
- mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneMapID)
- lineID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneLineID)
+ mapID = PlayerControl.GetCustomMapID(curPlayer)
+ lineID = PlayerControl.GetCustomLineID(curPlayer)
if mapID:
if not FBLogic.OnCanSummonPriWoodPile(curPlayer, mapID, lineID, npcID, count):
GameWorld.ErrLog("无法召唤木桩怪!mapID=%s,lineID=%s,npcID=%s,count=%s" % (mapID, lineID, npcID, count))
return
- maxCount = 10
- nowCount = 0
- # 只允许存在一个私有木桩
- indexList = range(curPlayer.GetSummonCount())
- for index in indexList[::-1]:
- summonNPC = curPlayer.GetSummonNPCAt(index)
- if not summonNPC:
- continue
- npcType = summonNPC.GetType()
- if npcType not in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
- continue
- if nowCount >= maxCount or summonNPC.GetNPCID() != npcID:
- SetDeadEx(summonNPC)
- else:
- nowCount += 1
-
+ if count != 1:
+ hp, hpEx = 0, 0 # 指定血量的暂仅适用于单只的
+
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_playerPriWoodPileNPCDict:
+ PyGameData.g_playerPriWoodPileNPCDict[playerID] = []
+ playerPriWoodNPCList = PyGameData.g_playerPriWoodPileNPCDict[playerID]
+ maxCount = 3
+ nowCount = len(playerPriWoodNPCList)
summonCount = min(count, maxCount - nowCount)
- #GameWorld.DebugLog("召唤: count=%s,maxCount=%s,nowCount=%s,summonCount=%s"
- # % (count, maxCount, nowCount, summonCount))
+ GameWorld.DebugLog("召唤木桩: npcID=%s,count=%s,maxCount=%s,nowCount=%s,summonCount=%s,hp=%s,hpEx=%s"
+ % (npcID, count, maxCount, nowCount, summonCount, hp, hpEx))
if summonCount <= 0:
return
+ npcManager = GameWorld.GetNPCManager()
for _ in xrange(summonCount):
- summonNPC = curPlayer.SummonNewNPC()
+ #summonNPC = curPlayer.SummonNewNPC()
+ summonNPC = npcManager.AddPlayerSummonNPC()
#设置召唤兽基础信息
summonNPC.SetNPCTypeID(npcID)
+ summonNPC.SetSightLevel(curPlayer.GetSightLevel())
#初始化
InitNPC(summonNPC)
#玩家召唤兽列表添加召唤兽,召唤兽添加主人
- summonNPC.SetOwner(curPlayer)
- summonNPC.SetDict(ChConfig.Def_NPC_Dict_SummonMapNPCPlayerID, curPlayer.GetPlayerID())
+ #summonNPC.SetOwner(curPlayer)
+ summonNPC.SetDict(ChConfig.Def_NPC_Dict_PriWoodPilePlayerID, playerID)
#将召唤兽召唤出来
#玩家周围随机出生点
#技能召唤坐标 ChConfig.Def_SummonAppearDist
summonPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), 3)
- summonNPC.Reborn(summonPos.GetPosX(), summonPos.GetPosY())
+ summonNPC.Reborn(summonPos.GetPosX(), summonPos.GetPosY(), False)
+ NPCControl(summonNPC).ResetNPC_Init(isReborn=True)
+ if hp or hpEx:
+ summonNPC.SetHP(hp)
+ summonNPC.SetHPEx(hpEx)
+ summonNPC.NotifyAppear() # 最终统一通知NPC出现
+ playerPriWoodNPCList.append(summonNPC)
- if not curPlayer.GetSight():
- summonNPCAppear = ChNetSendPack.tagPlayerSummonNPCAppear()
- summonNPCAppear.Clear()
- summonNPCAppear.PlayerID = curPlayer.GetPlayerID()
- summonNPCAppear.ObjID = summonNPC.GetID()
- summonNPCAppear.NPCID = summonNPC.GetNPCID()
- summonNPCAppear.PosX = summonNPC.GetPosX()
- summonNPCAppear.PosY = summonNPC.GetPosY()
- summonNPCAppear.HP = summonNPC.GetHP()
- summonNPCAppear.HPEx = summonNPC.GetHPEx()
- summonNPCAppear.MaxHP = summonNPC.GetMaxHP()
- summonNPCAppear.MaxHPEx = summonNPC.GetMaxHPEx()
- summonNPCAppear.Speed = summonNPC.GetSpeed()
- summonNPCAppear.LV = GetNPCLV(summonNPC)
- summonNPCAppear.OwnerName = curPlayer.GetPlayerName()
- summonNPCAppear.OwnerNameLen = len(summonNPCAppear.OwnerName)
- NetPackCommon.SendFakePack(curPlayer, summonNPCAppear)
-
return
def ClearPriWoodPile(curPlayer):
## 清除私有木桩
- indexList = range(curPlayer.GetSummonCount())
- for index in indexList[::-1]:
- summonNPC = curPlayer.GetSummonNPCAt(index)
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_playerPriWoodPileNPCDict:
+ return
+ playerPriWoodNPCList = PyGameData.g_playerPriWoodPileNPCDict.pop(playerID)
+ for summonNPC in playerPriWoodNPCList:
if not summonNPC:
- continue
- npcType = summonNPC.GetType()
- if npcType not in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
continue
SetDeadEx(summonNPC)
return
@@ -2138,10 +2187,8 @@
if curNPC.GetGameObjType() == IPY_GameWorld.gotNPC:
FBLogic.DoFB_NPCDead(curNPC)
- ownerPlayer = None
summonPlayerID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_SummonMapNPCPlayerID)
if summonPlayerID > 0:
- ownerPlayer = GameWorld.GetObj(summonPlayerID, IPY_GameWorld.gotPlayer)
curNPC.SetDict(ChConfig.Def_NPC_Dict_SummonMapNPCPlayerID, 0)
# 暗金boss
@@ -2169,14 +2216,16 @@
lineRobotJobDict.pop(curNPC.GetID(), 0)
PyGameData.g_fbRobotJobDict[lineID] = lineRobotJobDict
- if ownerPlayer and not ownerPlayer.GetSight():
- npcDie = ChNetSendPack.tagNPCDie()
- npcDie.ObjID = curNPC.GetID()
- npcDie.Reason = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
- npcDie.KillerType = curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerType)
- npcDie.KillerID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID)
- NetPackCommon.SendFakePack(ownerPlayer, npcDie)
-
+ priWoodPilePlayerID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_PriWoodPilePlayerID)
+ if priWoodPilePlayerID > 0 and priWoodPilePlayerID in PyGameData.g_playerPriWoodPileNPCDict:
+ priWoodPileNPCList = PyGameData.g_playerPriWoodPileNPCDict[priWoodPilePlayerID]
+ for priWoodNPC in priWoodPileNPCList:
+ if priWoodNPC and priWoodNPC.GetID() == curNPC.GetID():
+ priWoodPileNPCList.remove(priWoodNPC)
+ if not priWoodPileNPCList:
+ PyGameData.g_playerPriWoodPileNPCDict.pop(priWoodPilePlayerID)
+ break
+
# C++设置npc死亡
curNPC.SetDead(curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason),
curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerType),
@@ -4283,15 +4332,16 @@
def __NPCDropItem(self, dropPlayer, hurtType, hurtID, ownerPlayerList=[]):
if not dropPlayer:
return
- if dropPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
- GameWorld.DebugLog("前端自定义场景中，不掉落物品！")
- return
curNPC = self.__Instance
+ if curNPC.GetType() in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ GameWorld.DebugLog("木桩怪，不掉落物品！")
+ return
npcID = curNPC.GetNPCID()
mapID = GameWorld.GetMap().GetMapID()
mapID = FBCommon.GetRecordMapID(mapID)
isGameBoss = ChConfig.IsGameBoss(curNPC)
- if mapID in [ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_DemonKing]:
+ if mapID in [ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_DemonKing, ChConfig.Def_FBMapID_SealDemon, ChConfig.Def_FBMapID_ZhuXianBoss]:
+ GameWorld.DebugLog("该地图不走直接掉落物品逻辑！mapID=%s" % mapID)
return
if isGameBoss:
GameWorld.Log("NPC开始掉落: npcID=%s,dropPlayerID=%s" % (npcID, dropPlayer.GetPlayerID()), dropPlayer.GetPlayerID())
@@ -4969,10 +5019,13 @@
#if self.__GetIsLog():
# GameWorld.Log("玩家增加个人经验,npcID=%s,addExp=%s" % (curNPC.GetNPCID(), add_Exp), curPlayer.GetPlayerID())
-
+ addSkillID = 0
+ if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
+ addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
+
#设定人物获得经验
playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC)
+ playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
self.__KillNPCFuncEx(curPlayer, curNPC, curPlayer.GetPlayerID(), False)
@@ -5183,8 +5236,11 @@
return
#GameWorld.Log("普通队伍杀死怪物,队伍分享人数 = %s,个人经验增加 玩家 = %s, 增加 = %s"%(playerCount, curPlayer.GetPlayerID(), add_Exp))
#设定人物获得经验
+ addSkillID = 0
+ if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
+ addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC)
+ playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
return
#---------------------------------------------------------------------
@@ -5858,19 +5914,22 @@
#};
def OnGetCustomSceneCollectAward(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
npcID = clientData.NPCID
if not curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
- GameWorld.DebugLog("非自定义场景中，无法获取定义采集奖励!")
+ GameWorld.ErrLog("非自定义场景中，无法获取定义采集奖励!", playerID)
return
- mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneMapID)
- lineID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneLineID)
- GameWorld.DebugLog("前端场景采集: mapID=%s,lineID=%s,npcID=%s" % (mapID, lineID, npcID))
+ mapID = PlayerControl.GetCustomMapID(curPlayer)
+ lineID = PlayerControl.GetCustomLineID(curPlayer)
+ GameWorld.Log("前端场景采集: mapID=%s,lineID=%s,npcID=%s" % (mapID, lineID, npcID), playerID)
+ if not mapID:
+ GameWorld.ErrLog("无自定义场景地图ID，不允许采集!", playerID)
+ return
- if mapID:
- #if FBCommon.GetCustomSceneState(curPlayer, mapID, lineID) != ChConfig.CustomSceneState_Fight:
- # return
- FBLogic.OnCustomSceneCollectOK(curPlayer, mapID, lineID, npcID)
-
+ if not FBLogic.OnCustomSceneCollectOK(curPlayer, mapID, lineID, npcID):
+ GameWorld.ErrLog("自定义场景地图不允许采集! mapID=%s,lineID=%s,npcID=%s" % (mapID, lineID, npcID), playerID)
+ return
+
collectNPCIpyData = IpyGameDataPY.GetIpyGameData("CollectNPC", npcID)
if collectNPCIpyData:
DoGiveCollectNPCAward(curPlayer, npcID, collectNPCIpyData)
@@ -5923,20 +5982,7 @@
if not awardItemList:
alchemyDiffLV = collectNPCIpyData.GetAlchemyDiffLV()
- giveItemWeightList = []
- if alchemyDiffLV:
- curAlchemyLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AlchemyLV)
- for itemInfo in collectAwardCfg:
- itemID = itemInfo[1][0]
- itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
- if not itemData:
- continue
- if ItemCommon.GetItemClassLV(itemData) > curAlchemyLV + alchemyDiffLV:
- continue
- giveItemWeightList.append(itemInfo)
- else:
- giveItemWeightList = collectAwardCfg
-
+ giveItemWeightList = ItemCommon.GetWeightItemListByAlchemyDiffLV(curPlayer, collectAwardCfg, alchemyDiffLV)
GameWorld.DebugLog(" 常规采集物品权重列表: alchemyDiffLV=%s,collectAwardCfg=%s,giveItemWeightList=%s" % (alchemyDiffLV, collectAwardCfg, giveItemWeightList))
giveItemInfo = GameWorld.GetResultByWeightList(giveItemWeightList)
if giveItemInfo:
@@ -6187,7 +6233,7 @@
NetPackCommon.SendFakePack(curPlayer, npcInfoPack)
return
-def SendGameServerGoodItemRecord(mapID, lineID, npcID, playerName, playerID, itemID, equipInfo=[], serverGroupID=0):
+def SendGameServerGoodItemRecord(curPlayer, mapID, lineID, npcID, itemID, equipInfo=[]):
# @param equipInfo: [equipPlace, itemClassLV, itemColor, itemQuality, itemUserData]
# GameWorld.DebugLog("检查物品是否发送GameServer: mapID=%s, npcID=%s, playerName=%s, itemID=%s"
# % (mapID, npcID, playerName, itemID))
@@ -6207,18 +6253,21 @@
needRecord = True
weightValue = recSpecialItemIDList.index(itemID) + 10000
else:
- equipPlace, itemClassLV, itemColor, itemQuality, itemUserData = equipInfo
- weightValue = itemColor*1000+itemQuality*100+itemClassLV
+ equipPlace, itemClassLV, itemColor, suiteID, itemUserData = equipInfo
+ isSuit = 1 if suiteID else 0
+ weightValue = itemColor*1000+isSuit*100+itemClassLV
recordCondition = GameWorld.GetDictValueByKey(recDropEquipInfoDict, equipPlace)
if recordCondition:
- needClassLV, needItemColor, needItemQuality = recordCondition
- if itemClassLV >= needClassLV and itemColor >= needItemColor and itemQuality >= needItemQuality:
+ needClassLV, needItemColor, needItemSuite = recordCondition
+ if itemClassLV >= needClassLV and itemColor >= needItemColor and isSuit >= needItemSuite:
needRecord = True
if not needRecord:
return
-
- dropEquipMsg = str([playerID, playerName, mapID, lineID, npcID, itemID, itemUserData, weightValue, serverGroupID])
+ playerID = curPlayer.GetID()
+ playerName = curPlayer.GetName()
+ serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)
+ dropEquipMsg = str([playerID, playerName, mapID, lineID, npcID, itemID, itemUserData, weightValue, serverGroupID, curPlayer.GetLV()])
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'BossDropGoodItem', dropEquipMsg, len(dropEquipMsg))
GameWorld.DebugLog("发送GameServer记录拾取掉落好物品: %s" % dropEquipMsg, playerID)
return
@@ -6333,6 +6382,8 @@
def UpdateNPCAttackCount(curPlayer, npcID, attackCount, maxCount=0):
## 更新玩家攻击NPC次数
+ if not npcID:
+ return
GameWorld.DebugLog("更新玩家攻击NPC次数: npcID=%s,attackCount=%s,maxCount=%s" % (npcID, attackCount, maxCount))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_NPCAttackCount % npcID, attackCount)
@@ -6432,7 +6483,7 @@
if not dropItemList:
return
- mapID = attackPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneMapID)
+ mapID = PlayerControl.GetCustomMapID(attackPlayer)
if mapID:
DoGiveItemByVirtualDrop(attackPlayer, dropItemList, npcID)
GameLogic_CrossGrassland.RecordGrasslandAward(attackPlayer, dropItemList)
--
Gitblit v1.8.0