From c0146533c921960d5ce6640446b42c1e38df3629 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:22 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（掉落的暂时默认拍品）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
index 72934b1..49ae188 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
@@ -29,7 +29,7 @@
import ItemCommon
import ChConfig
import ChPlayer
-import PlayerSuccess
+import PlayerActLogin
import GameWorldProcess
import PlayerBillboard
import EventReport
@@ -78,6 +78,28 @@
def OnFBPlayerOnLogin(curPlayer):
+ if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_ZXTower):
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_ZXTower, 1)
+ #奖励变更补偿 s级通关奖励里的宝石
+ curFloor = __GetZhuXianTowerCurPassLV(curPlayer)
+ if curFloor:
+ giveItemList = []
+ for floor in xrange(1, curFloor+1):
+ ipyData = GetTowerIpyData(floor)
+ if not ipyData:
+ continue
+ for itemInfo in ipyData.GetFirstAward():
+ itemID = itemInfo[0]
+ itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
+ if not itemData:
+ continue
+ if itemData.GetType() == ChConfig.Def_ItemType_ZhuXianStone:
+ giveItemList.append(itemInfo)
+ if giveItemList:
+ PlayerControl.SendMailByKey('KillGodTowerCompensation', [curPlayer.GetID()], giveItemList)
+
+
+
SyncZhuXianLevelInfo(curPlayer)
return
@@ -88,6 +110,7 @@
ttInfo = ChPyNetSendPack.tagMCZhuXianTowerInfo()
ttInfo.Clear()
ttInfo.Floor = __GetZhuXianTowerCurPassLV(curPlayer)
+ ttInfo.LastFloor = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor)
NetPackCommon.SendFakePack(curPlayer, ttInfo)
return
@@ -98,11 +121,11 @@
## 更新当前已通关关卡
-def SetZhuXianTowerCurPassLV(curPlayer, passlv):
+def SetZhuXianTowerCurPassLV(curPlayer, passlv, costSeconds=0):
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerPassLV, passlv)
- #PlayerRune.DoUnlockRuneHole(curPlayer)
-
- #PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Tower, passlv, False)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerCostTime, costSeconds)
+ #更新诛仙塔排行榜
+ PlayerBillboard.UpdateZhuXianTowerBillboard(curPlayer)
GameWorld.DebugLog(' 更新诛仙塔已通关数 %s' % passlv)
return
@@ -136,8 +159,10 @@
gameFB = GameWorld.GetGameFB()
fbStep = gameFB.GetFBStep()
curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
- if curStar != Def_MaxStar and fbStep == FB_State_FreeTime:
- FBCommon.UpdateFBEnterTick(curPlayer)
+ hasPass = gameFB.GetGameFBDictByKey(FBDict_HasPass)
+ if fbStep == FB_State_FreeTime: #失败或非S通关需要加cd
+ if curStar != Def_MaxStar or not hasPass:
+ FBCommon.UpdateFBEnterTick(curPlayer)
return
##副本玩家进入点
@@ -341,6 +366,11 @@
FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttWaitStart, prepareTick)
FBCommon.SetFBStep(FB_State_FightPrepare, tick)
+ lastFloor = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor)
+ if fbLevel != lastFloor:
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ZhuXianTowerLastFloor, fbLevel)
+ SyncZhuXianLevelInfo(curPlayer) # 同步信息
+
DoFBHelp(curPlayer, tick)
GameWorld.DebugLog("StartFBLevel, fbLevel=%s，totalHP=%s" % (fbLevel, totalHP), curPlayer.GetPlayerID())
return
@@ -414,9 +444,8 @@
isFirstS = 0
if fbLevel != __GetZhuXianTowerCurPassLV(curPlayer) and curStar == Def_MaxStar:
#更新关卡
- SetZhuXianTowerCurPassLV(curPlayer, fbLevel)
- #更新诛仙塔排行榜
- PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_ZhuXianTower, fbLevel, 10000-costTime/1000)
+ SetZhuXianTowerCurPassLV(curPlayer, fbLevel, costTime/1000)
+
isFirstS = 1 #是否首次S通关
gameFB.SetGameFBDict(FBDict_isFirstS, isFirstS)
@@ -477,22 +506,15 @@
return
# 发邮件或放入背包
- needSpace = len(prizeItemList)
- emptySpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
- isSendMail = int(needSpace > emptySpace) # 是否发送邮件
- if isSendMail:
- PlayerControl.SendMailByKey('KillGodTowerReward', [curPlayer.GetPlayerID()], prizeItemList)
- GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())
- else:
- for itemID, itemCnt, isBind in prizeItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],
- event=["ZhuXianTower", False, {}])
+ ItemControler.GivePlayerItemOrMail(curPlayer, prizeItemList, 'KillGodTowerReward', ["ZhuXianTower", False, {}])
+
#首次S级不扣次数，非S级给奖励扣次数，非首次S扣次数
if not isFirstPass:
FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianTower, 1)
gameFB.SetGameFBDict(FBDict_HasGiveAward, 1)
+ PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_ZhuXianTower, 1)
return
@@ -510,7 +532,7 @@
remainHP = GetBossRemainHP(tick)
totalHP = __GetBossTotalHP()
hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0
- remainHPPer = min(100, remainHP * 100 / totalHP) if totalHP else 0
+ remainHPPer = min(1000000, remainHP * 1000000 / totalHP) if totalHP else 0
fbLevel = gameFB.GetGameFBDictByKey(FBDict_Level)
fbHelpDict = {FBCommon.Help_wheel:fbLevel, FBCommon.Help_grade:star, 'hpReduceSpeed':hpReduceSpeed, 'remainHPPer':remainHPPer, 'isReduceing':isReduceing}
GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())
--
Gitblit v1.8.0