From 378c281fc81dd9a136421503cc8cb267c0eaf995 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期日, 28 九月 2025 16:13:24 +0800 Subject: [PATCH] 16 卡牌服务端(删除副本鼓舞、副本buff;) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 192 +++++++++++++++++------------------------------- 1 files changed, 68 insertions(+), 124 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py index 3980af3..377d290 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py @@ -60,15 +60,11 @@ ("DWORD", "NPCID", 1), ("char", "NPCName", 0), ("DWORD", "RelatedHeroID", 0), - ("BYTE", "Country", 0), - ("BYTE", "AtkDistType", 0), - ("BYTE", "Sex", 0), ("WORD", "LV", 0), ("BYTE", "BossType", 0), ("DWORD", "Atk", 0), ("DWORD", "Def", 0), ("DWORD", "MaxHP", 0), - ("list", "SkillIDList", 0), ("DWORD", "FinalDamPer", 0), ("DWORD", "FinalDamPerDef", 0), ("DWORD", "MissRate", 0), @@ -84,7 +80,6 @@ ("DWORD", "SuckHPPer", 0), ("DWORD", "SuckHPPerDef", 0), ("dict", "SpecAttrInfo", 0), - ("BYTE", "Specialty", 0), ), "NPCStronger":( @@ -138,13 +133,13 @@ ("BYTE", "TriggerWay3", 0), ("BYTE", "TriggerSrc3", 0), ("WORD", "CoolDownTime", 0), - ("list", "IgnoreStates", 0), + ("WORD", "BuffStateLimit", 0), ("BYTE", "CurBuffState", 0), ("WORD", "LastTime", 0), ("BYTE", "LayerCnt", 0), ("BYTE", "LayerMax", 0), ("DWORD", "BuffRepeat", 0), - ("DWORD", "DieContinue", 0), + ("BYTE", "DispersedLimit", 0), ("DWORD", "FightPower", 0), ("char", "SkillMotionName", 0), ), @@ -152,10 +147,12 @@ "Hero":( ("DWORD", "HeroID", 1), ("char", "Name", 0), + ("BYTE", "PlayerCanUse", 0), ("BYTE", "Country", 0), ("BYTE", "Quality", 0), ("BYTE", "AtkDistType", 0), ("BYTE", "Sex", 0), + ("BYTE", "Job", 0), ("list", "SkinIDList", 0), ("DWORD", "NormalSkillID", 0), ("DWORD", "AngerSkillID", 0), @@ -1328,13 +1325,6 @@ ("BYTE", "ShowType", 0), ), - "FbEncourage":( - ("DWORD", "DataMapID", 1), - ("BYTE", "InspireType", 1), - ("WORD", "InspireMaxLV", 0), - ("char", "MoneyCount", 0), - ), - "MapRefreshNPC":( ("DWORD", "MapID", 1), ("BYTE", "RefreshNum", 0), @@ -1498,10 +1488,12 @@ ("BYTE", "IsAuctionItem", 0), ), - "FirstGold":( - ("BYTE", "Day", 1), - ("dict", "JobItemInfo", 0), - ("list", "CommItemList", 0), + "FirstCharge":( + ("BYTE", "FirstID", 1), + ("WORD", "NeedCTGID", 0), + ("list", "AwardListDay1", 0), + ("list", "AwardListDay2", 0), + ("list", "AwardListDay3", 0), ), "LVAward":( @@ -2435,13 +2427,6 @@ ("WORD", "LevelMax", 0), ), - "FBBuyBuff":( - ("DWORD", "MapId", 1), - ("WORD", "MoneyCnt", 1), - ("DWORD", "BuffID", 0), - ("WORD", "BuffCD", 0), - ), - "SkillElement":( ("DWORD", "ElementSkillID", 1), ("BYTE", "ElementSkillNum", 0), @@ -2622,31 +2607,26 @@ def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD def GetNPCName(self): return self.attrTuple[1] # 名称 char def GetRelatedHeroID(self): return self.attrTuple[2] # 关联武将ID DWORD - def GetCountry(self): return self.attrTuple[3] # 国家 BYTE - def GetAtkDistType(self): return self.attrTuple[4] # 远近类型;1-近战;2-远程 BYTE - def GetSex(self): return self.attrTuple[5] # 性别;1-男,2-女 BYTE - def GetLV(self): return self.attrTuple[6] # 等级 WORD - def GetBossType(self): return self.attrTuple[7] # Boss类型 BYTE - def GetAtk(self): return self.attrTuple[8] # 攻击力 DWORD - def GetDef(self): return self.attrTuple[9] # 防御值 DWORD - def GetMaxHP(self): return self.attrTuple[10] # 最大生命值,可超过20E DWORD - def GetSkillIDList(self): return self.attrTuple[11] # 技能ID列表 list - def GetFinalDamPer(self): return self.attrTuple[12] # 最终增伤 DWORD - def GetFinalDamPerDef(self): return self.attrTuple[13] # 最终减伤 DWORD - def GetMissRate(self): return self.attrTuple[14] # 闪避概率 DWORD - def GetMissRateDef(self): return self.attrTuple[15] # 抗闪避概率 DWORD - def GetSuperHitRate(self): return self.attrTuple[16] # 暴击概率 DWORD - def GetSuperHitRateDef(self): return self.attrTuple[17] # 抗暴击概率 DWORD - def GetStunRate(self): return self.attrTuple[18] # 击晕概率 DWORD - def GetStunRateDef(self): return self.attrTuple[19] # 抗击晕概率 DWORD - def GetComboRate(self): return self.attrTuple[20] # 连击概率 DWORD - def GetComboRateDef(self): return self.attrTuple[21] # 抗连击概率 DWORD - def GetParryRate(self): return self.attrTuple[22] # 格挡概率 DWORD - def GetParryRateDef(self): return self.attrTuple[23] # 抗格挡概率 DWORD - def GetSuckHPPer(self): return self.attrTuple[24] # 吸血比率 DWORD - def GetSuckHPPerDef(self): return self.attrTuple[25] # 抗吸血比率 DWORD - def GetSpecAttrInfo(self): return self.attrTuple[26] # 特殊属性信息 {"属性ID":值, ...} dict - def GetSpecialty(self): return self.attrTuple[27] # 特长 BYTE + def GetLV(self): return self.attrTuple[3] # 等级 WORD + def GetBossType(self): return self.attrTuple[4] # Boss类型 BYTE + def GetAtk(self): return self.attrTuple[5] # 攻击力 DWORD + def GetDef(self): return self.attrTuple[6] # 防御值 DWORD + def GetMaxHP(self): return self.attrTuple[7] # 最大生命值,可超过20E DWORD + def GetFinalDamPer(self): return self.attrTuple[8] # 最终增伤 DWORD + def GetFinalDamPerDef(self): return self.attrTuple[9] # 最终减伤 DWORD + def GetMissRate(self): return self.attrTuple[10] # 闪避概率 DWORD + def GetMissRateDef(self): return self.attrTuple[11] # 抗闪避概率 DWORD + def GetSuperHitRate(self): return self.attrTuple[12] # 暴击概率 DWORD + def GetSuperHitRateDef(self): return self.attrTuple[13] # 抗暴击概率 DWORD + def GetStunRate(self): return self.attrTuple[14] # 击晕概率 DWORD + def GetStunRateDef(self): return self.attrTuple[15] # 抗击晕概率 DWORD + def GetComboRate(self): return self.attrTuple[16] # 连击概率 DWORD + def GetComboRateDef(self): return self.attrTuple[17] # 抗连击概率 DWORD + def GetParryRate(self): return self.attrTuple[18] # 格挡概率 DWORD + def GetParryRateDef(self): return self.attrTuple[19] # 抗格挡概率 DWORD + def GetSuckHPPer(self): return self.attrTuple[20] # 吸血比率 DWORD + def GetSuckHPPerDef(self): return self.attrTuple[21] # 抗吸血比率 DWORD + def GetSpecAttrInfo(self): return self.attrTuple[22] # 特殊属性信息 {"属性ID":值, ...} dict # NPC成长表 class IPY_NPCStronger(): @@ -2710,13 +2690,13 @@ def GetTriggerWay3(self): return self.attrTuple[28] # 触发方式 BYTE def GetTriggerSrc3(self): return self.attrTuple[29] # 有效来源 BYTE def GetCoolDownTime(self): return self.attrTuple[30] # 技能冷却时间 WORD - def GetIgnoreStates(self): return self.attrTuple[31] # 无视限制列表 list + def GetBuffStateLimit(self): return self.attrTuple[31] # Buff状态限制组 WORD def GetCurBuffState(self): return self.attrTuple[32] # Buff状态值 BYTE def GetLastTime(self): return self.attrTuple[33] # 持续时间 WORD def GetLayerCnt(self): return self.attrTuple[34] # Buff层数 BYTE def GetLayerMax(self): return self.attrTuple[35] # 最大层数 BYTE def GetBuffRepeat(self): return self.attrTuple[36] # Buff叠加规则 DWORD - def GetDieContinue(self): return self.attrTuple[37] # Buff死亡存在 DWORD + def GetDispersedLimit(self): return self.attrTuple[37] # 驱散限制 BYTE def GetFightPower(self): return self.attrTuple[38] # 技能战斗力 DWORD def GetSkillMotionName(self): return self.attrTuple[39] # 技能动作名 char @@ -2729,20 +2709,22 @@ def GetHeroID(self): return self.attrTuple[0] # 英雄ID DWORD def GetName(self): return self.attrTuple[1] # 名称 char - def GetCountry(self): return self.attrTuple[2] # 国家 BYTE - def GetQuality(self): return self.attrTuple[3] # 品质 BYTE - def GetAtkDistType(self): return self.attrTuple[4] # 远近类型;1-近战;2-远程 BYTE - def GetSex(self): return self.attrTuple[5] # 性别;1-男,2-女 BYTE - def GetSkinIDList(self): return self.attrTuple[6] # 皮肤ID列表 list - def GetNormalSkillID(self): return self.attrTuple[7] # 普攻技能ID DWORD - def GetAngerSkillID(self): return self.attrTuple[8] # 怒气技能ID DWORD - def GetAtkInheritPer(self): return self.attrTuple[9] # 攻击继承 WORD - def GetDefInheritPer(self): return self.attrTuple[10] # 防御继承 WORD - def GetHPInheritPer(self): return self.attrTuple[11] # 生命继承 WORD - def GetBatAttrDict(self): return self.attrTuple[12] # 其他战斗属性字典 {"属性ID":值, ...} dict - def GetFetterIDList(self): return self.attrTuple[13] # 羁绊ID列表 list - def GetRecruitBySelf(self): return self.attrTuple[14] # 招募需要本体 BYTE - def GetSpecialty(self): return self.attrTuple[15] # 武将特长 BYTE + def GetPlayerCanUse(self): return self.attrTuple[2] # 玩家可用 BYTE + def GetCountry(self): return self.attrTuple[3] # 国家 BYTE + def GetQuality(self): return self.attrTuple[4] # 品质 BYTE + def GetAtkDistType(self): return self.attrTuple[5] # 远近类型;1-近战;2-远程 BYTE + def GetSex(self): return self.attrTuple[6] # 性别;1-男,2-女 BYTE + def GetJob(self): return self.attrTuple[7] # 职业 BYTE + def GetSkinIDList(self): return self.attrTuple[8] # 皮肤ID列表 list + def GetNormalSkillID(self): return self.attrTuple[9] # 普攻技能ID DWORD + def GetAngerSkillID(self): return self.attrTuple[10] # 怒气技能ID DWORD + def GetAtkInheritPer(self): return self.attrTuple[11] # 攻击继承 WORD + def GetDefInheritPer(self): return self.attrTuple[12] # 防御继承 WORD + def GetHPInheritPer(self): return self.attrTuple[13] # 生命继承 WORD + def GetBatAttrDict(self): return self.attrTuple[14] # 其他战斗属性字典 {"属性ID":值, ...} dict + def GetFetterIDList(self): return self.attrTuple[15] # 羁绊ID列表 list + def GetRecruitBySelf(self): return self.attrTuple[16] # 招募需要本体 BYTE + def GetSpecialty(self): return self.attrTuple[17] # 武将特长 BYTE # 武将星级天赋表 class IPY_HeroTalent(): @@ -4454,18 +4436,6 @@ def GetBindMissionID(self): return self.attrTuple[4] # 绑定的任务ID DWORD def GetShowType(self): return self.attrTuple[5] # 0-服务端通知,>0前端处理 BYTE -# 副本鼓舞表 -class IPY_FbEncourage(): - - def __init__(self): - self.attrTuple = None - return - - def GetDataMapID(self): return self.attrTuple[0] # 地图ID DWORD - def GetInspireType(self): return self.attrTuple[1] # 鼓舞类型 BYTE - def GetInspireMaxLV(self): return self.attrTuple[2] # 鼓舞等级限制 WORD - def GetMoneyCount(self): return self.attrTuple[3] # 单次消耗金钱数量 char - # 地图标试点NPC刷新 class IPY_MapRefreshNPC(): @@ -4710,15 +4680,17 @@ def GetIsAuctionItem(self): return self.attrTuple[3] # 是否拍品 BYTE # 首充表 -class IPY_FirstGold(): +class IPY_FirstCharge(): def __init__(self): self.attrTuple = None return - def GetDay(self): return self.attrTuple[0] # 首充第几天 BYTE - def GetJobItemInfo(self): return self.attrTuple[1] # 职业物品奖励 {"职业":[[物品ID,个数], ...], ...} dict - def GetCommItemList(self): return self.attrTuple[2] # 通用物品奖励 [[物品ID,个数], ...] list + def GetFirstID(self): return self.attrTuple[0] # 首充ID BYTE + def GetNeedCTGID(self): return self.attrTuple[1] # 所需充值ID WORD + def GetAwardListDay1(self): return self.attrTuple[2] # 第1天奖励 [[物品ID,个数,装备定制ID], ...] list + def GetAwardListDay2(self): return self.attrTuple[3] # 第2天奖励 [[物品ID,个数,装备定制ID], ...] list + def GetAwardListDay3(self): return self.attrTuple[4] # 第3天奖励 [[物品ID,个数,装备定制ID], ...] list # 等级奖励表 class IPY_LVAward(): @@ -6171,18 +6143,6 @@ def GetStar(self): return self.attrTuple[1] # 装备星数 BYTE def GetLevelMax(self): return self.attrTuple[2] # 洗练等级上限 WORD -# 副本Buff表 -class IPY_FBBuyBuff(): - - def __init__(self): - self.attrTuple = None - return - - def GetMapId(self): return self.attrTuple[0] # DWORD - def GetMoneyCnt(self): return self.attrTuple[1] # 仙玉数量 WORD - def GetBuffID(self): return self.attrTuple[2] # BuffID DWORD - def GetBuffCD(self): return self.attrTuple[3] # 间隔时间s WORD - # 技能升级表 class IPY_SkillElement(): @@ -6582,7 +6542,6 @@ self.__LoadFileData("FamilyRedPack", onlyCheck) self.__LoadFileData("ActFeastRedPacketSucc", onlyCheck) self.__LoadFileData("NPCShow", onlyCheck) - self.__LoadFileData("FbEncourage", onlyCheck) self.__LoadFileData("MapRefreshNPC", onlyCheck) self.__LoadFileData("RuneCompound", onlyCheck) self.__LoadFileData("ResourcesBack", onlyCheck) @@ -6599,7 +6558,7 @@ self.__LoadFileData("OrderInfo", onlyCheck) self.__LoadFileData("CTG", onlyCheck) self.__LoadFileData("CTGSelectItem", onlyCheck) - self.__LoadFileData("FirstGold", onlyCheck) + self.__LoadFileData("FirstCharge", onlyCheck) self.__LoadFileData("LVAward", onlyCheck) self.__LoadFileData("Invest", onlyCheck) self.__LoadFileData("XBXZ", onlyCheck) @@ -6704,7 +6663,6 @@ self.__LoadFileData("FamilyZhenbaogeItem", onlyCheck) self.__LoadFileData("FamilyZhenfa", onlyCheck) self.__LoadFileData("ItemWashMax", onlyCheck) - self.__LoadFileData("FBBuyBuff", onlyCheck) self.__LoadFileData("SkillElement", onlyCheck) self.__LoadFileData("LingGenEffect", onlyCheck) self.__LoadFileData("LoveGift", onlyCheck) @@ -6919,13 +6877,7 @@ def __StrToList(self, strValue): setList = [] - if (strValue.startswith("[") and strValue.endswith("]")) or (strValue.startswith("(") and strValue.endswith(")")): - setList = eval(strValue) - elif strValue in ["0", "-", ""]: - pass - elif strValue.isdigit(): - setList = (int(strValue),) - else: + if ChConfig.Def_Str_Montant in strValue: # |分割的优先 for value in strValue.split(ChConfig.Def_Str_Montant): if value.isdigit(): value = int(value) @@ -6939,6 +6891,12 @@ setList.append(value) if setList: setList = tuple(setList) + elif (strValue.startswith("[") and strValue.endswith("]")) or (strValue.startswith("(") and strValue.endswith(")")): + setList = eval(strValue) + elif strValue in ["0", "-", ""]: + pass + elif strValue.isdigit(): + setList = (int(strValue),) return setList @@ -7761,13 +7719,6 @@ self.CheckLoadData("NPCShow") return self.ipyNPCShowCache[index] - def GetFbEncourageCount(self): - self.CheckLoadData("FbEncourage") - return self.ipyFbEncourageLen - def GetFbEncourageByIndex(self, index): - self.CheckLoadData("FbEncourage") - return self.ipyFbEncourageCache[index] - def GetMapRefreshNPCCount(self): self.CheckLoadData("MapRefreshNPC") return self.ipyMapRefreshNPCLen @@ -7880,12 +7831,12 @@ self.CheckLoadData("CTGSelectItem") return self.ipyCTGSelectItemCache[index] - def GetFirstGoldCount(self): - self.CheckLoadData("FirstGold") - return self.ipyFirstGoldLen - def GetFirstGoldByIndex(self, index): - self.CheckLoadData("FirstGold") - return self.ipyFirstGoldCache[index] + def GetFirstChargeCount(self): + self.CheckLoadData("FirstCharge") + return self.ipyFirstChargeLen + def GetFirstChargeByIndex(self, index): + self.CheckLoadData("FirstCharge") + return self.ipyFirstChargeCache[index] def GetLVAwardCount(self): self.CheckLoadData("LVAward") @@ -8614,13 +8565,6 @@ def GetItemWashMaxByIndex(self, index): self.CheckLoadData("ItemWashMax") return self.ipyItemWashMaxCache[index] - - def GetFBBuyBuffCount(self): - self.CheckLoadData("FBBuyBuff") - return self.ipyFBBuyBuffLen - def GetFBBuyBuffByIndex(self, index): - self.CheckLoadData("FBBuyBuff") - return self.ipyFBBuyBuffCache[index] def GetSkillElementCount(self): self.CheckLoadData("SkillElement") -- Gitblit v1.8.0