From 73b55c6865b24648ed53ed3b6092eda82342f368 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 07 一月 2019 09:55:37 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发(进入跨服相关封包)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |  236 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 112 insertions(+), 124 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 e0a2d48..f0bf6af 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -64,13 +64,12 @@
 import PlayerGameEvent
 import EventReport
 import PlayerTeHui
-import GameLogic_XMZZ
+import PlayerGatherSoul
 import PlayerSuccess
 import PlayerPet
 import PlayerGreatMaster
 import ItemControler
 import GameFuncComm
-import PlayerMergeEvent
 import IpyGameDataPY
 import PlayerRune
 import GameLogic_DuJie
@@ -83,7 +82,9 @@
 import PlayerFamilyTech
 import PlayerCostRebate
 import PlayerFairyCeremony
+import PlayerCrossRealmPK
 import FunctionNPCCommon
+import CrossRealmPlayer
 import ChNetSendPack
 import PlayerState
 import QuestCommon
@@ -162,7 +163,7 @@
 # notifyCnt 代表广播周围玩家的数量,0为全部广播 -1为指定列表随机, 其他数字为指定指
 def PyNotifyAll(curPlayer, sendPack, notifySelf=True, notifyCnt=0):
     if notifyCnt == -1:
-        notifyCnt = random.choice((10, 10, 15, 15, 20, 25, 30, 50))
+        notifyCnt = 8
     #GameWorld.DebugLog("PyNotifyAll %s"%notifyCnt)
 
     curPlayer.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength(), notifySelf, notifyCnt)
@@ -230,7 +231,7 @@
 #  @return 无返回值
 def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]):
     # 如果是跨服服务器,则广播子服
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         sendMsg = str([country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo])
         GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'MergeWorldNotify',
                                                                   sendMsg, len(sendMsg))
@@ -353,7 +354,7 @@
         return
     
     # 跨服服务器不允许发送邮件
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         return
     
     itemCountDict = {}
@@ -1426,7 +1427,8 @@
     
     FBLogic.DoPlayerChangeMapLogic(curPlayer, tick)
     #summonList = list()
-    
+    #召回宠物
+    PetControl.ReCallFightPet(curPlayer)
     #1. 删除自己不需要的召唤兽(火焰之灵等)
     #必须用while, 因为在循环中要删除
     # 召唤兽切地图不带过去
@@ -1498,6 +1500,11 @@
         #RouteServer未初始化不允许切换地图, 缓存处理
         GameServerRefresh.Set_PlayerRouteServerInitOK_OnLeaveFB(curPlayer, 1)
         return
+    
+    GameWorld.Log("PlayerLeaveFB...", curPlayer.GetPlayerID())
+    if GameWorld.IsCrossServer():
+        CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
+        return
 
     #中立地图回到上一次非中立常规地图    
     if curPlayer.GetMapID() in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):
@@ -1558,72 +1565,6 @@
 
 #---------------------------------------------------------------------
 
