From 9421327ecfa67c72c250991d0dc2ef1e7868c9c6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 九月 2018 14:43:08 +0800
Subject: [PATCH] 3751 【后端】日常任务新增“击杀怪物”条目

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py      |    3 ++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py    |    4 +++-
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py                           |    3 ++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py |    3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index c89967a..1306ea2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1472,7 +1472,8 @@
 DailyActionID_FBHelp, # 助战副本 15
 DailyActionID_BOSSHome, # BOSS之家
 DailyActionID_FamilyRobBoss, # 仙盟抢boss
-) = range(1, 17 + 1)
+DailyActionID_KillNPC, # 野外怪物
+) = range(1, 18 + 1)
 
 
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index d6eabcb..bc6f6c2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -4769,7 +4769,9 @@
             #掉落归属
             if mapFBType != IPY_GameWorld.fbtNull:
                 FBLogic.DoFB_DropOwner(curPlayer , curNPC)
-            
+            else:
+                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC)
+                
             killBossCntLimitDict = IpyGameDataPY.GetFuncCfg('KillBossCntLimit', 1)
             limitIndex = GameWorld.GetDictValueByKey(killBossCntLimitDict, npcID)
             if limitIndex != None:
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..91eebf2 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,8 @@
     
     # 击杀特定NPC成就
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, killCnt, [npcID])
-    
+    # 日常活动
+    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC, killCnt)
     # 击杀任务怪, 杀怪日常已经没有了,暂时屏蔽
     #for _ in xrange(killCnt):
     #    EventShell.Event_OnKillByID(curPlayer, npcID)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index c89967a..1306ea2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1472,7 +1472,8 @@
 DailyActionID_FBHelp, # 助战副本 15
 DailyActionID_BOSSHome, # BOSS之家
 DailyActionID_FamilyRobBoss, # 仙盟抢boss
-) = range(1, 17 + 1)
+DailyActionID_KillNPC, # 野外怪物
+) = range(1, 18 + 1)
 
 
 

--
Gitblit v1.8.0