From 320a417a53a57a9cb7d7759f430afe5f6e6399a6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 29 一月 2019 16:28:30 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动（额度特效增加红包类型参数）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 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 aab149e..10416bf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -79,6 +79,8 @@
import GameLogic_FamilyWar
import PlayerBossReborn
import PlayerWeekParty
+import PlayerFeastWeekParty
+import PlayerActLogin
import Operate_EquipWash
import PlayerTreasure
import GameLogic_GodArea
@@ -101,6 +103,8 @@
import PlayerActTotalRecharge
import PlayerSpringSale
import PlayerFairyCeremony
+import PlayerNewFairyCeremony
+import PlayerFeastRedPacket
import CrossRealmPlayer
import ChNetSendPack
import FamilyRobBoss
@@ -110,6 +114,7 @@
import PlayerGeTui
import PlayerDogz
import PlayerCoat
+import PlayerQuDaoDoubleBill
import datetime
import time
@@ -409,6 +414,9 @@
PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
PlayerFamily.FamilyPlayerOnLoginCross(curPlayer)
+
+ PlayerTeam.OnPlayerLoginCrossServer(curPlayer)
+
#通知运行成功
curPlayer.BalanceServer_PlayerLoginInitOK()
return
@@ -675,6 +683,7 @@
PlayerRune.PlayerRuneLogin(curPlayer)
# 仙盟红包登录通知
PlayerFamilyRedPacket.OnPlayerLogin(curPlayer)
+ PlayerFeastRedPacket.DoPlayerOnLogin(curPlayer)
# 法宝登录通知
PlayerMagicWeapon.PlayerMagicWeaponLogin(curPlayer)
# 商店物品购买次数登录通知
@@ -702,8 +711,14 @@
PlayerBossReborn.OnLogin(curPlayer)
# 周狂欢活动
PlayerWeekParty.OnLogin(curPlayer)
+ # 节日巡礼活动
+ PlayerFeastWeekParty.OnLogin(curPlayer)
+ # 登录奖励活动
+ PlayerActLogin.OnLogin(curPlayer)
# 仙界盛典活动
PlayerFairyCeremony.OnLogin(curPlayer)
+ # 新仙界盛典活动
+ PlayerNewFairyCeremony.OnLogin(curPlayer)
# 分支下载奖励记录通知
SyncPackDownloadAward(curPlayer)
# 登录触发功能开启（老号处理）
@@ -735,6 +750,7 @@
# 如果被禁言的，上线同步前端
if curPlayer.GetGMForbidenTalk():
curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)
+
return
@@ -918,11 +934,22 @@
#@return 返回值无意义
#@remarks 通知玩家技能信息
def __Sync_ClientSkill(curPlayer):
+ sendPack = ChPyNetSendPack.tagMCPlayerSkills()
+ sendPack.Clear()
+ sendPack.Skills = []
skillManager = curPlayer.GetSkillManager()
for i in range(skillManager.GetSkillCount()):
curSkill = skillManager.GetSkillByIndex(i)
- curSkill.Sync_Skill()
+ #curSkill.Sync_Skill()
+ skillInfo = ChPyNetSendPack.tagPlayerSkill()
+ skillInfo.SkillID = curSkill.GetSkillID()
+ skillInfo.RemainTime = curSkill.GetRemainTime()
+ skillInfo.Proficiency = curSkill.GetProficiency()
+
+ sendPack.Skills.append(skillInfo)
+ sendPack.Count = len(sendPack.Skills)
+ NetPackCommon.SendFakePack(curPlayer, sendPack)
return
#---------------------------------------------------------------------
@@ -1246,6 +1273,15 @@
curPack.SetCount(ChConfig.Def_PackCnt_DogzEquip)
curPack.Sync_PackCanUseCount()
+ #初始化诛仙物品背包
+ curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptZhuXianItem)
+ curPack.SetCount(ChConfig.Def_PackCnt_ZhuXianItem)
+ curPack.Sync_PackCanUseCount()
+ #初始化诛仙装备背包
+ curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptZhuXianEquip)
+ curPack.SetCount(ChConfig.Def_PackCnt_ZhuXianEquip)
+ curPack.Sync_PackCanUseCount()
+
#初始化临时交换背包
curPack = itemManager.GetPack(ShareDefine.rptTempSwap)
curPack.SetCount(ChConfig.Def_PackCnt_TempSwap)
@@ -1530,6 +1566,8 @@
#EndLoadMap需放在最后
curPlayer.EndLoadMap()
+ # 渠道返利
+ PlayerQuDaoDoubleBill.OnMapQDDoubleBill(curPlayer)
return True
## 切换地图同步一次PK模式
@@ -5311,7 +5349,21 @@
# 领取周狂欢积分奖励
elif rewardType == ChConfig.Def_RewardType_WeekPartyPoint:
PlayerWeekParty.GetWeekPartyPointAward(curPlayer, dataEx, dataExStr)
-
+ # 领取登录奖励活动奖励
+ elif rewardType == ChConfig.Def_RewardType_ActLoginAwardAct:
+ PlayerActLogin.GetLoginAwardActionAward(curPlayer, dataEx, dataExStr)
+ # 领取新仙界盛典充值大礼
+ elif rewardType == ChConfig.Def_RewardType_NewFairyCRecharge:
+ PlayerNewFairyCeremony.GetFCRechargeAward(curPlayer)
+ # 领取新仙界盛典全民来嗨
+ elif rewardType == ChConfig.Def_RewardType_NewFairyCParty:
+ PlayerNewFairyCeremony.GetFCPartyAward(curPlayer, dataEx)
+ # 领取节日巡礼活动奖励
+ elif rewardType == ChConfig.Def_RewardType_FeastWeekPartyAct:
+ PlayerFeastWeekParty.GetFeastWeekPartyActionAward(curPlayer, dataEx, dataExStr)
+ # 领取节日巡礼积分奖励
+ elif rewardType == ChConfig.Def_RewardType_FeastWeekPartyPoint:
+ PlayerFeastWeekParty.GetFeastWeekPartyPointAward(curPlayer, dataEx, dataExStr)
return
--
Gitblit v1.8.0