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 | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 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 37601ae..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
@@ -83,15 +83,19 @@
import GameLogic_ElderBattlefield
import GameLogic_FamilyBoss
import GameLogic_FamilyWar
+import GameLogic_Dogz
import OpenServerCampaign
import PlayerCostRebate
import PlayerSpringSale
import PlayerBossReborn
import PlayerFlashGiftbag
import PlayerFairyCeremony
+import PlayerRefineStove
+import PlayerFlashSale
import PlayerVip
import PlayerDiceEx
import IpyGameDataPY
+import FamilyRobBoss
import QuestManager
import PyGameData
import PlayerTJG
@@ -498,19 +502,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:
#触发每日任务重置脚本
@@ -529,7 +533,10 @@
ChItem.ResetItemUseCntToday(curPlayer)
# 极品白拿
PlayerFreeGoods.OnDay(curPlayer)
-
+ #采集次数重置
+ NPCCommon.CollNPCTimeOnDay(curPlayer)
+
+ PlayerTJG.TJGOnDay(curPlayer, onEventType)
# 以下为支持两种重置模式切换配置的
FBCommon.FBOnDay(curPlayer, onEventType)
@@ -539,7 +546,8 @@
# 商店物品购买兑换OnDay
FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)
-
+ # 仙盟红包OnDay
+ PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
return
@@ -1219,8 +1227,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:
@@ -1239,6 +1252,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]):
@@ -1263,6 +1281,9 @@
elif actionName == ShareDefine.OperationActionName_FairyCeremony:
PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()
+
+ elif actionName == ShareDefine.OperationActionName_FlashSale:
+ PlayerFlashSale.RefreshflashSaleActionInfo()
return
if msgValue.isdigit():
@@ -1349,7 +1370,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)
@@ -1369,7 +1395,9 @@
# 活动buff状态变更
elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):
PlayerAction.OnActionBuffStateChange(key, tick)
-
+ #boss刷新时间参数
+ elif key.startswith(ShareDefine.Def_Notify_WorldKey_BossOnlineHeroCnt[:-2]):
+ GameLogic_Dogz.OnOnlineCntChange(key, tick)
#===============================================================================
# ---修改为上述的 统一字典处理
# if msg == ChConfig.Def_Notify_Key_PurTalk:
--
Gitblit v1.8.0