From 531ef1778441b79979e3d5c9367a53f407a0c604 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 27 八月 2018 19:13:35 +0800
Subject: [PATCH] fix:#1721 【BUG】娲皇遗迹，未获得奖励时，副本时间到，扣了次数
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 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 613f803..f13b50d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -51,7 +51,7 @@
import PlayerGeTui
import ChEquip
import QuestCommon
-
+import random
# 可吞噬的装备位
Def_EatItem_EquipPlace = [
@@ -199,6 +199,7 @@
if curPlayer.GetIP() != "127.0.0.1":
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, clientData.NPCID)
+
GameWorld.DebugLog("%s---OnTJGNPC:%s"%(curPlayer.GetName(),clientData.NPCID))
return
@@ -439,7 +440,8 @@
# 2.物品
OnTJGDropItems(curPlayer, npcID, killCnt)
-
+ #任务道具
+ OnTJGDropTaskItems(curPlayer, npcData.GetLV(), killCnt)
# VIP杀怪加攻
PlayerVip.DoAddVIPKillLVExp(curPlayer, npcData, killCnt)
@@ -557,6 +559,28 @@
NoteEatEquip(curPlayer, eatCount, giveCnt)
CheckPackFull(curPlayer)
+def OnTJGDropTaskItems(curPlayer, npclv, killCnt):
+ #掉落任务道具
+ if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TJGPackFullAfterEat):
+ # 满了不再给物品
+ return
+ dropTaskItemDict = IpyGameDataPY.GetFuncEvalCfg('TJDropTaskItem', 1, {})
+ for missionID, dropInfo in dropTaskItemDict.items():
+ if not curPlayer.FindMission(missionID):
+ continue
+ npclvLimit, itemID, needItemCnt, itemCntFormula = dropInfo
+ if npclv < npclvLimit:
+ continue
+ haveCnt = ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptItem, itemID)
+ giveItemCnt = min(needItemCnt-haveCnt, eval(itemCntFormula))
+ if giveItemCnt <= 0:
+ continue
+ packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, 1)
+ if packSpace < 1:
+ #GameWorld.Log('脱机挂掉落任务道具背包不足！ missionID=%s，itemID=%s,giveItemCnt=%s'%(missionID, itemID, giveItemCnt))
+ continue
+ ItemControler.GivePlayerItem(curPlayer, itemID, giveItemCnt, 0, [IPY_GameWorld.rptItem])
+ return
def CheckPackFull(curPlayer):
if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
@@ -628,6 +652,7 @@
def NotifyTJGInfo(curPlayer):
if curPlayer.GetIP() == "127.0.0.1":
+ LoginFixTJG(curPlayer, True)
return
# 脱机挂没有运作情况下 弥补收益
@@ -805,7 +830,7 @@
# 1. 非脱机死亡，2.存在脱机时间，3.离线时间超过5分钟；则一次补齐 离线时间-5分钟的收益并减少脱机时间
# 按当前经验倍率计算，且不会减buff时间
# 找到对应的NPC，需读取对应挂机表
-def LoginFixTJG(curPlayer):
+def LoginFixTJG(curPlayer, isTJG=False):
# 外层需判断是真实玩家登录
tjgTime = GetTJGTime(curPlayer) # 秒
if not tjgTime:
@@ -818,19 +843,24 @@
# 超过5分钟部分补偿
- seconds = PlayerControl.GetPlayerLeaveServerSecond(curPlayer) - 300
+ seconds = PlayerControl.GetPlayerLeaveServerSecond(curPlayer) - IpyGameDataPY.GetFuncCfg('AutoUseGuardian', 2)
if seconds <= 0:
return
times = min(seconds, tjgTime)
- npcID = FindTJGNPC(curPlayer)
- if not npcID:
- return
+ if not isTJG:
+ # 真实上线
+ npcID = FindTJGNPC(curPlayer)
+ if not npcID:
+ return
+
+ # 此时由服务端重新找一次挂机NPC
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, npcID)
- GameWorld.DebugLog("弥补脱机----npcid %s-%s"%(npcID, times))
+ GameWorld.DebugLog("弥补脱机----npcid %s-%s-%s"%(
+ curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_TJGNPC), times,
+ curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)))
- # 此时由服务端重新找一次挂机NPC
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, npcID)
# 设置脱机登录时的等级, 上线通知清空， 没清空说明多次脱机挂登录 使用旧等级
notifyLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_LV, 0, ChConfig.Def_PDictType_TJGNotify)
--
Gitblit v1.8.0