From d42896d1fe05ba65cf3bf537075c3d00467dfbb8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 11 七月 2019 11:38:48 +0800
Subject: [PATCH] 860312 混服或合服情况下需要指定修改的平台和服务器，Serverid不填写代表不改变只替换spid
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index d44df4f..95e2b3b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -88,7 +88,6 @@
import CrossRealmPlayer
import CrossPlayerData
import ChNetSendPack
-#import EquipZhuXian
import PlayerCoat
import PlayerState
import QuestCommon
@@ -1238,8 +1237,6 @@
CrossPlayerData.ClearCrossSyncDataCache(curPlayer)
PyGameData.g_fbBuyBuffTimeDict.pop(playerID, None)
#清除地图玩家缓存
- PyGameData.g_zhuXianSkillAddPerDict.pop(playerID, None)
- PyGameData.g_zhuXianSkillReducePerDict.pop(playerID, None)
PyGameData.g_playerFuncAttrDict.pop(playerID, None)
PyGameData.g_playerEquipPartAttrDict.pop(playerID, None)
PyGameData.g_equipChangeClassLVInfo.pop(playerID, None)
@@ -1783,7 +1780,9 @@
elif mapID == ChConfig.Def_FBMapID_DemonKing:
bossID = GameLogic_CrossDemonKing.GetCurFBLineBOSSID(mapID, lineID)
extendParamList = [bossID]
-
+ elif mapID in ChConfig.Def_MapID_LineIDToPropertyID:
+ enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % mapID)
+ extendParamList = [enterCnt]
SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList)
return
@@ -3836,14 +3835,17 @@
if expViewType == ShareDefine.Def_ViewExpType_KillNPC:
exp_rate = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)
superRate = PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(curPlayer, None, None, ChConfig.TriggerType_AddExpRate)
+ if superRate:
+ # 龙凤镯 经验
+ expViewType = ShareDefine.Def_ViewExpType_KillNPCSuper
if addSkillID == ChConfig.Def_SkillID_LXHY_AddExpRate:
addSkill = GameWorld.GetGameData().GetSkillBySkillID(addSkillID)
hasEffect = SkillCommon.GetSkillEffectByEffectID(addSkill, ChConfig.Def_Skill_Effect_AddExpRate)
if hasEffect:
+ #烈焰战神 经验
superRate += hasEffect.GetEffectValue(0)
+ expViewType = ShareDefine.Def_ViewExpType_LYZS
exp_rate += superRate
- if superRate:
- expViewType = ShareDefine.Def_ViewExpType_KillNPCSuper
elif expViewType in [ShareDefine.Def_ViewExpType_GameEvent, ShareDefine.Def_ViewExpType_Sit]:
exp_rate = curPlayer.GetGameEventExpRate()
@@ -4005,7 +4007,7 @@
# 记录玩家升级
DataRecordPack.DR_PlayerUpgrade(curPlayer, curPlayer.GetLV(), GetPlayerTotalExp(curPlayer), lvUpNeedExp)
DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_LVUP, {'lv':curLV})
-
+ self.__GiveLVMailAward(curLV)
self.__DoLVUPAddPoint() # 升级加点
#self.__DoLvUpAddSkill() # 升级加技能
@@ -4086,12 +4088,22 @@
FBLogic.OnPlayerLVUp(curPlayer)
# 记录开服活动冲级数据
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
+ #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
#神秘限购
FunctionNPCCommon.MysticalLimitShopOpen(curPlayer, befLV, aftLV)
#不需要做升级任务, 设置玩家经验
SetPlayerTotalExp(curPlayer, curTotalExp)
+ return
+
+ def __GiveLVMailAward(self, curLV):
+ # 给等级邮件奖励
+ mailLVAwardDict = IpyGameDataPY.GetFuncEvalCfg("MailLVAward", 1, {})
+ if curLV not in mailLVAwardDict:
+ return
+ mailTypeKey, mailItemList = mailLVAwardDict[curLV]
+ curPlayer = self.__Player
+ SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], mailItemList, [curLV])
return
#---------------------------------------------------------------------
@@ -4134,12 +4146,15 @@
ShareDefine.Def_Effect_Fire:[lambda curObj:GetFire(curObj), lambda curObj, value:SetFireQualityLV(curObj, value), lambda curObj:GetFireQualityLV(curObj)],
ShareDefine.Def_Effect_Earth:[lambda curObj:GetEarth(curObj), lambda curObj, value:SetEarthQualityLV(curObj, value), lambda curObj:GetEarthQualityLV(curObj)],
}
+ hasChange_Qualitylv = False #灵根品级是否有变更
lingGenQualityAttrList = [{} for _ in range(4)]
for pointAttrID, pointFuncInfo in pointValueInfo.items():
pointValue = pointFuncInfo[0](curPlayer)
befPQLV = pointFuncInfo[2](curPlayer)
pointFuncInfo[1](curPlayer, 0)
if not pointValue:
+ if 0 != befPQLV:
+ hasChange_Qualitylv = True
continue
ipyData = IpyGameDataPY.GetIpyGameData("RolePoint", pointAttrID)
if not ipyData:
@@ -4163,6 +4178,8 @@
else:
break
pointFuncInfo[1](curPlayer, curPQLV)
+ if curPQLV != befPQLV:
+ hasChange_Qualitylv = True
if not curPQLV:
continue
pqAttrInfoDict = ipyData.GetPointQualityAttrDict().get(str(curPlayer.GetJob()), {})
@@ -4171,7 +4188,8 @@
CalcAttrDict_Type(int(pqAttrID), pqAttrValue, lingGenQualityAttrList)
#GameWorld.DebugLog(" 属性点(%s)品阶等级属性: befPQLV=%s,curPQLV=%s,pqAttrInfoDict=%s" % (pointAttrID, befPQLV, curPQLV, pqAttrInfoDict))
if hadRefreshAttr and befPQLV < curPQLV:
- EventShell.EventRespons_LingGenQualityUP(curPlayer, pointAttrID, curPQLV)
+ for pqlv in xrange(befPQLV+1, curPQLV+1):
+ EventShell.EventRespons_LingGenQualityUP(curPlayer, pointAttrID, pqlv)
#GameWorld.DebugLog("等级属性点加属性: %s" % allAttrList)
#GameWorld.DebugLog("灵根品阶等级属性: %s" % lingGenQualityAttrList)
@@ -4179,7 +4197,7 @@
curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_Role, pointFightPowerEx)
SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_RoleBase, allAttrList)
SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_LingGenQuailty, lingGenQualityAttrList)
- return
+ return hasChange_Qualitylv
#---------------------------------------------------------------------
def NotifyAllState(self, playerStateDict):
@@ -4274,7 +4292,6 @@
PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)
PlayerEquipDecompose.RefreshEDAttr(curPlayer)
PlayerDogz.RefreshDogzAttr(curPlayer)
- #EquipZhuXian.CalcZhuXianAttr(curPlayer)
PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)
PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)
self.RefreshAllState(isForce=True)
@@ -4443,7 +4460,7 @@
CalcNoLineEffect.ChangePlayerAttrInNoLineEffectList(curPlayer, baseAttrNolineDict)
# 功能有加基础属性值，这里再重新刷新一下基础属性, 基础属性会影响战斗属性, 每次都刷新角色基础属性
- self.CalcRoleBaseAttr(curPlayer)
+ hasChange_Qualitylv = self.CalcRoleBaseAttr(curPlayer)
roleBaseAttrInfo, roleInsidePerAttrDict = GetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_RoleBase)
lingGenQualityAttrList, lingGenQualityInsidePerAttrDict = GetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_LingGenQuailty)
funcAttrInfoList[ChConfig.Def_CalcAttrFunc_RoleBase] = roleBaseAttrInfo
@@ -4620,6 +4637,10 @@
if beforePointList[i] != afterPointList[i]:
diffPointAttrList.append(attrID)
SkillShell.RefreshElementSkillByAttr(curPlayer, diffPointAttrList)
+ if hasChange_Qualitylv:
+ #灵根品级变化处理
+ ChEquip.ChangeEquipfacadeByLingGen(curPlayer)
+
# 更新开服活动灵根数据
OpenServerCampaign.UpdOpenServerCampaignLingGenData(curPlayer)
--
Gitblit v1.8.0