16 卡牌服务端（删除大师天赋）

hxp

5 天以前 0461f0bb6c710ee89856ffa4d1f75c868c69295f

16 卡牌服务端（删除大师天赋）

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -936,22 +936,6 @@
PacketSubCMD_4=0x46

PacketCallFunc_4=OnBuyTongTianLing



;大师天赋

[PlayerGreatMaster]

ScriptName = Player\PlayerGreatMaster.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 2



PacketCMD_1=0xA5

PacketSubCMD_1=0x49

PacketCallFunc_1=OnAddMasterSkillPoint



PacketCMD_2=0xA5

PacketSubCMD_2=0x50

PacketCallFunc_2=OnResetMasterSkill



;装备洗练

[EquipWash]

ScriptName = Event\EventSrc\Operate_EquipWash.py


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -4145,11 +4145,6 @@
Def_PDict_TTL_TaskAwardRecord = "TTL_TaskAwardRecord_%s" # 通天任务领奖记录,参数(key编号),按索引位存储0-未领,1-已领

Def_PDict_TTL_DailyTaskPointToday = "TTL_DailyTaskPointToday" # 每日通天任务每日可获得积分点上限



# 大师 Def_PDictType_GreatMaster

Def_PDict_Master_Exp = "Master_Exp" # 当前大师经验

Def_PDict_Master_ExpPoint = "Master_ExpPoint" # 当前大师经验点

Def_PDict_Master_FreeSkillPoint = "Master_FreeSkillPoint" # 当前剩余大师技能点



# 跨服竞技场

Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分

Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py

@@ -5474,124 +5474,6 @@




#------------------------------------------------------

# A5 49 大师天赋技能加点 #tagCMAddMasterSkillPoint



class  tagCMMasterSkillPoint(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("SkillID", c_int),    # 天赋技能ID

                  ("AddPoint", c_ubyte),    # 加的点数

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xA5

        self.SubCmd = 0x49

        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.Cmd = 0xA5

        self.SubCmd = 0x49

        self.SkillID = 0

        self.AddPoint = 0

        return



    def GetLength(self):

        return sizeof(tagCMMasterSkillPoint)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''// A5 49 大师天赋技能加点 //tagCMAddMasterSkillPoint:

                                Cmd:%s,

                                SubCmd:%s,

                                SkillID:%d,

                                AddPoint:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.SkillID,

                                self.AddPoint

                                )

        return DumpString





class  tagCMAddMasterSkillPoint(Structure):

    Head = tagHead()

    SkillCnt = 0    #(BYTE SkillCnt)// 变更技能个数

    AddSkillPointList = list()    #(vector<tagCMMasterSkillPoint> AddSkillPointList)// 加的技能点数列表

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xA5

        self.Head.SubCmd = 0x49

        return



    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

        self.SkillCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        for i in range(self.SkillCnt):

            temAddSkillPointList = tagCMMasterSkillPoint()

            _pos = temAddSkillPointList.ReadData(_lpData, _pos)

            self.AddSkillPointList.append(temAddSkillPointList)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xA5

        self.Head.SubCmd = 0x49

        self.SkillCnt = 0

        self.AddSkillPointList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 1

        for i in range(self.SkillCnt):

            length += self.AddSkillPointList[i].GetLength()



        return length



    def GetBuffer(self):

        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteBYTE(data, self.SkillCnt)

        for i in range(self.SkillCnt):

            data = CommFunc.WriteString(data, self.AddSkillPointList[i].GetLength(), self.AddSkillPointList[i].GetBuffer())

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                SkillCnt:%d,

                                AddSkillPointList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.SkillCnt,

                                "..."

                                )

        return DumpString





m_NAtagCMAddMasterSkillPoint=tagCMAddMasterSkillPoint()

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





#------------------------------------------------------

#A5 05 玩家开始副本扫荡 #tagCMBeginFBWipeOut



class  tagCMBeginFBWipeOut(Structure):

@@ -7172,62 +7054,6 @@


m_NAtagCMEquipPartSuiteActivate=tagCMEquipPartSuiteActivate()

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





#------------------------------------------------------

# A5 48 兑换大师等级经验 #tagCMExchangeMasterEXP



class  tagCMExchangeMasterEXP(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("Multiples", c_ubyte),    # 20亿经验倍数

                  ("ExtraExp", c_int),    # 额外附加经验(不超过20亿)

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xA5

        self.SubCmd = 0x48

        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.Cmd = 0xA5

        self.SubCmd = 0x48

        self.Multiples = 0

        self.ExtraExp = 0

        return



    def GetLength(self):

        return sizeof(tagCMExchangeMasterEXP)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''// A5 48 兑换大师等级经验 //tagCMExchangeMasterEXP:

                                Cmd:%s,

                                SubCmd:%s,

                                Multiples:%d,

                                ExtraExp:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.Multiples,

                                self.ExtraExp

                                )

        return DumpString





