From c19d3b869bfb294223a38880e15935fc0d73bc9e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 15 十一月 2018 14:35:18 +0800
Subject: [PATCH] 2378 【1.3】【1.2】集市购买偶发出现扣仙玉没有给物品bug
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index fe318e1..0108dab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -105,6 +105,7 @@
import PlayerFlashSale
import PlayerFlashGiftbag
import PlayerCostRebate
+import PlayerActTotalRecharge
import PlayerSpringSale
import PlayerFairyCeremony
import ChNetSendPack
@@ -487,6 +488,8 @@
#消费返利
PlayerCostRebate.OnPlayerLogin(curPlayer)
+ #累计充值
+ PlayerActTotalRecharge.OnPlayerLogin(curPlayer)
#限时特惠
PlayerSpringSale.OnPlayerLogin(curPlayer)
#限时礼包
@@ -684,8 +687,21 @@
itemManager = curPlayer.GetItemManager()
for packIndex in ChConfig.Def_PlayerLoginInitPackIndexList:
- itemManager.GetPack(packIndex).Sync_Refresh()
-
+ rolePack = itemManager.GetPack(packIndex)
+ rolePack.Sync_Refresh()
+
+ # 刷下装备评分，仓库可以暂不处理，取出装备后登录触发刷新
+ for i in xrange(rolePack.GetCount()):
+ curItem = rolePack.GetAt(i)
+ if curItem.IsEmpty():
+ continue
+ newScore = ItemCommon.CalcEquipGS(curItem)
+ hisScore = ItemCommon.GetEquipGearScore(curItem)
+ if hisScore != newScore:
+ ItemCommon.SetEquipGearScore(curItem, newScore)
+ GameWorld.Log("登录更新装备评分: packType=%s,i=%s,hisScore=%s,newScore=%s,itemID=%s,guid=%s"
+ % (packIndex, i, hisScore, newScore, curItem.GetItemTypeID(), curItem.GetGUID()), curPlayer.GetPlayerID())
+
for packIndex in ChConfig.Def_VPackCnt_Dict.keys():
ItemControler.Sync_VPackItem_Refresh(curPlayer, packIndex)
@@ -2562,8 +2578,7 @@
GameWorld.DebugLog(" 未购买VIP礼包，无法使用该气泡框！needVIPLVGift=%s" % needVIPLVGift, curPlayer.GetPlayerID())
return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ChatBubbleBoxUseID, useBoxID)
- SyncChatBubbleBoxState(curPlayer)
+ PlayerControl.SetChatBubbleBox(curPlayer, useBoxID)
return
def DoActivateChatBubbleBox(curPlayer, boxID):
@@ -2577,12 +2592,10 @@
def SyncChatBubbleBoxState(curPlayer):
## 同步聊天气泡框状态
- useBoxID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBubbleBoxUseID)
boxState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBubbleBoxState % 0)
- if not useBoxID and not boxState:
+ if not boxState:
return
boxStatePack = ChPyNetSendPack.tagMCChatBubbleBoxState()
- boxStatePack.UseBoxID = useBoxID
boxStatePack.BoxState = boxState
NetPackCommon.SendFakePack(curPlayer, boxStatePack)
return
@@ -3569,7 +3582,7 @@
#@return 返回值无意义
#@remarks 客户端封包响应 //03 10 退出副本#tagCExitFB
def __Func_ExitFB(curPlayer, tick):
- if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull:
+ if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull and curPlayer.GetMapID() not in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):
return
GameWorld.Log('玩家 = %s , 主动离开副本' % (curPlayer.GetName()) , curPlayer.GetID())
@@ -5093,6 +5106,9 @@
# 领取消费返利奖励
elif rewardType == ChConfig.Def_RewardType_CostRebate:
PlayerCostRebate.OnGetCostRebateAward(curPlayer, dataEx)
+ # 领取累计充值奖励
+ elif rewardType == ChConfig.Def_RewardType_TotalRecharge:
+ PlayerActTotalRecharge.OnGetTotalRechargeAward(curPlayer, dataEx)
# 领取boss复活活动奖励
elif rewardType == ChConfig.Def_RewardType_BossReborn:
PlayerBossReborn.GetBossRebornActionAward(curPlayer, dataEx)
--
Gitblit v1.8.0