-def ResetMergeFBPlayerCntInfo(resetMapID):
-    # 重置跨服活动副本地图人数分配情况信息
-    mapID = GameWorld.GetMap().GetMapID()
-    if mapID != ChConfig.Def_MergeTransMapID:
-        return
-    GameWorld.Log("重置跨服活动副本地图人数分配情况信息: resetMapID=%s" % resetMapID)
-    gameWorld = GameWorld.GetGameWorld()
-    mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")
-    for reqMapID, mapInfo in mergeFBPlayerCntDict.items():
-        if resetMapID and resetMapID != reqMapID:
-            continue
-        for playerMapID in mapInfo[1]:
-            playerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID)
-            for num in xrange(1, 1 + playerCnt):
-                playerID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num))
-                gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num), 0) # 重置对应的玩家ID
-                gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), 0) # 重置玩家ID对应的地图
-            gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, 0) # 重置地图人数
-    return
-
-def __GetMergeFBPlayerMapID(curPlayer, reqMapID):
-    # 获取玩家所分配的跨服活动地图ID
-    # @param reqMapID: 可以是本服活动的地图ID标识; 也可以是指定的跨服活动地图ID, 如果是指定的地图ID也是直接返回
-    
-    mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")
-    if reqMapID not in mergeFBPlayerCntDict:
-        return reqMapID
-    
-    playerID = curPlayer.GetPlayerID()
-    gameWorld = GameWorld.GetGameWorld()
-    
-    playerMapID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID))
-    if playerMapID:
-        GameWorld.DebugLog("已经有分配跨服活动地图,直接返回!playerMapID=%s" % (playerMapID), playerID)
-        return playerMapID
-    
-    # 还没分配该玩家, 则开始选择分配的地图ID
-    maxPlayerCnt, mapIDList = mergeFBPlayerCntDict[reqMapID]
-    minPlayerCount = 0 # 最少的地图玩家人数
-    minPlayerMapID = 0 # 最少人数的地图ID
-    for mID in mapIDList:
-        curMapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % mID)
-        if curMapPlayerCnt < maxPlayerCnt:
-            playerMapID = mID
-            break
-        
-        # 保存最少人数的地图ID信息
-        if not minPlayerCount or (minPlayerCount and curMapPlayerCnt < minPlayerCount):
-            minPlayerCount = curMapPlayerCnt
-            minPlayerMapID = mID
-    
-    # 如果没有人数未满的活动地图,则分配到人数较少的地图
-    if not playerMapID:
-        playerMapID = minPlayerMapID
-        
-    # 更新分配信息
-    if playerMapID:
-        mapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID) + 1
-        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, mapPlayerCnt)
-        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, mapPlayerCnt), playerID)
-        gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), playerMapID)
-        GameWorld.Log("分配跨服活动玩家所属地图: plaeyrID=%s,reqMapID=%s,分配MapID=%s,mapPlayerCnt=%s" 
-                      % (playerID, reqMapID, playerMapID, mapPlayerCnt))
-        
-    return playerMapID
-
 ##玩家进入副本
 # @param curPlayer 玩家实例
 # @param mapID 地图ID
@@ -1642,13 +1583,13 @@
     #        NotifyCode(curPlayer, 'jiazu_xyj_671654')
     #        return
         
-    #跨服活动人数分流处理
-    if GameWorld.IsMergeServer():
-        reqMapID = mapID
-        mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)
-        if not mapID:
-            GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)
-            return
+#    #跨服活动人数分流处理
+#    if GameWorld.IsCrossServer():
+#        reqMapID = mapID
+#        mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)
+#        if not mapID:
+#            GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)
+#            return
       
     #过滤封包地图ID
     if not GameWorld.GetMap().IsMapIDExist(mapID):
@@ -1773,6 +1714,12 @@
         if isNotify:
             NotifyCode(curPlayer, "SingleEnterPK", [mapID])
         return ShareDefine.EntFBAskRet_PKState
+    
+    ## 跨服PK匹配中
+    if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer):
+        if isNotify:
+            NotifyCode(curPlayer, "CrossMatching8", [mapID])            
+        return ShareDefine.EntFBAskRet_CrossPKMatching
     
     #===============================================================================================
     # # 这里不做状态限制,由前端处理,因为策划要根据界面来处理,同一传送功能有可能在不同界面
@@ -1997,16 +1944,18 @@
     sendPack.FuncLineID = funcLineID
     
     NetPackCommon.SendFakePack(curPlayer, sendPack)
+    GameWorld.Log("准备切换地图", curPlayer.GetID())
     return
 
 # 通知开始切换地图
 def NotifyStartChangeMap(curPlayer):
-    GameWorld.DebugLog("通知开始切换地图, NotifyStartChangeMap")
     sendPack = ChPyNetSendPack.tagMCStartChangeMap()
     sendPack.Clear()
     sendPack.MapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ChangeMapID)
     sendPack.FuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
     NetPackCommon.SendFakePack(curPlayer, sendPack)
