From 4087d18ce7cbd1578a6e287962bd902386984048 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 七月 2025 10:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 224 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 122 insertions(+), 102 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 89ba876..5c4acdc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -324,6 +324,7 @@
Def_PetBaseEffectList = range(5000, 5007 + 1)
#---------------------------------------------------------------------------
+Def_ItemCount_Max = 2000000000 # 物品最大叠加上限
#写死的物品ID都放这边
Def_ItemID_PetSoul = -1 #宠物满魂
Def_ItemID_PetDoubleExp = -1 #宠物双倍
@@ -442,10 +443,10 @@
Def_ItemType_retTrousers = 106 #6 裤子
Def_ItemType_retShoes = 107 #7 鞋子
Def_ItemType_retGlove = 108 #8 手套
-Def_ItemType_retNeck = 109 #9 项链
-Def_ItemType_retFairyCan = 110 #10 仙器1
-Def_ItemType_retFairyCan2 = 111 #11 仙器2
-Def_ItemType_retJade = 112 #12 玉佩
+Def_ItemType_retShawl = 109 #9 披肩
+Def_ItemType_retNeck = 110 #10 项链
+Def_ItemType_retRing = 111 #11 戒指
+Def_ItemType_retAmulet = 112 #12 玉佩
Def_ItemType_retWing = 113 #13 翅膀
Def_ItemType_retGuard1 = 114 #14 守护1
Def_ItemType_retGuard2 = 115 #15 守护2
@@ -463,13 +464,15 @@
Def_ItemType_CanUseByCDTime = 145 # 创建后根据CDTime到后可开启
+Def_ItemType_Hero = 150 # 武将英雄
+
#以下定义物品类型下次删除
Def_Item_Type_Horse = 1000036 #坐骑
#虚拟背包最大格子数 功能配置表对应的key
Def_VPackCnt_Dict = {
- ShareDefine.rptRune:'RunePackageNum',
- ShareDefine.rptGatherSoul:'GatherSoulPackCount',
+ #ShareDefine.rptRune:'RunePackageNum',
+ #ShareDefine.rptGatherSoul:'GatherSoulPackCount',
}
def GetItemPackType(itemData, defaultPack=IPY_GameWorld.rptItem):
@@ -496,13 +499,13 @@
ShareDefine.retTrousers:[Def_ItemType_retTrousers],
ShareDefine.retShoes:[Def_ItemType_retShoes],
ShareDefine.retGlove:[Def_ItemType_retGlove],
+ ShareDefine.retShawl:[Def_ItemType_retShawl],
ShareDefine.retNeck:[Def_ItemType_retNeck],
- ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
- ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
- ShareDefine.retJade:[Def_ItemType_retJade],
- ShareDefine.retWing:[Def_ItemType_retWing],
- ShareDefine.retGuard1:[Def_ItemType_retGuard1],
- ShareDefine.retGuard2:[Def_ItemType_retGuard2],
+ ShareDefine.retRing:[Def_ItemType_retRing],
+ ShareDefine.retAmulet:[Def_ItemType_retAmulet],
+ #ShareDefine.retWing:[Def_ItemType_retWing],
+ #ShareDefine.retGuard1:[Def_ItemType_retGuard1],
+ #ShareDefine.retGuard2:[Def_ItemType_retGuard2],
}
#---------------------------------------------------------------------
#写死的物品效果ID都放这边------请按数值顺序存放
@@ -555,6 +558,7 @@
Def_Effect_EmojiPack = 276 #表情包物品；A值-表情包ID
Def_Effect_RecycleItemMoney = 277 #回收物品转化为货币； A值-直接给货币物品ID；B值-货币数量
Def_Effect_FamilyEmblem = 278 #激活仙盟徽章； A值-徽章ID；
+Def_Effect_HeroSkin = 279 #激活武将皮肤； A值-武将ID；B值-皮肤索引
#----以下未使用或代码依然存在的---
Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
@@ -801,7 +805,6 @@
Def_SkillID_DoubleExp = -1 # 双倍经验系统中的双倍经验ID
Def_SkillID_Justice = 11504 # 正义阵营
Def_SkillID_Evil = 11505 # 黑道阵营
-Def_SkillID_JoinExam = -1 # 答题Buff
Def_SkillID_ActionWuDi = -1 # 活动无敌Buff
Def_SkillID_ZhenQiRestore = -1 # 真气恢复加成BUFF
Def_SkillTypeID_EfficientBattle = -1 #高效战斗类型ID,高效战斗buffID:49001~49008
@@ -880,6 +883,9 @@
#装备类型
Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
+#主线装备类型
+Def_MainEquipType = range(Def_ItemType_retWeapon, Def_ItemType_retAmulet + 1)
+
#神兽装备类型
Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
@@ -918,12 +924,6 @@
Def_PackCnt_Fashion = 1
#登陆初始武器时装格子数
Def_PackCnt_WeaponCoat = 8
-#初始化回收站
-Def_PackCnt_Recycle = 6
-#初始化临时交换背包格子数
-Def_PackCnt_TempSwap = 1
-#初始化临时存放背包格子数
-Def_PackCnt_TempItem = 10
#玩家脱离战斗状态时间(6秒)
Def_PlayerLeaveBattleTick = 3000
#玩家PK多杀间隔
@@ -1138,11 +1138,12 @@
#玩家登陆需要初始化的背包索引
Def_PlayerLoginInitPackIndexList = [#主角背包
- IPY_GameWorld.rptRecycle,
+ #IPY_GameWorld.rptRecycle,
IPY_GameWorld.rptEquip,
IPY_GameWorld.rptItem,
#IPY_GameWorld.rptFineSoulSlot,
- IPY_GameWorld.rptAnyWhere,
+ #IPY_GameWorld.rptAnyWhere,
+ IPY_GameWorld.rptIdentify,
#时装背包
#IPY_GameWorld.rptCabinetWeaponCoat,
#IPY_GameWorld.rptCabinetHorse,
@@ -1150,10 +1151,11 @@
#IPY_GameWorld.rptHorseEquip,
ShareDefine.rptTempItem,
ShareDefine.rptTreasure,
- ShareDefine.rptPet,
- ShareDefine.rptDogzItem,
- ShareDefine.rptDogzEquip,
- ShareDefine.rptGarbage,
+ #ShareDefine.rptPet,
+ #ShareDefine.rptDogzItem,
+ #ShareDefine.rptDogzEquip,
+ #ShareDefine.rptGarbage,
+ ShareDefine.rptHero,
]
#装备可强化背包列表
@@ -1188,9 +1190,6 @@
Type_Relation_Enemy = 1
#朋友
Type_Relation_Friend = 2
-
-Def_NpcDictKey_CampType = 'CampType'
-#阵营 三种 中立 正义 邪恶
CampType_Neutral = ShareDefine.CampType_Neutral # 中立
CampType_Justice = ShareDefine.CampType_Justice # 正义
@@ -1235,7 +1234,7 @@
) = range(Def_UseSkillAim_Type)
#技能施法目标类型, 修改此处应在Def_Dict_UseSkillTag_ObjType 相应更改
-Def_UseSkillTag_Type = 16
+Def_UseSkillTag_Type = 17
(
Def_UseSkillTag_None , #无需选择对象 0
Def_UseSkillTag_Self , #自己 1
@@ -1253,6 +1252,7 @@
Def_UseSkillTag_CanAttackBaseNPC, #可攻击的野外小怪（含精英）怪物 13
Def_UseSkillTag_FriendNPC, #友好NPC 14
Def_UseSkillTag_AppointNPC, #指定NPC 15 必须和效果值配合 Def_Skill_Effect_AppointNPC
+ Def_UseSkillTag_FriendDeath, #友方死亡目标16
) = range( 0, Def_UseSkillTag_Type )
@@ -1291,6 +1291,13 @@
Def_ST_CanNPCUseSkill = [
Def_UseSkillTag_None,
Def_UseSkillTag_Self,
+ ]
+
+#NPC技能：可以对友好目标释放的技能
+Def_ST_CanNPCUseSkillFriend = [
+ Def_UseSkillTag_Friend,
+ Def_UseSkillTag_SelfAndFriend,
+ Def_UseSkillTag_FriendNPC,
]
#自动攻击技能类型
@@ -1340,7 +1347,7 @@
Def_SkillType_PlsBuff : IPY_GameWorld.bfBuff , #增益BUFF 5
Def_SkillType_DepBuff : IPY_GameWorld.bfDeBuff , #减益BUFF 6
Def_SkillType_PassiveBuff : IPY_GameWorld.btPassiveBuf, # 被动技能 7 (废弃，无此定义分散为其他buff)
- Def_SkillType_Revive : IPY_GameWorld.bfIncBuff, #复活 8
+ #Def_SkillType_Revive : IPY_GameWorld.bfIncBuff, #复活 8
Def_SkillType_Increment : IPY_GameWorld.bfIncBuff, #增值技能（不可清除）9
Def_SkillType_Aura : IPY_GameWorld.bfAura , #光环技能 10
Def_SkillType_Equip : IPY_GameWorld.bfEquipBuff,#装备技能 11
@@ -1511,7 +1518,7 @@
#自动恢复计算间隔
Def_HPRestoreInterval = 5000
#允许重置的背包索引
-Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptGarbage]
+Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptGarbage, ShareDefine.rptHero]
#仓库分页个数
Def_ItemReset_WarehousePageCnt = 56
#玩家捡起物品的距离 8
@@ -1638,9 +1645,6 @@
#GM操作字符
Def_GM_Oper_ForbidAcc = 'GMOperForbidAcc' #GM操作符：踢出玩家
#---------------------------------------------------------------------
-#GM活动ID(10倍)
-Def_GY_GM_GameID_MapGiveExp_Ten = 3000005
-Def_GY_GM_GameID_MapGiveExp_Fifty = 3000006
#------------
# 非c++定义的账号状态，py用的账号锁定,禁言，按位判断
@@ -1730,6 +1734,11 @@
Def_NstNull, Def_NstMoving, Def_NstDead, Def_NstAttack = range(4)
#-------------------------------#副本相关#------------------------
+# 主线小怪
+Def_FBMapID_Main = 1
+# 主线Boss
+Def_FBMapID_MainBoss = 2
+
#创角新手村地图ID列表
Def_CreatRoleMapIDList = [10000]
#PK周赛
@@ -1848,9 +1857,6 @@
Def_TFMapID_MineArea, # 福地 1
) = range(1, 1 + 1)
-#回合战斗自定义地图需要发送GameServer的列表
-Def_TFMapID_SendToGameServer = [Def_TFMapID_MineArea]
-
#前端自定义场景地图
ClientCustomSceneList = [Def_FBMapID_PersonalBoss, Def_FBMapID_ArenaBattle, Def_FBMapID_MirrorBattle]
@@ -1949,6 +1955,7 @@
#副本ID转换
Def_FB_MapID = {
+ 'MainLevel':[Def_FBMapID_Main, Def_FBMapID_MainBoss], # 主线关卡
'FamilyWar':[Def_FBMapID_FamilyWar], # 仙盟联赛
'FamilyInvade':[Def_FBMapID_FamilyInvade], # 守卫人皇
'FamilyBoss':[Def_FBMapID_FamilyBossMap], # 战盟boss
@@ -2439,25 +2446,21 @@
ShareDefine.retTrousers, #6 裤子
ShareDefine.retShoes, #7 鞋子
ShareDefine.retGlove, #8 手套
- ShareDefine.retNeck, #9 项链
- ShareDefine.retFairyCan, #10 仙器1
- ShareDefine.retFairyCan2, #11 仙器2
- ShareDefine.retJade, #12 玉佩
+ ShareDefine.retShawl, #9 披肩
+ ShareDefine.retNeck, #10 项链
+ ShareDefine.retRing, #11 戒指
+ ShareDefine.retAmulet, #12 玉佩
],
}
## 装备位 - 基础攻击类
-EquipPlace_BaseWeapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2, ShareDefine.retBelt, ShareDefine.retGlove]
+EquipPlace_BaseWeapon = []
## 装备位 - 基础防具类
-EquipPlace_BaseArmor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retTrousers, ShareDefine.retShoes]
-## 装备位 - 仙器
-EquipPlace_Relics = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
-## 装备位 - 特殊
-EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
+EquipPlace_BaseArmor = []
## 装备位 - 所有基础
EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor
## 装备位 - 灵器
-EquipPlace_LingQi = [ShareDefine.retWing, ShareDefine.retGuard1, ShareDefine.retPeerlessWeapon, ShareDefine.retPeerlessWeapon2]
+EquipPlace_LingQi = []
#装备物品位置,不需要重刷属性
EquipItemNoRefreshState = [
@@ -2495,45 +2498,6 @@
TYPE_Time_Format_YmdHMS = "%Y%m%d%H%M%S"
#---------------------------------------------------------------------
-#无限封存时间(10年)
-Def_GMPower_MaxTime = 60*24*365*10
-#GM权限表
-
-# GM命令 超级GM(1级) A级GM(2级) B级GM(3级) C级GM(4级) D级GM(5级)
-Def_GMPower_Disc = {
- 'GY_GM_PlayerDetailByID' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #角色查询
- 'GY_GM_MoveToPlayerByID' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #传送到玩家身边
- 'GY_GM_PullPlayerByID' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #把玩家拉到身边
- 'GY_GM_ViewBroadcast' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #查询公告
- 'GY_GM_ForbidFight' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : False} , #禁止战斗
- 'GY_GM_KickPlayer' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #踢玩家下线
- 'GY_GM_CloseAccID' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : False} , #帐号封存
- 'GY_GM_SetNoSight' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #设置隐身
- 'GY_GM_CancelNoSight' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #取消隐身
- 'GY_GM_ForbidTalk' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #禁止说话
- 'GY_GM_ChangeGMLV' : { 1 : True , 2 : False, 3 : False, 4 : False, 5 : False} , #更改权限
- 'GY_GM_SetExpRate' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #经验倍率
- 'GY_GM_StartGame' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #开启活动
- 'GY_GM_ViewGame' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #查询活动
- 'GY_GM_FindPlayerByID' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #查询玩家
- 'GY_GM_FindPlayerByName' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #查询玩家
- 'GY_GM_GivePlayerExp' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #给经验
- 'GY_GM_Broadcast' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #发布公告
- 'GY_GM_ViewWordExpRate' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #查看服务器经验倍率
- 'GY_GM_MapGiveExp' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #设置指定地图经验倍率
- 'GY_GM_Offline_FindPlayer': { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查找玩家
- 'GY_GM_Offline_ViewItem' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #脱机工具-查看物品
- 'GY_GM_Offline_ViewAttribute' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查看玩家属性
- 'GY_GM_Offline_ViewSkill': { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查看玩家技能
- 'GY_GM_Offline_ViewTitle': { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查看玩家称号
- 'GY_GM_Offline_ViewMoney': { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查看玩家货币
- 'GY_GM_Offline_ViewGMOper': { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查看玩家GM操作
- 'GY_GM_CloseBroadcast' : { 1 : True , 2 : True , 3 : True , 4 : False, 5 : False} , #脱机工具-消除公告
- 'GY_GM_Offline_UnBind' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-解封玩家
- 'GY_GM_Offline_ViewUnBind' : { 1 : True , 2 : True , 3 : True , 4 : True , 5 : True } , #脱机工具-查询玩家
- }
-
-#---------------------------------------------------------------------
#请求类型(需要和GameServer中的一致)
Def_QueryType_Count = 56
(
@@ -2963,7 +2927,7 @@
# 回合攻击战斗类型
(
-TurnBattleType_Normal, # 普通
+TurnBattleType_Normal, # 常规攻击
TurnBattleType_Combo, # 连击
TurnBattleType_AtkBack, # 反击
) = range(3)
@@ -2971,9 +2935,22 @@
Def_PerTurnTick = 1000 # 每回合等同于常规tick时长
# 回合战斗目标类型
-TurnBattle_TagType_NPC = 0
+TurnBattle_TagType_NPCLineup = 0 # NPC阵容
TurnBattle_TagType_Player = 1
TurnBattle_TagType_Team = 2
+
+#---Obj字典-------
+Def_Obj_Dict_Faction = 'Faction' # 所属阵营
+Def_Obj_Dict_LineupPlayerID = 'LineupPlayerID' # 阵容所属玩家ID，可用于判断是否玩家阵容，PVP或PVE
+Def_Obj_Dict_HeroID = 'HeroID' # 该战斗NPC所绑定的武将ID，一般仅玩家阵容有
+Def_Obj_Dict_SkinID = 'SkinID' # 该战斗NPC所绑定的武将皮肤ID，一般仅玩家阵容有
+Def_Obj_Dict_TurnFightPosInfo = 'TurnFightPosInfo' # 回合制站位： 阵营编号*100+阵型站位，阵型站位为0时代表非主战单位
+Def_Obj_Dict_TurnFightTimeline = 'TurnFightTimeline' # 回合制战斗时间线: 回合数*100+行动编号节点
+Def_Obj_Dict_TurnComboNum = 'TurnComboNum' # 单次累计连击次数
+Def_Obj_Dict_TurnAtkBackNum = 'TurnAtkBackNum' # 单次累计反击次数
+Def_Obj_Dict_TurnParryNum = 'TurnParryNum' # 单次累计格挡次数
+Def_Obj_Dict_TurnMissNum = 'TurnMissNum' # 单次累计闪避次数
+Def_Obj_Dict_TurnBattleType = 'TurnBattleType' # 本次攻击战斗类型：TurnBattleType_xxx
#---NPC字典-------
#每道龙卷风最终坐标
@@ -3200,6 +3177,7 @@
Def_PlayerKey_AttrPerLVAtk = "PerLVAtk" #每1级+%s攻击, 数值取万分率，支持小数算法
Def_PlayerKey_AttrPerLVMaxHP = "PerLVMaxHP" #每1级+%s生命, 数值为固定值
Def_PlayerKey_AttrShieldMPCostRate = "AttrShieldMPCostRate" #魔法盾伤害吸收蓝耗比率
+Def_PlayerKey_AttrXP = "AttrXP" #当前XP
Def_PlayerKey_AttrXPRestorePer = "AttrXPRestorePer" #自动恢复XP值比率
Def_PlayerKey_MarkLoadMapTick = "LoadMapTickVIP" #记录切换地图后的tick,VIP
Def_PlayerKey_MTFreeOnlineRefreshTick = "MTFreeOnlineRTick" # 寻宝在线计算时间
@@ -3445,6 +3423,7 @@
Def_Player_Dict_CabinetCount_Horse = "CabinetCount_Horse_42" #马匹收纳柜
Def_Player_Dict_PackCount_Item = "PackCount_Item_72" #玩家物品背包格子数
Def_Player_Dict_PackCount_Warehouse = "PackCount_Warehouse_73" #仓库背包格子数
+Def_Player_Dict_PackCount_Hero = "PackCount_Hero" #武将背包格子数
Def_Player_Dict_PlayerMapSignCnt = "PlayerMapSignCnt_75" # 大地图标记数量
Def_Player_Dict_PlayerBuyZhenQiCnt = "PlayerBuyZhenQiCnt_76" # 购买真气次数
Def_Player_Dict_PlayChangeLineID = "PlayChangeLineID" # 玩家主动切换线路记录
@@ -3869,10 +3848,6 @@
Def_PDict_NewFCPartyCurPoint = "NewFCPartyCurPoint" #全民来嗨活动当前总点数
Def_PDict_NewFCPartyAwardRecord = "NewFCPartyAwardRecord" #全民来嗨活动领奖记录
Def_PDict_NewFCCostGold = "NewFCCostGold" # 绝版降临总累计消费仙玉
-
-#绑玉转盘
-Def_PDict_BindJadeWheelCurCnt = "BindJadeWheelCurCnt" # 今日已转次数
-Def_PDict_BindJadeWheelHistoryCnt = "BindJadeWheelHistoryCnt" # 历史已转次数
#限时抢购活动
Def_PDict_FlashSaleID = "FlashSaleID_%s" # 玩家身上的限时抢购活动ID，唯一标识，取活动开始日期time，参数（活动编号）
@@ -4308,10 +4283,6 @@
Def_PDict_GFPassiveIndex = "GFP_%s_%s" # 被动功法 页数-索引
Def_PDict_GFPassivePage = "GFPPage" # 被动功法选中页数
-# 我要太极
-Def_PDict_Dice_Result = "DiceResult" # 我要太极结果
-Def_PDict_Dice_FreeChangeCnt = "DiceFreeChangeCnt" # 我要太极免费改投次数
-
# 挂机收益
Def_PDict_GuajiCalcTime = "GuajiCalcTime" # 上次统计收益时间戳
Def_PDict_GuajiAwardSeconds = "GuajiAwardSeconds" # 已累计收益时长，秒
@@ -4423,6 +4394,15 @@
Def_PDict_TiandaoQiyun = "TiandaoQiyun" # 天道树当前气运
Def_PDict_TiandaoAward = "TiandaoAward_%s" # 天道树领奖记录，按奖励索引记录是否已领取，参数(key编号)
+#武将
+Def_PDict_HeroSkin = "HeroSkin_%s" # 武将皮肤解锁状态，按皮肤索引二进制存储，参数(武将ID)
+Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级，参数(武将ID) cccbbba a-初始激活状态1-英雄激活，2-初始图鉴激活； bbb-存星级图鉴激活等级；ccc-存突破图鉴激活等级
+
+#主线
+Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
+Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算掉落的战锤数
+Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)
+
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4454,6 +4434,10 @@
IPY_GameWorld.rptWarehouse:[
Def_Player_Dict_PackCount_Warehouse,
+ 0],
+
+ ShareDefine.rptHero:[
+ Def_Player_Dict_PackCount_Hero,
0],
#IPY_GameWorld.rptFineSoulSlot:[
@@ -4512,6 +4496,7 @@
AttrName_FightExpRate = "FightExpRate" # 杀怪经验倍率
AttrName_GameExpRate = "GameExpRate" # 游戏事件经验倍率
AttrName_SkillAtkRate = "SkillAtkRate" # 技能伤害加成 （用作伤害加成）
+AttrName_AtkBackHP = "AtkBackHP" # 攻击回复血量固定值
AttrName_AtkBackHPPer = "AtkBackHPPer" # 攻击回复血量比率
AttrName_SuperHit = "SuperHit" # 暴击伤害固定值
AttrName_SuperHitRate = "SuperHitRate" # 暴击概率
@@ -4542,6 +4527,17 @@
AttrName_PetAtk = "PetAtk" # 灵宠攻击
AttrName_PetSkillAtkRate = "PetSkillAtkRate" # 灵宠技能
AttrName_PetDamPer = "PetDamPer" # 灵宠伤害增加
+AttrName_ComboDefRate = "ComboDefRate" # 抗连击概率
+AttrName_AtkBackRate = "AtkBackRate" # 反击概率
+AttrName_AtkBackDefRate = "AtkBackDefRate" # 抗反击概率
+AttrName_SuckHPPer = "SuckHPPer" # 吸血比率
+AttrName_SuckHPDefPer = "SuckHPDefPer" # 抗吸血比率
+AttrName_CurePer = "CurePer" # 强化治疗
+AttrName_CureDefPer = "CureDefPer" # 弱化治疗
+AttrName_PetStrengthenPer = "PetStrengthenPer" # 强化灵兽
+AttrName_PetWeakenPer = "PetWeakenPer" # 弱化灵兽
+AttrName_SuperHitHurtPer = "SuperHitHurtPer" # 强化暴伤
+AttrName_SuperHitHurtDefPer = "SuperHitHurtDefPer" # 弱化暴伤
#物品效果(ID或指定类型)对应的属性计算信息 {效果（ID/指定类型）:[[属性索引, ...], 是否基础属性，(非)线性]}
#对应 Def_Calc_AllAttrType_MAX
@@ -4732,6 +4728,22 @@
ShareDefine.Def_Effect_FamilyWarHPPer:[[TYPE_Calc_FamilyWarHPPer], False, TYPE_Linear],
ShareDefine.Def_Effect_FamilyWarAtkPer:[[TYPE_Calc_FamilyWarAtkPer], False, TYPE_Linear],
ShareDefine.Def_Effect_FamilySitExpPer:[[TYPE_Calc_FamilySitExpPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_ComboDefRate:[[TYPE_Calc_ComboDefRate], False, TYPE_Linear],
+ AttrName_ComboDefRate:[[TYPE_Calc_ComboDefRate], False, TYPE_Linear],
+ ShareDefine.Def_Effect_AtkBackRate:[[TYPE_Calc_AtkBackRate], False, TYPE_Linear],
+ AttrName_AtkBackRate:[[TYPE_Calc_AtkBackRate], False, TYPE_Linear],
+ ShareDefine.Def_Effect_AtkBackDefRate:[[TYPE_Calc_AtkBackDefRate], False, TYPE_Linear],
+ AttrName_AtkBackDefRate:[[TYPE_Calc_AtkBackDefRate], False, TYPE_Linear],
+ ShareDefine.Def_Effect_SuckHPPer:[[TYPE_Calc_SuckHPPer], False, TYPE_Linear],
+ AttrName_SuckHPPer:[[TYPE_Calc_SuckHPPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_SuckHPDefPer:[[TYPE_Calc_SuckHPDefPer], False, TYPE_Linear],
+ AttrName_SuckHPDefPer:[[TYPE_Calc_SuckHPDefPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_CurePer:[[TYPE_Calc_CurePer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_CureDefPer:[[TYPE_Calc_CureDefPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_PetStrengthenPer:[[TYPE_Calc_PetStrengthenPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_PetWeakenPer:[[TYPE_Calc_PetWeakenPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_SuperHitHurtPer:[[TYPE_Calc_SuperHitHurtPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_SuperHitHurtDefPer:[[TYPE_Calc_SuperHitHurtDefPer], False, TYPE_Linear],
#战斗非线性
ShareDefine.Def_Effect_SuperHitPer:[[TYPE_Calc_SuperHit], False, TYPE_NoLinear],
@@ -4869,10 +4881,10 @@
ShareDefine.Def_Effect_HatAddPer: [ShareDefine.retHat, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
ShareDefine.Def_Effect_TrousersAddPer: [ShareDefine.retTrousers, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
ShareDefine.Def_Effect_ShoesAddPer: [ShareDefine.retShoes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
- ShareDefine.Def_Effect_FairyCanAddPer: [ShareDefine.retFairyCan, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
- ShareDefine.Def_Effect_FairyCan2AddPer: [ShareDefine.retFairyCan2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_ShawlAddPer: [ShareDefine.retShawl, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_RingAddPer: [ShareDefine.retRing, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
ShareDefine.Def_Effect_NeckAddPer: [ShareDefine.retNeck, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
- ShareDefine.Def_Effect_JadeAddPer: [ShareDefine.retJade, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_AmuletAddPer: [ShareDefine.retAmulet, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
}
# 指定地图生效的非线性属性配置
@@ -5742,8 +5754,9 @@
ntMonsterTime, #按时间掉血的怪物 22 废弃，以是否有配置在时间掉血怪物表为准
ntPriWoodPilePVE, #专属私有木桩 - PVE 23
ntPriWoodPilePVP, #专属私有木桩 - PVP 24
+ntHero, #武将英雄 25
ntMax
-) = range(26)
+) = range(27)
(Def_SkillFuncType_Common, #0为通用技能
@@ -5769,7 +5782,8 @@
Def_SkillFuncType_ShentongSkill, #20 神通技能
Def_SkillFuncType_ElfSkill, #21 精怪技能
Def_SkillFuncType_GatherTheSoul, #22 聚魂技能
-) = range(23)
+Def_SkillFuncType_TurnNormaAttack, #23 回合普攻技能
+) = range(24)
# 受技能效果完全影响的怪， 对应 Def_BattleRelationType_CommNoBoss
Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
@@ -5785,6 +5799,12 @@
Def_BattleRelationType_CommNoBoss, # 除了（指定）BOSS，可对其释放技能，但是无实际效果
) = range(0, 4)
+# 近战远程
+AtkDistTypeList = (
+AtkDistType_Short, # 近战
+AtkDistType_Long, # 远程
+) = range(1, 1 + 2)
+
# 经验倍率限制类型
(
ExpRateLimitType_Recover, # 资源找回
--
Gitblit v1.8.0