From 72c303f9f8819c6ab63eb5f00144d2872480ddc4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 05 十二月 2018 17:53:51 +0800
Subject: [PATCH] 5257 子 【1.3】【1.3.100】数值优化 / 【后端】【1.3】【1.3.100】符印属性公式优化
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 93812f5..f38e738 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,15 +86,19 @@
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 FBHelpBattle
import QuestManager
import PyGameData
import PlayerTJG
@@ -424,9 +428,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):
@@ -504,7 +516,6 @@
# 新手卡
PlayerNewGuyCard.NewGuyCardOnday(curPlayer)
- PlayerTJG.TJGOnDay(curPlayer)
#投资
PlayerGoldInvest.OnDay(curPlayer)
@@ -513,7 +524,8 @@
PlayerGoldGift.OnDay(curPlayer)
#炼丹
PlayerRefineStove.OnDay(curPlayer)
-
+ #绑玉转盘
+ PlayerBindJadeWheel.OnDay(curPlayer)
# 特殊时间点X点过天
elif onEventType == ShareDefine.Def_OnEventTypeEx:
#触发每日任务重置脚本
@@ -534,8 +546,10 @@
PlayerFreeGoods.OnDay(curPlayer)
#采集次数重置
NPCCommon.CollNPCTimeOnDay(curPlayer)
+ #副本助战
+ FBHelpBattle.DoPlayerOnDay(curPlayer)
-
+ PlayerTJG.TJGOnDay(curPlayer, onEventType)
# 以下为支持两种重置模式切换配置的
FBCommon.FBOnDay(curPlayer, onEventType)
@@ -547,6 +561,8 @@
# 仙盟红包OnDay
PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
+ #许愿池
+ PlayerWishingWell.OnDay(curPlayer)
return
@@ -1226,8 +1242,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:
@@ -1268,7 +1284,8 @@
elif actionName == ShareDefine.OperationActionName_CostRebate:
PlayerCostRebate.RefreshCostRebateActionInfo()
-
+ elif actionName == ShareDefine.OperationActionName_TotalRecharge:
+ PlayerActTotalRecharge.RefreshTotalRechargeActionInfo()
elif actionName == ShareDefine.OperationActionName_SpringSale:
PlayerSpringSale.RefreshSpringSaleActionInfo()
@@ -1280,6 +1297,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