+    
+    GameWorld.Log("通知开始切换地图", curPlayer.GetID())
     return
 
 #---------------------------------------------------------------------
@@ -2845,12 +2794,7 @@
         SetPlayerCurrency(curPlayer, type_Price, curCurrency - price)
     else:
         GameWorld.Log("付费金钱异常 type_Price = %s" % (type_Price), curPlayer.GetPlayerID())
-        return False   
-    
-    #添加跨服操作事件
-    if costType in ChConfig.MergeServerCanCostType:
-        eventInfo = [type_Price, price, costType, infoDict, quantity, costVIPGold]
-        PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_PayMoney, eventInfo)
+        return False
     
     #付款以后后续操作
     __PayMoneyAfter(curPlayer, type_Price, price, costType, infoDict, quantity, costVIPGold)
@@ -3371,22 +3315,57 @@
     
     return int(addPoint)
 
+def GetAllPointByLV(curPlayer):
+    ##获取当前等级可得到属性点数
+    openLV = GameFuncComm.GetFuncLimitLV(ShareDefine.GameFuncID_AddPoint)
+    curLV = curPlayer.GetLV()
+    if curLV < openLV:
+        return 0
+    addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
+    initFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2)
+    setFreePoint = initFreePoint
+    for lv in xrange(openLV, curLV+1):
+        setFreePoint += GameWorld.GetDictValueByRangeKey(addPointDict, lv, 0)
+    return setFreePoint
+
 def DoAddPointOpen(curPlayer):
     '''加点功能开启 处理给自由属性点及老号处理  
                     清除老服玩家未加点的点数(清零),以前加的加点属性不清除,属性不变,战力不减, 根据最新的加点开启等级和老服玩家的当前等级,相差的差值给予玩家对应的加点点数'''
     beforeFreePoint = curPlayer.GetFreePoint()
-    addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
-    initFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2)
-    openLV = GameFuncComm.GetFuncLimitLV(ShareDefine.GameFuncID_AddPoint)
-    setFreePoint = initFreePoint
+
+    setFreePoint = GetAllPointByLV(curPlayer)
     curLV = curPlayer.GetLV()
-    for lv in xrange(openLV, curLV+1):
-        setFreePoint += GameWorld.GetDictValueByRangeKey(addPointDict, lv, 0)
     addDataDict = {'beforeFreePoint':beforeFreePoint}
-    DataRecordPack.DR_Freepoint(curPlayer, "AddPointOpen", setFreePoint, addDataDict)
     curPlayer.SetFreePoint(setFreePoint)
+    DataRecordPack.DR_Freepoint(curPlayer, "AddPointOpen", setFreePoint, addDataDict)
     GameWorld.DebugLog('    加点功能开启处理  beforeFreePoint=%s,curLV=%s, setFreePoint=%s'%(beforeFreePoint, curLV, setFreePoint), curPlayer.GetID())
     return
+
+def FixOldAddPoint(curPlayer):
+    ##老号加点处理 重置已加点数,
+    if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_AddPoint):
+        return
+    GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_AddPoint, 1)
+    baseSTR, basePNE, basePHY, baseCON = GetPlayerBasePoint(curPlayer.GetJob())
+    addPoint = curPlayer.GetFreePoint()
+    attrInfoDict = {'BaseSTR':baseSTR,'BasePNE':basePNE,'BasePHY':basePHY,'BaseCON':baseCON}
+    for attrKey, basePoint in attrInfoDict.items():
+        addPoint += (getattr(curPlayer, 'Get%s'%attrKey)() - basePoint)
+    fixFreePoint = GetAllPointByLV(curPlayer)
+    if addPoint != fixFreePoint:
+        for attrKey, basePoint in attrInfoDict.items():
+            getattr(curPlayer, 'Set%s'%attrKey)(basePoint)
+        curPlayer.SetFreePoint(fixFreePoint)
+        #重置天赋
+        PlayerGreatMaster.DoResetMasterSkillPoint(curPlayer)
+        #邮件补偿
+        SendMailByKey('PointCompensation', [curPlayer.GetID()], [], goldPaper=200)
+        
+        addDataDict = {'beforeTotalPoint':addPoint}
+        DataRecordPack.DR_Freepoint(curPlayer, "FixOldAddPoint", fixFreePoint, addDataDict)
+        GameWorld.Log('老号加点处理 重置已加点数 addPoint=%s, fixFreePoint=%s' % (addPoint, fixFreePoint))
+    return
+    
 #---------------------------------------------------------------------
 
 ## 功能模块战斗力类
