Fix: 1536 【BUG】娲皇遗迹层数进入错误； 瞬间同时退出时可能导致该bug，修改为按最后一个退出的方式判断；

hxp

2018-08-14 2f15c6d63f5fac729c0d373b94f88d6ee0614fa3

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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
ó 
Ç¿r[c@s~
dd
lZdd
l
Z
dd
lZdd
lZdd
lZdd
lZdd
lZdd
lZdd
lZdd
l    Z    dd
l
Z
dd
lZd„Zd„Z d„Zd„Zd„Zd„Zd„Zd    „Zd
„Zd„Zd„Zd „Zd„Zd„Zd„Zd„Zd„Zd„Zd„Zd„Zd„Z d„Z!d„Z"d„Z#d„Z$d„Z%d
S(iÿÿÿÿNcCsÆ|jƒd
krBt
jd|jƒ|jƒ|jƒfƒ

dSt
jd|jƒ|jƒfƒ

|jtjƒ

|j    |
ƒ

|j
d
ƒ

t
jƒ}|jd
ƒ

|j |
ƒ

tj|
ƒ

dS(Nis5FB Open! lineID = %s, openState = %s, OpenFBTick = %ss$FB Open! lineID = %s, openState = %s(t GetOpenFBTickt    GameWorldtErrLogt    GetLineIDtGetOpenStatetLogtSetOpenStatet IPY_GameWorldtfbosOpent SetOpenFBTicktSetCloseFBTickt    GetGameFBt    SetFBStept SetFBStepTicktFBLogictOnOpenFB(t    gameWorldtticktgameFB((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__OpenFB8s

    
#
#
 
 
 
  
cCs¾tj
|
ƒ

|jd
ƒ

|jd
ƒ

|jd
ƒ

|jƒ}|jd
ƒ

|jd
ƒ

tj    d|j
ƒ|jƒfƒ

|jt jƒ

|jƒ}|jƒ}|d
krµdStjƒ
tj|jƒƒ
}i}g}tjƒ}x6t|jƒƒ
D]"}    |j|    ƒ
}
|j|
ƒ

qÿWxÛ|D]Ó}|s,
|jƒrK
q,
n|t jkro
|jtjƒ
}n*|jƒtj kr“
|j!ƒ}nd
}|j"ƒ} |rõ
| j#ƒtj$krõ
|j%|gƒ}|jt&j'| ƒ
ƒ

|||<n|j(ƒ
q,
W|tj)krn|rnxS|j*ƒD]B\}}tj    d||ƒ
t+j,d|g
||jƒg
ƒ
q%Wn|j-ƒ}|j.ƒd
kr |jt j/ƒ

dS|jt jƒ

t0|ƒ

