修改战斗脚本
DESKTOP-C3M45P4\dengdan
parent
b28a69daad
commit
c2c24b2033
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -15,7 +15,6 @@ end
|
|||
|
||||
|
||||
|
||||
|
||||
--被动技能表
|
||||
local passivityList = {
|
||||
--发动技能时，[a]的概率将[b]*[c]算作[d]计算
|
||||
|
|
@ -6791,7 +6790,7 @@ local passivityList = {
|
|||
end
|
||||
if target:IsDead() and not BattleUtil.CheckIsNoDead(target) and not role:IsDead() then
|
||||
--role:InsertExtraSkill(f1,f2)
|
||||
local effectData={role.superSkill[1],role.superSkill[2],role.superSkill[3],role.superSkill[4],{targets,{1,f1,f2}}}
|
||||
local effectData={role.superSkill[1],role.superSkill[2],role.superSkill[3],role.superSkill[4],role.superSkill[5],role.superSkill[6],{targets,{1,f1,f2}}}
|
||||
SkillManager.InsertSkill(role, effectData,BattleSkillType.Extra, nil, true, false,false,true)
|
||||
isTurn=false
|
||||
if skill then
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ end
|
|||
|
||||
|
||||
BATTLE_SERVER_TYPE = {
|
||||
NewArenaFight = 0, --本地测试竞技场值/罗浮争锋
|
||||
NewArenaFight = 0, --本地测试竞技场值/宇宙武道会
|
||||
StoryFight = 1, --故事副本
|
||||
MapExploreFight = 2, -- 地图探索
|
||||
ArenaFight = 3, --竞技场
|
||||
|
|
|
|||
|
|
@ -318,7 +318,8 @@ function BattleUtil.GetSkillData(skillId,skinId)
|
|||
skill[2] = EffectCombat.KeyFrame/1000
|
||||
skill[3] = EffectCombat.SkillDuration/1000
|
||||
skill[4] = EffectCombat.SkillNumber
|
||||
|
||||
skill[5] = EffectCombat.SkillNumbetTime
|
||||
skill[6] = EffectCombat.AttackDisplaceoffset==nil and {[1]=0.4,[2]=-0.2} or EffectCombat.AttackDisplaceoffset
|
||||
local index = 1
|
||||
for i = 1, #effectList do
|
||||
local effectGroup = { target[i][1] } -- 效果目标
|
||||
|
|
@ -330,8 +331,9 @@ function BattleUtil.GetSkillData(skillId,skinId)
|
|||
effectGroup[j + 1] = effect
|
||||
index = index + 1
|
||||
end
|
||||
skill[i + 4] = effectGroup
|
||||
skill[i + 6] = effectGroup
|
||||
end
|
||||
|
||||
return skill
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,487 +1,20 @@
|
|||
v1.0.158
|
||||
1.同步战斗提jiao
|
||||
v1.0.157
|
||||
1.同步战斗提jiao
|
||||
v1.0.156
|
||||
1.同步战斗提jiao
|
||||
v1.0.155
|
||||
1.同步战斗提jiao
|
||||
v1.0.154
|
||||
1.同步战斗提jiao
|
||||
v1.0.153
|
||||
1.同步战斗提jiao
|
||||
v1.0.152
|
||||
1.同步战斗提jiao
|
||||
v1.0.151
|
||||
1.同步战斗提jiao
|
||||
v1.0.150
|
||||
1.同步战斗提jiao
|
||||
v1.0.149
|
||||
1.同步战斗提jiao
|
||||
v1.0.148
|
||||
1.同步战斗提jiao
|
||||
v1.0.147
|
||||
1.同步战斗提jiao
|
||||
v1.0.146
|
||||
1.同步战斗提jiao
|
||||
v1.0.145
|
||||
1.同步战斗提jiao
|
||||
v1.0.144
|
||||
1.同步战斗提jiao
|
||||
v1.0.143
|
||||
1.同步战斗提jiao
|
||||
v1.0.142
|
||||
1.同步战斗提jiao
|
||||
v1.0.141
|
||||
1.同步战斗提jiao
|
||||
v1.0.140
|
||||
1.同步战斗提jiao
|
||||
v1.0.139
|
||||
1.同步战斗提jiao
|
||||
v1.0.138
|
||||
1.同步战斗提jiao
|
||||
v1.0.137
|
||||
1.同步战斗提交
|
||||
v1.0.136
|
||||
1.同步战斗提交
|
||||
v1.0.135
|
||||
1.同步战斗提交
|
||||
v1.0.134
|
||||
1.被动474修改
|
||||
v1.0.133
|
||||
1.添加新英雄
|
||||
v1.0.132
|
||||
1.新增被动470
|
||||
v1.0.131
|
||||
1.疯体同步山河设计图表
|
||||
v1.0.130
|
||||
1.同步到凤体分支
|
||||
v1.0.129
|
||||
1.新英雄提交
|
||||
v1.0.128
|
||||
1.御甲修改提交
|
||||
v1.0.127
|
||||
1.被动327修改
|
||||
v1.0.126
|
||||
1. 注释无用log
|
||||
v1.0.125
|
||||
1. 添加神兵战斗
|
||||
v1.0.124
|
||||
1. 被动441修改
|
||||
v1.0.123
|
||||
1. 修改困难副本星级条件
|
||||
v1.0.122
|
||||
1. 添加女娲，阎罗王新英雄
|
||||
v1.0.121
|
||||
1. 战斗添加回合最大伤害治疗限制
|
||||
v1.0.120
|
||||
1. 添加金翅大鹏变身卡
|
||||
v1.0.119
|
||||
1. 添加法相相关被动 454被动
|
||||
v1.0.118
|
||||
1. 添加152效果
|
||||
v1.0.117
|
||||
1. 添加151效果
|
||||
2. 御甲也对间接伤害生效
|
||||
v1.0.116
|
||||
1. 187被动治疗神将也会生效
|
||||
v1.0.115
|
||||
1.添加被动444，445
|
||||
v1.0.114
|
||||
1.被动273，189，184修改
|
||||
master_zh_test同步数据表2022_09_02_16_53_59
|
||||
master_zh_test同步数据表2022_08_24_16_07_52
|
||||
v1.0.113
|
||||
1.被动387 437修改
|
||||
master_zh_test同步数据表2022_08_17_18_26_38
|
||||
master_zh_test同步数据表2022_08_10_18_33_50
|
||||
master_zh_test同步数据表2022_08_10_17_37_10
|
||||
master_zh_test同步数据表2022_08_10_15_22_09
|
||||
master_zh_test同步数据表2022_08_03_17_06_59
|
||||
v1.0.112
|
||||
1.online_special 同步到zh_test
|
||||
v1.0.111
|
||||
1.438修改
|
||||
v1.0.110
|
||||
1.新增神印
|
||||
master_zh_test同步数据表2022_03_29_17_06_53
|
||||
master_zh_test同步数据表2022_03_22_11_35_14
|
||||
master_zh_test同步数据表2022_03_22_11_35_01
|
||||
master_zh_test同步数据表2022_03_21_16_48_11
|
||||
v1.0.109
|
||||
1.新增神系英雄技能被动
|
||||
master_zh_test同步数据表2022_03_14_18_15_06
|
||||
master_zh_test同步数据表2022_03_14_17_24_10
|
||||
v1.0.108
|
||||
1.新增429 430 431被动
|
||||
master_zh_test同步数据表2022_03_08_16_52_49
|
||||
v1.0.107
|
||||
1.新增427 428被动
|
||||
master_zh_test同步数据表2022_03_07_17_48_07
|
||||
master_zh_test同步数据表2022_03_02_15_24_08
|
||||
v1.0.106
|
||||
1.新增425 426被动
|
||||
master_zh_test同步数据表2022_03_01_15_02_06
|
||||
v1.0.105
|
||||
1.新增425 426被动
|
||||
v1.0.104
|
||||
1.被动375修改
|
||||
master_zh_test同步数据表2022_02_22_19_20_35
|
||||
master_zh_test同步数据表2022_02_22_18_59_21
|
||||
v1.0.103
|
||||
1.被动226 423 424修改
|
||||
master_zh_test同步数据表2022_02_22_10_34_06
|
||||
master_zh_test同步数据表2022_02_15_15_03_42
|
||||
v1.0.102
|
||||
1.效果108修改
|
||||
2.被动356修改 新增422
|
||||
master_zh_test同步数据表2022_02_08_14_14_42
|
||||
v1.0.101
|
||||
1.修复姑获鸟神魂五对所有人生效的问题
|
||||
v1.0.100
|
||||
1.御甲初始化修改
|
||||
master_zh_test同步数据表2022_01_24_18_51_19
|
||||
v1.0.99
|
||||
1.御甲显示修改
|
||||
v1.0.98
|
||||
1.被动414修改
|
||||
master_zh_test同步数据表2022_01_24_10_59_41
|
||||
master_zh_test同步数据表2022_01_18_15_41_40
|
||||
v1.0.97
|
||||
1.护盾buff修改
|
||||
master_zh_test同步数据表2022_01_17_16_56_13
|
||||
master_zh_test同步数据表2022_01_17_16_30_59
|
||||
master_zh_test同步数据表2022_01_15_19_12_17
|
||||
v1.0.96
|
||||
1.被动417-421 白金法宝
|
||||
master_zh_test同步数据表2022_01_11_16_23_47
|
||||
master_zh_test同步数据表2022_01_10_18_57_57
|
||||
v1.0.95
|
||||
1.新增被动414-417
|
||||
2.添加御甲修改
|
||||
v1.0.94
|
||||
1.被动283修改
|
||||
v1.0.93
|
||||
1.战斗结束获取队伍剩余角色信息接口修改
|
||||
master_zh_test同步数据表2021_12_28_09_56_49
|
||||
master_zh_test同步数据表2021_12_24_18_32_21
|
||||
v1.0.92
|
||||
1.新增412被动 56被动修改
|
||||
master_zh_test同步数据表2021_12_21_18_13_54
|
||||
v1.0.91
|
||||
1.护盾buff修改
|
||||
2.鲸吞魂印修改
|
||||
v1.0.90
|
||||
1、修复RoleManager table.removebyvalue方法空报错
|
||||
master_zh_test同步数据表2021_12_14_12_03_26
|
||||
v1.0.89
|
||||
1.第五期神魂
|
||||
2.第二期变身卡
|
||||
master_zh_test同步数据表2021_12_13_18_06_46
|
||||
v1.0.88
|
||||
1.被动257修改
|
||||
2.不灭修改
|
||||
v1.0.87
|
||||
1.被动257修改
|
||||
master_zh_test同步数据表2021_12_07_17_09_58
|
||||
master_zh_test同步数据表2021_12_07_16_56_46
|
||||
v1.0.86
|
||||
1 战斗驱动逻辑修改 回合转换添加延时减半
|
||||
2.被动257修改
|
||||
v1.0.85
|
||||
1 战斗驱动逻辑修改 回合转换添加延时减半
|
||||
v1.0.84
|
||||
1 战斗驱动逻辑修改 回合转换添加延时
|
||||
master_zh_test同步数据表2021_12_06_19_02_28
|
||||
v1.0.83
|
||||
1 第四期神魂添加
|
||||
master_zh_test同步数据表2021_11_30_12_06_26
|
||||
v1.0.82
|
||||
1 目标选择逻辑添加
|
||||
master_zh_test同步数据表2021_11_29_19_48_14
|
||||
v1.0.81
|
||||
1、效果137修改
|
||||
master_zh_test同步数据表2021_11_27_22_26_12
|
||||
v1.0.80
|
||||
1、同步战斗逻辑
|
||||
master_zh_test同步数据表2021_11_23_11_29_17
|
||||
v1.0.79
|
||||
1、被动391修改 我方流血显示修改
|
||||
master_zh_test同步数据表2021_11_22_18_00_26
|
||||
v1.0.78
|
||||
1、被动112 258 360修改提交
|
||||
2. 伤害公式修改
|
||||
3.战斗超时 pvp添加战斗类型
|
||||
v1.0.77
|
||||
1、第三批神魂提交
|
||||
v1.0.76
|
||||
1、修复前后端战斗数据格式不一致导致的结果不一致
|
||||
master_zh_test同步数据表2021_11_16_11_07_25
|
||||
v1.0.75
|
||||
1，添加不处理增伤的伤害接口
|
||||
master_zh_test同步数据表2021_11_15_17_10_47
|
||||
v1.0.74
|
||||
1，第二期神魂技能
|
||||
master_zh_test同步数据表2021_11_08_18_01_19
|
||||
v1.0.73
|
||||
1，被动285修改
|
||||
master_zh_test同步数据表2021_11_08_17_48_59
|
||||
v1.0.73
|
||||
1，添加日志
|
||||
v1.0.72
|
||||
1，第一期神魂技能
|
||||
v1.0.71
|
||||
1，灵兽技能检测添加初始化
|
||||
2.追加技能特效修改
|
||||
v1.0.70
|
||||
1、添加神魂被动技能
|
||||
master_zh_test同步数据表2021_11_01_14_07_31
|
||||
master_zh_test同步数据表2021_10_26_10_10_26
|
||||
master_zh_test同步数据表2021_10_25_18_57_36
|
||||
v1.0.69
|
||||
1、战斗公式修改
|
||||
master_zh_test同步数据表2021_10_22_18_57_18
|
||||
v1.0.68
|
||||
1、添加主角技能
|
||||
2. 被动199修改
|
||||
master_zh_test同步数据表2021_10_18_11_00_42
|
||||
master_zh_test同步数据表2021_10_16_19_07_28
|
||||
master_zh_test同步数据表2021_10_16_19_06_48
|
||||
v1.0.67
|
||||
1、被动344添加空判断
|
||||
2. 战斗力公式修改
|
||||
master_zh_test同步数据表2021_10_12_15_58_23
|
||||
master_zh_test同步数据表2021_10_12_10_25_47
|
||||
master_zh_test同步数据表2021_10_11_18_25_43
|
||||
v1.0.66
|
||||
1、被动312修改
|
||||
master_zh_test同步数据表2021_10_09_18_47_41
|
||||
master_zh_test同步数据表2021_10_09_18_46_50
|
||||
v1.0.65
|
||||
1、被动116 258 281 312 344 250修改
|
||||
2. 精卫借的怒气不会回复怒气
|
||||
3. 添加不处理增伤被动的方法
|
||||
master_zh_test同步数据表2021_09_28_17_45_03
|
||||
v1.0.64
|
||||
1、353 351 137 被动修改
|
||||
2. 添加获取没有出发不灭的目标
|
||||
master_zh_test同步数据表2021_09_27_18_41_38
|
||||
v1.0.63
|
||||
1、353被动修改
|
||||
v1.0.62
|
||||
1、添加御甲buff
|
||||
2.添加最后一期紫府神印，添加白金装备被动 觉醒被动修改
|
||||
master_zh_test同步数据表2021_09_26_20_35_14
|
||||
master_zh_test同步数据表2021_09_18_21_14_36
|
||||
master_zh_test同步数据表2021_09_18_18_42_35
|
||||
v1.0.61
|
||||
1、技能是否能释放 添加是否有技能目标判断
|
||||
2.被动196 200 188 修改
|
||||
master_zh_test同步数据表2021_09_17_16_21_53
|
||||
master_zh_test同步数据表2021_09_15_20_05_28
|
||||
master_zh_test同步数据表2021_09_15_14_23_26
|
||||
master_zh_test同步数据表2021_09_14_15_46_46
|
||||
master_zh_test同步数据表2021_09_14_11_51_05
|
||||
v1.0.60
|
||||
1、被动56修改
|
||||
master_zh_test同步数据表2021_09_11_18_04_19
|
||||
v1.0.59
|
||||
1、被动261 修改
|
||||
master_zh_test同步数据表2021_09_10_18_24_51
|
||||
|
||||
v1.0.58
|
||||
1、修复方法缺失报错
|
||||
v1.0.57
|
||||
1、尝试修复孙悟空大招不会增加伤害的问题
|
||||
2、添加用于debug的log
|
||||
master_zh_test同步数据表2021_09_07_11_00_31
|
||||
v1.0.56
|
||||
1.选生命百分比最少目标逻辑修改 去掉有不灭单位
|
||||
2. 死亡不把怒气显示清空
|
||||
3.被动99 307 选目标逻辑修改
|
||||
v1.0.55
|
||||
1.被动263 269 274 332 112 145 修改
|
||||
2. 添加战斗日志
|
||||
v1.0.54
|
||||
1. 被动91 被动115 160修改
|
||||
2. Dot类buff清除逻辑修改
|
||||
master_zh_test同步数据表2021_08_27_18_25_18
|
||||
master_zh_test同步数据表2021_08_21_16_34_06
|
||||
v1.0.54
|
||||
1. 被动141 310 283 330 336修改
|
||||
master_zh_test同步数据表2021_08_02_19_27_29
|
||||
v1.0.53
|
||||
1. 随机种子修改
|
||||
master_zh_test同步数据表2021_07_31_17_55_16
|
||||
master_zh_test同步数据表2021_07_31_17_54_20
|
||||
v1.0.52
|
||||
1. 死亡技能不会被控制
|
||||
2.追加技能是否触发特性修改
|
||||
master_zh_test同步数据表2021_07_26_11_10_56
|
||||
v1.0.51
|
||||
1. 被动292 修改
|
||||
v1.0.50
|
||||
1. 被动292 319修改
|
||||
|
||||
master_zh_test同步数据表2021_07_13_18_19_09
|
||||
master_zh_test同步数据表2021_07_10_20_33_05
|
||||
v1.0.49
|
||||
1. 同步客户端逻辑
|
||||
v1.0.48
|
||||
1. 新增紫府神印被动效果
|
||||
v1.0.47
|
||||
1. 新增英雄觉醒被动 及 困难副本被动 效果
|
||||
|
||||
master_zh_test同步数据表2021_06_30_07_33_23
|
||||
master_zh_test同步数据表2021_06_28_13_40_30
|
||||
v1.0.46
|
||||
1、同步数据表
|
||||
v1.0.45
|
||||
1. 【战斗】修改免疫控制效果清除提示
|
||||
v1.0.44
|
||||
1. 【战斗】修复群体性的免疫效果不会正常消失的问题
|
||||
v1.0.43
|
||||
1. 被动200修改
|
||||
v1.0.42
|
||||
1. 困难副本关卡表修改
|
||||
v1.0.41
|
||||
1. 同步客户端战斗消息号
|
||||
2. 同步苦难关卡数据
|
||||
v1.0.40
|
||||
1、回滚v1.0.39
|
||||
v1.0.39
|
||||
1、删除LogGreen方法
|
||||
v1.0.38
|
||||
1. 同步客户端困难关卡表逻辑
|
||||
v1.0.37
|
||||
1. 通关星级条件检测逻辑4修改
|
||||
v1.0.36
|
||||
1. 同步表数据
|
||||
v1.0.35
|
||||
1. rolelogic添加查找被动id接口
|
||||
2.通关星级条件检测逻辑9修改
|
||||
v1.0.34
|
||||
1. 战斗去除log
|
||||
v1.0.33
|
||||
1. 同步被动逻辑
|
||||
v1.0.32
|
||||
1. 精英副本星级判断逻辑修改
|
||||
v1.0.31
|
||||
1. 添加精英副本相关战斗逻辑
|
||||
v1.0.30
|
||||
1. 同步客户端被动表lua文件
|
||||
v1.0.29
|
||||
1、新增客户端数据文件，客户端数据解析文件
|
||||
1、被动新增 313，用于动态从表数据里面抓取被动数据
|
||||
v1.0.28
|
||||
1、BattleMain添加测试接口
|
||||
v1.0.27
|
||||
1、清除轮转方法，防止收到上一局战斗的影响
|
||||
v1.0.26
|
||||
1、合并海外战斗内容
|
||||
v1.0.25
|
||||
1、选择单个对位目标修改
|
||||
v1.0.24
|
||||
1、同步大闹天宫新增英雄专属圣物的代码逻辑修改
|
||||
v1.0.23
|
||||
1、被动249修改
|
||||
|
||||
v1.0.22
|
||||
1、效果叠加显示修改，注释逻辑里关于效果覆盖的代码
|
||||
2 同步战斗逻辑添加boss展示
|
||||
v1.0.21
|
||||
1、混乱后的普攻不触发任何特性
|
||||
2 舍身济世分担的伤害改为可以触发被动
|
||||
|
||||
v1.0.20
|
||||
1、修复孙悟空和观音菩萨同时死亡导致报错的问题
|
||||
|
||||
v1.0.19
|
||||
1、298被动修改 解除中毒效果前先解除禁疗
|
||||
|
||||
v1.0.18
|
||||
1、禁疗显示血量 +0
|
||||
2、126效果修改 生命百分比伤害会被无敌盾挡住
|
||||
|
||||
|
||||
v1.0.17
|
||||
1、新增新将观音的技能及被动
|
||||
2、新增选择两列的目标选择逻辑
|
||||
3、有技能在释放时不会检测轮转逻辑
|
||||
|
||||
v1.0.16
|
||||
1、修改获取最大血量的方式，修复灵兽伤害未计算到最大血量中的问题
|
||||
2、被动120删除无用的事件
|
||||
3、log打印添加结果数据
|
||||
|
||||
v1.0.15
|
||||
1、添加第四期英雄觉醒
|
||||
2、添加结算界面显示log
|
||||
|
||||
v1.0.14_2
|
||||
1、战斗类型常量化
|
||||
2、森罗幻境战斗超出最大回合数，结果返回2，并返回双方剩余血量
|
||||
|
||||
v1.0.14
|
||||
1、 244被动修改
|
||||
2、 检测是否为boss方法修改
|
||||
|
||||
|
||||
v1.0.13
|
||||
1、 新增灵兽 金乌技能逻辑修改
|
||||
2、 新增 124 125 效果
|
||||
3、 rolelogic 新增job字段
|
||||
v1.0.12
|
||||
1、【魂印】舍身济世魂印修改为不触发任何特性
|
||||
2、【技能】阎罗王的连接符伤害结算改为最终伤害。
|
||||
3、【技能】洛神的溢出伤害，修改为最终伤害。
|
||||
|
||||
v1.0.11
|
||||
1、修复圣物效果数据错误
|
||||
2、不灭buff实现方式修改
|
||||
3、灵兽buff回合计算方式修改
|
||||
|
||||
v1.0.10
|
||||
1、修复部分圣物效果数据计算错误的问题
|
||||
|
||||
v1.0.9
|
||||
1、二期觉醒技能添加
|
||||
|
||||
|
||||
v1.0.9
|
||||
1、同步数
|
||||
v1.0.8
|
||||
1、被动技能添加id和类型字段
|
||||
2、部分被动技能优化
|
||||
|
||||
1、同步数
|
||||
v1.0.7
|
||||
1、修复单个回合技能上限数值会在后端累加，当一场战斗结束此数值刚好达到上限时，下一场战斗毕定卡死的问题
|
||||
|
||||
1、同步数
|
||||
v1.0.6
|
||||
1、添加战斗超时判断
|
||||
|
||||
|
||||
1、同步数
|
||||
v1.0.5
|
||||
1、修复人物行动前被持续伤害击杀，触发被击杀时追加技能，释放技能后战斗卡死的问题
|
||||
2、添加每回合技能释放数量上限
|
||||
|
||||
1、同步数
|
||||
v1.0.4
|
||||
1、被动112 修复参数错误导致的报错
|
||||
2、被动196 普通攻击不会被降低分摊比
|
||||
|
||||
|
||||
1、同步数据
|
||||
v1.0.3
|
||||
1、被动技能200添加分摊比例检测
|
||||
2、特殊处理部分特性被动使其不会在被部分技能触发
|
||||
|
||||
|
||||
1、同步数据
|
||||
v1.0.2
|
||||
修复灵兽技能结束后检测轮转可能会导致战斗死循环的问题
|
||||
|
||||
|
||||
1、同步数据
|
||||
v1.0.1
|
||||
1、觉醒相关被动技能加入
|
||||
2、减伤盾效果修改
|
||||
|
||||
|
||||
1、同步沾毒
|
||||
v1.0.0
|
||||
1、创建战斗版本文件
|
||||
2、灵兽技能加入
|
||||
1、创建真0.1战斗服
|
||||
Loading…
Reference in New Issue