129 【战斗】战斗系统-服务端（优化战斗武将跟NPC独立处理；去除程序无技能普攻，增加反击普攻；新增回合主动普攻技能功能类型23；）

hxp

58 分钟以前 35c596a6ed34680d9af09788274051c1c212d4eb

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py

@@ -134,20 +134,6 @@
    GameWorld.GetGameWorld().EventShell_SendEventEx(eventTypeStr, len(eventTypeStr), dataStr, len(dataStr))

    return





## 二次非同天登陆

#  @param accID: 账号ID

#  @param ip: ip

#  @return: None

def DR_OtherDayLogin(accID, ip, curPlayer):

    
    dataDict = {'AccID':accID, 'IP':ip}



    #发送封包

    SendEventPack("OtherDayLogin", dataDict, curPlayer)

    return





## 登陆

#  @param curPlayer 玩家实例

#  @return: None

@@ -292,22 +278,6 @@
    SendEventPack("AddNewMission", dataDict, curPlayer)

    return





##  完成任务 
#  @param curPlayer: 玩家实例

#  @param missionID: 任务ID

#  @return: None

def DR_DeleteMission(curPlayer, missionID):

    return



    dataDict = {'PlayerID':curPlayer.GetPlayerID(), 'PlayerName':curPlayer.GetPlayerName(), 
                'AccID':curPlayer.GetAccID(), 'MissionID':missionID}

    
    #发送封包

    SendEventPack("DeleteMission", dataDict, curPlayer)

    return





## 仓库存入金钱

#  @param curPlayer: 玩家实例

#  @param moneyType: 金钱类型

@@ -322,24 +292,6 @@


    #发送封包

    SendEventPack("SetMoneyInWarehouse", dataDict, curPlayer)

    return





## 仓库取出金钱

#  @param curPlayer: 玩家实例

#  @param moneyType: 金钱类型

#  @param moneyCount: 金钱数量

#  @return: None

def DR_GetMoneyInWarehouse(curPlayer, moneyType, moneyCount):



    dataDict = {'PlayerID':curPlayer.GetPlayerID(), 'PlayerName':curPlayer.GetPlayerName(), 
                'AccID':curPlayer.GetAccID(), 
                'MoneyType':moneyType, 'MoneyCount':moneyCount, 
                'WarehouseMoneyCount':PlayerControl.GetWarehouseMoney(curPlayer, moneyType), 
                'PlayerMoneyCount':PlayerControl.GetMoney(curPlayer, moneyType)}



    #发送封包

    SendEventPack("GetMoneyInWarehouse", dataDict, curPlayer)

    return





@@ -745,21 +697,6 @@
    SendEventPack("ChangePackItem", dataDict, curPlayer)

    return





## 设置仓库密码

#  @param curPlayer: 玩家实例

#  @param OldPsw: 旧密码

#  @param NewPsw: 新密码

#  @return: 
def DR_SetWarehousePsw(curPlayer, oldPsw, newPsw):

    dataDict = {"PlayerID":curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
                "AccID":curPlayer.GetAccID(),

                "OldPsw":oldPsw, "NewPsw":newPsw}

    
    SendEventPack("SetWarehousePsw", dataDict, curPlayer)

    return





## 消耗金钱

#  @param curPlayer: 玩家实例

#  @param eventName: 功能事件名

@@ -931,24 +868,6 @@
    SendEventPack("LearnORUPSkill", dataDict, curPlayer)

    return



## 碎片合成给予物品

#  @param curPlayer: 玩家实例

#  @param itemID: 物品ID

#  @param itemCnt: 物品数量

#  @param isBind: 是否绑定

#  @return: 
def DR_StuffMachining(curPlayer, itemID, itemCnt, isBind):

    return

    #MySql不识别 True False,改成1和0

    isBind = 1 if isBind else 0

    
    dataDict = {"PlayerID":curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
                "AccID":curPlayer.GetAccID(),

                "ItemID":itemID, "ItemCount":itemCnt, "IsBind":isBind}

    
    SendEventPack("StuffMachining", dataDict, curPlayer)

    return



## 背包格子数量购买

#  @param curPlayer: 玩家实例

#  @param packType: 背包类型

@@ -1040,21 +959,6 @@
                "ItemID":itemID, "ItemGUID":itemGUID, "NPCID":petNpcID, "NPCName":petNpcName}

    

    SendEventPack("UsePetSoul", dataDict, curPlayer)

    return





## 镖车

#  @param curPlayer: 玩家实例

#  @param eventName: 事件名

#  @param addDataDict: 附加属性

#  @return: 
def DR_Truck(curPlayer, eventName, addDataDict):

    dataDict = {"PlayerID":curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
                "AccID":curPlayer.GetAccID()}

    
    dataDict.update(addDataDict)

    
    SendEventPack("Truck_%s"%eventName, dataDict, curPlayer)

    return



## 设置玩家SB状态

@@ -1565,4 +1469,40 @@
                'AccID':curPlayer.GetAccID(), 'dayIndex':dayIndex, 'point':point}

    #发送封包

    SendEventPack("FeastWeekPartyPoint", dataDict, curPlayer)

    return
    return



def DR_MailSend(playerID, GUID, addDict={}):

    ## 邮件发送流向

    dataDict = {'PlayerID':playerID, 'GUID':GUID} 
    dataDict.update(addDict)

    #发送封包

    SendEventPack("MailSend", dataDict)

    return 


def DR_MailGiveSuccess(playerID, GUID):

    ## 邮件领取流向

    dataDict = {'PlayerID':playerID, 'GUID':GUID} 
    #发送封包

    SendEventPack("MailGiveSuccess", dataDict)

    return



def DR_MailDel(playerID, GUID, eventName):

    ## 邮件删除流向

    dataDict = {'PlayerID':playerID, 'GUID':GUID, 'eventName':eventName}

    #发送封包

    SendEventPack("MailDel", dataDict)

    return 


def DR_ServerMail(GUID, eventName, addDict={}):

    ## 全服邮件流向

    dataDict = {'GUID':GUID, "eventName":eventName}

    dataDict.update(addDict)

    SendEventPack("MailServerMail", dataDict)

    return



def DR_CreateRole(playerData):

    dataDict = {'PlayerID':playerData.PlayerID, 'AccID':playerData.AccID, 'PlayerName':playerData.PlayerName, "Job":playerData.Job}

    #发送封包

    SendEventPack("CreateRole", dataDict)

    return