Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-06-03 2eab795c40d64af47f624ffccba94ec88ef591bc

Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py

@@ -986,10 +986,10 @@
                GameWorld.DebugLog("#--- 最远距离防范[%s-%s]"%(attacker.GetID(), curTag.GetID()))

                continue

            

        if CheckFunc != None:

            #检查是否受影响

            if not CheckFunc(attacker, curTag, curSkill, tick):

                continue

            if CheckFunc != None:

                #检查是否受影响

                if not CheckFunc(attacker, curTag, curSkill, tick):

                    continue

        

        resultList.append(curTag)

            


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py

@@ -1358,6 +1358,10 @@
    if curPlayer.GetHP() <= 0:

        return

    

    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        #GameWorld.DebugLog("自定义场景中，不检查!")

        return True

    
    #===========================================================================

    # if curPlayer.IsMoving():

    #    GameWorld.DebugLog("移动中不可使用技能")