8921 【主干】【BT2】【BT3】【后端】H.活动-节日活动-垃圾分类（封包AA56 AA57 增加本次活动累计获得环保值）

hxp

2021-07-05 80f98c222c349b33d621ccc444c2ab9134f2649a

8921 【主干】【BT2】【BT3】【后端】H.活动-节日活动-垃圾分类（封包AA56 AA57 增加本次活动累计获得环保值）

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -25014,6 +25014,7 @@
                  ("GarbageSortingType", c_ubyte),    #垃圾分类类型

                  ("IsRight", c_ubyte),    #是否正确

                  ("AddEnvValue", c_int),    #增加环保值

                  ("HisEnvValueTotal", c_int),    # 当前活动累计获得环保值

                  ]



    def __init__(self):

@@ -25034,6 +25035,7 @@
        self.GarbageSortingType = 0

        self.IsRight = 0

        self.AddEnvValue = 0

        self.HisEnvValueTotal = 0

        return



    def GetLength(self):

@@ -25049,7 +25051,8 @@
                                ActNum:%d,

                                GarbageSortingType:%d,

                                IsRight:%d,

                                AddEnvValue:%d

                                AddEnvValue:%d,

                                HisEnvValueTotal:%d

                                '''\

                                %(

                                self.Cmd,

@@ -25057,7 +25060,8 @@
                                self.ActNum,

                                self.GarbageSortingType,

                                self.IsRight,

                                self.AddEnvValue

                                self.AddEnvValue,

                                self.HisEnvValueTotal

                                )

        return DumpString



@@ -25115,6 +25119,7 @@
class  tagMCActGarbageTaskInfo(Structure):

    Head = tagHead()

    ActNum = 0    #(BYTE ActNum)// 活动编号

    HisEnvValueTotal = 0    #(DWORD HisEnvValueTotal)// 当前活动累计获得环保值

    GarbageTaskCount = 0    #(BYTE GarbageTaskCount)//任务数

    GarbageTaskList = list()    #(vector<tagMCActGarbageTask> GarbageTaskList)//任务信息列表

    data = None

@@ -25129,6 +25134,7 @@
        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        self.HisEnvValueTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.GarbageTaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        for i in range(self.GarbageTaskCount):

            temGarbageTaskList = tagMCActGarbageTask()

@@ -25142,6 +25148,7 @@
        self.Head.Cmd = 0xAA

        self.Head.SubCmd = 0x56

        self.ActNum = 0

        self.HisEnvValueTotal = 0

        self.GarbageTaskCount = 0

        self.GarbageTaskList = list()

        return

@@ -25150,6 +25157,7 @@
        length = 0

        length += self.Head.GetLength()

        length += 1

        length += 4

        length += 1

        for i in range(self.GarbageTaskCount):

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

@@ -25160,6 +25168,7 @@
        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteBYTE(data, self.ActNum)

        data = CommFunc.WriteDWORD(data, self.HisEnvValueTotal)

        data = CommFunc.WriteBYTE(data, self.GarbageTaskCount)

        for i in range(self.GarbageTaskCount):

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

@@ -25169,12 +25178,14 @@
        DumpString = '''

                                Head:%s,

                                ActNum:%d,

                                HisEnvValueTotal:%d,

                                GarbageTaskCount:%d,

                                GarbageTaskList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.ActNum,

                                self.HisEnvValueTotal,

                                self.GarbageTaskCount,

                                "..."

                                )


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

@@ -25014,6 +25014,7 @@
                  ("GarbageSortingType", c_ubyte),    #垃圾分类类型

                  ("IsRight", c_ubyte),    #是否正确

                  ("AddEnvValue", c_int),    #增加环保值

                  ("HisEnvValueTotal", c_int),    # 当前活动累计获得环保值

                  ]



    def __init__(self):

@@ -25034,6 +25035,7 @@
        self.GarbageSortingType = 0

        self.IsRight = 0

        self.AddEnvValue = 0

        self.HisEnvValueTotal = 0

        return



    def GetLength(self):

@@ -25049,7 +25051,8 @@
                                ActNum:%d,

                                GarbageSortingType:%d,

                                IsRight:%d,

                                AddEnvValue:%d

                                AddEnvValue:%d,

                                HisEnvValueTotal:%d

                                '''\

                                %(

                                self.Cmd,

@@ -25057,7 +25060,8 @@
                                self.ActNum,

                                self.GarbageSortingType,

                                self.IsRight,

                                self.AddEnvValue

                                self.AddEnvValue,

                                self.HisEnvValueTotal

                                )

        return DumpString



@@ -25115,6 +25119,7 @@
class  tagMCActGarbageTaskInfo(Structure):

    Head = tagHead()

    ActNum = 0    #(BYTE ActNum)// 活动编号

    HisEnvValueTotal = 0    #(DWORD HisEnvValueTotal)// 当前活动累计获得环保值

    GarbageTaskCount = 0    #(BYTE GarbageTaskCount)//任务数

    GarbageTaskList = list()    #(vector<tagMCActGarbageTask> GarbageTaskList)//任务信息列表

    data = None

@@ -25129,6 +25134,7 @@
        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        self.HisEnvValueTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.GarbageTaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        for i in range(self.GarbageTaskCount):

            temGarbageTaskList = tagMCActGarbageTask()

@@ -25142,6 +25148,7 @@
        self.Head.Cmd = 0xAA

        self.Head.SubCmd = 0x56

        self.ActNum = 0

        self.HisEnvValueTotal = 0

        self.GarbageTaskCount = 0

        self.GarbageTaskList = list()

        return

@@ -25150,6 +25157,7 @@
        length = 0

        length += self.Head.GetLength()

        length += 1

        length += 4

        length += 1

        for i in range(self.GarbageTaskCount):

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

@@ -25160,6 +25168,7 @@
        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteBYTE(data, self.ActNum)

        data = CommFunc.WriteDWORD(data, self.HisEnvValueTotal)

        data = CommFunc.WriteBYTE(data, self.GarbageTaskCount)

        for i in range(self.GarbageTaskCount):

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

@@ -25169,12 +25178,14 @@
        DumpString = '''

                                Head:%s,

                                ActNum:%d,

                                HisEnvValueTotal:%d,

                                GarbageTaskCount:%d,

                                GarbageTaskList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.ActNum,

                                self.HisEnvValueTotal,

                                self.GarbageTaskCount,

                                "..."

                                )


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py

@@ -247,6 +247,7 @@
    clientPack.GarbageSortingType = sortingType

    clientPack.IsRight = isRight

    clientPack.AddEnvValue = addEnvValueTotal

    clientPack.HisEnvValueTotal = actEnvValueTotal

    NetPackCommon.SendFakePack(curPlayer, clientPack)

    return



@@ -271,6 +272,7 @@
    syncTaskIDList = [taskID] if taskID else ChConfig.GarbageTaskList

    clientPack = ChPyNetSendPack.tagMCActGarbageTaskInfo()

    clientPack.ActNum = actNum

    clientPack.HisEnvValueTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GarbageEnvironmentValue % actNum)

    clientPack.GarbageTaskList = []

    for taskID in syncTaskIDList:

        task = ChPyNetSendPack.tagMCActGarbageTask()