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

hwj35

6 小时以前 f067cdb91542e6841dc098cd434266ffd3f8ca8d

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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
ó 
ÕM¢jc@sð
dd
lZdd
l
Z
dd
lZdd
lZdd
lZdd
lZdd
lZdd
lZdd
lZd
e
d„Zd„Zid„
Z d„Zd„Zd„Zd„Zd    „Zd
„Zd„Zd„Zd „Zd„Zd„Zdid„Zd„Zid„
Zd„Zdd„
Zd„Zid„
Zid„
Z d„Z!d„Z"id„
Z#id„
Z$d„Z%id„
Z&d„Z'd „Z(d!„Z)d"„Z*id#„
Z+d$„Z,d%„Z-id&„
Z.d'„Z/d(„Z0d
S()iÿÿÿÿNcCsõ|r#tj
ƒr#tjd
ƒ

dS|r—tj|ƒ
s<dS|jtjƒ
}|ra||
d<ntj|ƒ
|
d<|j    ƒ|
d<|j
ƒ|
d<nttjj ƒƒ
jdƒ
d|
d<t|
ƒ
}tjƒj|t|ƒ
|t|ƒ
ƒ
dS(    NsÕ½¶··þÎñÆ÷Ôݲ»×öÁ÷Ïò¼Ç¼tpidt
fightPowertPlayerLVtIPs
.ittime(t    GameWorldtIsBattleServert
DebugLogExtIsNormalPlayertNomalDictGetPropertytChConfigtDef_Player_Dict_PlayerFromPIDt PlayerControlt GetFightPowertGetLVtGetIPtstrtdatetimettodaytsplittGetGameWorldtEventShell_SendEventExtlen(teventTypeStrtdataDictt    curPlayertcheckBatServerRtdataStr((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt SendEventPack{s 
 





 



&
(
c
CsPtj
ƒ}
tjƒjƒ}i|
d
6|d6|d6}td|dtƒ

dS(Nt    GroupNametServerIDt
ReloadTypetReloadR(RtGetServerGroupNameRtGetServerIDRtFalse(t
reloadTypeRRR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt    DR_Reloads




cCsNi|jƒd
6|j
ƒd6|jƒd6}|j|ƒ

t|
||ƒ
dS(NtPlayerIDt
PlayerNametAccID(tGetPlayerIDt GetPlayerNametGetAccIDtupdateR(RRtdrDictR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt    DR_Player˜s


 

c
Cs&
|jƒ}
|j
ƒ}|jƒ}|jƒ}tjƒjƒ}|jƒ}|jƒ}i    d
d6t    |ƒ
d6|
d6|d6|d6|d6|d6t    |ƒ
d    6d
d6}tj
ƒr
|jtj ƒ
}    |jtjƒ
}
|jtjƒ
}|ji|    d6|
d 6|d6ƒ

