SnxxServerCode.git

parent: 46c9d7d8 | 补丁 | 提交 | ignore whitespace

hxp

2020-02-11 3eee55d3e918bf2386fc59836dd2c89e21e6c1c3

8374 【后端】【主干】通知客户端攻击封包增加专精技能

4个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.py	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -32825,6 +32825,7 @@
    PosY = 0    #(WORD PosY)

    HurtCount = 0    #(WORD HurtCount)//伤害数目

    HurtList = list()    #(vector<tagSkillPosHurtObj> HurtList)//size = HurtCount

    SkillElementID = 0    #(WORD SkillElementID)//专精技能ID

    data = None



    def __init__(self):

@@ -32846,6 +32847,7 @@
            temHurtList = tagSkillPosHurtObj()

            _pos = temHurtList.ReadData(_lpData, _pos)

            self.HurtList.append(temHurtList)

        self.SkillElementID,_pos = CommFunc.ReadWORD(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -32860,6 +32862,7 @@
        self.PosY = 0

        self.HurtCount = 0

        self.HurtList = list()

        self.SkillElementID = 0

        return



    def GetLength(self):

@@ -32873,6 +32876,7 @@
        length += 2

        for i in range(self.HurtCount):

            length += self.HurtList[i].GetLength()

        length += 2



        return length



@@ -32887,6 +32891,7 @@
        data = CommFunc.WriteWORD(data, self.HurtCount)

        for i in range(self.HurtCount):

            data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())

        data = CommFunc.WriteWORD(data, self.SkillElementID)

        return data



    def OutputString(self):

@@ -32898,7 +32903,8 @@
                                PosX:%d,

                                PosY:%d,

                                HurtCount:%d,

                                HurtList:%s

                                HurtList:%s,

                                SkillElementID:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -32908,7 +32914,8 @@
                                self.PosX,

                                self.PosY,

                                self.HurtCount,

                                "..."

                                "...",

                                self.SkillElementID

                                )

        return DumpString




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py

@@ -2749,8 +2749,9 @@
        sendPack.HurtList.append(hurtList)

        

    sendPack.HurtCount = len(sendPack.HurtList)



    sendPack.SkillElementID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)

    PlayerControl.PyNotifyAll(curPlayer, sendPack, notifySelf=True, notifyCnt=-1)

    return





# py重现View_UseSkillPos效果，对地通知，只用于玩家

@@ -2785,6 +2786,7 @@
        

    sendPack.HurtCount = len(sendPack.HurtList)

    if attacker.GetGameObjType() == IPY_GameWorld.gotPlayer:

        sendPack.SkillElementID = attacker.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)

        PlayerControl.PyNotifyAll(attacker, sendPack, notifySelf, -1)

    else:

        attacker.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength())

@@ -2826,6 +2828,7 @@
        sendPack.HurtList.append(hurtList)

        

    sendPack.HurtCount = len(sendPack.HurtList)

    sendPack.SkillElementID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return




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

@@ -332,6 +332,7 @@
    PosY = 0    #(WORD PosY)

    HurtCount = 0    #(WORD HurtCount)//伤害数目

    HurtList = list()    #(vector<tagSkillPosHurtObj> HurtList)//size = HurtCount

    SkillElementID = 0    #(WORD SkillElementID)//专精技能ID    
    data = None



    def __init__(self):

@@ -354,6 +355,7 @@
            temHurtList = tagSkillPosHurtObj()

            _pos = temHurtList.ReadData(_lpData, _pos)

            self.HurtList.append(temHurtList)

        self.SkillElementID,_pos = CommFunc.ReadWORD(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -369,6 +371,7 @@
        self.PosY = 0

        self.HurtCount = 0

        self.HurtList = list()

        self.SkillElementID = 0

        return



    def GetLength(self):

@@ -383,6 +386,7 @@
        length += 2

        for i in range(self.HurtCount):

            length += self.HurtList[i].GetLength()

        length += 2



        return length



@@ -398,6 +402,7 @@
        data = CommFunc.WriteWORD(data, self.HurtCount)

        for i in range(self.HurtCount):

            data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())

        data = CommFunc.WriteWORD(data, self.SkillElementID)

        return data



    def OutputString(self):

@@ -410,7 +415,8 @@
                                PosX:%d,

                                PosY:%d,

                                HurtCount:%d,

                                HurtList:%s

                                HurtList:%s,

                                SkillElementID:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -421,7 +427,8 @@
                                self.PosX,

                                self.PosY,

                                self.HurtCount,

                                "..."

                                "...",

                                self.SkillElementID

                                )

        return DumpString




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

@@ -32825,6 +32825,7 @@
    PosY = 0    #(WORD PosY)

    HurtCount = 0    #(WORD HurtCount)//伤害数目

    HurtList = list()    #(vector<tagSkillPosHurtObj> HurtList)//size = HurtCount

    SkillElementID = 0    #(WORD SkillElementID)//专精技能ID

    data = None



    def __init__(self):