@@ -3651,10 +3630,6 @@
         #副本获得经验, 无论获得多少经验均需通知, 有些副本逻辑需要通过获得经验时机处理
         if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
             FBLogic.OnGetExp(curPlayer, finalAddExp, expViewType)
-        
-        # 跨服中获得经验
-        if finalAddExp and GameWorld.IsMergeServer():
-            PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddExp, finalAddExp)
             
         return finalAddExp
     
@@ -3851,6 +3826,7 @@
                        
             # 记录玩家升级
             DataRecordPack.DR_PlayerUpgrade(curPlayer, curPlayer.GetLV(), GetPlayerTotalExp(curPlayer), lvUpNeedExp)
+            DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_LVUP, {'lv':curLV})
             
             self.__DoLVUPAddPoint()  # 升级加点
             #self.__DoLvUpAddSkill()  # 升级加技能
@@ -4087,6 +4063,7 @@
         PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)
         PlayerEquipDecompose.RefreshEDAttr(curPlayer)
         PlayerDogz.RefreshDogzAttr(curPlayer)
+        PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)
         self.RefreshAllState(isForce=True)
         GameWorld.DebugLog("End ReCalcAllState!!!")
         return
@@ -4739,14 +4716,16 @@
         mfpInfo.MFPCnt = len(mfpDataList)
         mfpInfo.MFPList = mfpDataList
         NetPackCommon.SendFakePack(curPlayer, mfpInfo)
-        
+        beforeFightPower = curPlayer.GetFightPower()
         curPlayer.SetFightPower(totalFightPower, False)
+        if totalFightPower < beforeFightPower:
+            DataRecordPack.DR_FightPowerChangeInfo(curPlayer, beforeFightPower)
         highestFightPower = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FightPower_Highest, 0,
                                                            ChConfig.Def_PDictType_FightPower)
         if totalFightPower > highestFightPower:
             NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPower_Highest, totalFightPower,
                                  ChConfig.Def_PDictType_FightPower)
-        GameWorld.DebugLog("总战力: %s, 历史最高战力: %s" % (totalFightPower, highestFightPower))
+        GameWorld.DebugLog("总战力: %s, 历史最高战力: %s, beforeFightPower=%s" % (totalFightPower, highestFightPower, beforeFightPower))
         PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)
         # 记录开服活动数据
         OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower)
@@ -4909,7 +4888,7 @@
                         }
         
         for i in xrange(1, ChConfig.Def_Calc_AllAttrType_MAX):
-            if i in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP]:
+            if i in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP, ChConfig.TYPE_Calc_ProDef]:
                 continue
             value = 0 if i not in initAttrDict else initAttrDict[i]
             EffGetSet.SetValueByEffIndex(curPlayer, i, value)
@@ -5703,6 +5682,10 @@
 def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False)
 def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()
 
+## 跨服状态: 0-非跨服状态,1-跨服状态
+def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()
+def SetCrossRealmState(curPlayer, value): curPlayer.SetExAttr5(value, False, True)
+
 ## 铜钱点, 支持铜钱超20亿
 def GetSilver(curPlayer): return curPlayer.GetExAttr6() * ChConfig.Def_PerPointValue + curPlayer.GetSilver()
 def SetSilver(curPlayer, totalSilver):
