From 3ddd283d8d8fc305e340c496a5993c3aa0356c17 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 九月 2018 01:05:36 +0800
Subject: [PATCH] 3798 还原（修复活动日期相连时如果都配置了提前显示时间不会取最近的活动时间bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 100 insertions(+), 11 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..9b428f1 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 = [
@@ -176,6 +176,11 @@
return
curPlayer.SetSight(min(ChConfig.Def_PlayerSight_Default, clientData.Sight))
GameWorld.DebugLog("OnSightZoom:%s"%clientData.Sight)
+
+ # 脱机玩家过多，需要隐身一部分
+ if curPlayer.GetLV() < 190:
+ if random.randint(0, 5) != 2:
+ curPlayer.SetVisible(False)
return
# 需要处理的点，防沉迷
@@ -199,6 +204,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 +445,8 @@
# 2.物品
OnTJGDropItems(curPlayer, npcID, killCnt)
-
+ #任务道具
+ OnTJGDropTaskItems(curPlayer, npcData.GetLV(), killCnt)
# VIP杀怪加攻
PlayerVip.DoAddVIPKillLVExp(curPlayer, npcData, killCnt)
@@ -448,7 +455,9 @@
# 击杀特定NPC成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, killCnt, [npcID])
-
+ # 日常活动
+ if npcData.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC, killCnt)
# 击杀任务怪, 杀怪日常已经没有了，暂时屏蔽
#for _ in xrange(killCnt):
# EventShell.Event_OnKillByID(curPlayer, npcID)
@@ -557,6 +566,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 +659,7 @@
def NotifyTJGInfo(curPlayer):
if curPlayer.GetIP() == "127.0.0.1":
+ LoginFixTJG(curPlayer, True)
return
# 脱机挂没有运作情况下 弥补收益
@@ -801,11 +833,63 @@
return
+def TJGGM(curPlayer, times):
+ # 真实上线
+ npcID = FindTJGNPC(curPlayer)
+ if not npcID:
+ return
+
+ # 此时由服务端重新找一次挂机NPC
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, npcID)
+
+ GameWorld.DebugAnswer(curPlayer, "GM模拟脱机产出,npcid:%s, 时间秒：%s， 经验倍率：%s"%(
+ curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_TJGNPC), times,
+ curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)))
+
+
+ # 设置脱机登录时的等级, 上线通知清空， 没清空说明多次脱机挂登录 使用旧等级
+ notifyLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_LV, 0, ChConfig.Def_PDictType_TJGNotify)
+ if not notifyLV:
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGNotify_LV, curPlayer.GetLV(), ChConfig.Def_PDictType_TJGNotify)
+
+
+ # 记录秒单位
+ NoteTJGTime(curPlayer, times)
+ OnTJGKillNPCByTimes(curPlayer, times)
+
+ sendPack = ChPyNetSendPack.tagMCTJGInfo()
+ sendPack.Clear()
+ sendPack.Exp1 = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_Exp1, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.Exp2 = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_Exp2, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.Times = times
+ sendPack.PurpleEquip = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_Purple, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.OrangeEquip = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_Orange, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.EatPurpleEquip = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_EatPurple, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.GiveCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_GiveCnt, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.BeforeLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_LV, 0, ChConfig.Def_PDictType_TJGNotify)
+ sendPack.Items = []
+ itemIDList = IpyGameDataPY.GetFuncEvalCfg('OfflinePostItem', 1)
+ for itemID in itemIDList:
+ count = curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGNotify_ItemID%itemID, 0, ChConfig.Def_PDictType_TJGNotify)
+ if count == 0:
+ continue
+ itemInfo = ChPyNetSendPack.tagMCTJGItems()
+ itemInfo.ItemID = itemID
+ itemInfo.Count = count
+ sendPack.Items.append(itemInfo)
+ sendPack.Cnt = len(sendPack.Items)
+
+ NetPackCommon.SendFakePack(curPlayer, sendPack)
+
+ curPlayer.ClearNomalDict(ChConfig.Def_PDictType_TJGNotify)
+
+
+
# 上线检查脱机时间是否正常运行, 弥补对应缺失时间，如维护2小时缺失的脱机挂收益
# 1. 非脱机死亡，2.存在脱机时间，3.离线时间超过5分钟；则一次补齐 离线时间-5分钟的收益并减少脱机时间
# 按当前经验倍率计算，且不会减buff时间
# 找到对应的NPC，需读取对应挂机表
-def LoginFixTJG(curPlayer):
+def LoginFixTJG(curPlayer, isTJG=False):
# 外层需判断是真实玩家登录
tjgTime = GetTJGTime(curPlayer) # 秒
if not tjgTime:
@@ -818,19 +902,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