From 47f6627083fb64b82fb238b384ce23f29228e7f1 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 15 六月 2019 15:16:50 +0800
Subject: [PATCH] 7292 【2.0】【后端】前2次升星成功率定制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
index d7e67ba..02e8d34 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
@@ -59,6 +59,10 @@
     if attackerCampType != defenderCampType:
         return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
     
+    #机器人可以打机器人
+    if attacker.GetType() == ChConfig.ntRobot and defender.GetType() == ChConfig.ntRobot:
+        return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
+    
     return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
     
 
@@ -100,7 +104,8 @@
     
     #普通NPC
     if GameObj.GetHP(defender) <= 0:
-        
+        if not ChNPC.OnCheckCanDie(attacker, defender, skill, tick):
+            return
         #副本
         FBLogic.DoFB_Npc_KillNPC(attacker, defender, tick)
             

--
Gitblit v1.8.0