From ccaf2f02905ec635332e2d22cb7bd5b77b6a7bbb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 22 十月 2018 21:10:34 +0800
Subject: [PATCH] 4282 【主干】【1.1.0】【后端】新增物品效果:获得X法宝X经验 4280 【主干】【1.1.0】【后端】开服触发成就类型

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
index 288a5a6..546dc2e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
@@ -246,16 +246,16 @@
 def OnFamilyPartyStateChange(state, tick):
     #活动状态变更
     GameWorld.DebugLog('    仙盟宴会活动状态变更 state=%s'%state)
-    if state == 0:
-        playerManager = GameWorld.GetPlayerManager()
-        for i in xrange(playerManager.GetPlayerCount()):
-            curPlayer = playerManager.GetPlayerByIndex(i)
-            if not curPlayer or curPlayer.IsEmpty():
-                continue
-            #答对题或者进过图的给参与奖励
-            curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
-            if FBCommon.GetEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyParty) or curAnswerCnt:
-                GiveJoinPrize(curPlayer)
+#    if state == 0:
+#        playerManager = GameWorld.GetPlayerManager()
+#        for i in xrange(playerManager.GetPlayerCount()):
+#            curPlayer = playerManager.GetPlayerByIndex(i)
+#            if not curPlayer or curPlayer.IsEmpty():
+#                continue
+#            #答对题或者进过图的给参与奖励
+#            curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
+#            if FBCommon.GetEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyParty) or curAnswerCnt:
+#                GiveJoinPrize(curPlayer)
                 
     
     mapID = GameWorld.GetMap().GetMapID()
@@ -268,15 +268,15 @@
     
     return
 
-
-def GiveJoinPrize(curPlayer):
-    #参与奖
-    joinAward = IpyGameDataPY.GetFuncCfg('PartyReward')
-    if not joinAward:
-        return
-    
-    PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, joinAward, True, ShareDefine.Def_AddFAVReason_FamilyParty)
-    return
+#
+#def GiveJoinPrize(curPlayer):
+#    #参与奖
+#    joinAward = IpyGameDataPY.GetFuncCfg('PartyReward')
+#    if not joinAward:
+#        return
+#    
+#    PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, joinAward, True, ShareDefine.Def_AddFAVReason_FamilyParty)
+#    return
 
 
 
@@ -375,7 +375,7 @@
 # @param tick 时间戳
 # @return 无意义
 # @remarks
-def OnCollectOK(curPlayer, tick):
+def OnCollectOK(curPlayer, npcID, tick):
     playerID = curPlayer.GetID()
     gameWorld = GameWorld.GetGameWorld()
     gameWorld.SetGameWorldDict(FBPlayerDict_HasCollect % playerID, 1)

--
Gitblit v1.8.0