From 623442b524137821ea6abb1b429660a9a107b364 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 31 一月 2019 19:27:01 +0800
Subject: [PATCH] 6118 【后端】【1.5.200】新增技能效果-- 宠物技能-宠物主人受到暴击伤害时触发技能 - 效果填写错误

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py
index 1ff0067..08ad17e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py
@@ -34,10 +34,12 @@
 import PlayerSuccess
 import PlayerActivity
 import PlayerBillboard
+import PlayerWeekParty
 import EventReport
 
 import random
 import math
+import PlayerBossReborn
 
 g_runeTypeDict = {}
 FBDict_Level = 'FBDict_Level'   # 副本关卡
@@ -102,6 +104,7 @@
     #通关符印塔成就
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_PassRuneTower, 1, [passlv])
     PlayerBillboard.UpdateRuneTowerBillboard(curPlayer)
+    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Tower, passlv, False, True)
     GameWorld.DebugLog(' 更新符印塔已通关数 %s' % passlv)
     return
 
@@ -408,7 +411,7 @@
 
 def __GetEndAward(curPlayer, fbLevel):
     #结算奖励
-    giveItemCountRateList = IpyGameDataPY.GetFuncEvalCfg('RuneAwardCntRate')
+    giveItemCountRateList = GameWorld.GetDictValueByRangeKey(IpyGameDataPY.GetFuncEvalCfg('RuneAwardCntRate', 1, {}), fbLevel, [])
     giveItemCount = GameWorld.GetResultByRandomList(giveItemCountRateList)
     if not giveItemCount:
         return []
@@ -419,7 +422,7 @@
     InitRuneTypeColorInfo(curPlayer)
     
     giveItemList = []
-    runeColorRateDict = IpyGameDataPY.GetFuncEvalCfg('RuneAwardColor')
+    runeColorRateDict = GameWorld.GetDictValueByRangeKey(IpyGameDataPY.GetFuncEvalCfg('RuneAwardColor', 1, {}), fbLevel, {})
     for _ in xrange(giveItemCount):
         giveRuneType = random.choice(runeTypeList)
         
@@ -568,8 +571,8 @@
     giveRuneYsogDict = {}
     giveRunePoint = 0
     giveRuneYsog = 0
-    giveItemCountRateList = IpyGameDataPY.GetFuncEvalCfg('RuneAwardCntRate', 2)
-    runeColorRateDict = IpyGameDataPY.GetFuncEvalCfg('RuneAwardColor')
+    
+    
     ipyDataMgr = IpyGameDataPY.IPY_Data()
     for i in xrange(ipyDataMgr.GetRuneTowerCount()):
         ipyData = ipyDataMgr.GetRuneTowerByIndex(i)
@@ -582,14 +585,14 @@
         giveRunePoint += ipyData.GetSweepRunePoint()
         giveRuneYsogDict[floor] = giveRuneYsogDict.get(floor, 0) + ipyData.GetSweepYsog()
         giveRuneYsog += ipyData.GetSweepYsog()
-        
+        giveItemCountRateList = GameWorld.GetDictValueByRangeKey(IpyGameDataPY.GetFuncEvalCfg('RuneAwardCntRate', 2, {}), towerLV, [])
         giveItemCount = GameWorld.GetResultByRandomList(giveItemCountRateList)
         if not giveItemCount:
             continue
         runeTypeList = GetRuneTypeByTowerLV(towerLV)
         if not runeTypeList:
             continue
-        
+        runeColorRateDict = GameWorld.GetDictValueByRangeKey(IpyGameDataPY.GetFuncEvalCfg('RuneAwardColor', 2, {}), towerLV, {})
         for _ in xrange(giveItemCount):
             giveRuneType = random.choice(runeTypeList)
             
@@ -651,4 +654,6 @@
     FBCommon.Notify_FB_Over(curPlayer, overDict)
     #成就
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_TowerSD, 1)
+    #BOSS复活活动
+    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_TowerSweep, 1)
     return True
\ No newline at end of file

--
Gitblit v1.8.0