From ccfd713e99081322e68bc8c2f3f1ea02f0df52eb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 02 一月 2020 14:11:11 +0800
Subject: [PATCH] 8358 【主干】【后端】坐骑修改(修复bug)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py
index 8a77571..50d3bd5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py
@@ -28,6 +28,7 @@
 import ChPyNetSendPack
 import GameWorldProcess
 import PlayerDienstgrad
+import PlayerWeekParty
 import IpyGameDataPY
 import PlayerFamily
 import NetPackCommon
@@ -521,7 +522,7 @@
     if not FBCommon.GetHadDelTicket(curPlayer):
         FBCommon.SetHadDelTicket(curPlayer)
         FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyWar)
-        
+        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_FamilyWar, 1)
     isFinalMatch = gameFB.GetGameFBDictByKey(GameFBDict_IsFinalMatch)
     roundNum = gameFB.GetGameFBDictByKey(GameFBDict_RoundNum)
     groupID = gameFB.GetGameFBDictByKey(GameFBDict_GroupID)
@@ -1270,7 +1271,7 @@
     skillTypeID, buffOwner = 0, None
     lostValue = int(GameObj.GetMaxHP(curPlayer) * lostHPPer / 100.0) * lostTime
     #GameWorld.DebugLog("OnCollecting lostHPPer=%s,lostTime=%s,lostValue=%s" % (lostHPPer, lostTime, lostValue), playerID)
-    SkillCommon.SkillLostHP(curPlayer, skillTypeID, buffOwner, lostValue, tick)
+    SkillCommon.SkillLostHP(curPlayer, skillTypeID, buffOwner, lostValue, tick, skillAffect=False)
     return
 
 
@@ -1486,7 +1487,7 @@
     Sync_ChampionFamilyDailyRewardState(curPlayer)
     
     for itemID, itemCnt, isBind in itemList:
-        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
         
     GameWorld.DebugLog("领取王者仙盟每日俸禄: itemList=%s" % itemList, playerID)
     return

--
Gitblit v1.8.0