Merge remote-tracking branch 'remotes/origin/master'

hxp

2018-08-16 8f476186cf97ffc569a9ba2845c53e15a392c442

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -13447,7 +13447,8 @@
                  ("Index", c_ubyte),    # 找回项索引

                  ("RecoverCnt", c_ubyte),    # 可找回次数

                  ("ExtraCnt", c_ubyte),    # VIP额外次数

                  ("ExtraData", c_ubyte),    # 额外参数

                  ("ExtraData", c_ubyte),    # 额外参数1

                  ("ExtraData2", c_ubyte),    # 额外参数2

                  ]



    def __init__(self):

@@ -13464,6 +13465,7 @@
        self.RecoverCnt = 0

        self.ExtraCnt = 0

        self.ExtraData = 0

        self.ExtraData2 = 0

        return



    def GetLength(self):

@@ -13477,13 +13479,15 @@
                                Index:%d,

                                RecoverCnt:%d,

                                ExtraCnt:%d,

                                ExtraData:%d

                                ExtraData:%d,

                                ExtraData2:%d

                                '''\

                                %(

                                self.Index,

                                self.RecoverCnt,

                                self.ExtraCnt,

                                self.ExtraData

                                self.ExtraData,

                                self.ExtraData2

                                )

        return DumpString



@@ -18736,6 +18740,7 @@
                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("FirstGoldRewardState", c_ubyte),    #首充奖励是否已领奖

                  ("FirstGoldTry", c_ubyte),    #首充试用状态0-不可试用 1-可试用 2-已试用

                  ]



    def __init__(self):

@@ -18753,6 +18758,7 @@
        self.Cmd = 0xAA

        self.SubCmd = 0x02

        self.FirstGoldRewardState = 0

        self.FirstGoldTry = 0

        return



    def GetLength(self):

@@ -18765,12 +18771,14 @@
        DumpString = '''// AA 02 首充信息 //tagMCFirstGoldInfo:

                                Cmd:%s,

                                SubCmd:%s,

                                FirstGoldRewardState:%d

                                FirstGoldRewardState:%d,

                                FirstGoldTry:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.FirstGoldRewardState

                                self.FirstGoldRewardState,

                                self.FirstGoldTry

                                )

        return DumpString



@@ -18788,7 +18796,6 @@
                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("FirstGoldRemainTime", c_int),    #首充提示剩余时间

                  ("FirstGoldTry", c_ubyte),    #首充试用状态0-不可试用 1-可试用 2-已试用

                  ]



    def __init__(self):

@@ -18806,7 +18813,6 @@
        self.Cmd = 0xAA

        self.SubCmd = 0x08

        self.FirstGoldRemainTime = 0

        self.FirstGoldTry = 0

        return



    def GetLength(self):

@@ -18819,14 +18825,12 @@
        DumpString = '''// AA 08 首充提示剩余时间 //tagMCFirstGoldTime:

                                Cmd:%s,

                                SubCmd:%s,

                                FirstGoldRemainTime:%d,

                                FirstGoldTry:%d

                                FirstGoldRemainTime:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.FirstGoldRemainTime,

                                self.FirstGoldTry

                                self.FirstGoldRemainTime

                                )

        return DumpString