SnxxServerCode.git

			@@ -24723,17 +24723,23 @@


			#------------------------------------------------------
			# AA 56 垃圾收集活动任务进度信息 #tagMCActGarbageTaskInfo
			# AA 57 垃圾收集活动分类结果 #tagMCActGarbageSortingResult

			class tagMCActGarbageTaskItem(Structure):
			class tagMCActGarbageSortingResult(Structure):
			_pack_ = 1
			_fields_ = [
			("ItemID", c_int),
			("ItemCount", c_ushort),
			("Cmd", c_ubyte),
			("SubCmd", c_ubyte),
			("ActNum", c_ubyte), #活动编号
			("GarbageSortingType", c_ubyte), #垃圾分类类型
			("IsRight", c_ubyte), #是否正确
			("AddEnvValue", c_ushort), #增加环保值
			]

			def __init__(self):
			self.Clear()
			self.Cmd = 0xAA
			self.SubCmd = 0x57
			return

			def ReadData(self, stringData, _pos=0, _len=0):
			@@ -24742,27 +24748,46 @@
			return _pos + self.GetLength()

			def Clear(self):
			self.ItemID = 0
			self.ItemCount = 0
			self.Cmd = 0xAA
			self.SubCmd = 0x57
			self.ActNum = 0
			self.GarbageSortingType = 0
			self.IsRight = 0
			self.AddEnvValue = 0
			return

			def GetLength(self):
			return sizeof(tagMCActGarbageTaskItem)
			return sizeof(tagMCActGarbageSortingResult)

			def GetBuffer(self):
			return string_at(addressof(self), self.GetLength())

			def OutputString(self):
			DumpString = '''// AA 56 垃圾收集活动任务进度信息 //tagMCActGarbageTaskInfo:
			ItemID:%d,
			ItemCount:%d
			DumpString = '''// AA 57 垃圾收集活动分类结果 //tagMCActGarbageSortingResult:
			Cmd:%s,
			SubCmd:%s,
			ActNum:%d,
			GarbageSortingType:%d,
			IsRight:%d,
			AddEnvValue:%d
			'''\
			%(
			self.ItemID,
			self.ItemCount
			self.Cmd,
			self.SubCmd,
			self.ActNum,
			self.GarbageSortingType,
			self.IsRight,
			self.AddEnvValue
			)
			return DumpString


			m_NAtagMCActGarbageSortingResult=tagMCActGarbageSortingResult()
			ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGarbageSortingResult.Cmd,m_NAtagMCActGarbageSortingResult.SubCmd))] = m_NAtagMCActGarbageSortingResult


			#------------------------------------------------------
			# AA 56 垃圾收集活动任务进度信息 #tagMCActGarbageTaskInfo

			class tagMCActGarbageTask(Structure):
			_pack_ = 1
			@@ -24812,8 +24837,6 @@
			ActNum = 0 #(BYTE ActNum)// 活动编号
			GarbageTaskCount = 0 #(BYTE GarbageTaskCount)//任务数
			GarbageTaskList = list() #(vector<tagMCActGarbageTask> GarbageTaskList)//任务信息列表
			TaskItemCount = 0 #(BYTE TaskItemCount)//本次获得的垃圾收集任务奖励物品个数，可能为0
			GarbageTaskItemList = list() #(vector<tagMCActGarbageTaskItem> GarbageTaskItemList)
			data = None

			def __init__(self):
			@@ -24831,11 +24854,6 @@
			temGarbageTaskList = tagMCActGarbageTask()
			_pos = temGarbageTaskList.ReadData(_lpData, _pos)
			self.GarbageTaskList.append(temGarbageTaskList)
			self.TaskItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			for i in range(self.TaskItemCount):
			temGarbageTaskItemList = tagMCActGarbageTaskItem()
			_pos = temGarbageTaskItemList.ReadData(_lpData, _pos)
			self.GarbageTaskItemList.append(temGarbageTaskItemList)
			return _pos

			def Clear(self):
			@@ -24846,8 +24864,6 @@
			self.ActNum = 0
			self.GarbageTaskCount = 0
			self.GarbageTaskList = list()
			self.TaskItemCount = 0
			self.GarbageTaskItemList = list()
			return

			def GetLength(self):
			@@ -24857,9 +24873,6 @@
			length += 1
			for i in range(self.GarbageTaskCount):
			length += self.GarbageTaskList[i].GetLength()
			length += 1
			for i in range(self.TaskItemCount):
			length += self.GarbageTaskItemList[i].GetLength()

			return length

			@@ -24870,9 +24883,6 @@
			data = CommFunc.WriteBYTE(data, self.GarbageTaskCount)
			for i in range(self.GarbageTaskCount):
			data = CommFunc.WriteString(data, self.GarbageTaskList[i].GetLength(), self.GarbageTaskList[i].GetBuffer())
			data = CommFunc.WriteBYTE(data, self.TaskItemCount)
			for i in range(self.TaskItemCount):
			data = CommFunc.WriteString(data, self.GarbageTaskItemList[i].GetLength(), self.GarbageTaskItemList[i].GetBuffer())
			return data

			def OutputString(self):
			@@ -24880,16 +24890,12 @@
			Head:%s,
			ActNum:%d,
			GarbageTaskCount:%d,
			GarbageTaskList:%s,
			TaskItemCount:%d,
			GarbageTaskItemList:%s
			GarbageTaskList:%s
			'''\
			%(
			self.Head.OutputString(),
			self.ActNum,
			self.GarbageTaskCount,
			"...",
			self.TaskItemCount,
			"..."
			)
			return DumpString