From b8fde01b237a2ad9c69e64f265efa692f1d4f70f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 10 五月 2019 19:39:50 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 增加前端用的印记包
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 486 +++++++++++++++++++++++++++++------------------------
1 files changed, 268 insertions(+), 218 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 8a0fa4a..2249002 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -70,6 +70,7 @@
import PlayerEquipDecompose
import PlayerGreatMaster
import PlayerGatherSoul
+import PlayerFairyDomain
import PlayerCrossRealmPK
import GameFuncComm
import PlayerMagicWeapon
@@ -104,6 +105,7 @@
import PlayerNewFairyCeremony
import PlayerFeastRedPacket
import PlayerLuckyTreasure
+import Item_ResetAttrPoint
import CrossRealmPlayer
import ChNetSendPack
import FamilyRobBoss
@@ -114,6 +116,8 @@
import PlayerDogz
import PlayerCoat
import PlayerQuDaoDoubleBill
+import PlayerFB
+import SkillShell
import datetime
import time
@@ -136,10 +140,6 @@
#@return 返回值无意义
#@remarks 玩家登陆游戏初始化
def InitLoginPlayer(curPlayer, tick):
- #初始化职业阶数，默认1
- if PlayerControl.GetJobRank(curPlayer) == 0:
- PlayerControl.SetJobRank(curPlayer, 1)
-
##初始化交易列表
if curPlayer.GetTradeList().GetTradeItemCount() == 0:
curPlayer.GetTradeList().SetTradeListCount(ChConfig.Def_PlayerTradeMaxItemCount)
@@ -233,13 +233,26 @@
#struct tagCMClientStartCustomScene
#{
# tagHead Head;
+# DWORD MapID;
+# WORD FuncLineID;
#};
def OnClientStartCustomScene(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- DoEnterCustomScene(curPlayer)
+ DoEnterCustomScene(curPlayer, clientData.MapID, clientData.FuncLineID)
return
-def DoEnterCustomScene(curPlayer):
+#// A2 33 前端退出自定义场景 #tagCMClientExitCustomScene
+#
+#struct tagCMClientExitCustomScene
+#{
+# tagHead Head;
+#};
+def OnClientExitCustomScene(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ DoExitCustomScene(curPlayer)
+ return
+
+def DoEnterCustomScene(curPlayer, mapID, lineID):
## 进入自定义场景状态
curPlayer.SetCanAttack(False)
curPlayer.SetVisible(False)
@@ -248,8 +261,12 @@
if curPet:
curPet.SetVisible(False)
- curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomScene, 1)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomScene, 1) # 由于前端不一定有发mapID，所以这里额外记录这个状态，不能直接用mapID判断
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomSceneMapID, mapID)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomSceneLineID, lineID)
GameWorld.Log("玩家开始自定义场景!", curPlayer.GetPlayerID())
+ if mapID:
+ FBLogic.OnEnterCustomScene(curPlayer, mapID, lineID)
return
def DoExitCustomScene(curPlayer):
@@ -264,6 +281,8 @@
if curPet:
curPet.SetVisible(True)
curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomScene, 0)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomSceneMapID, 0)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomSceneLineID, 0)
GameWorld.Log("玩家退出自定义场景!", curPlayer.GetPlayerID())
return
@@ -477,14 +496,12 @@
# 离线过久恢复为非跨服状态
if PlayerControl.GetCrossMapID(curPlayer):
PlayerControl.SetCrossMapID(curPlayer, 0)
-
+ PyGameData.g_customFBPrizeInfo.pop(curPlayer.GetPlayerID(), None)
+
SyncGuideState(curPlayer)
#上线检查一次装备属性
- ItemControler.PlayerItemControler(curPlayer).CheckRolePackEquipAttr()
- #上线检查加点属性点
- PlayerControl.FixOldAddPoint(curPlayer)
-
+ ItemControler.PlayerItemControler(curPlayer).CheckRolePackEquipAttr()
#更新服务器组ID
PlayerControl.UpdPlayerServerGroupID(curPlayer)
@@ -496,15 +513,10 @@
#通知玩家技能信息
__Sync_ClientSkill(curPlayer)
- #替换旧物品
- ItemControler.LoginCheckChangeOldItem(curPlayer)
- #清除生产采集Buff
- #PlayerControl.DelProduceBuff(curPlayer, tick)
#清除国家答题Buff
#PlayerExam.DoLogic_ExitExam(curPlayer, tick, needRefresh = False)
#清除VIPbuff
#BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_VIPExp_SkillTypeID, tick)
- #PlayerReincarnation.ReincarOnLogin(curPlayer)
#通知玩家的buff
__Sync_ClientBuff(curPlayer)
@@ -538,14 +550,8 @@
#PK模式
SyncPKModel(curPlayer)
- #通用强化星级信息
- ChEquip.NotifyEquipPartStarLV(curPlayer)
- Operate_EquipWash.OnEquipWashLogin(curPlayer)
- #通知套装信息
- ChEquip.NotifyEquipPartSuiteLV(curPlayer)
- ChEquip.SyncAllEquipAttrActiveInfo(curPlayer)
- #装备位宝石镶嵌通知
- Operate_EquipStone.OnLogin(curPlayer)
+ #装备相关信息
+ ChEquip.OnPlayerEquipLoginLogic(curPlayer)
#大师
PlayerGreatMaster.MasterOnLogin(curPlayer)
@@ -589,9 +595,6 @@
# 首充/天天首充/充值豪礼
PlayerGoldGift.OnLogin(curPlayer)
- #玩家回归通知
- #PlayerRecall.PlayerBack(curPlayer)
-
#通知购买功能中各购买类型的已购买和可购买次数
Operate_PlayerBuyZhenQi.DoPlayerLogin(curPlayer)
#
@@ -622,72 +625,54 @@
#通知运行成功
curPlayer.BalanceServer_PlayerLoginInitOK()
- # 新手指导员上线处理
-# #PlayerFreshmanGuide.FreshmanGuiderOnLogin(curPlayer)
-#
# 坐骑相关通知
PlayerHorse.PlayerHorseLogin(curPlayer)
PlayerTreasure.OnTreasureLogin(curPlayer)
-# # 通知累计登陆礼
+ # 通知累计登陆礼
PlayerLoginDayAward.OnLoginNotifyLoginDayAward(curPlayer)
-#
+
# 开服活动奖励信息
OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer)
-#
-# # 节日登陆奖励
-# PlayerFestivalLogin.OnLoginFestivalLogin(curPlayer)
# 试炼之塔
GameLogic_TrialTower.OnFBPlayerLogin(curPlayer)
# 古神禁地
GameLogic_GodArea.GodAreaOnLogin(curPlayer)
-# # 采集NPC次数通知
+ # 采集NPC次数通知
NPCCommon.SyncCollNPCTime(curPlayer)
-#
-# # 特惠活动
-# PlayerTeHui.PlayerLogin_TeHui(curPlayer)
-#
-# # 自定义商店
-# ShopItemManage.DoOnLogin(curPlayer)
-#
-# # 每日活跃度
+
+ # 每日活跃度
PlayerActivity.OnLogin(curPlayer)
-#
-# # 副本进入时间
+
+ # 副本进入时间
FBCommon.FBOnLogin(curPlayer)
-#
-# #天梯竞技场
-# HighLadderTube.OnLogin(curPlayer)
-#
-# #世界等级
+
+ #世界等级
PlayerWorldAverageLv.OnLogin(curPlayer)
-#
+
# 投资理财
PlayerGoldInvest.OnLogin(curPlayer)
-#
-# #节日活动
-# PlayerAction.ActionOnLogin(curPlayer)
-#
-# #属性果实使用情况
+
+ #属性果实使用情况
PlayerAttrFruit.AttrFruitOnLogin(curPlayer)
-#
-# #成就
+
+ #成就
PlayerSuccess.SuccOnLogin(curPlayer)
-#
-# #同步自动战斗配置记录
+
+ #同步自动战斗配置记录
# Sync_AutoFightSetting(curPlayer)
-#
+
PlayerFamily.FamilyPlayerOnLogin(curPlayer, tick)
#改到 GameServerRefresh GameSever_PlayerInitOK后处理才能保证玩家已经在Gameserver注册
#PlayerDienstgrad.RefreshBillBoardDienstgrad(curPlayer)
# 称号
PlayerDienstgrad.Sync_AllDienstgradOnLogin(curPlayer)
-# # 资源找回OnLogin
+ # 资源找回OnLogin
PlayerRecover.RecoverOnLogin(curPlayer)
-#
-# # 时装
+
+ # 时装
PlayerCoat.OnLogin_Coat(curPlayer)
# 跨服PK
@@ -708,17 +693,11 @@
PlayerFlashGiftbag.OnPlayerLogin(curPlayer)
#限时抢购
PlayerFlashSale.OnPlayerLogin(curPlayer)
-# # 消费VIP
-# PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)
-#
-# # QQ相关奖励OnLogin
-# #PlayerQQ.Sync_QQAllAwardRecord(curPlayer)
-#
-# # 世界boss
+ # 世界boss
BossHurtMng.OnLogin(curPlayer)
ChItem.Sync_ItemDayUseCnt(curPlayer)
-# # 悬赏登录通知
-# PlayerArrestTask.OnLogin(curPlayer)
+ # 悬赏登录通知
+ #PlayerArrestTask.OnLogin(curPlayer)
# 符印登录通知
PlayerRune.PlayerRuneLogin(curPlayer)
# 仙盟红包登录通知
@@ -783,6 +762,12 @@
FBHelpBattle.DoPlayerLogin(curPlayer)
# 聚魂
PlayerGatherSoul.PlayerLogin(curPlayer)
+ #缥缈仙域
+ PlayerFairyDomain.OnLogin(curPlayer)
+ PlayerFB.OnLogin(curPlayer)
+ #技能专精信息
+ SkillShell.NotifyElementSkillInfo(curPlayer)
+
curPlayer.SetState(0) # 脱机挂恢复为正常上线
curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线，做一次恢复，1为保存 0为正常下线
tjgTime = PlayerTJG.GetTJGTime(curPlayer)
@@ -828,16 +813,22 @@
GameWorld.Log("玩家合服首登处理! lastMixServerDay=%s,mixServerWorldLV=%s" % (lastMixServerDay, mixServerWorldLV), playerID)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MixLoginDay, lastMixServerDay)
+ if curPlayer.GetLV() <= 1:
+ GameWorld.Log(" 新号不给合服奖励!", playerID)
+ return
+
# 重置首充双倍
PlayerCoin.DoResetCTGCount(curPlayer, "MixServer")
- # 重置商店购买次数
- FunctionNPCCommon.ResetShopItemBuyCount(curPlayer)
+ # 重置商店购买次数，暂定只重置类型 7 的
+ FunctionNPCCommon.ResetShopItemBuyCount(curPlayer, [7])
# 合服邮件，盟主专属邮件在GameServer处理
mailItemList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 1)
worldLVMailItemList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 2)
mailMoneyList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 3)
+ worldLVDown = IpyGameDataPY.GetFuncCfg("MixServerMail", 5) # 等级丹相对合服世界等级差值
+ itemWorldLV = max(150, mixServerWorldLV - worldLVDown)
goldPaper, silver = mailMoneyList
worldLVItemList = []
for itemID, itemCount, isBind in worldLVMailItemList:
@@ -851,14 +842,14 @@
lvLimit = curEff.GetEffectValue(1)
if not lvLimit:
continue
- if lvLimit <= mixServerWorldLV:
+ if lvLimit <= itemWorldLV:
worldLVItemList = [[itemID, itemCount, isBind]]
else:
break
- detailDict = {"MixServerWorldLV":mixServerWorldLV, "LastMixServerDay":lastMixServerDay}
+ detailDict = {"MixServerWorldLV":mixServerWorldLV, "LastMixServerDay":lastMixServerDay, "ItemWorldLV":itemWorldLV}
addItemList = mailItemList + worldLVItemList
PlayerControl.SendMailByKey("MixServer1", [playerID], addItemList, goldPaper=goldPaper, silver=silver, detail=detailDict)
- GameWorld.Log(" 发送合服补偿邮件: addItemList=%s" % (addItemList), playerID)
+ GameWorld.Log(" 发送合服补偿邮件: itemWorldLV=%s,addItemList=%s" % (itemWorldLV, addItemList), playerID)
# 同步排行榜
PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer, isAll=True)
@@ -1098,8 +1089,6 @@
PlayerGameEvent.TakeoffFishermanEquipment(curPlayer)
#切地图要清除的buff
__CheckClearBuffOnMapChange(curPlayer, tick)
- #上线和切地图加有限无敌Buff
- SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_LimitSuperBuff, tick)
#刷新玩家的视野
if not GameWorld.IsCrossServer() and PlayerControl.GetCrossMapID(curPlayer):
@@ -1352,7 +1341,7 @@
#设置装备实际个数
curPack = itemManager.GetPack(IPY_GameWorld.rptEquip)
- curPack.SetCount(ShareDefine.retMax)
+ curPack.SetCount(ChConfig.Def_PackCnt_Equip)
#初始化垃圾桶
#curPack = itemManager.GetPack(IPY_GameWorld.rptRecycle)
@@ -1450,6 +1439,11 @@
#if not __CheckGMCanLoadMapOK(curPlayer):
# return
+ #上线和切地图加有限无敌Buff, 移到切换地图成功，太早发包客户端不显示
+ if curPlayer.GetLV() > 50:
+ SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_LimitSuperBuff, tick)
+
+
#检测账号是否锁定
if not __CheckForbidLogin(curPlayer):
return
@@ -1525,11 +1519,6 @@
PlayerTeam.PlayerLoginSetTeam(curPlayer, tick)
- #要求数据库得到邮件状态
- #curPlayer.DataServer_GetPlayerMailState()
-
- #curPlayer.EndLoadMap()
-
#激活玩家(保证持续性Buff处理间隔)
PlayerControl.SetIsNeedProcess(curPlayer, True)
@@ -1582,7 +1571,7 @@
GameWorld.Log('玩家登录重置位置失败, 设置附近点 nearPosX = %s nearPosY = %s' % (nearPosX, nearPosY) , curPlayer.GetPlayerID())
#申请得到奖励物品
- curPlayer.DataServer_CheckPrizeItem()
+ #curPlayer.DataServer_CheckPrizeItem()
#===========================================================================
# #if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_Frist_Lock) == 1 \
@@ -1596,9 +1585,6 @@
#防止玩家读取地图时未触发OnDay，读取地图后再次验证(2009.9.11)
PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
-
- #特惠活动事件
- #PlayerTeHui.PlayerLoadMapOK(curPlayer)
#设置阵营
if curPlayer.GetFaction() != ChConfig.CampType_Neutral \
@@ -1626,8 +1612,6 @@
#EndLoadMap需放在最后
curPlayer.EndLoadMap()
- # 渠道返利
- PlayerQuDaoDoubleBill.OnMapQDDoubleBill(curPlayer)
return True
## 切换地图同步一次PK模式
@@ -1746,80 +1730,134 @@
#@return 返回值无意义
#@remarks //03 01 加属性点#tagCAddPoint
def AddPoint(index, tick):
- GameWorld.GetPsycoFunc(__Func_AddPoint)(index, tick)
return
-##//03 01 加属性点#tagCAddPoint
-#@param index 玩家索引
-#@param tick 时间戳
-#@return 返回值无意义
-#@remarks //03 01 加属性点#tagCAddPoint
-def __Func_AddPoint(index, tick):
+#// B2 06 玩家加点 #tagCMAddPoint
+#
+#struct tagCMAddPoint
+#{
+# tagHead Head;
+# BYTE PointAttrIDCount; // 加点属性ID个数
+# BYTE PointAttrIDList[PointAttrIDCount]; // 加点属性ID列表
+# WORD PointValueList[PointAttrIDCount]; // 加点属性ID对应的点数列表
+#};
+def OnAddPoint(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- playerControl = PlayerControl.PlayerControl(curPlayer)
- #JobQuotiety = PlayerControl.JobQuotiety
+ pointAttrIDList = clientData.PointAttrIDList
+ pointValueList = clientData.PointValueList
+ if not pointAttrIDList or not pointValueList or len(pointAttrIDList) != len(pointValueList):
+ return
+
+ needTotalPoint = 0
+ for i, attrID in enumerate(pointAttrIDList):
+ if not IpyGameDataPY.GetIpyGameData("RolePoint", attrID):
+ return
+ needTotalPoint += pointValueList[i]
+
curFreePoint = curPlayer.GetFreePoint()
- #job = curPlayer.GetJob()
- recvAddPoint = IPY_GameWorld.IPY_CAddPoint()
- addValue = recvAddPoint.GetPoint()
-
- #检验是否能够加点
- if addValue < 1 or addValue > curFreePoint:
- #检验不通过, 返回
- #GameWorld.ErrLog("(%s,%s)检验是否能够加点，检验不通过, 返回"%(addValue,curFreePoint) , curPlayer.GetPlayerID())
+ if needTotalPoint > curFreePoint:
+ GameWorld.DebugLog("剩余点数不足! curFreePoint(%s) < needTotalPoint(%s)" % (curFreePoint, needTotalPoint))
return
- #封包加点类型
- addPointType = recvAddPoint.GetType()
-
- #加点
- if addPointType == ShareDefine.Def_Effect_STR:
- curPlayer.SetBaseSTR(addValue + curPlayer.GetBaseSTR())
+ curPlayer.SetFreePoint(curFreePoint - needTotalPoint)
+ for i, attrID in enumerate(pointAttrIDList):
+ addPoint = pointValueList[i]
+ curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID)
+ updPoint = curPoint + addPoint
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AddPointValue % attrID, updPoint)
+ GameWorld.DebugLog("玩家加点: attrID=%s,curPoint=%s,addPoint=%s,updPoint=%s" % (attrID, curPoint, addPoint, updPoint))
- elif addPointType == ShareDefine.Def_Effect_PNE:
- curPlayer.SetBasePNE(addValue + curPlayer.GetBasePNE())
-
- elif addPointType == ShareDefine.Def_Effect_PHY:
- curPlayer.SetBasePHY(addValue + curPlayer.GetBasePHY())
-
- elif addPointType == ShareDefine.Def_Effect_CON:
- curPlayer.SetBaseCON(addValue + curPlayer.GetBaseCON())
-
- else:
- #异常超出边界
- GameWorld.ErrLog("AddPoint GetTypeErr = %s" % (addPointType) , curPlayer.GetID())
- return
-
- curPlayer.SetFreePoint(curFreePoint - addValue)
-
- DataRecordPack.DR_Freepoint(curPlayer, "AddPoint", curFreePoint, {"AddPointType":addPointType})
- playerControl.RefreshPlayerAttrState()
-
+ NotifyPlayerBasePoint(curPlayer, pointAttrIDList)
+ playerControl = PlayerControl.PlayerControl(curPlayer)
+ playerControl.RefreshPlayerAttrState()
return
-def NotifyPlayerBasePoint(curPlayer):
- #上线通知基础属性点
- notifyList = []
- notifyBasePointDict = {
- IPY_GameWorld.CDBPlayerRefresh_BaseSTR:'BaseSTR',
- IPY_GameWorld.CDBPlayerRefresh_BasePHY:'BasePHY',
- IPY_GameWorld.CDBPlayerRefresh_BaseCON:'BaseCON',
- IPY_GameWorld.CDBPlayerRefresh_BasePNE:'BasePNE',
- }
- for refreshType, keyStr in notifyBasePointDict.items():
- notifyStruct = ChPyNetSendPack.tagRefreshType()
- notifyStruct.RefreshType = refreshType
- notifyStruct.Value = getattr(curPlayer, 'Get%s'%keyStr)()
- notifyList.append(notifyStruct)
+#// B2 07 重置加点 #tagCMResetAttrPoint
+#struct tagCMResetAttrPoint
+#{
+# tagHead Head;
+#};
+def OnResetAttrPoint(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ canResetIDList = [ipyDataMgr.GetRolePointByIndex(index).GetAttrID() for index in xrange(ipyDataMgr.GetRolePointCount())]
+ canReset = False
+ for attrID in canResetIDList:
+ curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID)
+ if curPoint:
+ canReset = True
+ break
+ if not canReset:
+ GameWorld.DebugLog('重置加点 没有点数需要重置')
+ return
+ isFree = curPlayer.GetLV() < IpyGameDataPY.GetFuncCfg('LVUPAddPoint', 4)
+ if not isFree:
+ needItemID = IpyGameDataPY.GetFuncCfg('LVUPAddPoint', 5)
+ itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
+ hasEnough, itemList = ItemCommon.GetItem_FromPack_ByID(needItemID, itemPack, 1)
+ if not hasEnough:
+ GameWorld.DebugLog("重置加点 item(%s) isn't enough" % (needItemID))
+ return
+ ItemCommon.ReduceItem(curPlayer, itemPack, itemList, 1, False, ChConfig.ItemDel_ResetAttrPoint)
+
+ Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0, 0)
+ return
+
+def NotifyPlayerBasePoint(curPlayer, syncAttrIDList=[]):
+ # 通知基础属性点，已分配的自由点数
+
+ if not syncAttrIDList:
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ syncAttrIDList = [ipyDataMgr.GetRolePointByIndex(index).GetAttrID() for index in xrange(ipyDataMgr.GetRolePointCount())]
- #属性组合包 通知自己
- sendPack = ChPyNetSendPack.tagObjInfoListRefresh()
+ pointAttrIDList = []
+ pointValueList = []
+ for attrID in syncAttrIDList:
+ curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID)
+ pointAttrIDList.append(attrID)
+ pointValueList.append(curPoint)
+
+ pointInfo = ChPyNetSendPack.tagMCRolePointInfo()
+ pointInfo.PointAttrIDList = pointAttrIDList
+ pointInfo.PointValueList = pointValueList
+ pointInfo.PointAttrIDCount = len(pointAttrIDList)
+ NetPackCommon.SendFakePack(curPlayer, pointInfo)
+ return
+
+#===============================================================================
+# //B4 14 根据类型来决定移动的方式 #tagMCMoveByType
+#
+# struct tagMCMoveByType
+# {
+# tagHead Head;
+# DWORD ID; //玩家ID
+# WORD PosX; // 目标X
+# WORD PosY; // 目标Y
+# BYTE MoveType; //移动方式
+# };
+#===============================================================================
+def OnMoveByType(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+
+ #玩家移动通用检查
+ if not __CheckPlayerCanMove(curPlayer):
+ return
+
+ #先验证目标点是否合法
+ if not GameWorld.GetMap().CanMove(clientData.PosX, clientData.PosY):
+ return
+
+ curPlayer.StopMove()
+ curPlayer.ChangePos(clientData.PosX, clientData.PosY)
+ sendPack = ChPyNetSendPack.tagMCMoveByType()
sendPack.Clear()
- sendPack.ObjID = curPlayer.GetID()
+ sendPack.ID = curPlayer.GetID()
sendPack.ObjType = curPlayer.GetGameObjType()
- sendPack.Count = len(notifyList)
- sendPack.RefreshType = notifyList
- NetPackCommon.SendFakePack(curPlayer, sendPack)
+ sendPack.PosX = clientData.PosX
+ sendPack.PosY = clientData.PosY
+ sendPack.MoveType = clientData.MoveType
+
+ PlayerControl.PyNotifyAll(curPlayer, sendPack, False, -1)
return
#===============================================================================
@@ -1853,7 +1891,15 @@
#===========================================================================
#超出视野
- if GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), clientData.PosX, clientData.PosY) > curPlayer.GetSight():
+ if curPlayer.GetSight() and GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), clientData.PosX, clientData.PosY) > curPlayer.GetSight():
+ return
+
+ #玩家移动通用检查
+ if not __CheckPlayerCanMove(curPlayer):
+ return
+
+ #先验证目标点是否合法
+ if not GameWorld.GetMap().CanMove(clientData.PosX, clientData.PosY):
return
curPlayer.StopMove()
@@ -2587,62 +2633,64 @@
#@return 返回值无意义
#@remarks 客户端封包响应//04 02 获取鼠标左键点击之后对象的详细信息#tagCClickObjGetInfo
def __Func_PlayerClickOtherPlayerGetInfo(index, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- sendPack = IPY_GameWorld.IPY_CClickObjGetInfo()
- sendPack_ID = sendPack.GetObjID()
- sendPack_Type = sendPack.GetObjType()
-
- tagObj = GameWorld.GetObj(sendPack_ID, sendPack_Type)
-
- if tagObj == None:
- #GameWorld.Log("玩家请求其他玩家的相貌信息失败, 对象不存在", curPlayer.GetPlayerID())
- return
-
- dist = GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), tagObj.GetPosX(), tagObj.GetPosY())
- #是否可以目标详细信息
- canGetDetail = (dist <= curPlayer.GetSight())
- #目标类型
- tagObjType = tagObj.GetGameObjType()
-
- #仅处理Player和NPC
- if tagObjType not in [IPY_GameWorld.gotPlayer, IPY_GameWorld.gotNPC]:
- return
-
- #---玩家处理---
- if tagObjType == IPY_GameWorld.gotPlayer:
- #获取玩家详细信息成功
- if canGetDetail:
- extendDataDict = {}
- extendDataDict['maxHP'] = tagObj.GetMaxHP()
- extendDataDict['maxMP'] = tagObj.GetMaxMP()
- extendDataDict['hit'] = tagObj.GetHit()
- extendDataDict['miss'] = tagObj.GetMiss()
- extendDataDict['atkSpeed'] = PlayerControl.GetAtkSpeed(tagObj)
- extendDataDict['superHitRate'] = tagObj.GetSuperHitRate()
- extendDataDict['superHit'] = tagObj.GetSuperHit()
- extendDataDict['luckyHitRate'] = tagObj.GetLuckyHitRate()
- extendDataDict['greatHitRate'] = tagObj.GetGreatHitRate()
- extendDataDict['ignoreDefRate'] = tagObj.GetIgnoreDefRate()
- extendDataDict['damageReduceRate'] = tagObj.GetDamageReduceRate()
- extendDataDict['damageBackRate'] = tagObj.GetDamageBackRate()
-
- extendData = str(extendDataDict)
- extendDataLen = len(extendData)
- curPlayer.PlayerClickOtherPlayerDetail(tagObj, extendDataLen, extendData)
- return
-
- #获取玩家详细信息失败
- curPlayer.Sync_GetPlayerInfoFail(sendPack_ID)
- return
-
- #---NPC处理---
-
- #获取NPC详细信息成功
- if canGetDetail:
- curPlayer.PlayerClickOtherNPCDetail(tagObj)
- return
-
+ #===========================================================================
+ # curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ #
+ # sendPack = IPY_GameWorld.IPY_CClickObjGetInfo()
+ # sendPack_ID = sendPack.GetObjID()
+ # sendPack_Type = sendPack.GetObjType()
+ #
+ # tagObj = GameWorld.GetObj(sendPack_ID, sendPack_Type)
+ #
+ # if tagObj == None:
+ # #GameWorld.Log("玩家请求其他玩家的相貌信息失败, 对象不存在", curPlayer.GetPlayerID())
+ # return
+ #
+ # dist = GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), tagObj.GetPosX(), tagObj.GetPosY())
+ # #是否可以目标详细信息
+ # canGetDetail = (dist <= curPlayer.GetSight())
+ # #目标类型
+ # tagObjType = tagObj.GetGameObjType()
+ #
+ # #仅处理Player和NPC
+ # if tagObjType not in [IPY_GameWorld.gotPlayer, IPY_GameWorld.gotNPC]:
+ # return
+ #
+ # #---玩家处理---
+ # if tagObjType == IPY_GameWorld.gotPlayer:
+ # #获取玩家详细信息成功
+ # if canGetDetail:
+ # extendDataDict = {}
+ # extendDataDict['maxHP'] = tagObj.GetMaxHP()
+ # extendDataDict['maxMP'] = tagObj.GetMaxMP()
+ # extendDataDict['hit'] = tagObj.GetHit()
+ # extendDataDict['miss'] = tagObj.GetMiss()
+ # extendDataDict['atkSpeed'] = PlayerControl.GetAtkSpeed(tagObj)
+ # extendDataDict['superHitRate'] = tagObj.GetSuperHitRate()
+ # extendDataDict['superHit'] = tagObj.GetSuperHit()
+ # extendDataDict['luckyHitRate'] = tagObj.GetLuckyHitRate()
+ # extendDataDict['greatHitRate'] = tagObj.GetGreatHitRate()
+ # extendDataDict['ignoreDefRate'] = tagObj.GetIgnoreDefRate()
+ # extendDataDict['damageReduceRate'] = tagObj.GetDamageReduceRate()
+ # extendDataDict['damageBackRate'] = tagObj.GetDamageBackRate()
+ #
+ # extendData = str(extendDataDict)
+ # extendDataLen = len(extendData)
+ # curPlayer.PlayerClickOtherPlayerDetail(tagObj, extendDataLen, extendData)
+ # return
+ #
+ # #获取玩家详细信息失败
+ # curPlayer.Sync_GetPlayerInfoFail(sendPack_ID)
+ # return
+ #
+ # #---NPC处理---
+ #
+ # #获取NPC详细信息成功
+ # if canGetDetail:
+ # curPlayer.PlayerClickOtherNPCDetail(tagObj)
+ # return
+ #
+ #===========================================================================
#获取NPC详细信息失败
#暂不处理
return
@@ -4513,10 +4561,11 @@
#{
# tagHead Head;
# DWORD DataMapID;
+# WORD LineID;
#};
def OnEnterCrossServer(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- PlayerControl.PlayerEnterCrossServer(curPlayer, clientData.DataMapID)
+ PlayerControl.PlayerEnterCrossServer(curPlayer, clientData.DataMapID, clientData.LineID)
return
#===============================================================================
@@ -5295,9 +5344,6 @@
# 首充礼包奖励
elif rewardType == ChConfig.Def_RewardType_GoldGiftFirst:
PlayerGoldGift.GetPlayerGoldGiftFirst(curPlayer)
- # 领取法宝之魂奖励
- elif rewardType == ChConfig.Def_RewardType_MWSoulAward:
- PlayerMagicWeapon.GetMWSoulAward(curPlayer, dataEx)
# 领取极品白拿
elif rewardType == ChConfig.Def_RewardType_FreeGoods:
PlayerFreeGoods.OnGetFreeGoods(curPlayer, dataEx)
@@ -5349,6 +5395,10 @@
# 领取节日巡礼积分奖励
elif rewardType == ChConfig.Def_RewardType_FeastWeekPartyPoint:
PlayerFeastWeekParty.GetFeastWeekPartyPointAward(curPlayer, dataEx, dataExStr)
+ #缥缈奇遇领取
+ elif rewardType == ChConfig.Def_RewardType_FairyAdventuresAward:
+ PlayerFairyDomain.GetFairyAdventuresAward(curPlayer, dataEx, dataExStr)
+
return
@@ -5797,7 +5847,7 @@
PlayerControl.SendMailByKey('SubpackageDownload', [curPlayer.GetID()], awardItemList)
else:
for itemID, itemCnt, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncPackDownloadAward(curPlayer)
return
--
Gitblit v1.8.0