From ac98391b1102b1c07aa71dbab56f232db74273ec Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 九月 2025 11:51:20 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(计算主公官职属性;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py |  229 ++------------------------------------------------------
 1 files changed, 11 insertions(+), 218 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py
index 375b3b6..a2e642b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py
@@ -25884,6 +25884,7 @@
         ('RealmLV', ctypes.c_ubyte),
         ('Face', ctypes.c_int),
         ('FacePic', ctypes.c_int),
+        ('ModelMark', ctypes.c_ulong),
         ('FamilyID', ctypes.c_ulong),
         ('FamilyName', ctypes.c_char * 33),
         ('FamilyEmblemID', ctypes.c_ushort),
@@ -25910,6 +25911,7 @@
         self.RealmLV = 0
         self.Face = 0
         self.FacePic = 0
+        self.ModelMark = 0
         self.FamilyID = 0
         self.FamilyName = ''
         self.FamilyEmblemID = 0
@@ -25938,6 +25940,7 @@
         self.RealmLV, pos = CommFunc.ReadBYTE(buf, pos)
         self.Face, pos = CommFunc.ReadDWORD(buf, pos)
         self.FacePic, pos = CommFunc.ReadDWORD(buf, pos)
+        self.ModelMark, 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)
@@ -25961,6 +25964,7 @@
         buf = CommFunc.WriteBYTE(buf, self.RealmLV)
         buf = CommFunc.WriteDWORD(buf, self.Face)
         buf = CommFunc.WriteDWORD(buf, self.FacePic)
+        buf = CommFunc.WriteDWORD(buf, self.ModelMark)
         buf = CommFunc.WriteDWORD(buf, self.FamilyID)
         buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 33, self.FamilyName)
         buf = CommFunc.WriteWORD(buf, self.FamilyEmblemID)
@@ -25984,6 +25988,7 @@
         length += sizeof(ctypes.c_int)
         length += sizeof(ctypes.c_int)
         length += sizeof(ctypes.c_ulong)
+        length += sizeof(ctypes.c_ulong)
         length += sizeof(ctypes.c_char) * 33
         length += sizeof(ctypes.c_ushort)
         length += sizeof(ctypes.c_ulong)
@@ -26006,6 +26011,7 @@
         rec[u'RealmLV'] = self.RealmLV
         rec[u'Face'] = self.Face
         rec[u'FacePic'] = self.FacePic
+        rec[u'ModelMark'] = self.ModelMark
         rec[u'FamilyID'] = self.FamilyID
         rec[u'FamilyName'] = fix_incomingText(self.FamilyName)
         rec[u'FamilyEmblemID'] = self.FamilyEmblemID
@@ -26028,6 +26034,7 @@
         self.RealmLV = rec.get(u'RealmLV', 0)
         self.Face = rec.get(u'Face', 0)
         self.FacePic = rec.get(u'FacePic', 0)
+        self.ModelMark = rec.get(u'ModelMark', 0)
         self.FamilyID = rec.get(u'FamilyID', 0)
         self.FamilyName = fix_outgoingText(rec.get(u'FamilyName', u''))
         self.FamilyEmblemID = rec.get(u'FamilyEmblemID', 0)
@@ -26149,6 +26156,7 @@
             RealmLV = %s,
             Face = %s,
             FacePic = %s,
+            ModelMark = %s,
             FamilyID = %s,
             FamilyName = %s,
             FamilyEmblemID = %s,
@@ -26169,6 +26177,7 @@
                 self.RealmLV,
                 self.Face,
                 self.FacePic,
+                self.ModelMark,
                 self.FamilyID,
                 self.FamilyName,
                 self.FamilyEmblemID,
