Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

cehua_hzl

2018-09-11 1ad203d0308568749dd289ec7a67c7d2dd0610e0

1
2
3
ó 
x{[c@s"dd
lZd„Z
d„Zd
S(iÿÿÿÿNc
Csd
S(Nt((t
query_Typetquery_IDtpackCMDListttick((so.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\RemoteQuery\GY_Query_MergeEvent.pytDoLogics
cCstj
|t|ƒ
ƒ
dS(
N(tPlayerMergeEventt OnClientServerPlayerDoMergeEventteval(t    curPlayertcallFunNamet    funResultR((so.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\RemoteQuery\GY_Query_MergeEvent.pytDoResult(s

(RRR(((so.\ServerPython\ZoneServerGroup\map1_8G\MapServer\MapServerData\Script\Player\RemoteQuery\GY_Query_MergeEvent.pyt<module>s