Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

hxp

3 天以前 dc0b92c1e2fe9f3d24c183b325dad54d088735c1

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py

@@ -740,94 +740,18 @@
                                                os.path.join(GlobalFunctions.getServerConfigPath(),

                                                                CommonDefine.SYSDB_PATH,

                                                                'tagChinNPC.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPCRefresh,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagNPCRefresh.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinSkill,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinSkill.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinExp,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinExp.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinItem,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinItem.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagTransportRefresh,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagTransportRefresh.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinShopItem,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinShopItem.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBornRefresh,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagBornRefresh.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMixItem,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinMixItem.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBuildEquip,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagBuildEquip.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteActivation,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagSuiteActivation.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteEffect,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagSuiteEffect.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagRepeatEvent,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagRepeatEvent.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagEffectRefresh,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagEffectRefresh.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMap,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagChinMap.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagDBStoreItem,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagDBStoreItem.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagOnMissionDelete,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagOnMissionDelete.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPet,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagPet.txt'))   
    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetGrade,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagPetGrade.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetFriendliness,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagPetFriendliness.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetExp,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagPetExp.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPC_Item_Pet,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagNPC_Item_Pet.txt'))

    sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagFlyObjBaseInfo,

                                        os.path.join(GlobalFunctions.getServerConfigPath(),

                                                    CommonDefine.SYSDB_PATH,

                                                    'tagFlyObjBaseInfo.txt'))





    #压缩


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.py

@@ -1898,7 +1898,7 @@
        ('ItemGUID', ctypes.c_char * 40),

        ('PlayerID', ctypes.c_ulong),

        ('ItemTypeID', ctypes.c_ulong),

        ('Count', ctypes.c_ushort),

        ('Count', ctypes.c_ulong),

        ('IsLocked', ctypes.c_ubyte),

        ('ItemPlaceType', ctypes.c_ubyte),

        ('ItemPlaceIndex', ctypes.c_ushort),

@@ -1946,7 +1946,7 @@
        self.ItemGUID, pos = CommFunc.ReadString(buf, pos, 40)

        self.PlayerID, pos = CommFunc.ReadDWORD(buf, pos)

        self.ItemTypeID, pos = CommFunc.ReadDWORD(buf, pos)

        self.Count, pos = CommFunc.ReadWORD(buf, pos)

        self.Count, pos = CommFunc.ReadDWORD(buf, pos)

        self.IsLocked, pos = CommFunc.ReadBYTE(buf, pos)

        self.ItemPlaceType, pos = CommFunc.ReadBYTE(buf, pos)

        self.ItemPlaceIndex, pos = CommFunc.ReadWORD(buf, pos)

@@ -1965,7 +1965,7 @@
        buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 40, self.ItemGUID)

        buf = CommFunc.WriteDWORD(buf, self.PlayerID)

        buf = CommFunc.WriteDWORD(buf, self.ItemTypeID)

        buf = CommFunc.WriteWORD(buf, self.Count)

        buf = CommFunc.WriteDWORD(buf, self.Count)

        buf = CommFunc.WriteBYTE(buf, self.IsLocked)

        buf = CommFunc.WriteBYTE(buf, self.ItemPlaceType)

        buf = CommFunc.WriteWORD(buf, self.ItemPlaceIndex)

@@ -1983,7 +1983,7 @@
        length += sizeof(ctypes.c_char) * 40

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ushort)

        length += sizeof(ctypes.c_ulong)

        length += sizeof(ctypes.c_ubyte)

        length += sizeof(ctypes.c_ubyte)

        length += sizeof(ctypes.c_ushort)

@@ -2259,7 +2259,6 @@
            self.CreateTime = Str

        else:

            self.CreateTime = Str[:30]