ntd||ƒ
dS(NtlogintTypeRR(tMapIDtNametLVtGoldt    LoginTimett
LogoutTimetRegCrossZoneIDt RegCrossMapIDtRegCrossLineIDtLogInOut(R+RtGetLoginTimetGetNameRtGetMaptGetMapIDRtGetGoldRt IsCrossServerR    R
t Def_Player_Dict_ReqCrossFBZoneIDtDef_Player_Dict_ReqCrossFBMapIDt"Def_Player_Dict_ReqCrossFBFuncLineR,R(RtaccIDtipt    loginTimetnametmapIDtlvtgoldRtregCrossZoneIDt regCrossMapIDtregCrossLineID((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_PlayerLogin£s 





:




%
c

CsË|jƒ}
|j
ƒ}|jƒ}|jƒ}|jƒ}|jƒ}|jƒ}tjƒj    ƒ}i    d
d6|d6|
d6|d6|d6|d6|d6t
|ƒ
d    6t
|ƒ
d
6}    td|    |ƒ
dS(NtlogoutR0RR(R1R2R3R4R5R7R;(R+RR=t GetLogoffTimeR<RR@RR>R?RR(
RRERFRHt
logoutTimeRGRJRKRIR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_PlayerDisconnect¾s








4

cCsEi|jƒd
6|j
ƒd6|jƒd6|
d6}td|ƒ
dS(NR&R'R(t
OnlineTimetOnlineTimeToday(R)R*R+R(Rt
onlineTimeR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_OnlineTimeTodayÍs

 
cCs(i|d
6|
d6}td||ƒ
dS(NR(Rt
FirstLogin(
R(RERFRR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt DR_FirstLoginØs
c
Csi
|d
6}
td
|
ƒ
dS(NtOnLinePlayerCount(
R(tplayerCountR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_OnLinePlayerCountàs 
 
cCsRi|jƒd
6|j
ƒd6|jƒd6}|j|ƒ

td|
||ƒ
dS(NR&R'R(sGiveItem_%s(R)R*R+R,R(RtfuncNametaddDataDictR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_FuncGiveItemìs



 
cCs¡i|jƒd
6|j
ƒd6|jƒd6|
d6}|j|ƒ

td||ƒ
tjd|
|f|jƒƒ
|jdƒ
rtjdd    |
|fƒ
ndS(
NR&R'R(t    ErrorInfotCTGErrors%s. %storderIDtGameWarningsCTGError:%s - %s(    R)R*R+R,RRtErrLogtgett SendGameError(Rt    errorInfotaddDictR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_CTGErrorôs

 
 

cCs[i|jƒd
6|j
ƒd6|jƒd6|jƒd6}|j|
ƒ

td||ƒ
dS(NR&R'R(R3tCTGOK(R)R*R+RR,R(RRhR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_CTGOK

s


 
cCsRi|jƒd
6|j
ƒd6|jƒd6}|j|ƒ

td|
||ƒ
dS(NR&R'R(s FixVersion_%s(R)R*R+R,R(RtfixNametfixDictR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt DR_FixVersion
s


 

cCsEi|jƒd
6|j
ƒd6|jƒd6|
d6}td|ƒ
dS(NR&R'R(tADIDtADAward(R)R*R+R(RtadIDR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt
DR_ADAward
s

 
cCsci|jƒd
6|j
ƒd6|jƒd6|
d6|d6|d6|jƒd6}td||ƒ
dS(    NR&R'R(RtPlayerTotalExptCurLVRequireExpRt PlayerUpgrade(R)R*R+RR(RtplayerLVtplayerTotalExptcurLVRequireExpR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_PlayerUpgrade 
s



R6cCsgi|jƒd
6|j
ƒd6|jƒd6|d6|
d6|d6}|j|ƒ

td|
||ƒ
dS(NR&R'R(tTaskIDt    TaskGroupt    eventNamesTask_%s(R)R*R+R,R(Rt    taskGroupttaskIDR|R-R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_Task*
s

%
 

cCsa|jt
jƒ
}i|jƒd
6|jƒd6|jƒd6|
d6|d6}td||ƒ
dS(NR&R'R(tlvIDttreeLVt MainLevelPass(R    R
tDef_PDict_TreeLVR)R*R+R(RR€RR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_MainLevelPass2
s




cCs`i|jƒd
6|j
ƒd6|jƒd6|
d6|d6}|j|ƒ

td|
||ƒ
dS(NR&R'R(R1tLineIDs    FBPass_%s(R)R*R+R,R(RRIt
funcLineIDR-R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt    DR_FBPass:
s


 

c
CsÓi    |d
6|
d6|d6|d6|d6|d6|d6|d6|    d    6}
td
|
dt
ƒ

|rÏtjdd iƒ}|
|krÏ||
}||krÌi
|d6} | j|
ƒ

td|
| dt
ƒ

qÌqÏndS(NR&RIR†tisWintturnNumtturnMaxt    heroCounttcostTimetguidt    FightTimeRtBattleRecordi
t
heroIDDictsFightPass_%s(RR#t IpyGameDataPYtGetFuncEvalCfgR,(treqPlayerIDRIR†RˆR‰RŠR‹RŒtdrHeroIDDictRRtmapPassDicttdrLineIDt
failDRDict((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_FightStatB
s
&






 
 
 cCsRi|d
6|
d6|d6|d6|d6}tj
ƒj|ƒ
}td||ƒ
dS(NR&R'R(t    GMOperatetMsgt GMToolOperate(RtGetPlayerManagertFindPlayerByIDR(tplayerIDt
playerNameREt    gmToolCmdtmsgRR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_ToolGMOperate[
s




cCsH|
ji|j
ƒd
6|jƒd6|jƒd6ƒ

td|
|ƒ
dS(NR&R'R(tDeleteItemInRecycle(R,R)R*R+R(RR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_DeleteItemInRecyclei
s
#


cCsgi|jƒd
6|j
ƒd6|jƒd6|d6|d6|d6}|j|ƒ

td|
||ƒ
dS(NR&R'R(tItemIDt    ItemCounttItemGUIDs
BuyItem_%s(R)R*R+R,R(RR|titemIdtbuyCounttitemGuidR^R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt
DR_BuyItemv
s


%
 

cCs_i|jƒd
6|j
ƒd6|jƒd6}|j|ƒ

|j|ƒ

td|
||ƒ
dS(NR&R'R(s DeleteItem_%s(R)R*R+R,R(RR|tdelItemInfoDictt    extraDictR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt DR_DeleteItem‚
s


 
 
cCsadSi|jƒd
6|j
ƒd6|jƒd6|
d6|d6|d6|d6}td||ƒ
dS(    NR&R'R(R¥R¦R§tSkillIDtUseSkilLostItem(R)R*R+R(RtitemIDtitemCntRªtskillIDR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_UseSkilLostItem’
s


 

cCshdSi|jƒd
6|j
ƒd6|jƒd6|
d6|d6|d6|d6|d6}td    ||ƒ
dS(
NR&R'R(R¥R¦R§tSrcPackTypetDescPackTypetChangePackItem(R)R*R+R(RR±R²RªtsrcPackTypetdescPackTypeR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_ChangePackItem¤
s

 


cCsÜ
|d
k
rdS|tj
ddƒkr,dStj
ddiƒ}||krj||}||krjdSni    |jƒd6|jƒd6|jƒd6|
d6|d    6|d
6tj||ƒd6|jƒd6|jƒd 6}|j    |ƒ

|t
jkr
td||ƒ
nÐ|t
j kr*
td||ƒ
n®|t
jkrL
td||ƒ
nŒ|t
jkrn
td||ƒ
nj|tjkr
td||ƒ
nH|tjkr²
td||ƒ
n&|tjkrØ
td|||ƒ
ndS(NitMoneyRecordiiR&R'R(R|t    MoneyTypet
MoneyCounttPlayerMoneyCounttVIPLVRtUseGoldtUseGoldPapert    UseSilvertUseSilverPapert
UsePayCointUseCashVouchersUseCurrency_%s(R‘R’R)R*R+RtGetMoneyRealtGetVIPLvRR,t IPY_GameWorldtTYPE_Price_Gold_MoneyRtTYPE_Price_Gold_PapertTYPE_Price_Silver_MoneytTYPE_Price_Silver_PapertShareDefinetTYPE_Price_PayCointTYPE_Price_CashVouchertTYPE_Price_CurrencyDict(RR|t    moneyTypet
moneyCountR^tmoneyRecordDictt    recordSetR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_UseMoney¶
s<










 






cCsÙ
|d
k
rdS|tj
ddƒkr,dStj
ddiƒ}||krj||}||krjdSni    |jƒd6|jƒd6|jƒd6|
d6|d    6|d
6tj||ƒd6|jƒd6|jƒd 6}|j    |ƒ

|t
jkr
td||ƒ
nÍ|t
j kr*
td||ƒ
n«|t
jkrL
td||ƒ
n‰|t
jkrn
td||ƒ
ng|tjkr
td||ƒ
nE|tjkr²
td||ƒ
n#|tjkrÕ
td||ƒ
ndS(NiR»i
iR&R'R(R|R¼R½R¾R¿RtGiveGoldt GiveGoldPapert
GiveSilvertGiveSilverPapertGivePayCointGiveCashVouchersGiveCurrency_%s(R‘R’R)R*R+RRÆRÇRR,RÈRÉRRÊRËRÌRÍRÎRÏRÐ(RR|RÑRÒR^RÓRÔR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_GiveMoneyö
s<










 






cCsZi|jƒd
6|j
ƒd6|jƒd6|d6|d6|d6}td|
||ƒ
dS(NR&R'R(tGiveTypet    GiveValuetAddDataDictsGiveMoneyError_%s(R)R*R+R(Rt    priceTypetvaluetgiveTypeR^R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_GiveMoneyError,s

%

cCs_i|jƒd
6|j
ƒd6|jƒd6}|j|ƒ

|j|ƒ

td|
||ƒ
dS(NR&R'R(sGivePlayerItem_%s(R)R*R+R,R(RR|titemDataDictR^R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_SetPlayerItem9s

 
 

cCsOi|jƒd
6|j
ƒd6|jƒd6|
d6|d6}td||ƒ
dS(NR&R'R(R³R3tLearnORUPSkill(R)R*R+R(RR³tskillLVR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_LearnORUPSkillGs


 

cCs\i|jƒd
6|j
ƒd6|jƒd6|d6|d6}|j|ƒ

t|
||ƒ
dS(NR&R'R(R¥tItemCnt(R)R*R+R,R(Rt
recordNameR±R²titemDataR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_EquipCompoundVs


 
cCsutt
j
jƒƒ
jd
ƒ
d|d<tjj|
dƒ}|tjkratj|j    |ƒ

n|g
tj|<dS(Ns
.itdotimetUnknown(
RRRRR
tFightPowerDownRecordDictRet
PyGameDatat g_fightpowerChangeDataRecordDicttappend(RtdotypeRR|((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytCache_FightPowerChangeInfo_s&



cCs·i|
d
6|jƒd6|j
ƒd6}xptjjƒD]_\}}g}x@|D]8}|d}tj|ƒ
dkr{qPn|j|ƒ

qPW|||<q7Wit_td||ƒ
dS(NtbeforePowerR&R(Ríi
tFightPowerChangeInfo(    R)R+RðRñtitemsRtGetPastSecondsRòR(RRõRRótdateListtrListtdateInfotdateTimeStr((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_FightPowerChangeInfois'


 






    
cCs2i|d
6|
d6}|j|ƒ

t
d|ƒ
dS(NR&tGUIDtMailSend(R,R(RžRþRhR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_MailSendys
  
cCs%i|d
6|
d6}td|ƒ
dS(NR&RþtMailGiveSuccess(
R(RžRþR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytDR_MailGiveSuccesss 
cCs,i|d
6|
d6|d6}td|ƒ
dS(NR&RþR|tMailDel(
R(RžRþR|R((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt
DR_MailDelˆs 
cCs2i|d
6|
d6}|j|ƒ

t
d|ƒ
dS(NRþR|tMailServerMail(R,R(RþR|RhR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt DR_ServerMails
 
 
c
Cs?i|jd
6|j
d6|jd6|jd6}
td|
ƒ
dS(NR&R(R'tJobt
CreateRole(R&R(R'R
R(t
playerDataR((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt DR_CreateRole–s
. 
cOstj
|tjƒ}tj
|
tjƒ}d    }    tjƒjƒ}
tjƒ}tj    j
|d
|
ƒ}tjd|ƒ

x 
tj|ƒ
D]
\} }}| j dƒ
}|d}tj
|tjƒ}|rç|    sÞ||    krç|}    ntj|||ƒs
qˆnd|kr8
g|dD]}d||f^q
}n|}xÖ|D]Î}tj    j
| |ƒ}tj    j|ƒ
sx
qE
n|}d    }|r±
||||Ž
\}}|s±
qE
q±
n||jdƒ
 }t|dƒ}|jƒ}|jƒ
x'|D]}|||||||Ž
qð
WqE
WqˆWd    S(
s} Ñ­»·±éÀúÁ÷ÏòÐÅÏ¢£¬²¢½âÎöÂú×ãʱ¼ä·¶Î§Á÷Ïò
    @param cfg: InterfaceConfig.php ÅäÖöÔÏó
    @param startDate: ÆðʼÈÕÆÚ
    @param endDate: ½áÊøÈÕÆÚ
    @param argvDict: postµ½ÖÐÐĵIJÎÊý
    @param checkDrFileNeedParseFunc: ¶îÍâ¼ì²éÁ÷ÏòÎļþÊÇ·ñÐèÒª½âÎöµÄº¯Êý£¬´«Èë²ÎÊý(Á÷ÏòÎļþÃû drFileName, *parseArgs, **kv)£¬·µ»Ø×Ô¶¨ÒåÐÅÏ¢Ìṩ  parseLineFunc ÓÃ
    @param parseLineFunc: ½âÎöÁ÷ÏòÿÐÐÄÚÈݵÄÂß¼­º¯Êý£¬´«Èë²ÎÊý(Á÷ÏòÃûdrName, ËùÊôdateStr, checkDrFileNeedParseFunc ·µ»ØµÄ½á¹ûÐÅÏ¢ checkNeedParseRetInfo, Á÷ÏòÐÐÄÚÈÝline, *parseArgs, **kv)
    @param *parseArgs: ×Ô¶¨Òå²ÎÊý
    
    @return: needQueryCenterbak ÊÇ·ñÐèÒª²éѯÖÐÐı¸·ÝÁ÷ÏòÊý¾Ý
    sEventServerPY\EventData\S%ssLoopServerDR: %ss
\iÿÿÿÿt
drNameLists    %s_%s.txtt
_t
rN(RtChangeStrToDatetimeR
tTYPE_Time_Format_YmdtNoneRR"tGetServerRootPathtostpathtjointDebugLogtwalkRtCheckDateIntisfiletrindextopent    readlinestclose(t    startDatetendDatetargvDicttcheckDrFileNeedParseFunct parseLineFunct    parseArgstkvt startDatetimetendDatetimetminDatetimetserverIDtserverRootPatht
FolderPathtparentR
tfileListt
parentListtlastStrtfileDatetimetdrNametloopFileListt
drFileNametfullPathtdateStrtcheckNeedParseRetInfotisNeedt
ftlinestline((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pytLoopServerDRœsF 










    

* 





    




 
%(1RRRÈR
RÍRRðR‘R
R
tTrueRR%R.RORSRWRYR\R_RiRkRnRrRyRR„R‡R˜R¢R¤R«R®R´RºRÕRÜRãRåRèRìRôRýR
R
R
R
R

R9
(((sfD:\SG_ServerCode\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\DataRecordPack.pyt<module>ms\







                                     
             
                     @6