From affca29e7500fc8e2e65cf15d19496a370f6329e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十二月 2018 16:22:58 +0800
Subject: [PATCH] 860312 机器人

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

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 6454c29..32d3417 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -52,6 +52,7 @@
 import ChEquip
 import QuestCommon
 import random
+import GameObj
 
 # 可吞噬的装备位
 Def_EatItem_EquipPlace = [
@@ -67,6 +68,15 @@
 ]
 
 Def_EatSpace = 5    # 低于X格自动吞噬
+
+
+def DoTJGOpen(curPlayer):
+    ##脱机挂功能开启 赠送脱机时间
+    addTime = IpyGameDataPY.GetFuncCfg('TJGGiftTime')
+    AddTJGTime(curPlayer, addTime)
+    GameWorld.DebugLog('脱机挂功能开启 赠送脱机时间 %s'%addTime, curPlayer.GetID())
+    return
+
 #===============================================================================
 # //B2 01 脱机挂状态 # tagCMLoginState
 # struct    tagCMLoginState
@@ -177,10 +187,6 @@
     curPlayer.SetSight(min(ChConfig.Def_PlayerSight_Default, clientData.Sight))
     GameWorld.DebugLog("OnSightZoom:%s"%clientData.Sight)
     
-    # 脱机玩家过多,需要隐身一部分
-    if curPlayer.GetLV() < 190:
-        if random.randint(0, 2) != 1:
-            curPlayer.SetVisible(False)
     return
 
 # 需要处理的点,防沉迷
@@ -321,7 +327,7 @@
     aSkillAtkRate = curPlayer.GetSkillAtkRate()    # 技能攻击力加成
     petMinAtk = PlayerControl.GetPetMinAtk(curPlayer)   #灵宠最小攻击
     petMaxAtk = PlayerControl.GetPetMaxAtk(curPlayer)   #灵宠最大攻击
-    petDamPer = PlayerControl.GetPetDamPer(curPlayer)   #灵宠增加伤害
+    petDamPer = GameObj.GetPetDamPer(curPlayer)   #灵宠增加伤害
     atkSpeed = PlayerControl.GetAtkSpeed(curPlayer) # 攻击速度
     aIgnoreDefRate = curPlayer.GetIgnoreDefRate()  # 无视防御比率
     aLuckyHit = curPlayer.GetLuckyHitVal()  # 会心一击
@@ -539,6 +545,7 @@
     #GameWorld.DebugLog("equipScores----%s"%equipScores)
     
     eatIndexList = []
+    eatItemIDList = []
     itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
     for i in range(0, itemPack.GetCount()):
         curItem = itemPack.GetAt(i)
@@ -561,9 +568,9 @@
                 continue
         
         eatIndexList.append(i)
-    
+        eatItemIDList.append(curItem.GetItemTypeID())
     #GameWorld.DebugLog("eatIndexList-----------%s"%len(eatIndexList))
-    eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList)
+    eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList, eatItemIDList)
     NoteEatEquip(curPlayer, eatCount, giveCnt)
     CheckPackFull(curPlayer)
     

--
Gitblit v1.8.0