From 5acd21c7163d1b77db6971e7f0a7faf600ed3177 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 23 五月 2019 17:54:18 +0800
Subject: [PATCH] 6501 增加神兵任务接口

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py        |   10 +++++++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py            |    3 ++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py                  |    7 ++++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py |    2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index 721a1dd..a181458 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -1789,9 +1789,14 @@
     RunQuestEvent(curPlayer, "passiveset", "passiveset", Def_RunQuestType_Normal)
     return
 
-def EventRespons_PlusGodWeapon(curPlayer):
+def EventRespons_PlusGodWeapon(curPlayer, weaponType):
     #神兵锤炼
     RunQuestEvent(curPlayer, "plusgodweapon", "plusgodweapon", Def_RunQuestType_Normal)
+    RunQuestEvent(curPlayer, "plusgodweapon", weaponType, Def_RunQuestType_Normal)
+    return
+def EventRespons_GodWeaponUp(curPlayer, weaponType, attrLV):
+    # 神兵升级
+    RunQuestEvent(curPlayer, "godweaponup", "%s_%s"%(weaponType, attrLV), Def_RunQuestType_Normal)
     return
 
 def EventRespons_RefineItem(curPlayer, alchemyLV, alchemyItemID):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
index 585f3d9..cadbdc6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
@@ -7300,4 +7300,12 @@
         
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FairyDomainState, 2)
     PlayerFairyDomain.NotifyVisitFairyDomainInfo(curPlayer)
-    return
\ No newline at end of file
+    return
+
+##神兵等级判断
+# @param None
+# @return None <Godweaponlv value="lv" weapontype=""/>
+def ConditionType_Godweaponlv(curPlayer, curMission, curActionNode):
+    lv = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
+    weapontype = GameWorld.ToIntDef(curActionNode.GetAttribute("weapontype"), 0)
+    return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GodWeaponLV % weapontype) >= lv
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 0afee8e..cf6a9b8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -2059,7 +2059,7 @@
 def AddFbEncourageBuff(curPlayer, key, tick, ownerID=0):
     curPlayerID = curPlayer.GetID()
     GameWorld.Log("AddFbEncourageBuff() curPlayerID=%s" % curPlayerID)
-  
+    ownerID = ownerID or curPlayer.GetID()
     gameFB = GameWorld.GetGameFB()
     encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)
     if not encourageLV:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
index 980cec6..6010012 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
@@ -298,6 +298,7 @@
         RefreshGodWeaponAttr(curPlayer)
         #x神器达到X级成就
         PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_GodWeapon, attrLV, [weaponType])
+        EventShell.EventRespons_GodWeaponUp(curPlayer, weaponType, attrLV)
         if beforeAttrLV == 0:
             # 解封通知
             sysMark = IpyGameDataPY.GetFuncEvalCfg('GodWeaponSys', 1, {}).get(weaponType, 'GetGodWeapon')
@@ -318,7 +319,7 @@
         
     Sync_GodWeaponLVInfo(curPlayer, weaponType)
     #任务
-    EventShell.EventRespons_PlusGodWeapon(curPlayer)
+    EventShell.EventRespons_PlusGodWeapon(curPlayer, weaponType)
     return
 
 #神兵升级触发其他功能:技能

--
Gitblit v1.8.0