From b4ba68e227370e3dc9dfca06ce5b9c8225bf4faa Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 00:13:49 +0800
Subject: [PATCH] 4997 【后端】【1.3】冰晶矿脉AI--技能指定NPCID使用
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 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 973b23a..2d465c4 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
@@ -86,13 +86,18 @@
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
+import FamilyRobBoss
import QuestManager
import PyGameData
import PlayerTJG
@@ -422,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):
@@ -499,20 +512,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 +546,7 @@
#采集次数重置
NPCCommon.CollNPCTimeOnDay(curPlayer)
-
+ PlayerTJG.TJGOnDay(curPlayer, onEventType)
# 以下为支持两种重置模式切换配置的
FBCommon.FBOnDay(curPlayer, onEventType)
@@ -544,7 +556,10 @@
# 商店物品购买兑换OnDay
FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)
-
+ # 仙盟红包OnDay
+ PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
+ #许愿池
+ PlayerWishingWell.OnDay(curPlayer)
return
@@ -1224,8 +1239,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:
@@ -1246,6 +1266,11 @@
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]):
keyHead = ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]
actionName = key[len(keyHead):]
@@ -1256,7 +1281,8 @@
elif actionName == ShareDefine.OperationActionName_CostRebate:
PlayerCostRebate.RefreshCostRebateActionInfo()
-
+ elif actionName == ShareDefine.OperationActionName_TotalRecharge:
+ PlayerActTotalRecharge.RefreshTotalRechargeActionInfo()
elif actionName == ShareDefine.OperationActionName_SpringSale:
PlayerSpringSale.RefreshSpringSaleActionInfo()
@@ -1268,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