m_NAtagCMExchangeMasterEXP=tagCMExchangeMasterEXP()

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





#------------------------------------------------------

@@ -9232,54 +9058,6 @@


m_NAtagCMResetFBJoinCnt=tagCMResetFBJoinCnt()

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





#------------------------------------------------------

# A5 50 重置大师天赋技能 #tagCMResetMasterSkill



class  tagCMResetMasterSkill(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xA5

        self.SubCmd = 0x50

        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.Cmd = 0xA5

        self.SubCmd = 0x50

        return



    def GetLength(self):

        return sizeof(tagCMResetMasterSkill)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''// A5 50 重置大师天赋技能 //tagCMResetMasterSkill:

                                Cmd:%s,

                                SubCmd:%s

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd

                                )

        return DumpString





m_NAtagCMResetMasterSkill=tagCMResetMasterSkill()

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





#------------------------------------------------------


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.py

File was deleted

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetGreatMasterPoint.py

File was deleted

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SkillReset.py

@@ -16,7 +16,6 @@
#---------------------------------------------------------------------

#"""Version = 2016-03-24 17:00"""



import PlayerGreatMaster

import PlayerControl

#import GameWorld

#import Lang

@@ -33,8 +32,6 @@
    #    GameWorld.DebugAnswer(curPlayer, Lang.GBText("命令参数不正确"))

    #    return

    #===========================================================================

    # 先重置大师技能，归还大师天赋点

    PlayerGreatMaster.DoResetMasterSkillPoint(curPlayer)

    

    skillManager=curPlayer.GetSkillManager()

    #===========================================================================


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py

@@ -61,7 +61,6 @@
import PlayerRecover

import GameLogic_SkyTower

import PlayerEquipDecompose

import PlayerGreatMaster

import PlayerGatherSoul

import PlayerGatherTheSoul

import PlayerFairyDomain

@@ -556,9 +555,6 @@
    

    #PKģʽ

    SyncPKModel(curPlayer)

    
    #大师

    PlayerGreatMaster.MasterOnLogin(curPlayer)

    

    #֪ͨVIP

    PlayerVip.DoOnLogin(curPlayer, tick)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py

@@ -41,7 +41,6 @@
import PlayerCrossChampionship

import PlayerFreeGoods

import FunctionNPCCommon

import PlayerGreatMaster

import PlayerActBuyCountGift

import PlayerActLoginNew

import PlayerActTask

@@ -70,7 +69,6 @@
                     ShareDefine.GameFuncID_FreeGoods:lambda curObj:PlayerFreeGoods.DoFreeGoodsOpen(curObj),

                     ShareDefine.GameFuncID_OSSail:lambda curObj:FunctionNPCCommon.OSSaleOpenMail(curObj),

                     ShareDefine.GameFuncID_AddPoint:lambda curObj:PlayerControl.DoAddPointOpen(curObj),

                     ShareDefine.GameFuncID_Talent:lambda curObj:PlayerGreatMaster.DoTalentOpen(curObj),

                     ShareDefine.GameFuncID_Arena:lambda curObj:PlayerArena.DoArenaOpen(curObj),

                     ShareDefine.GameFuncID_FaQi:lambda curObj:PlayerFaQi.DoFaQiOpen(curObj),

                     ShareDefine.GameFuncID_LianTi:lambda curObj:PlayerLianTi.DoLianTiOpen(curObj),


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.py

File was deleted

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py

@@ -32,7 +32,6 @@
import DataRecordPack

#import ChItem

import ShareDefine

import PlayerGreatMaster

import PlayerHorse

import GameObj

import random

@@ -1891,9 +1890,9 @@
#        if not PlayerHorse.CheckLearnHorseSkill(curPlayer, curSkillTypeID):

#            return False

    #天赋技学习点数判断

    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:

        if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):

            return False

    #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:

    #    if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):

    #        return False

        

    #经验检测

    skillLvUpNeedExp = upSkill.GetLVUpCostExp()

@@ -1958,8 +1957,8 @@
        #GeRen_jin_474794  <n color="255,255,0" BKCOLOR="0,0,0">您消耗了经验值:</n><n color="0,190,255" BKCOLOR="0,0,0">{%S1%}</n>

        PlayerControl.NotifyCode(curPlayer, "GeRen_jin_474794", [skillLvUpNeedExp])

    

    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:

        PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, -1)

    #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:

    #    PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, -1)

    return True

#---------------------------------------------------------------------

##检测学习技能需求条件