From acd1649429df17b675122b3708704625b61c4b08 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 01 十一月 2018 16:33:45 +0800
Subject: [PATCH] 2260 【1.2】【bug】私有掉落不受掉落等级上限限制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index 00ab102..d479a12 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -92,6 +92,7 @@
 import PlayerFairyCeremony
 import PlayerRefineStove
 import PlayerFlashSale
+import PlayerWishingWell
 import PlayerVip
 import PlayerDiceEx
 import IpyGameDataPY
@@ -425,9 +426,17 @@
 #  @remarks 函数详细说明.
 def GameServer_InitOK(index, tick):
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    #通知BServer自己OK了
-    curPlayer.SendToBServerServerInitOK()
-    ChPlayer.OnAllServerInitOK(curPlayer, tick)
+    try:
+        #通知BServer自己OK了
+        curPlayer.SendToBServerServerInitOK()
+        ChPlayer.OnAllServerInitOK(curPlayer, tick)
+    except:
+        curPlayer.Kick(IPY_GameWorld.disWaitForPlayerLoinError)
+        import traceback
+        GameWorld.ErrLog("玩家上线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
+        if GameWorld.GetGameWorld().GetDebugLevel():
+            raise Exception("玩家上线逻辑错误~~~~\r\n%s" % traceback.format_exc())
+    return
 
 #--------------------------------------------------------
 def PlayerOnDay(curPlayer):
@@ -548,6 +557,8 @@
     
     # 仙盟红包OnDay
     PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
+    #许愿池
+    PlayerWishingWell.OnDay(curPlayer)
     return
 
 
@@ -1284,6 +1295,10 @@
             
             elif actionName == ShareDefine.OperationActionName_FlashSale:
                 PlayerFlashSale.RefreshflashSaleActionInfo()
+                
+            elif actionName == ShareDefine.OperationActionName_WishingWell:
+                PlayerWishingWell.RefreshWishingWellAction()
+                
             return
         
         if msgValue.isdigit():

--
Gitblit v1.8.0