From cf2d56a012082ceb2a0906d97935d05d947ea595 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 18 九月 2018 15:15:34 +0800
Subject: [PATCH] 1 召唤陷阱 延迟0.5秒后可触发,进入攻击范围中陷阱,陷阱消失

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.py                       |   28 +++++++++++++++-------------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py |    3 ++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py                                   |    2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
index d7a8a04..2f4abf4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
@@ -62,7 +62,8 @@
     
     #人物的召唤兽,不能攻击自己的主人
     if GameWorld.IsSameObj(summonOwner, curTagPlayer) :
-        return ChNPC.OnGetOwnerRelation(curSummonNPC, curTagPlayer)
+        #return ChNPC.OnGetOwnerRelation(curSummonNPC, curTagPlayer)
+        return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
     
     #判断主人的攻击模式,判断是否可以攻击这个玩家
     if not AttackCommon.CheckPlayerAttackMode_Player(summonOwner, curTagPlayer):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 67440f3..cca8612 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -1140,7 +1140,7 @@
 ) = range(2)
 
 #陷阱出生后, 不攻击时间
-Def_Trap_Born_Idle_Time = 2000
+Def_Trap_Born_Idle_Time = 500
 
 #技能--------------------------------------------
 #恶名初始点
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.py
index 19a9280..2f8641a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.py
@@ -58,7 +58,7 @@
     
     npcControl = NPCCommon.NPCControl(curNPC)
     #刷新自己仇恨度列表
-    npcControl.RefreshAngryList(tick, 1000) # 为确保踩陷阱体验,暂定1秒
+    npcControl.RefreshAngryList(tick, 500) # 为确保踩陷阱体验,暂定1秒
     #遍历仇恨列表找到最近的,并触发
     for i in range(0, curNPC.GetNPCAngry().GetAngryCount()):
         curAngry = curNPC.GetNPCAngry().GetAngryValueTag(i)
@@ -73,7 +73,7 @@
         
         #有NPC靠近,当超过攻击距离
         if GameWorld.GetDist(curNPC.GetPosX(), curNPC.GetPosY(), 
-                             curObj.GetPosX(), curObj.GetPosY()) > curNPC.GetSight():
+                             curObj.GetPosX(), curObj.GetPosY()) > curNPC.GetAtkDist():
             continue
         
         #进入战斗
@@ -128,15 +128,17 @@
     GameObj.SetHP(curNPC, 0)
     return
 
-def OnGetOwnerRelation(curNPC, owner):
-    # 陷阱与主人的关系
-    
-    if owner.GetGameObjType() == IPY_GameWorld.gotPlayer:
-        #自由PK区 or 非安全区内开全体 时可攻击主人
-        if GameMap.GetAreaTypeByMapPos(owner.GetPosX(), owner.GetPosY()) == IPY_GameWorld.gatFreePK \
-            or (GameMap.GetAreaTypeByMapPos(owner.GetPosX(), owner.GetPosY()) != IPY_GameWorld.gatSafe and \
-                owner.GetAttackMode() == IPY_GameWorld.amAll):
-            return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
-        
-    return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
+#===============================================================================
+# def OnGetOwnerRelation(curNPC, owner):
+#    # 陷阱与主人的关系
+#    
+#    if owner.GetGameObjType() == IPY_GameWorld.gotPlayer:
+#        #自由PK区 or 非安全区内开全体 时可攻击主人
+#        if GameMap.GetAreaTypeByMapPos(owner.GetPosX(), owner.GetPosY()) == IPY_GameWorld.gatFreePK \
+#            or (GameMap.GetAreaTypeByMapPos(owner.GetPosX(), owner.GetPosY()) != IPY_GameWorld.gatSafe and \
+#                owner.GetAttackMode() == IPY_GameWorld.amAll):
+#            return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
+#        
+#    return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
+#===============================================================================
 

--
Gitblit v1.8.0