dS(Nis%FB Close! lineID = %s, openState = %ss·¢ËÍδʰȡµÄÎïÆ·¸øÍæ¼Ò: %stItemNoPickUp(1Rt    OnCloseFBR    R
tSetFBFirstOpenRtSetPlayerLogoffTicktSetIsSafeCloseR
RRRRRt
fbosClosedtGetMaptGetMapFBTypetFBCommont
ClearFBNPCtGetRecordMapIDtGetMapIDtGetMapItemManagertxrangetGetMapItemCounttGetMapItemByIndextappendtIsEmptyt    fbtSingletGetGameFBDictByKeytChConfigtDef_FB_SingleFBPlayerIDtGetOwnerTypetDef_NPCHurtTypePlayert
GetOwnerIDtGetItemtGetTypetDef_ItemType_Moneytgett
ItemCommontGetMailItemDictt    DisappeartDef_SendUnPickItemMailMapIDListtitemst PlayerControlt SendMailByKeytGetMapCopyPlayerManagertGetPlayerCounttfbosWaitForClosetFreeOrClearFBByAutoSize(RRt    gameFBMgrtgameMaptfbTypetmapIDtunPickItemDicttmapItem_ListtmapItemManagertindext
curMapItemtmapItemtownerIDtcurItemtmailItemListt playerManager((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt    __CloseFBSs\  
 
 
 
 #








 








 


)


c
Cs?|jƒj
ƒd
kr1tjƒ}
|
jƒ
n
|jƒ
dS(Ni(RtGetAutoSizeR
RtClearR(RR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR;žs

 cCs™|jƒt
jkrdS|jƒ}x6t|jƒƒ
D]"}|j|ƒ
}tj|ƒ

q8Wt    j
ƒjd
ƒ

t    jd|jƒƒ

t ||
ƒ
dS(Nis---------------%d(RRRR8trangeR9tGetPlayerByIndexR6t PlayerLeaveFBR
RtGameServer_FbInfoRefreshRRJ(RRRIt
it    curPlayer((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__KickAllPlayerAndCloseFB­s



 
cCs
|jƒ}|d
krdSt
jƒjƒ}|d
kr>dS|
|jƒ|k
rXdStj|
ƒ

|jƒ}x_td
|jƒƒD]H}|j    |ƒ
}|
|j
ƒ}||dkrÂq‡ntj|ƒ

q‡Wt
j d|jƒ|jƒfƒ

t||
ƒ
dS(Niis4__ProcessTimeKickPlayer! LineID = %s, openState = %s(RR
RtGetExistTimeRtDoFBTimeOutR8RMR9RNtGetLoginTickt
EventShelltEventResponse_OnFBTimeOutRRRRS(RRtopenTickt    existTimeRIRQRRtplayerExistTime((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessTimeKickPlayerÅs&

 

# 
cCs|jƒ}|d
krdS|j
ƒtjkrB|jd
ƒ

dS|
|tjk
rYdStjd|j    ƒ|j
ƒfƒ

t
||
ƒ
dS(Nis7__ProcessFBDelayKickPlayer! LineID = %s, openState = %s(tGetCloseFBTickRRRR
R(tDef_FBKickPlayerTimeR
RRRS(RRtcloseFBTick((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessFBDelayKickPlayerñs

 
# 
cCs.|jƒsdSt
||
ƒ
|jd
ƒ

dS(Ni(tGetFBFirstOpenRR(RR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt __ProcessOpen 
s


  
c
Cs9tj
ƒ}
tjƒjƒd
kr(dSt|
|ƒ
dS(Ni(R
tGetGameWorldRRKRb(RR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pytEnterOpenFB
s


c    Cs>
|jƒsdS|j
ƒ}|jƒd
kr2dStjƒjƒsHdStjƒ}|jƒ}|tj    krÁtj    |\}}|dkr®|
|}|t
jkr®dSntj    j|ƒ

n@|j ƒ}|d
krÝdS|jƒr

|
|t
jkr

dStjd|jƒ|jƒ|jƒfƒ

t||
ƒ
dS(Nii
s=__ProcessClose! LineID = %s, openState = %s, isSafeClose = %s(t    GetInitOKR8R9R
RRKRtGetCurGameWorldIndext
PyGameDatatg_lastExitFBTypeR(tDef_EmptyFBKeepTimetpoptGetPlayerLogoffTicktGetIsSafeCloseRRRRS(    RRRIRtfbIndext
exitFBTypetexitTicktpassTickt
logOffTick((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessClose*
s2









     
# 
cCsptj
s dS|
|jƒdkr'dStjƒ}|jƒtjkrLdS|j|
ƒ

|j    ƒ
t
t_
dS(Ni
ièi'(Rgtg_needRefreshMapServerStatetGetSyncMapServerStateTickR
RRRtfbtNulltSetSyncMapServerStateTicktGameServer_MapServerStatetFalse(RRR=((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessRefreshMapServerStatee
s
    


 


    
c
Csctj
ƒ}
|
jtjƒ
}|d
kr.dS||tjtjkrLdS|
jtj|ƒ
dS(Niÿÿÿÿ(R
Rct GetTickByTypeR(tTYPE_Map_Tick_MapAcPlayertTYPE_Map_Tick_Timet SetTickByType(RRtlastTick((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessMapServerAcPlayer|
s



cCsF
tj
ƒ}|j|
jƒ|
jƒƒs¨tj|
jƒ|
jƒtjƒ\}}|d
kr¨|d
kr¨tj    d|
j
ƒ|
jƒ|
jƒfƒ

tjdfSn|
j
ƒtj kr

|jƒjƒsÖtjS|jƒr

|j|jƒƒ
r

tjSntj|
ƒ
s
tjdfStj|
|ƒ}|dkrB
tjS|S(Nis@´«ËÍÖÁÄ¿±êµãΪÕÏ°­µã, ´«ËÍʧ°Ü, mapid = %s, posX = %s, posY = %ss#04BBF813-7A30-47A8-927DE1ACCC4F378EtFB_andyshao_861048(R
RtCanMovetGetPosXtGetPosYtGameMaptGetNearbyPosByDisR(tDef_RebornPos_Area_RangeRRRt    cmeCustomtDef_FB_SystemAssignMapIDListtGetPlayerManagertIsPlayerCanLogint cmePlayerFullRKt IsMapCopyFulltGetBMChangeMapAskCountRtCheckFBStateCanEnterRtOnChangeMapAsktNonet    cmeAccept(Rt    askStructRR=tnearPosXtnearPosYtchangeMapAskResult((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessCurrentChangeMapAsk’
s$

*

    
#
!
 c
Csštj
ƒ}
x}t|
jƒƒ
D]i}|
j|ƒ
}t|
||ƒ}t|ƒ
tkrg|d
f}n|
j|j    ƒ|d|dƒ
qW|
j
ƒ
dS(Ntii
(R
RcRMRtGetBMChangeMapAskAtR–ttypetinttRouteServer_ChangeMapAnswertGetPlayerIDtClearBMChangeMapAsk(RRRQtasktresult((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt__ProcessChangeMapAskº
s




%

c

Cstj
tƒ
|ƒ

dS(
N(R
tGetPsycoFunct__Func_OnGameWorldProcess(
R((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pytOnGameWorldProcessÌ
s

c
Cs­tj
ƒ}
|
jƒsdSt|
|ƒ
t|
|ƒ
t|
|ƒ
t|
|ƒ
t|ƒ

t|ƒ

t    j
|ƒ

t|
|ƒ
t|
|ƒ
t |ƒ

t|ƒ

tjƒ
dS(
N(R
RcReRbR\R`RrRR Rt    OnProcessRyt__ProcessRouteServert__RefreshOnMinutet__RefreshOnFiveMinutetEventReporttOnTimeCloseScribeTxt(RR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR¢Ô
s 


    
 
 
 
 

cCsg|jt
jƒ
}|d
kr"dS|
|t
jt
jkr@dS|jt
j|
ƒ
tjƒjƒ
dS(Niÿÿÿÿ(RzR(t!TYPE_Map_Tick_SendMsg_RouteServerR|R}R
Rct SendHeartBeat(RRR~((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR¥û
s

c
Csltj
ƒ}
tjƒ
tjƒ
tj|ƒ

|
jt    j
ƒ

tjƒ
t |
ƒ

|
jtƒ

|
jƒ
dS(
N(R
RcR1t
InitPyItemRWtDoReloadRefreshRtOnInittSetTickTypeCountR(tTYPE_Map_Tick_CountR¨tInitDllAppIDtGameServer_CommMapServerInitOKt    SetInitOKtTruetBalanceServer_MapServerInitOK(RR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt InitGameWorlds


 
 
 
 

c
Csztj
ƒjƒtjkrvt|jƒ|jƒ|jƒ|j    ƒgƒ
}
tj
ƒjd
d
d
d|
t|
ƒ
ƒ
ndS(s‡
    Í¨ÖªGameServerµØͼÆô¶¯Íê±Ï
    GetMapID=10010,GetLineID=0,GetRealMapID=10010,GetCopyMapID=0,GetLineNO=-1
    GetMapID=10010,GetLineID=1,GetRealMapID=10010,GetCopyMapID=1,GetLineNO=-1
    GetMapID=10010,GetLineID=2,GetRealMapID=10010,GetCopyMapID=2,GetLineNO=-1
    GetMapID=10010,GetLineID=3,GetRealMapID=10010,GetCopyMapID=3,GetLineNO=-1
    GetMapID=10010,GetLineID=4,GetRealMapID=10010,GetCopyMapID=4,GetLineNO=-1
    GetMapID=10010,GetLineID=5,GetRealMapID=10011,GetCopyMapID=0,GetLineNO=-1
    GetMapID=10010,GetLineID=6,GetRealMapID=10011,GetCopyMapID=1,GetLineNO=-1
    GetMapID=10010,GetLineID=7,GetRealMapID=10011,GetCopyMapID=2,GetLineNO=-1
    GameWorld.DebugLog("GetMapID=%s,GetLineID=%s,GetRealMapID=%s,GetCopyMapID=%s,GetLineNO=%s" 
                       % (gameWorld.GetMapID(), gameWorld.GetLineID(), gameWorld.GetRealMapID(), gameWorld.GetCopyMapID(), gameWorld.GetLineNO()))
    itCommMapServerInitOKN( R
RRRRutstrRRtGetRealMapIDtGetCopyMapIDR‰tGameServer_QueryPlayerResulttlen(RtmsgInfo((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR²"s
0
+
c

Cstj
ƒj|ƒ

dS(
N(R
RcR
(
R((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pytCloseFB;s

cCsˆtj
ƒ}|jƒ}
|
jƒd
kr.dS|
jƒd
krDdS|jƒ}|jƒdkr„ttj
ƒtj
ƒjƒƒ
ndS(Nii
(    R
RcRRRKR8R9RJtGetTick(RR=RI((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pytOnPlayerLeaveMapCloseFBCs



cCsttj
ƒ}tjƒ}|jd
|jƒƒ
|jd|jƒƒ
|jd|jƒƒ
|jd|jƒƒ
dS(Ni
iii(    RtIPY_MPlayerCountByCountryR
RctSetPlayerByCountryCounttGetCountry1CounttGetCountry2CounttGetCountry3CounttGetCountryOtherCount(RCRtpackR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pytGameSever_PlayerCountByCountryjs




c

CsFtj
d
ƒ

tjƒjdddddƒ
tjƒjd|ƒ
dS(Ns×¢²á¼¶Áª¼ÆʱÆ÷tProcessFighti‚tPlayerStatetPlayerProcessFighti
(R
RRct
RegLvTimertStartLvTimer(
R((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyŔs

 

 
c
CsYtj
ƒ}
|
jtjƒ
}tjtj}|||krBdS|
jtj|ƒ
dS(
N(R
RcRzR(tTYPE_Map_Tick_ProcessFiveMinuteR|R}(RRR~ttickInterval((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR§s





c
CsÆtj
ƒ}
|
jtjƒ
}tjtj}|||krBdS|
jtj|ƒ
tjƒ}t||ƒ
tj    ƒ}xEt
|jƒƒ
D]1}|j|ƒ
}|s®qnt |||ƒ
qWdS(
N(R
RcRzR(tTYPE_Map_Tick_ProcessMinuteR|R}tGetCurrentTimet __OnMapMinuteR8R!R9RNt__ProcessHalfHour(RRR~RÏtcurTimeRIRCRR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyR¦¢s





 




cCs6|j}|t
jkrdS|t
_tj|
ƒ

dS(
N(tminuteRgtg_mapLastProcess_Minutet
PlayerTeamt"OnCheckTeamPlayerDisconnectTimeout(RÔRt    curMinute((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyRÒ·s    


    
 
cCs$|
jdkrdSt
j|ƒ

dS(Nii(ii(RÕRWtEventResponse_OnHalfHour(RRRÔR((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyRÓÆs

 
(&RR
R(R6RWRRR¨R1RgR×R„RRJR;RSR\R`RbRdRrRyRR–R R£R¢R¥R¶R²R¾RÀRÈRÌR§R¦RÒRÓ(((sh.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\GameWorldLogic\GameWorldProcess.pyt<module>&sJ










        K            ,                ;            (            '                    '