From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 十月 2018 15:04:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   13 +++++++++----
 1 files changed, 9 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 d05cbc1..00ab102 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -58,7 +58,7 @@
 import PlayerGoldGift
 import PlayerActivity
 import PlayerTeHui
-import HighLadderTube
+import PlayerBindJadeWheel
 import PlayerAction
 import PlayerTruck
 import FBCommon
@@ -91,6 +91,7 @@
 import PlayerFlashGiftbag
 import PlayerFairyCeremony
 import PlayerRefineStove
+import PlayerFlashSale
 import PlayerVip
 import PlayerDiceEx
 import IpyGameDataPY
@@ -512,7 +513,8 @@
         PlayerGoldGift.OnDay(curPlayer)
         #炼丹
         PlayerRefineStove.OnDay(curPlayer)
-        
+        #绑玉转盘
+        PlayerBindJadeWheel.OnDay(curPlayer)
     # 特殊时间点X点过天
     elif onEventType == ShareDefine.Def_OnEventTypeEx:
         #触发每日任务重置脚本
@@ -1225,8 +1227,8 @@
             PyGameData.g_bossShuntPlayerInfo = eval(msgValue)
             return
         
-        if key == ShareDefine.Def_Notify_WorldKey_BossShuntDeadLine:
-            PyGameData.g_bossShuntDeadLine = eval(msgValue)
+        if key == ShareDefine.Def_Notify_WorldKey_BossShuntLineState:
+            PyGameData.g_bossShuntLineState = eval(msgValue)
             return
         
         if key == ShareDefine.Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt:
@@ -1279,6 +1281,9 @@
             
             elif actionName == ShareDefine.OperationActionName_FairyCeremony:
                 PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()
+            
+            elif actionName == ShareDefine.OperationActionName_FlashSale:
+                PlayerFlashSale.RefreshflashSaleActionInfo()
             return
         
         if msgValue.isdigit():

--
Gitblit v1.8.0