From f778e109783cf44c6bf6b1603ae1668629f1b77f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 24 一月 2019 19:26:15 +0800
Subject: [PATCH] 5735 【后端】【1.5】仙玉返还

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_QDFLDoubleBill.py                                  |    2 +-
 Tool/WebCenter/DoubleBill/webapp.py                                                                               |    6 +++++-
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py                                                 |    3 +--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py |    6 ++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_QDFLDoubleBill.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_QDFLDoubleBill.py
index ea817e0..8b33982 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_QDFLDoubleBill.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_QDFLDoubleBill.py
@@ -44,7 +44,7 @@
     queryType = ChConfig.queryType_sqtPlayerByAccID
     tagPlayer = playerManager.FindPlayerByAccID(accID)
     
-    if not tagPlayer:
+    if not tagPlayer or not tagPlayer.GetInitOK():
         # 玩家不在线,先记录,等玩家上线后处理
         GameWorld.Log("玩家离线,暂存渠道测试返利 %s, 仙玉%s"%(accID, gold))
         GMShell.AddOfflinePlayerGMTInfo(orderId, queryType, accID, gmCmdDict)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 895ab02..cc6638a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -186,7 +186,6 @@
         #跨服PK
         CrossRealmPK.OnPlayerLogin(curPlayer)
         
-        GMShell.OnPlayerLogin(curPlayer)
         GMT_CTG.OnPlayerLogin(curPlayer)
     return
 
@@ -773,7 +772,7 @@
 #===============================================================================
     #自己已经初始化成功
     curPlayer.SetInitOK(True)
-    
+    GMShell.OnPlayerLogin(curPlayer)
     #发送请求至目标地图(任务需要登陆家族长触发事件)
     __RefreshFamilyToMapServer(curPlayer)
     return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py
index 0ad3920..f3cd3f1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py
@@ -38,6 +38,12 @@
         return
     
     gold = packCMDList[0]
+    
+    curGold = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillGold)
+    if curGold != 0:
+        # 已记录的不能再更改
+        return
+    
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_QuDao_DoubleBillGold, gold)    
     if gold <= 2:
         return
diff --git a/Tool/WebCenter/DoubleBill/webapp.py b/Tool/WebCenter/DoubleBill/webapp.py
index 3e63ba9..ca12c29 100644
--- a/Tool/WebCenter/DoubleBill/webapp.py
+++ b/Tool/WebCenter/DoubleBill/webapp.py
@@ -66,7 +66,11 @@
         return
     
     if rec["ServerID"]:
-        # 已领取,GM返回2, 减少反复查询
+        if sid == rec["ServerID"]:
+            #同服已领取的返回相同
+            SendGm(gameAccID, rec["Gold"])
+            return
+        # 不同服已领取,GM返回2, 减少反复查询
         SendGm(gameAccID, 2)
         return
     

--
Gitblit v1.8.0