Project_SG_ServerCode.git

			@@ -5404,135 +5404,6 @@


			#------------------------------------------------------
			# A3 37 投资理财信息 #tagMCGoldInvestInfo

			class tagMCInvestReward(Structure):
			_pack_ = 1
			_fields_ = [
			("RewardIndex", c_ushort), # 索引
			("RewardValue", c_ubyte), # 该等级已领取数据，0可认为未领取
			]

			def __init__(self):
			self.Clear()
			return

			def ReadData(self, stringData, _pos=0, _len=0):
			self.Clear()
			memmove(addressof(self), stringData[_pos:], self.GetLength())
			return _pos + self.GetLength()

			def Clear(self):
			self.RewardIndex = 0
			self.RewardValue = 0
			return

			def GetLength(self):
			return sizeof(tagMCInvestReward)

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

			def OutputString(self):
			DumpString = '''// A3 37 投资理财信息 //tagMCGoldInvestInfo:
			RewardIndex:%d,
			RewardValue:%d
			'''\
			%(
			self.RewardIndex,
			self.RewardValue
			)
			return DumpString


			class tagMCGoldInvestInfo(Structure):
			Head = tagHead()
			InvestType = 0 #(BYTE InvestType)// 投资类型
			CurDay = 0 #(DWORD CurDay)// 当前天数
			InvestGold = 0 #(DWORD InvestGold)// 投资额度
			RewardRecordCnt = 0 #(BYTE RewardRecordCnt)// 投资回报个数
			InvestRewardList = list() #(vector<tagMCInvestReward> InvestRewardList)// 投资回报记录
			data = None

			def __init__(self):
			self.Clear()
			self.Head.Cmd = 0xA3
			self.Head.SubCmd = 0x37
			return

			def ReadData(self, _lpData, _pos=0, _Len=0):
			self.Clear()
			_pos = self.Head.ReadData(_lpData, _pos)
			self.InvestType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.CurDay,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.InvestGold,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.RewardRecordCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			for i in range(self.RewardRecordCnt):
			temInvestRewardList = tagMCInvestReward()
			_pos = temInvestRewardList.ReadData(_lpData, _pos)
			self.InvestRewardList.append(temInvestRewardList)
			return _pos

			def Clear(self):
			self.Head = tagHead()
			self.Head.Clear()
			self.Head.Cmd = 0xA3
			self.Head.SubCmd = 0x37
			self.InvestType = 0
			self.CurDay = 0
			self.InvestGold = 0
			self.RewardRecordCnt = 0
			self.InvestRewardList = list()
			return

			def GetLength(self):
			length = 0
			length += self.Head.GetLength()
			length += 1
			length += 4
			length += 4
			length += 1
			for i in range(self.RewardRecordCnt):
			length += self.InvestRewardList[i].GetLength()

			return length

			def GetBuffer(self):
			data = ''
			data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
			data = CommFunc.WriteBYTE(data, self.InvestType)
			data = CommFunc.WriteDWORD(data, self.CurDay)
			data = CommFunc.WriteDWORD(data, self.InvestGold)
			data = CommFunc.WriteBYTE(data, self.RewardRecordCnt)
			for i in range(self.RewardRecordCnt):
			data = CommFunc.WriteString(data, self.InvestRewardList[i].GetLength(), self.InvestRewardList[i].GetBuffer())
			return data

			def OutputString(self):
			DumpString = '''
			Head:%s,
			InvestType:%d,
			CurDay:%d,
			InvestGold:%d,
			RewardRecordCnt:%d,
			InvestRewardList:%s
			'''\
			%(
			self.Head.OutputString(),
			self.InvestType,
			self.CurDay,
			self.InvestGold,
			self.RewardRecordCnt,
			"..."
			)
			return DumpString


			m_NAtagMCGoldInvestInfo=tagMCGoldInvestInfo()
			ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGoldInvestInfo.Head.Cmd,m_NAtagMCGoldInvestInfo.Head.SubCmd))] = m_NAtagMCGoldInvestInfo


			#------------------------------------------------------
			# A3 C7 古宝信息 #tagMCGubaoInfo

			class tagMCGubao(Structure):
			@@ -5877,94 +5748,67 @@


			#------------------------------------------------------
			# A3 38 投资理财信息 #tagMCInvestInfo
			# A3 38 投资信息 #tagSCInvestInfo

			class tagMCInvestInfo(Structure):
			Head = tagHead()
			InvestType = 0 #(BYTE InvestType)// 投资类型
			CurDay = 0 #(WORD CurDay)// 当前天数，投资第一天为1
			ValueCount = 0 #(BYTE ValueCount)
			RewardValue = list() #(vector<DWORD> RewardValue)//领奖记录值，按投资回报索引位记录是否已领取
			ProgressValue = list() #(vector<DWORD> ProgressValue)//投资相关可领取进度记录值: 9登录投资-记录已登录天数；11Boss投资-按回报索引位记录是否已击杀该boss
			data = None
			class tagSCInvestInfo(Structure):
			_pack_ = 1
			_fields_ = [
			("Cmd", c_ubyte),
			("SubCmd", c_ubyte),
			("InvestType", c_ubyte), # 投资类型
			("InvestBuyTime", c_int), # 投资购买时间戳，永久的通过该时间判断是否有效或已过天数，任意类型均有该值，过期没有重置，前端自己判断
			("InvestEndTime", c_int), # 投资到期时间戳，非永久的通过该时间判断到期时间，有天数限制的才有值
			("AwardState", c_ubyte), # 今日是否已领取奖励
			]

			def __init__(self):
			self.Clear()
			self.Head.Cmd = 0xA3
			self.Head.SubCmd = 0x38
			self.Cmd = 0xA3
			self.SubCmd = 0x38
			return

			def ReadData(self, _lpData, _pos=0, _Len=0):
			def ReadData(self, stringData, _pos=0, _len=0):
			self.Clear()
			_pos = self.Head.ReadData(_lpData, _pos)
			self.InvestType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.CurDay,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.ValueCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			for i in range(self.ValueCount):
			value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
			self.RewardValue.append(value)
			for i in range(self.ValueCount):
			value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
			self.ProgressValue.append(value)
			return _pos
			memmove(addressof(self), stringData[_pos:], self.GetLength())
			return _pos + self.GetLength()

			def Clear(self):
			self.Head = tagHead()
			self.Head.Clear()
			self.Head.Cmd = 0xA3
			self.Head.SubCmd = 0x38
			self.Cmd = 0xA3
			self.SubCmd = 0x38
			self.InvestType = 0
			self.CurDay = 0
			self.ValueCount = 0
			self.RewardValue = list()
			self.ProgressValue = list()
			self.InvestBuyTime = 0
			self.InvestEndTime = 0
			self.AwardState = 0
			return

			def GetLength(self):
			length = 0
			length += self.Head.GetLength()
			length += 1
			length += 2
			length += 1
			length += 4 * self.ValueCount
			length += 4 * self.ValueCount

			return length
			return sizeof(tagSCInvestInfo)

			def GetBuffer(self):
			data = ''
			data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
			data = CommFunc.WriteBYTE(data, self.InvestType)
			data = CommFunc.WriteWORD(data, self.CurDay)
			data = CommFunc.WriteBYTE(data, self.ValueCount)
			for i in range(self.ValueCount):
			data = CommFunc.WriteDWORD(data, self.RewardValue[i])
			for i in range(self.ValueCount):
			data = CommFunc.WriteDWORD(data, self.ProgressValue[i])
			return data
			return string_at(addressof(self), self.GetLength())

			def OutputString(self):
			DumpString = '''
			Head:%s,
			DumpString = '''// A3 38 投资信息 //tagSCInvestInfo:
			Cmd:%s,
			SubCmd:%s,
			InvestType:%d,
			CurDay:%d,
			ValueCount:%d,
			RewardValue:%s,
			ProgressValue:%s
			InvestBuyTime:%d,
			InvestEndTime:%d,
			AwardState:%d
			'''\
			%(
			self.Head.OutputString(),
			self.Cmd,
			self.SubCmd,
			self.InvestType,
			self.CurDay,
			self.ValueCount,
			"...",
			"..."
			self.InvestBuyTime,
			self.InvestEndTime,
			self.AwardState
			)
			return DumpString


			m_NAtagMCInvestInfo=tagMCInvestInfo()
			ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCInvestInfo.Head.Cmd,m_NAtagMCInvestInfo.Head.SubCmd))] = m_NAtagMCInvestInfo
			m_NAtagSCInvestInfo=tagSCInvestInfo()
			ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCInvestInfo.Cmd,m_NAtagSCInvestInfo.SubCmd))] = m_NAtagSCInvestInfo


			#------------------------------------------------------
			@@ -38427,10 +38271,10 @@
			("Cmd", c_ubyte),
			("SubCmd", c_ubyte),
			("ObjID", c_int),
			("HP", c_int), # 当前血量，求余20亿部分
			("HPEx", c_int), # 当前血量，整除20亿部分
			("MaxHP", c_int), # 最大血量，求余20亿部分
			("MaxHPEx", c_int), # 最大血量，整除20亿部分
			("HP", c_int), # 当前血量，求余亿部分
			("HPEx", c_int), # 当前血量，整除亿部分
			("MaxHP", c_int), # 最大血量，求余亿部分
			("MaxHPEx", c_int), # 最大血量，整除亿部分
			]

			def __init__(self):
			@@ -39419,10 +39263,10 @@
			("NPCID", c_int), # 战斗NPCID，不同的实例ID对应的NPCID可能一样
			("HeroID", c_int), # 武将ID，玩家或NPC均可能有，如果有值则外观相关以该武将为准，否则以NPCID为准
			("SkinID", c_int), # 武将皮肤ID，玩家或NPC均可能有，如果有值则皮肤以该值为准，否则取NPCID对应的皮肤ID
			("HP", c_int), # 当前血量，求余20亿部分
			("HPEx", c_int), # 当前血量，整除20亿部分
			("MaxHP", c_int), # 最大血量，求余20亿部分
			("MaxHPEx", c_int), # 最大血量，整除20亿部分
			("HP", c_int), # 当前血量，求余亿部分
			("HPEx", c_int), # 当前血量，整除亿部分
			("MaxHP", c_int), # 最大血量，求余亿部分
			("MaxHPEx", c_int), # 最大血量，整除亿部分
			("LV", c_ushort), # 等级，玩家的武将等级或NPC成长等级，等级显示以该值为准
			("PosNum", c_ubyte), # 在本阵容中的站位，从1开始，非主战斗武将为0，如红颜
			("AngreXP", c_ushort), # 当前怒气值