From bf6b4488343be498966fe59314c209944297f402 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 九月 2018 17:52:35 +0800
Subject: [PATCH] 3428 子 【开发】神兽技能 / 【后端】神兽技能-- 修复攻击吸血

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 20f77dd..80f0873 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -455,7 +455,10 @@
     
     # 击杀特定NPC成就
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, killCnt, [npcID])
-    
+    # 日常活动
+    if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGOnDayEx):
+        if npcData.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):
+            PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC, killCnt)
     # 击杀任务怪, 杀怪日常已经没有了,暂时屏蔽
     #for _ in xrange(killCnt):
     #    EventShell.Event_OnKillByID(curPlayer, npcID)
@@ -659,7 +662,8 @@
     if curPlayer.GetIP() == "127.0.0.1":
         LoginFixTJG(curPlayer, True)
         return
-    
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 0)
+                                       
     # 脱机挂没有运作情况下 弥补收益
     LoginFixTJG(curPlayer)
     
@@ -781,12 +785,16 @@
  
 
 # 过天清理
-def TJGOnDay(curPlayer):
-    times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
-    if times == 0:
-        return
-        
-    ResetTJGDeadInfo(curPlayer)
+def TJGOnDay(curPlayer, onEventType):
+    if onEventType == ShareDefine.Def_OnEventType:
+        times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
+        if times == 0:
+            return
+            
+        ResetTJGDeadInfo(curPlayer)
+    elif onEventType == ShareDefine.Def_OnEventTypeEx:
+        if GetIsTJG(curPlayer):
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 1)
     return
 
 def ResetTJGDeadInfo(curPlayer):

--
Gitblit v1.8.0