@@ -32846,6 +32847,7 @@
            temHurtList = tagSkillPosHurtObj()

            _pos = temHurtList.ReadData(_lpData, _pos)

            self.HurtList.append(temHurtList)

        self.SkillElementID,_pos = CommFunc.ReadWORD(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -32860,6 +32862,7 @@
        self.PosY = 0

        self.HurtCount = 0

        self.HurtList = list()

        self.SkillElementID = 0

        return



    def GetLength(self):

@@ -32873,6 +32876,7 @@
        length += 2

        for i in range(self.HurtCount):

            length += self.HurtList[i].GetLength()

        length += 2



        return length



@@ -32887,6 +32891,7 @@
        data = CommFunc.WriteWORD(data, self.HurtCount)

        for i in range(self.HurtCount):

            data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())

        data = CommFunc.WriteWORD(data, self.SkillElementID)

        return data



    def OutputString(self):

@@ -32898,7 +32903,8 @@
                                PosX:%d,

                                PosY:%d,

                                HurtCount:%d,

                                HurtList:%s

                                HurtList:%s,

                                SkillElementID:%d

                                '''\

                                %(

                                self.Head.OutputString(),

@@ -32908,7 +32914,8 @@
                                self.PosX,

                                self.PosY,

                                self.HurtCount,

                                "..."

                                "...",

                                self.SkillElementID

                                )

        return DumpString

			@@ -32825,6 +32825,7 @@
			PosY = 0 #(WORD PosY)
			HurtCount = 0 #(WORD HurtCount)//伤害数目
			HurtList = list() #(vector<tagSkillPosHurtObj> HurtList)//size = HurtCount
			SkillElementID = 0 #(WORD SkillElementID)//专精技能ID
			data = None

			def __init__(self):
			@@ -32846,6 +32847,7 @@
			temHurtList = tagSkillPosHurtObj()
			_pos = temHurtList.ReadData(_lpData, _pos)
			self.HurtList.append(temHurtList)
			self.SkillElementID,_pos = CommFunc.ReadWORD(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -32860,6 +32862,7 @@
			self.PosY = 0
			self.HurtCount = 0
			self.HurtList = list()
			self.SkillElementID = 0
			return

			def GetLength(self):
			@@ -32873,6 +32876,7 @@
			length += 2
			for i in range(self.HurtCount):
			length += self.HurtList[i].GetLength()
			length += 2

			return length

			@@ -32887,6 +32891,7 @@
			data = CommFunc.WriteWORD(data, self.HurtCount)
			for i in range(self.HurtCount):
			data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())
			data = CommFunc.WriteWORD(data, self.SkillElementID)
			return data

			def OutputString(self):
			@@ -32898,7 +32903,8 @@
			PosX:%d,
			PosY:%d,
			HurtCount:%d,
			HurtList:%s
			HurtList:%s,
			SkillElementID:%d
			'''\
			%(
			self.Head.OutputString(),
			@@ -32908,7 +32914,8 @@
			self.PosX,
			self.PosY,
			self.HurtCount,
			"..."
			"...",
			self.SkillElementID
			)
			return DumpString

			@@ -2749,8 +2749,9 @@
			sendPack.HurtList.append(hurtList)

			sendPack.HurtCount = len(sendPack.HurtList)

			sendPack.SkillElementID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)
			PlayerControl.PyNotifyAll(curPlayer, sendPack, notifySelf=True, notifyCnt=-1)
			return


			# py重现View_UseSkillPos效果，对地通知，只用于玩家
			@@ -2785,6 +2786,7 @@

			sendPack.HurtCount = len(sendPack.HurtList)
			if attacker.GetGameObjType() == IPY_GameWorld.gotPlayer:
			sendPack.SkillElementID = attacker.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)
			PlayerControl.PyNotifyAll(attacker, sendPack, notifySelf, -1)
			else:
			attacker.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength())
			@@ -2826,6 +2828,7 @@
			sendPack.HurtList.append(hurtList)

			sendPack.HurtCount = len(sendPack.HurtList)
			sendPack.SkillElementID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % skillID)
			NetPackCommon.SendFakePack(curPlayer, sendPack)
			return

			@@ -332,6 +332,7 @@
			PosY = 0 #(WORD PosY)
			HurtCount = 0 #(WORD HurtCount)//伤害数目
			HurtList = list() #(vector<tagSkillPosHurtObj> HurtList)//size = HurtCount
			SkillElementID = 0 #(WORD SkillElementID)//专精技能ID
			data = None

			def __init__(self):
			@@ -354,6 +355,7 @@
			temHurtList = tagSkillPosHurtObj()
			_pos = temHurtList.ReadData(_lpData, _pos)
			self.HurtList.append(temHurtList)
			self.SkillElementID,_pos = CommFunc.ReadWORD(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -369,6 +371,7 @@
			self.PosY = 0
			self.HurtCount = 0
			self.HurtList = list()
			self.SkillElementID = 0
			return

			def GetLength(self):
			@@ -383,6 +386,7 @@
			length += 2
			for i in range(self.HurtCount):
			length += self.HurtList[i].GetLength()
			length += 2

			return length

			@@ -398,6 +402,7 @@
			data = CommFunc.WriteWORD(data, self.HurtCount)
			for i in range(self.HurtCount):
			data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())
			data = CommFunc.WriteWORD(data, self.SkillElementID)
			return data

			def OutputString(self):
			@@ -410,7 +415,8 @@
			PosX:%d,
			PosY:%d,
			HurtCount:%d,
			HurtList:%s
			HurtList:%s,
			SkillElementID:%d
			'''\
			%(
			self.Head.OutputString(),
			@@ -421,7 +427,8 @@
			self.PosX,
			self.PosY,
			self.HurtCount,
			"..."
			"...",
			self.SkillElementID
			)
			return DumpString