From 00916d353a461680aa6e9f1431a92743b1a3e903 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 28 五月 2019 14:12:38 +0800
Subject: [PATCH] 6970 【2.0】【后端】缥缈仙域仙草园（修复2星灵草园采完后不结算的bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 677e40b..d2b1d95 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -310,7 +310,6 @@
aMaxAtk = curPlayer.GetMaxAtk() # 攻击方最大攻击
aSuperHitRate = curPlayer.GetSuperHitRate() # 暴击率
aSuperHit = curPlayer.GetSuperHit() # 暴击伤害固定值
- aSuperHitPer = PlayerControl.GetSuperHitPer(curPlayer) # 暴击伤害固定值
aIceAtk = curPlayer.GetIceAtk() # 真实伤害
aDamagePVE = PlayerControl.GetDamagePVE(curPlayer) # PVE固定伤害
aSkillAtkRate = curPlayer.GetSkillAtkRate() # 技能攻击力加成
@@ -320,7 +319,6 @@
atkSpeed = PlayerControl.GetAtkSpeed(curPlayer) # 攻击速度
aIgnoreDefRate = curPlayer.GetIgnoreDefRate() # 无视防御比率
aLuckyHit = curPlayer.GetLuckyHitVal() # 会心一击固定值
- aLuckyHitPer = PlayerControl.GetLuckyHitPer(curPlayer) # 会心一击万分率
aLuckyHitRate = curPlayer.GetLuckyHitRate() # 会心一击概率
aBleedDamage = PlayerControl.GetBleedDamage(curPlayer) # 流血伤害 万分率
aFinalHurt = PlayerControl.GetFinalHurt(curPlayer) # 最终固定伤害
@@ -364,11 +362,11 @@
if GameWorld.GetGameWorld().GetDebugLevel():
GameWorld.DebugLog("""CalcTJGExp--%s-%s-%s-%s-reExp:%s, attackEff:%s, aMinAtk:%s, aMaxAtk:%s, aSuperHitRate:%s, aSuperHit:%s,
- aSuperHitPer:%s, aLuckyHitPer:%s, aNPCHurtAddPer:%s, aFinalHurtPer:%s,
+ aNPCHurtAddPer:%s, aFinalHurtPer:%s,
aIceAtk:%s, aDamagePVE:%s, aSkillAtkRate:%s, petMinAtk:%s, petMaxAtk:%s, petDamPer:%s, atkSpeed:%s,
aIgnoreDefRate:%s, aLuckyHit:%s, aLuckyHitRate:%s, aBleedDamage:%s, aFinalHurt:%s, npcExp:%s, npcMaxHP:%s, npcCommendFightPower:%s,
petSkillLV:%s, petSkillPer:%s, skill:%s, petSkill:%s"""%(curPlayer.GetID(), curPlayer.GetLV(), times, npcData.GetNPCID(),
- reExp, attackEff, aMinAtk, aMaxAtk, aSuperHitRate, aSuperHit, aSuperHitPer, aLuckyHitPer, aNPCHurtAddPer, aFinalHurtPer,
+ reExp, attackEff, aMinAtk, aMaxAtk, aSuperHitRate, aSuperHit, aNPCHurtAddPer, aFinalHurtPer,
aIceAtk, aDamagePVE, aSkillAtkRate, petMinAtk, petMaxAtk, petDamPer,
atkSpeed, aIgnoreDefRate, aLuckyHit, aLuckyHitRate, aBleedDamage, aFinalHurt, npcExp, npcMaxHP, npcCommendFightPower, petSkillLV,
petSkillPer, eval("[" +", ".join(["skill%s"%i for i in range(1, 11)]) + "]"),
@@ -493,7 +491,7 @@
## 装备一件件给
if ItemCommon.GetIsEquip(curItemData):
for _ in xrange(dropCount):
- curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem)
+ curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem, curPlayer=curPlayer)
if not curItem:
continue
if not itemControl.PutInItem(IPY_GameWorld.rptItem, curItem, event=[ChConfig.ItemGive_TJGDropItem, False, {}]):
@@ -502,7 +500,7 @@
#记录紫橙装数量用于通知
NoteEquip(curPlayer, curItemData.GetItemColor())
else:
- curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem)
+ curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem, curPlayer=curPlayer)
if not curItem:
continue
@@ -948,7 +946,7 @@
ipyDataMgr = IpyGameDataPY.IPY_Data()
- maxMapID = 0
+ maxMapID = 0 # 高级地图按表顺序行排
# ---找到可以挂机的最高级地图---
for i in xrange(ipyDataMgr.GetMapEventPointCount()):
mapInfo = ipyDataMgr.GetMapEventPointByIndex(i)
@@ -960,7 +958,7 @@
# ---判断地图表的任务和等级限制---
mapData = GameWorld.GetGameData().GetChinMap().GetMapByID(mapID)
if not mapData:
- continue
+ continue
enterLV = mapData.GetLV()
if curPlayer.GetLV() < enterLV:
@@ -969,8 +967,6 @@
if missionMapStep < openMapStep:
continue
- if mapID < maxMapID:
- continue
maxMapID = mapID
if not maxMapID:
--
Gitblit v1.8.0