@@ -5716,7 +5699,7 @@
 
 ## 玩家今日已获得仙缘币
 def GetTodayXianyuanCoin(curPlayer): return curPlayer.GetExAttr11()
-def SetTodayXianyuanCoin(curPlayer, value): return curPlayer.SetExAttr11(value)
+def SetTodayXianyuanCoin(curPlayer, value): return curPlayer.SetExAttr11(value, False, True)
 def AddTodayXianyuanCoin(curPlayer, addValue): return curPlayer.SetExAttr11(curPlayer.GetExAttr11() + addValue, False, True)
 
 ##VIP到期时间, 需要同步GameServer
@@ -5726,6 +5709,21 @@
 ##聊天气泡框
 def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10()
 def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)
+
+## 玩家所属服务器组ID
+def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
+def UpdPlayerServerGroupID(curPlayer):
+    # 更新自己的服务器组ID, 跨服服务器不处理
+    if GameWorld.IsCrossServer():
+        return
+    serverGroupID = GameWorld.GetServerGroupID()
+    if not serverGroupID:
+        return
+    playerServerGroupID = curPlayer.GetExAttr13()
+    if playerServerGroupID != serverGroupID:
+        curPlayer.SetExAttr13(serverGroupID, False, True)
+        GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID)
+    return
 
 ##获得玩家威望值
 def GetPrestige(curPlayer): return 0
@@ -5822,10 +5820,6 @@
     
     SetZhenQi(curPlayer, value)
     #EventReport.WriteEvent_add_zhenqi(curPlayer, eventName, eventData, addValue, value)
-
-    if GameWorld.IsMergeServer():
-        eventInfo = [addValue, eventName, eventData]
-        PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddZhenQi, eventInfo)
     return True
 
 
@@ -5917,19 +5911,6 @@
 def SetLongMaiLV(curPlayer, value):
     return
 #---------------------------------------------------------------------------
-## 设置玩家跨服预赛排位
-#  @param curPlayer: 玩家实例
-#  @param value: 威望值
-#  @return: 
-def SetMergeWarRank(curPlayer, value):
-    return
-
-    
-## 获取玩家跨服预赛排位
-#  @param curPlayer: 玩家实例
-#  @return: 威望值
-def GetMergeWarRank(curPlayer):
-    return 0
 
 ##获取可免费开启的格子数
 # @param curPlayer 玩家对象
@@ -6515,7 +6496,12 @@
     
 #---当前防护值,需存DB----
 def GetProDef(curPlayer): return curPlayer.GetExAttr4()
-def SetProDef(curPlayer, value): curPlayer.SetExAttr4(value)
+def SetProDef(curPlayer, value):
+    if GameWorld.IsCrossServer():
+        curPlayer.SetExAttr4(value, True) # 跨服服务器需要广播周围玩家
+    else:
+        curPlayer.SetExAttr4(value)
+    
 #---最大防护值----
 def GetMaxProDef(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrMaxProDef)
 def SetMaxProDef(curPlayer, value):
@@ -6538,11 +6524,13 @@
 def GetPetMaxAtk(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetMaxAtk)
 def SetPetMaxAtk(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetMaxAtk, value)
 
-#---宠物伤害百分比提升----
-def GetPetDamPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetDamPer)
-def SetPetDamPer(curPlayer, value): 
-    curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetDamPer, value)
-    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PetDamPer, value, False)
+#---宠物伤害百分比提升----移到GameObj下
+#===============================================================================
+# def GetPetDamPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetDamPer)
+# def SetPetDamPer(curPlayer, value): 
+#    curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetDamPer, value)
+#    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PetDamPer, value, False)
+#===============================================================================
 #---宠物技能伤害百分比提升----
 def GetPetSkillAtkRate(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_PetSkillAtkRate)
 def SetPetSkillAtkRate(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_PetSkillAtkRate, value)

--
Gitblit v1.8.0