@@ -26184,7 +26193,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'''%(
+        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'''%(
                 self.PlayerID,
                 self.AccID,
                 self.PlayerName,
@@ -26193,6 +26202,7 @@
                 self.RealmLV,
                 self.Face,
                 self.FacePic,
+                self.ModelMark,
                 self.FamilyID,
                 self.FamilyName,
                 self.FamilyEmblemID,
@@ -28174,223 +28184,6 @@
         else:
             self.Name = Str[:33]
             
-
-
-# 通用记录表新 #tagDBGameRec
-class tagDBGameRec(Structure):
-    _pack_ = 1
-    _fields_ = [
-        ('RecType', ctypes.c_ushort),
-        ('RecID', ctypes.c_ulong),
-        ('Time', ctypes.c_double),
-        ('Value1', ctypes.c_ulong),
-        ('Value2', ctypes.c_ulong),
-        ('Value3', ctypes.c_ulong),
-        ('Value4', ctypes.c_ulong),
-        ('Value5', ctypes.c_ulong),
-        ('Value6', ctypes.c_ulong),
-        ('Value7', ctypes.c_ulong),
-        ('Value8', ctypes.c_ulong),
-        ('UserDataLen', ctypes.c_ushort),
-        ('UserData', ctypes.c_char_p),
-        ('ADOResult', ctypes.c_ulong),
-    ]
-
-    def __init__(self):
-        Structure.__init__(self)
-        self.clear()
-
-    def clear(self):
-        self.RecType = 0
-        self.RecID = 0
-        self.Time = 0.0
-        self.Value1 = 0
-        self.Value2 = 0
-        self.Value3 = 0
-        self.Value4 = 0
-        self.Value5 = 0
-        self.Value6 = 0
-        self.Value7 = 0
-        self.Value8 = 0
-        self.UserDataLen = 0
-        self.UserData = ''
-
-    def readData(self, buf, pos = 0, length = 0):
-        if not pos <= length:
-            msg = error.formatMsg('error', error.ERROR_NO_148, '(pos = %s) > (length = %s)'%(pos, length))
-            mylog.error(msg)
-            return -1
-        if len(buf) < pos + self.getLength():
-            msg = error.formatMsg('error', error.ERROR_NO_149, 'len = %s while %s expected!'%(len(buf) - pos, self.getLength()))
-            mylog.error(msg)
-        self.clear()
-        self.RecType, pos = CommFunc.ReadWORD(buf, pos)
-        self.RecID, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Time, pos = CommFunc.ReadDouble(buf, pos)
-        self.Value1, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value2, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value3, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value4, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value5, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value6, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value7, pos = CommFunc.ReadDWORD(buf, pos)
-        self.Value8, pos = CommFunc.ReadDWORD(buf, pos)
-        self.UserDataLen, pos = CommFunc.ReadWORD(buf, pos)
-        tmp, pos = CommFunc.ReadString(buf, pos, self.UserDataLen)
-        self.UserData = ctypes.c_char_p(tmp)
-        return self.getLength()
-
-    def getBuffer(self):
-        buf = ''
-        buf = CommFunc.WriteWORD(buf, self.RecType)
-        buf = CommFunc.WriteDWORD(buf, self.RecID)
-        buf = CommFunc.WriteDouble(buf, self.Time)
-        buf = CommFunc.WriteDWORD(buf, self.Value1)
-        buf = CommFunc.WriteDWORD(buf, self.Value2)
-        buf = CommFunc.WriteDWORD(buf, self.Value3)
-        buf = CommFunc.WriteDWORD(buf, self.Value4)
-        buf = CommFunc.WriteDWORD(buf, self.Value5)
-        buf = CommFunc.WriteDWORD(buf, self.Value6)
-        buf = CommFunc.WriteDWORD(buf, self.Value7)
-        buf = CommFunc.WriteDWORD(buf, self.Value8)
-        buf = CommFunc.WriteWORD(buf, self.UserDataLen)
-        buf = CommFunc.WriteString(buf, self.UserDataLen, self.UserData)
-        return buf
-
-    def getLength(self):
-        length = 0
-        length += sizeof(ctypes.c_ushort)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_double)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ulong)
-        length += sizeof(ctypes.c_ushort)
-        length += self.UserDataLen
-        return length
-
-    def getRecord(self):
-        '''组织存储记录'''
-        rec = {}
-        rec[u'RecType'] = self.RecType
-        rec[u'RecID'] = self.RecID
-        rec[u'Time'] = self.Time
-        rec[u'Value1'] = self.Value1
-        rec[u'Value2'] = self.Value2
-        rec[u'Value3'] = self.Value3
-        rec[u'Value4'] = self.Value4
-        rec[u'Value5'] = self.Value5
-        rec[u'Value6'] = self.Value6
-        rec[u'Value7'] = self.Value7
-        rec[u'Value8'] = self.Value8
-        rec[u'UserDataLen'] = self.UserDataLen
-        rec[u'UserData'] = fix_incomingText(self.UserData)
-        return rec
-
-    def readRecord(self, rec):
-        '''由于MongoDB读出来是unicode,所有字符串需要进行转换'''
-        self.RecType = rec.get(u'RecType', 0)
-        self.RecID = rec.get(u'RecID', 0)
-        self.Time = rec.get(u'Time', 0)
-        self.Value1 = rec.get(u'Value1', 0)
-        self.Value2 = rec.get(u'Value2', 0)
-        self.Value3 = rec.get(u'Value3', 0)
-        self.Value4 = rec.get(u'Value4', 0)
-        self.Value5 = rec.get(u'Value5', 0)
-        self.Value6 = rec.get(u'Value6', 0)
-        self.Value7 = rec.get(u'Value7', 0)
-        self.Value8 = rec.get(u'Value8', 0)
-        self.UserDataLen = rec.get(u'UserDataLen', 0)
-        self.UserData = fix_outgoingText(rec.get(u'UserData', u''))
-
-#Can not implement adoLoadStr method:No key defined!
-#Can not implement adoInsertStr method:No key defined!
-#Can not implement adoUpdateStr method:No key defined!
-#Can not implement adoUpdateStr method:No key defined!
-#Can not implement adoCheckUpdateStr method:No key defined!
-#Can not implement adoCheckUpdateExStr method:No key defined!
-
-    def getAdoRecords(self, resultCollection):
-        '''查询结果打包成二进制流'''
-        result = ''
-        result = CommFunc.WriteDWORD(result, resultCollection.count())
-        for rec in resultCollection:
-            self.readRecord(rec)
-            result += self.getBuffer()
-        return result
-
-#Can not implement adoQueryIndexStr method:No key defined!
-
-    def adoQueryCustom(self, collection, queryDict):
-        '''自定义查询'''
-        resultCollection = collection.find(queryDict)
-
-        return self.getAdoRecords(resultCollection)
-
-
-    def adoQueryAll(self, collection):
-        '''查询所有''' 
-        resultCollection = collection.find()
-         
-        return self.getAdoRecords(resultCollection)
-
-#Can not implement adoDeleteByIndexStr method:No key defined!
-    def outputString(self):
-        output = '''// 通用记录表新 #tagDBGameRec:
-            RecType = %s,
-            RecID = %s,
-            Time = %s,
-            Value1 = %s,
-            Value2 = %s,
-            Value3 = %s,
-            Value4 = %s,
-            Value5 = %s,
-            Value6 = %s,
-            Value7 = %s,
-            Value8 = %s,
-            UserDataLen = %s,
-            UserData = %s,
-            ADOResult = %s,
-            '''%(
-                self.RecType,
-                self.RecID,
-                self.Time,
-                self.Value1,
-                self.Value2,
-                self.Value3,
-                self.Value4,
-                self.Value5,
-                self.Value6,
-                self.Value7,
-                self.Value8,
-                self.UserDataLen,
-                self.UserData,
-                self.ADOResult,
-            )
-        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'''%(
-                self.RecType,
-                self.RecID,
-                self.Time,
-                self.Value1,
-                self.Value2,
-                self.Value3,
-                self.Value4,
-                self.Value5,
-                self.Value6,
-                self.Value7,
-                self.Value8,
-                self.UserDataLen,
-                self.UserData,
-            )
-        return output
 
 
 # 功能队伍表 #tagDBFuncTeam

--
Gitblit v1.8.0