From f97b6ae94c6acdaacf6adf140416df901d1caf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 四月 2019 11:56:41 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 259 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 171 insertions(+), 88 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 d18b3fe..afc30f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -51,22 +51,19 @@
import PlayerGeTui
import ChEquip
import QuestCommon
-
-
-# 可吞噬的装备位
-Def_EatItem_EquipPlace = [
- ShareDefine.retWeapon, #1 主手
- ShareDefine.retWeapon2, #2 副手
- ShareDefine.retHat, #3 帽子
- ShareDefine.retClothes, #4 衣服
- ShareDefine.retBelt, #5 腰带
- ShareDefine.retTrousers, #6 裤子
- ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
-
-]
+import random
+import GameObj
Def_EatSpace = 5 # 低于X格自动吞噬
+
+
+def DoTJGOpen(curPlayer):
+ ##脱机挂功能开启 赠送脱机时间
+ addTime = IpyGameDataPY.GetFuncCfg('TJGGiftTime')
+ AddTJGTime(curPlayer, addTime)
+ GameWorld.DebugLog('脱机挂功能开启 赠送脱机时间 %s'%addTime, curPlayer.GetID())
+ return
+
#===============================================================================
# //B2 01 脱机挂状态 # tagCMLoginState
# struct tagCMLoginState
@@ -94,57 +91,58 @@
# 切换守护
def ChangeGuard(curPlayer, tick):
- # 检查过背包中无守护则不再执行
- if curPlayer.GetDictByKey("AutoCGuardID") == 1:
- return
-
- curGuardID = 0 # 装备的守护ID
- itemIDList = IpyGameDataPY.GetFuncEvalCfg('AutoUseGuardian', 1)
- guardItem = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip).GetAt(ShareDefine.retGuard)
- # 1。 守护存在，判断是否最优先守护
- if ItemCommon.CheckItemCanUse(guardItem) and ItemCommon.CheckItemCanUseByExpireTime(guardItem):
- curGuardID = guardItem.GetItemTypeID()
- if curGuardID == itemIDList[0]:
- # 最高优先级
- return
- if curPlayer.GetDictByKey("AutoCGuardID") == 2:
- # 当前背包最高
- return
-
-
- findItemList = []
- curPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
-
- # 找到背包中优先级最高的守护物品
- for i in range(0, curPack.GetCount()):
- item = curPack.GetAt(i)
-
- if not ItemCommon.CheckItemCanUse(item):
- continue
-
- if item.GetItemTypeID() not in itemIDList:
- continue
-
- if not ItemCommon.CheckItemCanUseByExpireTime(item):
- # 背包有不过期的物品
- continue
-
- findItemList.append(item)
-
- if not findItemList:
- curPlayer.SetDict("AutoCGuardID", 1) # 设置无可替换的标志
- return
-
- findItemList.sort(cmp=SortGuard)
- if curGuardID in itemIDList and itemIDList.index(curGuardID) <= itemIDList.index(findItemList[0].GetItemTypeID()):
- # 当前装备最高，减少遍历
- curPlayer.SetDict("AutoCGuardID", 2)
- return
-
-
- #---执行玩家换装逻辑---
- ChEquip.DoPlayerEquipItem(curPlayer, findItemList[0], ShareDefine.retGuard, tick)
- curPlayer.SetDict("AutoCGuardID", 0)
+ return #新版本不需要切换
+# # 检查过背包中无守护则不再执行
+# if curPlayer.GetDictByKey("AutoCGuardID") == 1:
+# return
+#
+# curGuardID = 0 # 装备的守护ID
+# itemIDList = IpyGameDataPY.GetFuncEvalCfg('AutoUseGuardian', 1)
+# guardItem = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip).GetAt(ShareDefine.retGuard1)
+# # 1。 守护存在，判断是否最优先守护
+# if ItemCommon.CheckItemCanUse(guardItem) and ItemCommon.CheckItemCanUseByExpireTime(guardItem):
+# curGuardID = guardItem.GetItemTypeID()
+# if curGuardID == itemIDList[0]:
+# # 最高优先级
+# return
+# if curPlayer.GetDictByKey("AutoCGuardID") == 2:
+# # 当前背包最高
+# return
+#
+#
+# findItemList = []
+# curPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
+#
+# # 找到背包中优先级最高的守护物品
+# for i in range(0, curPack.GetCount()):
+# item = curPack.GetAt(i)
+#
+# if not ItemCommon.CheckItemCanUse(item):
+# continue
+#
+# if item.GetItemTypeID() not in itemIDList:
+# continue
+#
+# if not ItemCommon.CheckItemCanUseByExpireTime(item):
+# # 背包有不过期的物品
+# continue
+#
+# findItemList.append(item)
+#
+# if not findItemList:
+# curPlayer.SetDict("AutoCGuardID", 1) # 设置无可替换的标志
+# return
+#
+# findItemList.sort(cmp=SortGuard)
+# if curGuardID in itemIDList and itemIDList.index(curGuardID) <= itemIDList.index(findItemList[0].GetItemTypeID()):
+# # 当前装备最高，减少遍历
+# curPlayer.SetDict("AutoCGuardID", 2)
+# return
+#
+#
+# #---执行玩家换装逻辑---
+# ChEquip.DoPlayerEquipItem(curPlayer, findItemList[0], ItemCommon.GetEquipPackIndex(findItemList[0]), tick)
+# curPlayer.SetDict("AutoCGuardID", 0)
return
@@ -176,6 +174,7 @@
return
curPlayer.SetSight(min(ChConfig.Def_PlayerSight_Default, clientData.Sight))
GameWorld.DebugLog("OnSightZoom:%s"%clientData.Sight)
+
return
# 需要处理的点，防沉迷
@@ -200,8 +199,6 @@
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, clientData.NPCID)
- # 先弥补错失的时间
- LoginFixTJG(curPlayer, True)
GameWorld.DebugLog("%s---OnTJGNPC:%s"%(curPlayer.GetName(),clientData.NPCID))
return
@@ -318,7 +315,7 @@
aSkillAtkRate = curPlayer.GetSkillAtkRate() # 技能攻击力加成
petMinAtk = PlayerControl.GetPetMinAtk(curPlayer) #灵宠最小攻击
petMaxAtk = PlayerControl.GetPetMaxAtk(curPlayer) #灵宠最大攻击
- petDamPer = PlayerControl.GetPetDamPer(curPlayer) #灵宠增加伤害
+ petDamPer = GameObj.GetPetDamPer(curPlayer) #灵宠增加伤害
atkSpeed = PlayerControl.GetAtkSpeed(curPlayer) # 攻击速度
aIgnoreDefRate = curPlayer.GetIgnoreDefRate() # 无视防御比率
aLuckyHit = curPlayer.GetLuckyHitVal() # 会心一击
@@ -442,7 +439,8 @@
# 2.物品
OnTJGDropItems(curPlayer, npcID, killCnt)
-
+ #任务道具
+ OnTJGDropTaskItems(curPlayer, npcData.GetLV(), killCnt)
# VIP杀怪加攻
PlayerVip.DoAddVIPKillLVExp(curPlayer, npcData, killCnt)
@@ -451,7 +449,10 @@
# 击杀特定NPC成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, killCnt, [npcID])
-
+ # 日常活动
+ if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGOnDayEx):
+ if npcData.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC, killCnt)
# 击杀任务怪, 杀怪日常已经没有了，暂时屏蔽
#for _ in xrange(killCnt):
# EventShell.Event_OnKillByID(curPlayer, npcID)
@@ -463,10 +464,10 @@
# 满了不再给物品
return
- dropIDCountDict, dropIDBindDict, money = {}, {}, 0
+ dropIDCountDict, auctionIDList, money = {}, [], 0
dropRet = NPCCommon.GetNPCDropInfoTJG(curPlayer, curPlayer.GetMapID(), npcID, killCnt)
if dropRet:
- dropIDCountDict, dropIDBindDict, money = dropRet
+ dropIDCountDict, auctionIDList, money = dropRet
# 1. 出售为铜钱 2.放入背包 3.满则不继续给物品
for itemID, dropCount in dropIDCountDict.items():
if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
@@ -476,8 +477,7 @@
if not curItemData:
continue
- # 掉落绑定, 默认绑定
- isDropBind = dropIDBindDict.get(itemID, 1)
+ isAuctionItem = itemID in auctionIDList
itemControl = ItemControler.PlayerItemControler(curPlayer)
## 装备物品 白蓝直接换算铜钱
@@ -489,7 +489,7 @@
## 装备一件件给
if ItemCommon.GetIsEquip(curItemData):
for _ in xrange(dropCount):
- curItem = ItemControler.GetOutPutItemObj(itemID, 1, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem)
if not curItem:
continue
if not itemControl.PutInItem(IPY_GameWorld.rptItem, curItem, event=[ChConfig.ItemGive_TJGDropItem, False, {}]):
@@ -498,7 +498,7 @@
#记录紫橙装数量用于通知
NoteEquip(curPlayer, curItemData.GetItemColor())
else:
- curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem)
if not curItem:
continue
@@ -523,7 +523,7 @@
equipScores = {}
equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
- for i in Def_EatItem_EquipPlace:
+ for i in ChConfig.EquipPlace_Base:
equipItem = equipPack.GetAt(i)
if not equipItem or equipItem.IsEmpty():
continue
@@ -532,6 +532,7 @@
#GameWorld.DebugLog("equipScores----%s"%equipScores)
eatIndexList = []
+ eatItemIDList = []
itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
for i in range(0, itemPack.GetCount()):
curItem = itemPack.GetAt(i)
@@ -554,12 +555,34 @@
continue
eatIndexList.append(i)
-
+ eatItemIDList.append(curItem.GetItemTypeID())
#GameWorld.DebugLog("eatIndexList-----------%s"%len(eatIndexList))
- eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList)
+ eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList, eatItemIDList)
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):
@@ -631,8 +654,10 @@
def NotifyTJGInfo(curPlayer):
if curPlayer.GetIP() == "127.0.0.1":
+ LoginFixTJG(curPlayer, True)
return
-
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 0)
+
# 脱机挂没有运作情况下 弥补收益
LoginFixTJG(curPlayer)
@@ -754,12 +779,16 @@
# 过天清理
-def TJGOnDay(curPlayer):
- times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
- if times == 0:
- return
-
- ResetTJGDeadInfo(curPlayer)
+def TJGOnDay(curPlayer, onEventType):
+ if onEventType == ShareDefine.Def_OnEventType:
+ times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
+ if times == 0:
+ return
+
+ ResetTJGDeadInfo(curPlayer)
+ elif onEventType == ShareDefine.Def_OnEventTypeEx:
+ if GetIsTJG(curPlayer):
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 1)
return
def ResetTJGDeadInfo(curPlayer):
@@ -804,6 +833,58 @@
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时间
@@ -821,7 +902,7 @@
# 超过5分钟部分补偿
- seconds = PlayerControl.GetPlayerLeaveServerSecond(curPlayer) - 300
+ seconds = PlayerControl.GetPlayerLeaveServerSecond(curPlayer) - IpyGameDataPY.GetFuncCfg('AutoUseGuardian', 2)
if seconds <= 0:
return
times = min(seconds, tjgTime)
@@ -835,7 +916,9 @@
# 此时由服务端重新找一次挂机NPC
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, npcID)
- GameWorld.DebugLog("弥补脱机----npcid %s-%s"%(curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_TJGNPC), times))
+ GameWorld.DebugLog("弥补脱机----playerID:%s ,npcid %s-%s-%s"%(curPlayer.GetID(),
+ curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_TJGNPC), times,
+ curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)))
# 设置脱机登录时的等级, 上线通知清空， 没清空说明多次脱机挂登录 使用旧等级
--
Gitblit v1.8.0