Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_ZWJ

2019-01-07 bc42e044cf0e891ee9651ab27abc306272ada1cb

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
ó 
úZþ[c@sW
dd
lZdd
l
Z
dd
lZdd
lZdd
lZdd
lZdd
lZdd
lZdd
lZdd
l    Z    dd
l
Z
dd
lZdd
lZd„Z d„Zd„Zd„Zd„Zd„Zd„Zd    „Zd
„Zd„Zd„Zd „Zd„Zd„Zd„Zd„Zd„Zd„Zd„Zdd„
Z d
S(iÿÿÿÿNcCsltj
ƒj|ƒ
}|
j}|
j}|d
|}tj||ƒ
tjd|||f|jƒƒ
dS(Ni
sSÐ޸ĶÓÎéÏà¹ØÉóºË״̬: Èë¶ÓÉêÇëÊÇ·ñÐèÒªÉóºË=%s,×é¶ÓÑûÇëÊÇ·ñÐèÒªÉóºË=%s,checkState=%s(    t    GameWorldtGetPlayerManagertGetPlayerByIndextJoinReqChecktInviteCheckt PlayerControltSetTeamCheckStatetDebugLogtGetPlayerID(tindext
clientDatattickt    curPlayertjoinReqChecktinviteCheckt
checkState((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytOnChangeTeamCheckState-s

    
    


    

c
CsdS(
N((RR((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytNotifyPosInfoToPlayer7s    c
CsdS(
N((RR((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytPlayerLoginSetTeamBsc
Csd
S(sæ·ÏÆú¸ÃÂß¼­£¬ÓÉ0502¡¢0503·â°ü½áºÏ´¦Àí
    ·ÏÆúÔ­Òò£º
    ÒòΪµ±Íæ¼ÒÓжÓÎéʱ£¬¼ÓÈë±ðÈ˵ĶÓÎ飬´Ëʱ¸ÃÍæ¼ÒÐèÒªÏÈÍ˳ö¶ÓÎ飨OnTeamͬ²½£©£¬ÔÙ¼ÓÈë¶ÓÎ飨0502ͬ²½£©
    ¶øµØͼ»áÏÈÊÕµ½0502°ü£¬µ¼ÖµØͼ¶ÓÎé¹ÜÀí³öÏÖÒì³££¬ËùÒÔÔÝʱ·ÏÆúOnTeam
    N((R    R((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytGameServer_OnTeamLscCsO|j}|j
}|j}tjd
|||f|ƒ
t||||
ƒ
dS(NsBGameServer_PlayerLeaveTeam playerID=%s,copyMapID=%s,leaveTeamID=%s(tPlayerIDt    CopyMapIDtTeamIDRRt__OnPlayerLeaveTeam(tcurPackDataRtplayerIDt    copyMapIDtleaveTeamID((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytGameServer_PlayerLeaveTeam]s
    
    
    
    


cCsÒ
|j}|j
}|j}|j}i|d
6|d6}tjd||||f|ƒ
tjƒj|ƒ
}|s€|jƒr—t    d||dƒ
dS|j
ƒ}|dkrÕ|rÑt|jƒ|||
ƒ
ndSt ||||
ƒ
|jtj|ƒ
d}    d}
|jƒ}tjtjƒ
}xr|jD]g} || jkrJ
q/
n|rŒ
t|d| jƒrŒ
t|d| jƒƒrŒ
|
d7}
n|    d7}    q/
Wtd|    dd    ƒ}t||ƒ
t||
|
ƒ
dS(
NRtteamLVs=GameServer_TeamInfo playerID=%s,teamID=%s,teamLV=%s,memCnt=%stTeamInfoscurPlayer is None or emptyisGetVIP%di
iè(RRtTeamLVtMemCntRRR
tFindPlayerByIDtIsEmptytDR_Teamt    GetTeamIDRtGetCopyMapIDtRefreshPlayerTeamIDtSetDicttChConfigtDef_PlayerKey_TeamMemCounttGetMapIDt    PlayerViptGetVipPrivilegeDatatVIPPrivilege_TeamVIPBufftMemInfoListtMapIDthasattrtVIPLVtgetattrtmaxtUpdTeamExpRatet__RefreshTeamVIPBuff(RRRtteamIDRtmemCnttdataDictRtplayerTeamIDtsameMapMemCounttsameMapVIPLVtmapIDtteamVIPBuffIpyDatatmemInfotteamExpRate((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytGameServer_TeamInfoxs@
    
    
    
    
 












 
 
c    Csþ|jƒ}t
j|tjƒ\}}}}t}|rI|
rIt}n|r|
r|jƒjƒ}    |    |
krt}qnt    j
d
|
|f|ƒ
|r¦|
s¬|r¼t||ƒ
n|rút
j|tj||
ƒ}
t    j
d|
|
f|ƒ
ndS(Ns7    Í¬µØͼ¶ÓԱͳ¼Æ: sameMapVIPLV=%s,isAddTeamVIPBuff=%ss(__AddTeamVIPBuff sameMapVIPLV=%s,isOK=%s( RtSkillCommontFindBuffByIDR(tDef_SkillID_TeamVIPBufftFalsetTruetGetSkillt
GetSkillLVRRt__DelTeamVIPBufftAddBuffBySkillType(RR;RRtfindBufftbuffManagertbuffTypet    findSkilltisAddTeamVIPBufftbuffLVtisOK((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR5©s 

!

 
    







cCstd
}|jƒ}t
jtjƒ
}|r`t|d|ƒr`t|d|ƒƒr`|d7}nt|||
ƒ
dS(NisGetVIP%di
(tGetVIPLvR+R,R(R-R0R2R5(RRR;tplayerVIPLVR=((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytRefreshTeamVIPBuff_OnNoTeamÂs




 

c Cs”
|jƒ}|j
ƒ}|jƒ}|jƒ}tjd
|||
|f|ƒ
|jƒ}|j|
ƒ

|j|ƒ

i|d6|d6|d6|d6|d6}    |
s©dSt    j    |ƒ
}
|
j
ƒj|
ƒ
}|dkr,
|
j
ƒj |
ƒ
}tjƒjƒt    jkr
|j|
ƒ

ntd|
|    ƒ
n||
ks?
|rd
||
k}t|||||    ƒ
n,|sp
dn    |jƒ|    d    <td
|
|    ƒ
dS(NsHË¢ÐÂÍæ¼Ò¶ÓÎéÐÅÏ¢: playerTeamID=%s,playerCopyMapID=%s,teamID=%s,teamLV=%sRR9tplayerCopyMapIDtplayerTeamLVRtRefreshPlayerTeamID_CreateitMemberCounttRefreshPlayerTeamID_Update(RR$R%t    GetTeamLVRRtGetTeamt    SetTeamIDt    SetTeamLVt IPY_GameWorldtGetTeamManagertFindTeamtNonet
CreateTeamtGetMaptGetMapFBTypetfbtTeamtSetCurrentFBPropertyR#t __OnEnterTeamtGetMemberCount( RR6RRRR9RTRUtcurTeamR8tcurGameWorldt
curMapTeamt    isNewTeam((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR&Ós4




    


 
 





c    CsR
|
jƒ}|
j
ƒ}|tjkrktjd
||f|jƒƒ
td||d|tjfƒ
dStjƒj    ƒt
jkr–|jdƒ

n|j |
ƒ

|j|ƒ

|
j|ƒ

|
j
ƒ|d<td||ƒ
|jƒ}tjj|gƒ}||krD
|j|ƒ

|tj|<tjd||tjfƒ

n|sN
dSdS(Ns0¶ÓÎéÈËÊýÒÑÂú£¬Íæ¼ÒÈë¶Óʧ°Ü!teamID=%s,memCount=%stRefreshPlayerTeamID_EnterErrorsmemCount(%s) >= %si
RWtRefreshPlayerTeamID_Enters&Íæ¼Ò¼ÓÈë¶ÓÎé: teamID=%s,playerID=%s,%s(R$RgtShareDefinetDef_Team_MaxPlayerCountRtErrLogRR#RbRcR]RdtGameServer_TeamEnterFBtSetTeamR[t    AddMembert
PyGameDatatg_teamPlayerDicttgettappendR(    RRjRkRR8R6tmemCountRtteamPlayerIDList((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyRf
s,



 
 

 
 
 





 
 
 

c
CsÅ
tj
d
||
|fƒ

tj|ƒ
}|jƒj|ƒ
}|r||j|
ƒ

|jƒdkr||jƒj|ƒ

q|nt|
t    ƒ
i|
d6|d6}tj
ƒj|
ƒ
}|sÅ|jƒrÜt d||dƒ
dS|jƒ}|jƒ}    tj|    ƒ
}|ji|d6|    d6ƒ

t d||ƒ
||kr´
|jdƒ

|jdƒ

|jdƒ

t||ƒ
|jƒjƒd    kr´
tjƒjƒtjkr´
|jdƒ

q´
nt||ƒ
dS(
Ns=__OnPlayerLeaveTeam copyMapID=%s, playerID=%s, leaveTeamID=%siRRtPlayerLeaveTeamscurPlayer is None or emptyR9RTi
(RRR]R^R_tDeleteMemberRgt
DeleteTeamt__DelPlayerIDFromTeamPlayerRDR
R!R"R#R$R%tupdateRrR`R[R\t__CleanTeamEffecttGetMapCopyPlayerManagertGetPlayerCountRbRcttmtTeamReRS(
RRRRRiRjR8RR9RT((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR"
s6


 
 






 
 
  3
 
cCs't|d
ƒ
t
j|tj|
ƒ
dS(Ni(R4t    BuffSkilltDelBuffBySkillIDR(tDef_SkillID_DropOwnerBuff(RR((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyRS
s
 
cCs8tj
|tj|
ƒr4tj|ƒ
}|jƒ
ndS(
N(RƒR„R(RCRtRefreshPlayerAttrByBuff(RRt playerControl((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyRHY
s

 
cCs@|
|jt
jƒ
krdS|jt
j|
ƒ
tj|ƒ

dS(
N(tGetDictByKeyR(tDef_PlayerKey_TeamExpRateR'RtSync_ExpRateChange(Rt
updExpRate((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR4b
s


 
cCs!
|jƒ}|dkrdStjd
|jƒ||jƒf|jƒƒ
t||
ƒ
|jdƒ

|jƒ}|jƒ}i|d6|d6|jƒd6}|j    ƒdk
rÚtj
ƒj|ƒ

d|d<d|d<n|j|ƒ

|j    ƒ|d<t d    ||ƒ
|s
t|tƒ
ntS(
Ns8¶ÓÎé³ÉÔ±À뿪µØͼ: temaID=%s,isDisconnect=%s,copyMapID=%sRtisDisconnectRTi
iRWR|tPlayerLeaveMap(RZR`RRR$R%RRRrRgR^R|R{R#R}RE(RRRŒRhR6RR8((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytTeamPlayerLeaveMapk
s&/
  

!



  


cCs›x”tj
jƒD]ƒ\}}||kr.qn|j|ƒ

tjd
|
||fƒ

|stj
j|ƒ

tjd|ƒ

ntjdtj
ƒ

qWdS(Ns0Íæ¼ÒÀ뿪¶ÓÎé!isleaveMap=%s,teamID=%s,playerID=%ss'    µØͼ¶ÓÎéûÈËÁË£¬É¾³ý¶ÓÎ飡teamID=%ss"    PyGameData.g_teamPlayerDict=%s(RtRutitemstremoveRRtpop(Rt
isleaveMapR6Ry((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR}Ž
s



 





c

Cstj
j|gƒS(
N(RtRuRv(
R6((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pytGetMapTeamPlayerIDListš
sc
Cs
t}
xÝt
jjƒD]Ì\}}g}xo|D]g}tj|ƒ
}|sPq/n||tjkr/|j|ƒ

t    j
d
||||fƒ

t}
q/q/Wx|D]}|j|ƒ

q¡W|st
jj |ƒ

t    j
d|ƒ

qqW|
r
t    j
dt
jƒ

ndS(NsB    ÒƳýÀëÏß±£»¤µÄ¶ÓÔ±: teamID=%s,leaveTick=%s,tick=%s,playerID=%ss2    ¶ÓÎéÒÑûÓб£»¤ÖеĶÓÔ±, É¾³ý¶ÓÎé¼Ç¼!teamID=%ss"    PyGameData.g_teamPlayerDict=%s(RDRtRuRRtGetPlayerLeaveServerTickR(tDef_PlayerOfflineProtectTimeRwRRRERR‘(Rt    isTimeoutR6RyttimeoutPlayerIDListRt    leaveTickttimeoutPlayerID((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyt"OnCheckTeamPlayerDisconnectTimeoutž
s&


 



 

  




cCs)tj
ƒj|ƒ
}tj||
ƒ
dS(
N(RR
RtFBLogictGameServer_LeaveFB(R    RR((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyRœ¿
s


tcCsLi|d
6|
d6|d6}|j|ƒ

t
jdtjƒjƒ|ƒ
dS(Nt    EventNameRtInfosTeam_%s(R~tDataRecordPackt SendEventPackRRbR*(t    eventNameR6R8tinfotdrDict((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyR#Ä
s

 
 
(!RƒRRR›R(RAR]R Rnt
SkillShellt PlayerSuccessRtR+RRRRRR@R5RSR&RfRRRHR4RŽR}R“RšRœR#(((sjE:\SnxxServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\PlayerTeam.pyt<module>s@










    
        
            1            /         1                        #            !