From b813aa21bc48546c8e5adead95ba4cb4e8e02148 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 14 十一月 2018 14:11:10 +0800
Subject: [PATCH] 4730 【后端】【1.3】神兵系统修改(激活方式修改、升级支持自动锤炼)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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 e7e2154..2d465c4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -86,11 +86,14 @@
 import GameLogic_Dogz
 import OpenServerCampaign
 import PlayerCostRebate
+import PlayerActTotalRecharge
 import PlayerSpringSale
 import PlayerBossReborn
 import PlayerFlashGiftbag
 import PlayerFairyCeremony
 import PlayerRefineStove
+import PlayerFlashSale
+import PlayerWishingWell
 import PlayerVip
 import PlayerDiceEx
 import IpyGameDataPY
@@ -424,9 +427,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):
@@ -547,6 +558,8 @@
     
     # 仙盟红包OnDay
     PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
+    #许愿池
+    PlayerWishingWell.OnDay(curPlayer)
     return
 
 
@@ -1268,7 +1281,8 @@
                 
             elif actionName == ShareDefine.OperationActionName_CostRebate:
                 PlayerCostRebate.RefreshCostRebateActionInfo()
-
+            elif actionName == ShareDefine.OperationActionName_TotalRecharge:
+                PlayerActTotalRecharge.RefreshTotalRechargeActionInfo()
             elif actionName == ShareDefine.OperationActionName_SpringSale:
                 PlayerSpringSale.RefreshSpringSaleActionInfo()
 
@@ -1280,6 +1294,13 @@
             
             elif actionName == ShareDefine.OperationActionName_FairyCeremony:
                 PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()
+            
+            elif actionName == ShareDefine.OperationActionName_FlashSale:
+                PlayerFlashSale.RefreshflashSaleActionInfo()
+                
+            elif actionName == ShareDefine.OperationActionName_WishingWell:
+                PlayerWishingWell.RefreshWishingWellAction()
+                
             return
         
         if msgValue.isdigit():

--
Gitblit v1.8.0