From 78e817e23677187c8ad9fea93aff706839a30d5f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 28 九月 2018 19:26:02 +0800
Subject: [PATCH] 3553 【主干】绑玉转盘功能开发(广播)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 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 e79c69e..e7e2154 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
@@ -90,9 +90,11 @@
 import PlayerBossReborn
 import PlayerFlashGiftbag
 import PlayerFairyCeremony
+import PlayerRefineStove
 import PlayerVip
 import PlayerDiceEx
 import IpyGameDataPY
+import FamilyRobBoss
 import QuestManager
 import PyGameData
 import PlayerTJG
@@ -499,20 +501,19 @@
         #成就
         PlayerSuccess.SuccOnDay(curPlayer)
         
-        # 仙盟红包OnDay
-        PlayerFamilyRedPacket.RedPacketOnDay(curPlayer)
-        
         # 新手卡
         PlayerNewGuyCard.NewGuyCardOnday(curPlayer)
         
-        PlayerTJG.TJGOnDay(curPlayer)
         #投资
         PlayerGoldInvest.OnDay(curPlayer)
         
         #法宝
         PlayerMagicWeapon.OnDay(curPlayer)
         PlayerGoldGift.OnDay(curPlayer)
-        
+        #炼丹
+        PlayerRefineStove.OnDay(curPlayer)
+        #绑玉转盘
+        PlayerBindJadeWheel.OnDay(curPlayer)
     # 特殊时间点X点过天
     elif onEventType == ShareDefine.Def_OnEventTypeEx:
         #触发每日任务重置脚本
@@ -534,7 +535,7 @@
         #采集次数重置
         NPCCommon.CollNPCTimeOnDay(curPlayer)
         
-    
+    PlayerTJG.TJGOnDay(curPlayer, onEventType)
     # 以下为支持两种重置模式切换配置的
     FBCommon.FBOnDay(curPlayer, onEventType)
     
@@ -544,7 +545,8 @@
     # 商店物品购买兑换OnDay
     FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)
     
-    
+    # 仙盟红包OnDay
+    PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
     return
 
 
@@ -1224,8 +1226,13 @@
             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:
+            PyGameData.g_familyKillHorsePetRobBossCntDict = eval(msgValue)
+            FamilyRobBoss.OnFamilyKillHorsePetRobBossCntChange(tick)
             return
         
         if key == ShareDefine.Def_Notify_WorldKey_FBEnterTimeLimiitMapID:
@@ -1244,6 +1251,11 @@
             if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_FamilyBossMap:
                 familyID, openCount = eval(msgValue)
                 GameLogic_FamilyBoss.GameServerOpenFamilyBoss(familyID, openCount)
+            return
+        
+        if key == ShareDefine.Def_Notify_WorldKey_FamilyPartyInfo:
+            if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_FamilyParty:
+                PyGameData.g_familyPartyInfo = eval(msgValue)
             return
         
         if key.startswith(ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]): 
@@ -1354,7 +1366,12 @@
                 if curPlayer.GetID() == 0:
                     continue
                 PlayerWorldAverageLv.UpdatePlayerWorldAverageLv(curPlayer)
-                
+            
+    # 日常活动
+    elif key.startswith(ShareDefine.Def_Notify_WorldKey_DailyActionState[:-2]):
+        if value and gameWorldMgr.GetGameWorldDictByKey(key) != value:
+            NPCCustomRefresh.ResetActivityBossRefreshCount()
+            
     #通用设置
     gameWorldMgr.SetGameWorldDict(key, value)
     

--
Gitblit v1.8.0