From 912176de9ed5b45e5fe0edbb15b8796f54c56ba2 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期一, 25 八月 2025 19:26:52 +0800 Subject: [PATCH] 121 【武将】武将系统-服务端(武将表、NPC表 增加性别) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 123 +--------------------------------------- 1 files changed, 5 insertions(+), 118 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 e026c22..2b212c8 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py @@ -19,7 +19,6 @@ import ChConfig import BuffSkill import PlayerEventCounter -import PlayerTeam import PlayerHorse import NPCCommon import SkillCommon @@ -53,26 +52,15 @@ import PlayerGoldInvest import PlayerActivity import FBCommon -import BossHurtMng import PlayerWishingWell import PlayerSuccess import PlayerDienstgrad import PlayerFreeGoods import PlayerRecover -import GameLogic_SkyTower import PlayerEquipDecompose -import PlayerGreatMaster -import PlayerGatherSoul -import PlayerGatherTheSoul -import PlayerFairyDomain import PlayerCrossRealmPK import PlayerCrossChampionship -import PlayerCrossBattlefield import GameFuncComm -import PlayerMagicWeapon -import GameLogic_FamilyBoss -import GameLogic_TrialTower -import GameLogic_FamilyWar import PlayerBossReborn import PlayerWeekParty import PlayerFeastWeekParty @@ -81,16 +69,12 @@ import PlayerFeastWish import PlayerActLogin import PlayerTreasure -import GameLogic_GodArea import PlayerRune import PlayerFamilyRedPacket import IpyGameDataPY import EventReport import OpenServerCampaign -import PlayerVip -import PlayerRefineStove import PassiveBuffEffMng -import GameLogic_XMZZ import PlayerFlashSale import PlayerFlashGiftbag import PlayerDailyGiftbag @@ -113,8 +97,6 @@ import PlayerActHorsePetFeast import PlayerActBossTrial import PlayerSpringSale -import PlayerFairyCeremony -import PlayerNewFairyCeremony import GY_Query_BossFirstKill import PlayerCrossYaomoBoss import PlayerFeastRedPacket @@ -128,9 +110,6 @@ import PlayerTongTianLing import CrossRealmPlayer import ChNetSendPack -import FamilyRobBoss -import FBHelpBattle -import PlayerAssist import PlayerArena import PyGameData import PlayerCoin @@ -491,8 +470,6 @@ EventReport.WriteEvent_login(curPlayer) #---玩家上线, 宠物逻辑处理--- PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick) - - PlayerTeam.OnPlayerLoginCrossServer(curPlayer) return leaveServerSecond = PlayerControl.GetPlayerLeaveServerSecond(curPlayer) @@ -557,15 +534,6 @@ #PK模式 SyncPKModel(curPlayer) - #大师 - PlayerGreatMaster.MasterOnLogin(curPlayer) - - #通知VIP - PlayerVip.DoOnLogin(curPlayer, tick) - - #通知法宝精炼等级 - PlayerRefineStove.DoOnLogin(curPlayer, tick) - #---玩家上线, 宠物逻辑处理--- PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick) PlayerPet.OnPlayerPetLogin(curPlayer) @@ -590,13 +558,6 @@ #通知玩家死亡时间 PlayerControl.PlayerControl(curPlayer).NotifyPlayerDeadTime(curPlayer) - #ClearPlayerDeadInfo(curPlayer) - - #充值活动玩家登入处理 - #PlayerGoldAction.DoLogic_PlayerOnLogin(curPlayer) - - # 提示贵宾俱乐部信息 - #PlayerVip.NoteVIPClubInfo(curPlayer) #角色改名次数 UpdatePlayerName.Sync_UpdatePlayerNameCount(curPlayer) @@ -617,11 +578,7 @@ # 开服活动奖励信息 OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer) - - # 试炼之塔 - GameLogic_TrialTower.OnFBPlayerLogin(curPlayer) - # 古神禁地 - GameLogic_GodArea.GodAreaOnLogin(curPlayer) + # 采集NPC次数通知 NPCCommon.SyncCollNPCTime(curPlayer) @@ -660,7 +617,6 @@ # 跨服PK PlayerCrossRealmPK.DoPlayerLogin(curPlayer) PlayerCrossChampionship.DoPlayerLogin(curPlayer) - PlayerCrossBattlefield.DoPlayerLogin(curPlayer) # 幸运云购 PlayerLuckyCloudBuy.OnPlayerLogin(curPlayer) @@ -702,29 +658,21 @@ PlayerActFamilyCTGAssist.OnPlayerLogin(curPlayer) #集字活动 PlayerActCollectWords.OnPlayerLogin(curPlayer) - # 世界boss - BossHurtMng.OnLogin(curPlayer) ChItem.Sync_ItemDayUseCnt(curPlayer) # 符印登录通知 PlayerRune.PlayerRuneLogin(curPlayer) # 仙盟红包登录通知 PlayerFamilyRedPacket.OnPlayerLogin(curPlayer) PlayerFeastRedPacket.DoPlayerOnLogin(curPlayer) - # 法宝登录通知 - PlayerMagicWeapon.PlayerMagicWeaponLogin(curPlayer) # 商店物品购买次数登录通知 FunctionNPCCommon.ShopItemOnLogin(curPlayer) # 通知设置的被动功法 #PassiveBuffEffMng.OnLoginGFPassive(curPlayer) - #仙魔之争 - GameLogic_XMZZ.OnXMZZLogin(curPlayer) PlayerOnlinePrize.OnPlayerLogin(curPlayer) #装备分解 PlayerEquipDecompose.PlayerLogin(curPlayer) #防沉迷 PlayerGameWallow.DoLogic_CheckWallow(curPlayer, tick) - # 协助 - PlayerAssist.OnPlayerLogin(curPlayer) # 极品白拿 PlayerFreeGoods.OnLogin(curPlayer) # BOSS复活活动 @@ -773,31 +721,18 @@ PlayerActSingleRecharge.OnPlayerLogin(curPlayer) # 转盘活动 PlayerActTurntable.OnPlayerLogin(curPlayer) - # 仙界盛典活动 - PlayerFairyCeremony.OnLogin(curPlayer) - # 新仙界盛典活动 - PlayerNewFairyCeremony.OnLogin(curPlayer) # 分支下载奖励记录通知 SyncPackDownloadAward(curPlayer) # 登录触发功能开启(老号处理) GameFuncComm.DoFuncOpenLogic(curPlayer) # 神兽 PlayerDogz.OnPlayerLogin(curPlayer) - # 骑宠 - FamilyRobBoss.OnPlayerLogin(curPlayer) # 许愿池 PlayerWishingWell.OnLogin(curPlayer) #幸运鉴宝 PlayerLuckyTreasure.OnLogin(curPlayer) # 小助手 SyncLittleHelper(curPlayer) - # 副本助战 - FBHelpBattle.DoPlayerLogin(curPlayer) - # 聚魂 - PlayerGatherSoul.PlayerLogin(curPlayer) - PlayerGatherTheSoul.OnPlayerLogin(curPlayer) - #缥缈仙域 - PlayerFairyDomain.OnLogin(curPlayer) PlayerFB.OnLogin(curPlayer) #技能专精信息 SkillShell.NotifyElementSkillInfo(curPlayer) @@ -994,9 +929,6 @@ # 同步排行榜 PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer, isAll=True) - - # 天星塔全服过关记录 - GameLogic_SkyTower.OnMixFirstLogin(curPlayer) # boss凭证 PlayerActBossTrial.OnMixFirstLogin(curPlayer) @@ -1645,9 +1577,7 @@ #======================================================================= #此时已经是下马状态不需要刷状态 但是需要通知客户端下马 PlayerHorse.PlayerRideHorseDown(curPlayer, False) - - PlayerTeam.PlayerLoginSetTeam(curPlayer, tick) - + #激活玩家(保证持续性Buff处理间隔) PlayerControl.SetIsNeedProcess(curPlayer, True) @@ -1706,13 +1636,7 @@ curPlayer.SetFaction(ChConfig.CampType_Neutral) BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_SkillID_Justice, tick) BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_SkillID_Evil, tick) - - - #再次请求双倍经验是否领取 - #PlayerDoubleExpSys.ChangeMapAfter_CalcDoubleExpTime(curPlayer, tick) - - #PlayerVip.SetStartCalcVIPTick(curPlayer, tick) - + #强制切换PK模式 initAttackModel = curMap.GetInitAttackModel() if curPlayer.GetAttackMode() != initAttackModel: @@ -2371,8 +2295,6 @@ #流向记录玩家下线 DataRecordPack.DR_PlayerDisconnect(curPlayer) - #VIP时间 - #PlayerVip.CalcVIPTimeByTick(curPlayer, tick, False) #在线时间 PlayerOnlinePrize.CalcOnlineTime(curPlayer) #首充提示时间 @@ -2978,11 +2900,7 @@ return elif rebornType == ChConfig.rebornType_UseItem: - if crossMapID == ChConfig.Def_FBMapID_CrossBattlefield: - rebornItemID = IpyGameDataPY.GetFuncCfg("CrossBattlefieldReborn", 1) - rebornItem = ItemCommon.FindItemInPackByItemID(curPlayer, rebornItemID, IPY_GameWorld.rptItem) - else: - rebornItem = ItemCommon.FindItemInPackByEffectEx(curPlayer, ChConfig.Def_Effect_Reborn) + rebornItem = ItemCommon.FindItemInPackByEffectEx(curPlayer, ChConfig.Def_Effect_Reborn) if not rebornItem: GameWorld.ErrLog("复活道具不足,无法原地复活! ", playerID) return @@ -3317,7 +3235,7 @@ # @param transportType 传送类型 # @return 是否vip等级限制 def TransportVipLvRestrict(curPlayer, transportType): - return PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FreeTransport) + return 0 @@ -3526,21 +3444,12 @@ # 每日免费直购礼包 elif rewardType == ChConfig.Def_RewardType_DayFreeGoldGift: PlayerDailyGiftbag.OnGetDailyFreeGiftbag(curPlayer) - # 仙盟联赛冠军仙盟每日俸禄奖励 - elif rewardType == ChConfig.Def_RewardType_ChampionFamilyDailyReward: - GameLogic_FamilyWar.GetChampionFamilyDailyReward(curPlayer) - # 仙魔之争胜利场数奖励 - elif rewardType == ChConfig.Def_RewardType_XMZZWinCnt: - GameLogic_XMZZ.GetXMZZWinPrize(curPlayer, dataEx) # 仙盟每日福利奖励 elif rewardType == ChConfig.Def_RewardType_FamilyDayAward: PlayerFamily.GetFamilyDayAward(curPlayer) # 玩家等级奖励 elif rewardType == ChConfig.Def_RewardType_LVAward: PlayerLVAward.GetPlayerLVAward(curPlayer, dataEx) - # 仙宝寻主奖励 - elif rewardType == ChConfig.Def_RewardType_XBXZ: - PlayerMagicWeapon.OnGetXBXZAward(curPlayer, dataEx) # 首充礼包奖励 elif rewardType == ChConfig.Def_RewardType_GoldGiftFirst: PlayerGoldGift.GetPlayerGoldGiftFirst(curPlayer, dataEx) @@ -3562,12 +3471,6 @@ # 领取boss复活活动奖励 elif rewardType == ChConfig.Def_RewardType_BossReborn: PlayerBossReborn.GetBossRebornActionAward(curPlayer, dataEx) - # 领取仙界盛典充值大礼 - elif rewardType == ChConfig.Def_RewardType_FCRecharge: - PlayerFairyCeremony.GetFCRechargeAward(curPlayer) - # 领取仙界盛典全民来嗨 - elif rewardType == ChConfig.Def_RewardType_FCParty: - PlayerFairyCeremony.GetFCPartyAward(curPlayer, dataEx) # 领取分包下载奖励 elif rewardType == ChConfig.Def_RewardType_DownLoad: GetDownloadAward(curPlayer, dataEx) @@ -3586,12 +3489,6 @@ # 领取登录奖励活动奖励 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) @@ -3646,18 +3543,12 @@ # 轮回殿奖励 elif rewardType == ChConfig.Def_RewardType_LunhuidianAward: PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr) - #缥缈奇遇领取 - elif rewardType == ChConfig.Def_RewardType_FairyAdventuresAward: - PlayerFairyDomain.GetFairyAdventuresAward(curPlayer, dataEx, dataExStr) #历史累计充值领取 elif rewardType == ChConfig.Def_RewardType_HistoryChargeAward: PlayerGoldGift.OnGetHistoryRechargeAward(curPlayer, dataEx) #在线特惠充值额外奖励 elif rewardType == ChConfig.Def_RewardType_OnlineRechargeTH: PlayerCoin.OnGetOnlineRechargeTH(curPlayer) - #天星塔全服挑战层领奖 - elif rewardType == ChConfig.Def_RewardType_SkyTowerServerChallengeReward: - GameLogic_SkyTower.OnGetSkyTowerServerChallengeReward(curPlayer, dataEx, dataExStr) #创角奖励 elif rewardType == ChConfig.Def_RewardType_CreateRole: OnGetCreateRoleAward(curPlayer) @@ -3667,9 +3558,6 @@ #境界渡劫任务条件奖励 elif rewardType == ChConfig.Def_RewardType_RealmLVUpTask: PlayerPrestigeSys.GetRealmLVUpTaskAward(curPlayer, dataEx) - #仙盟boss伤害奖励 - elif rewardType == ChConfig.Def_RewardType_FamilyBossHurt: - GameLogic_FamilyBoss.GetFamilyBossHurtAward(curPlayer, dataEx, dataExStr) #打包直购礼包奖励 elif rewardType == ChConfig.Def_RewardType_DailyPackBuyGift: PlayerGoldGift.GetDailyPackBuyGift(curPlayer, dataEx) @@ -3847,7 +3735,6 @@ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index) if not curPlayer: return - BossHurtMng.OnQueryBossHurtList(curPlayer, clientData) return -- Gitblit v1.8.0