Project_SG_ServerCode.git

			@@ -25885,6 +25885,7 @@
			('Face', ctypes.c_int),
			('FacePic', ctypes.c_int),
			('ModelMark', ctypes.c_ulong),
			('EquipShowSwitch', ctypes.c_ulong),
			('FamilyID', ctypes.c_ulong),
			('FamilyName', ctypes.c_char * 33),
			('FamilyEmblemID', ctypes.c_ushort),
			@@ -25913,6 +25914,7 @@
			self.Face = 0
			self.FacePic = 0
			self.ModelMark = 0
			self.EquipShowSwitch = 0
			self.FamilyID = 0
			self.FamilyName = ''
			self.FamilyEmblemID = 0
			@@ -25943,6 +25945,7 @@
			self.Face, pos = CommFunc.ReadDWORD(buf, pos)
			self.FacePic, pos = CommFunc.ReadDWORD(buf, pos)
			self.ModelMark, pos = CommFunc.ReadDWORD(buf, pos)
			self.EquipShowSwitch, pos = CommFunc.ReadDWORD(buf, pos)
			self.FamilyID, pos = CommFunc.ReadDWORD(buf, pos)
			self.FamilyName, pos = CommFunc.ReadString(buf, pos, 33)
			self.FamilyEmblemID, pos = CommFunc.ReadWORD(buf, pos)
			@@ -25968,6 +25971,7 @@
			buf = CommFunc.WriteDWORD(buf, self.Face)
			buf = CommFunc.WriteDWORD(buf, self.FacePic)
			buf = CommFunc.WriteDWORD(buf, self.ModelMark)
			buf = CommFunc.WriteDWORD(buf, self.EquipShowSwitch)
			buf = CommFunc.WriteDWORD(buf, self.FamilyID)
			buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 33, self.FamilyName)
			buf = CommFunc.WriteWORD(buf, self.FamilyEmblemID)
			@@ -25991,6 +25995,7 @@
			length += sizeof(ctypes.c_ubyte)
			length += sizeof(ctypes.c_int)
			length += sizeof(ctypes.c_int)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_char) * 33
			@@ -26017,6 +26022,7 @@
			rec[u'Face'] = self.Face
			rec[u'FacePic'] = self.FacePic
			rec[u'ModelMark'] = self.ModelMark
			rec[u'EquipShowSwitch'] = self.EquipShowSwitch
			rec[u'FamilyID'] = self.FamilyID
			rec[u'FamilyName'] = fix_incomingText(self.FamilyName)
			rec[u'FamilyEmblemID'] = self.FamilyEmblemID
			@@ -26041,6 +26047,7 @@
			self.Face = rec.get(u'Face', 0)
			self.FacePic = rec.get(u'FacePic', 0)
			self.ModelMark = rec.get(u'ModelMark', 0)
			self.EquipShowSwitch = rec.get(u'EquipShowSwitch', 0)
			self.FamilyID = rec.get(u'FamilyID', 0)
			self.FamilyName = fix_outgoingText(rec.get(u'FamilyName', u''))
			self.FamilyEmblemID = rec.get(u'FamilyEmblemID', 0)
			@@ -26164,6 +26171,7 @@
			Face = %s,
			FacePic = %s,
			ModelMark = %s,
			EquipShowSwitch = %s,
			FamilyID = %s,
			FamilyName = %s,
			FamilyEmblemID = %s,
			@@ -26186,6 +26194,7 @@
			self.Face,
			self.FacePic,
			self.ModelMark,
			self.EquipShowSwitch,
			self.FamilyID,
			self.FamilyName,
			self.FamilyEmblemID,
			@@ -26202,7 +26211,7 @@
			return output

			def dumpString(self):
			output = '''%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s'''%(
			output = '''%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s'''%(
			self.PlayerID,
			self.AccID,
			self.PlayerName,
			@@ -26212,6 +26221,7 @@
			self.Face,
			self.FacePic,
			self.ModelMark,
			self.EquipShowSwitch,
			self.FamilyID,
			self.FamilyName,
			self.FamilyEmblemID,
			@@ -26275,6 +26285,7 @@
			('CmpValue', ctypes.c_ulong),
			('CmpValue2', ctypes.c_ulong),
			('CmpValue3', ctypes.c_ulong),
			('Time', ctypes.c_ulong),
			('DataLen', ctypes.c_ushort),
			('UserData', ctypes.c_char_p),
			('ADOResult', ctypes.c_ulong),
			@@ -26304,6 +26315,7 @@
			self.CmpValue = 0
			self.CmpValue2 = 0
			self.CmpValue3 = 0
			self.Time = 0
			self.DataLen = 0
			self.UserData = ''

			@@ -26335,6 +26347,7 @@
			self.CmpValue, pos = CommFunc.ReadDWORD(buf, pos)
			self.CmpValue2, pos = CommFunc.ReadDWORD(buf, pos)
			self.CmpValue3, pos = CommFunc.ReadDWORD(buf, pos)
			self.Time, pos = CommFunc.ReadDWORD(buf, pos)
			self.DataLen, pos = CommFunc.ReadWORD(buf, pos)
			tmp, pos = CommFunc.ReadString(buf, pos, self.DataLen)
			self.UserData = ctypes.c_char_p(tmp)
			@@ -26361,6 +26374,7 @@
			buf = CommFunc.WriteDWORD(buf, self.CmpValue)
			buf = CommFunc.WriteDWORD(buf, self.CmpValue2)
			buf = CommFunc.WriteDWORD(buf, self.CmpValue3)
			buf = CommFunc.WriteDWORD(buf, self.Time)
			buf = CommFunc.WriteWORD(buf, self.DataLen)
			buf = CommFunc.WriteString(buf, self.DataLen, self.UserData)
			return buf
			@@ -26375,6 +26389,7 @@
			length += sizeof(ctypes.c_char) * 33
			length += sizeof(ctypes.c_char) * 65
			length += sizeof(ctypes.c_ubyte)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_ulong)
			length += sizeof(ctypes.c_ulong)
			@@ -26412,6 +26427,7 @@
			rec[u'CmpValue'] = self.CmpValue
			rec[u'CmpValue2'] = self.CmpValue2
			rec[u'CmpValue3'] = self.CmpValue3
			rec[u'Time'] = self.Time
			rec[u'DataLen'] = self.DataLen
			rec[u'UserData'] = fix_incomingText(self.UserData)
			return rec
			@@ -26437,6 +26453,7 @@
			self.CmpValue = rec.get(u'CmpValue', 0)
			self.CmpValue2 = rec.get(u'CmpValue2', 0)
			self.CmpValue3 = rec.get(u'CmpValue3', 0)
			self.Time = rec.get(u'Time', 0)
			self.DataLen = rec.get(u'DataLen', 0)
			self.UserData = fix_outgoingText(rec.get(u'UserData', u''))

			@@ -26493,6 +26510,7 @@
			CmpValue = %s,
			CmpValue2 = %s,
			CmpValue3 = %s,
			Time = %s,
			DataLen = %s,
			UserData = %s,
			ADOResult = %s,
			@@ -26516,6 +26534,7 @@
			self.CmpValue,
			self.CmpValue2,
			self.CmpValue3,
			self.Time,
			self.DataLen,
			self.UserData,
			self.ADOResult,
			@@ -26523,7 +26542,7 @@
			return output

			def dumpString(self):
			output = '''%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s'''%(
			output = '''%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s\t%1s'''%(
			self.GroupValue1,
			self.GroupValue2,
			self.BillboardType,
			@@ -26543,6 +26562,7 @@
			self.CmpValue,
			self.CmpValue2,
			self.CmpValue3,
			self.Time,
			self.DataLen,
			self.UserData,
			)