wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
wangzhenxing
|
6927b52365
|
[战斗]=======主角变身卡添加gm
|
2021-11-25 18:36:00 +08:00 |
gaoxin
|
879cf506f5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:43:15 +08:00 |
gaoxin
|
4923314bbb
|
【战斗】屏幕震动加入伤害延时时间
|
2021-11-25 15:43:10 +08:00 |
wangzhenxing
|
aff13f8904
|
【战斗】======技能132-140提交
|
2021-11-25 15:07:40 +08:00 |
wangzhenxing
|
b15eaf8b19
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:05:10 +08:00 |
wangzhenxing
|
ae8021cd6a
|
[战斗表现]========敌我方立绘镜像显示
|
2021-11-25 15:04:55 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
gaoxin
|
a36714d286
|
【战斗】跳过提示文字:第二回合结束后可以跳过
|
2021-11-25 14:44:10 +08:00 |
gaoxin
|
bb15f0056e
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:42:11 +08:00 |
gaoxin
|
d1ce54c9a9
|
【测试战斗】报错修复
|
2021-11-24 14:22:27 +08:00 |
gaoxin
|
f01889db21
|
【战斗】改为第三回合时战斗就可以跳过
|
2021-11-24 14:21:44 +08:00 |
gaoxin
|
5462a1ad3b
|
【战斗】弹道特效转向
|
2021-11-23 17:23:35 +08:00 |
gaoxin
|
3f343bb1b2
|
【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过
|
2021-11-23 17:22:54 +08:00 |
wangzhenxing
|
9cce1aa31c
|
【战斗表现】======剧情特殊处理敌人名字位置
|
2021-11-23 15:13:43 +08:00 |
wangzhenxing
|
b8b1c74f03
|
[战斗]========被动391修改 我方流血显示修改
|
2021-11-23 10:46:52 +08:00 |
wangzhenxing
|
134b1aff71
|
【战斗表现】============我方复活后血条不显示修改
|
2021-11-22 17:21:59 +08:00 |
wangzhenxing
|
f67006e041
|
【战斗】============战斗超时pvp类型检测添加类型
|
2021-11-22 16:57:46 +08:00 |
gaoxin
|
66670029dc
|
【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题
|
2021-11-22 16:42:14 +08:00 |
wangzhenxing
|
3ec9fd80fd
|
[战斗]======被动360 伤害公式修改只有神将才计算阵营伤害增减
|
2021-11-22 16:34:57 +08:00 |
gaoxin
|
7f68c39f91
|
【灵脉】回放跳过时战斗卡住
|
2021-11-22 16:28:36 +08:00 |
gaoxin
|
d52ca13ff6
|
【战斗】关闭战斗类型打印
|
2021-11-22 16:13:06 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
wangzhenxing
|
ed8ef42849
|
[战斗]========被动112 258修改
|
2021-11-22 12:01:55 +08:00 |
ZhangBiao
|
85c8028bc5
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-19 17:57:09 +08:00 |
wangzhenxing
|
2cf0c5afde
|
[战斗]=======被动310,391修改
|
2021-11-19 17:39:43 +08:00 |
gaoxin
|
9ce1d26fa9
|
【战斗】添加一些战斗类型
|
2021-11-19 17:29:40 +08:00 |
gaoxin
|
ab9408b485
|
【战斗】后端被动和主动技能id格式转换成数字,可能导致战斗不一致
|
2021-11-19 17:21:01 +08:00 |
wangzhenxing
|
3d4211740c
|
【战斗表现】=========我方战中立绘缩放读取字段修改
|
2021-11-19 11:19:18 +08:00 |
wangzhenxing
|
9830c04a4b
|
【战斗】======御甲增加表现
|
2021-11-19 11:18:15 +08:00 |
wangzhenxing
|
fc82b7bbc7
|
【战斗】======323 258 112 被动修改
|
2021-11-19 10:00:04 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
wangzhenxing
|
45bc2139a6
|
[战斗表现]=========我方前排血条位置修改
|
2021-11-18 18:37:14 +08:00 |
wangzhenxing
|
b74561d70b
|
[战斗表现]===============敌我前后排立绘缩放大小固定
|
2021-11-18 18:29:13 +08:00 |
gaoxin
|
670320141c
|
【战斗】初始怒气和爆伤减免的顺序交换
|
2021-11-18 17:17:53 +08:00 |
wangzhenxing
|
e705049135
|
【战斗】=======362修改 填加388-391被动
|
2021-11-18 16:02:16 +08:00 |
wangzhenxing
|
ad0e844852
|
[战中表现]========我方单位立绘大小读取字段修改
|
2021-11-18 15:44:16 +08:00 |
ZhangBiao
|
de7a516a87
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 13:30:03 +08:00 |
wangzhenxing
|
666f33e9c9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-18 11:08:11 +08:00 |
wangzhenxing
|
071b7e62de
|
[战斗]======被动362 修改
|
2021-11-18 11:06:19 +08:00 |
gaoxin
|
ecedea90f8
|
Merge branch '0功能/新增克制属性' into china/dev
|
2021-11-18 10:49:34 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
wangzhenxing
|
bf5f664fb8
|
[战斗]==========困难副本 禁疗不算控制
|
2021-11-17 17:36:20 +08:00 |
gaoxin
|
37000619e3
|
【战斗】加入克制属性的计算
|
2021-11-17 17:29:46 +08:00 |
wangzhenxing
|
6ee80e7a9f
|
[战斗表现]================战斗表现修改提交
|
2021-11-17 17:29:17 +08:00 |
gaoxin
|
fe13249728
|
【人物属性】新增爆伤减免属性,战斗适用
|
2021-11-17 16:01:14 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +08:00 |
gaoxin
|
ce5042eb86
|
【克制属性】添加
|
2021-11-16 16:59:59 +08:00 |
gaoxin
|
b6ea250096
|
【新手战斗】选择女角色后,战斗中立绘替换为女角色
|
2021-11-15 18:34:25 +08:00 |
gaoxin
|
3a70720f9c
|
【新手战斗】第一场战斗关闭跳过
|
2021-11-15 17:26:04 +08:00 |
liujiaqi
|
1498cd7661
|
【新手战斗】报错修复
|
2021-11-19 17:20:28 +08:00 |
gaoxin
|
79d22b0545
|
【新手战斗】回合开始触发改为回合结束触发
|
2021-11-15 17:09:52 +08:00 |
gaoxin
|
9c50acee09
|
【引导战斗】添加第N回合开始时触发剧情
|
2021-11-15 16:46:41 +08:00 |
gaoxin
|
f7a1ddbc94
|
【假战斗】背景走表配置
|
2021-11-15 16:39:38 +08:00 |
wangzhenxing
|
7790f90d8f
|
【战斗】=======被动处理伤害修改
|
2021-11-15 10:34:13 +08:00 |
wangzhenxing
|
7dfa28321c
|
[战斗]======被动376 377修改
|
2021-11-12 17:38:28 +08:00 |
gaoxin
|
83583747ad
|
Merge branch '0功能/和谐资源后台控制' into china/dev
|
2021-11-12 16:39:53 +08:00 |
wangzhenxing
|
41dc490d28
|
【战斗】=============== 被动处理伤害方法只处理减伤
|
2021-11-12 15:54:54 +08:00 |
wangzhenxing
|
4756c0b19e
|
[战斗]========363被动替换逻辑修改
|
2021-11-12 15:31:01 +08:00 |
gaoxin
|
451d8f4460
|
【战斗】伤害数字延时显示
|
2021-11-12 11:59:40 +08:00 |
wangzhenxing
|
f71bbbdf95
|
[战斗]===========第二期神魂被动提交
|
2021-11-11 14:01:32 +08:00 |
gaoxin
|
b661b04ad1
|
【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误
|
2021-11-10 13:22:32 +08:00 |
gaoxin
|
880c77888a
|
【新假战斗】加入主角技能
|
2021-11-10 11:03:18 +08:00 |
gaoxin
|
c9e2ddcaf8
|
【新假战斗】
|
2021-11-10 09:48:42 +08:00 |
gaoxin
|
3131ffca2f
|
【资源和谐】后台控制完成
|
2021-11-09 10:49:37 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
wangzhenxing
|
d30fc43d9f
|
【战斗】============被动285修改
|
2021-11-08 15:28:04 +08:00 |
wangzhenxing
|
8bc936aff8
|
【神魂】=====伤害统计界面神魂显示修改
|
2021-11-05 18:24:05 +08:00 |
gaoxin
|
d4582cf244
|
【神魂】修复战斗中神魂特效不显示的问题
|
2021-11-05 18:13:32 +08:00 |
jiaoyangna
|
420356da83
|
添加特效
|
2021-11-05 14:33:09 +08:00 |
wangzhenxing
|
6ace7b50ab
|
[战斗]======被动154 200 360 修改
|
2021-11-05 13:17:17 +08:00 |
jiaoyangna
|
5ac1f04718
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:18:28 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
wangzhenxing
|
51dfdede03
|
[战斗]===========被动371 368修改
|
2021-11-05 09:50:28 +08:00 |
wangzhenxing
|
661ea27421
|
[战斗]======被动357修改 御甲buff修改
|
2021-11-04 16:57:06 +08:00 |
wangzhenxing
|
b6ec2b0f89
|
【战斗】======被动360修改
|
2021-11-04 15:40:14 +08:00 |
wangzhenxing
|
113e1ebefa
|
【战斗】=====被动356 修改
|
2021-11-04 14:13:28 +08:00 |
wangzhenxing
|
41044877f1
|
[战斗]=============被动357修改
|
2021-11-04 13:43:05 +08:00 |
wangzhenxing
|
878b12f574
|
【战斗】===============被动364-371 提交 307 360修改
|
2021-11-04 10:27:02 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
wangzhenxing
|
6092ce28c0
|
【战斗】=========处理战斗伤害记录不显示敌方主角
|
2021-11-02 20:19:36 +08:00 |
wangzhenxing
|
46fe5a1b8d
|
【战斗】======战斗结果显示主角伤害治疗修改
|
2021-11-02 18:00:31 +08:00 |
wangzhenxing
|
7331cdb7d0
|
【战斗】======灵兽技能检测方法初始化时清空, 战斗治疗数据记录修改
|
2021-11-02 13:33:35 +08:00 |
wangzhenxing
|
a55388942b
|
【战斗】=========追加的技能显示皮肤的特效
|
2021-11-01 19:22:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
689522120c
|
[战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数
|
2021-11-02 06:42:19 +08:00 |
wangzhenxing
|
3815dc0ff3
|
[战斗]=======灵兽技能触发机制修改
|
2021-10-29 15:50:17 +08:00 |
wangzhenxing
|
d004e1d459
|
【神魂】======战斗中 和伤害记录界面加神魂显示
|
2021-10-29 15:14:01 +08:00 |
wangzhenxing
|
e738e8eda8
|
【战斗】===========被动180 修改提交
|
2021-10-28 14:41:01 +08:00 |
wangzhenxing
|
74dea991bc
|
[战斗]======被动355-363 提交
|
2021-10-28 09:48:01 +08:00 |
gaoxin
|
266d3088e7
|
【战斗】修复假战斗报错
|
2021-10-26 21:43:00 +08:00 |
wangzhenxing
|
a38fe30800
|
[主角技能]=====注重主角立绘等级显示修改
|
2021-10-26 18:03:02 +08:00 |
gaoxin
|
e7da10a595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:45:34 +08:00 |
gaoxin
|
a692f8d9d4
|
【本场最佳】主角名颜色根据修行等级改变
|
2021-10-26 14:45:28 +08:00 |
wangzhenxing
|
4c292035cf
|
[主角技能]======心魔试炼快速战斗不显示主角伤害记录修改
|
2021-10-26 14:00:23 +08:00 |
wangzhenxing
|
7b406e1c4b
|
【战斗】===========主角技能使用 队伍战斗力 接口修改
|
2021-10-25 16:37:41 +08:00 |
wangzhenxing
|
237767eb29
|
【战斗】=============灵兽技能 8 回合cd判断修改
|
2021-10-25 15:54:38 +08:00 |
wangzhenxing
|
09755c8d12
|
[战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力
|
2021-10-25 13:48:48 +08:00 |
wangzhenxing
|
7ae770a3b0
|
[战斗]=============伤害力公式修改 防御 乘2
|
2021-10-25 11:48:54 +08:00 |
wangzhenxing
|
5e541238de
|
[战斗]=============128 129 130 131 修改 添加最大限制
|
2021-10-22 17:34:15 +08:00 |
gaoxin
|
24ea182587
|
【最佳】加入主角伤害展示
|
2021-11-10 02:52:51 +08:00 |
wangzhenxing
|
fc3edefd82
|
【战斗】=====hot buff修改提交
|
2021-10-22 14:11:25 +08:00 |
wangzhenxing
|
8035e3f6f3
|
[战斗]==============战斗消息位置修改
|
2021-10-22 14:04:15 +08:00 |
wangzhenxing
|
e0b7df4206
|
[战斗]==========被动199 历战之躯 被动修改 2
|
2021-10-22 13:57:51 +08:00 |
wangzhenxing
|
2a6f3389b3
|
[战斗]=============被动199 历战之躯 修改
|
2021-10-22 13:35:44 +08:00 |
wangzhenxing
|
7261a428fb
|
主角技能伤害提交
|
2021-10-21 17:47:49 +08:00 |
wangzhenxing
|
5575ba2245
|
[战斗]=====灵兽技能修改提交
|
2021-10-21 16:17:10 +08:00 |
wangzhenxing
|
3d9bf0041f
|
[战斗]============灵兽技能伤害不检测是否命中
|
2021-10-21 13:25:41 +08:00 |
wangzhenxing
|
18da581061
|
[战斗]=====技能添加空判断
|
2021-10-21 10:41:57 +08:00 |
wangzhenxing
|
7b7879ce89
|
[战斗]=========效果130修改
|
2021-10-20 22:00:01 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
wangzhenxing
|
54b07410bf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-19 10:12:38 +08:00 |
wangzhenxing
|
b5f27a64af
|
主角技能提交
|
2021-10-19 10:00:34 +08:00 |
wangzhenxing
|
23ed8a7a2b
|
【战斗】==========被动344添加空判断
|
2021-10-16 18:12:56 +08:00 |
wangzhenxing
|
267598d53b
|
Revert "【战斗】=======被动199"
This reverts commit c8603f010f.
|
2021-10-16 18:07:30 +08:00 |
wangzhenxing
|
c8603f010f
|
【战斗】=======被动199
|
2021-10-16 16:47:57 +08:00 |
wangzhenxing
|
fbb1c387c7
|
【战斗】=======伤害公式 修改 去点 防御0.5的容错
|
2021-10-14 17:12:01 +08:00 |
wangzhenxing
|
f0fcd144f2
|
[战斗]===========被动添加 354 355
|
2021-10-14 13:54:07 +08:00 |
wangzhenxing
|
d2c2b39b8b
|
[战斗]==========被动312修改
|
2021-10-11 17:46:01 +08:00 |
wangzhenxing
|
453216c6c7
|
【战斗】==========被动344修改
|
2021-10-09 18:23:45 +08:00 |
wangzhenxing
|
79addd132d
|
[战斗]=========被动250 修改
|
2021-10-09 18:10:11 +08:00 |
wangzhenxing
|
4bd1047ccc
|
[战斗]=====被动116 258 281 312 344修改
|
2021-10-09 17:13:24 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
wangzhenxing
|
1a808dfd54
|
[战斗]============被动137修改 添加查找没有触发不灭的技能目标
|
2021-09-27 17:33:51 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
wangzhenxing
|
433ae25590
|
[战斗]======被动351 353 修改
|
2021-09-27 13:47:27 +08:00 |
gaoxin
|
ace42823db
|
【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题
|
2021-09-26 20:48:32 +08:00 |
gaoxin
|
2bce8547c7
|
【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
|
2021-09-26 20:31:51 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
wangzhenxing
|
d83cf97ae2
|
【战斗】==========被动93 307 309 351修改
|
2021-09-24 17:40:08 +08:00 |
wangzhenxing
|
34f52e18e7
|
[战斗]=====被动352 描述修改
|
2021-09-24 15:20:59 +08:00 |
wangzhenxing
|
8ffd86ee19
|
Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 15:13:46 +08:00 |
wangzhenxing
|
19f7984f01
|
[战斗]=============新增352被动
|
2021-09-24 14:59:54 +08:00 |
wangzhenxing
|
9abf1ef390
|
Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 14:56:13 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
wangzhenxing
|
cbb22260f3
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-09-23 11:02:19 +08:00 |
wangzhenxing
|
fbaca4e989
|
[战斗]====添加间接治疗得方法
|
2021-09-23 10:51:21 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
wangzhenxing
|
d5ce7b7f84
|
【战斗】=======被动37修改
|
2021-09-17 17:07:57 +08:00 |
wangzhenxing
|
01e446fed3
|
[战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗
|
2021-09-17 16:55:49 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
wangzhenxing
|
df1409717d
|
【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放
|
2021-09-17 15:20:44 +08:00 |
ZhangBiao
|
2925de34e8
|
【七界试炼】结算界面提交
|
2021-09-17 14:38:05 +08:00 |
wangzhenxing
|
52221aca04
|
【战斗】==========被动196 修改
|
2021-09-17 14:26:30 +08:00 |
wangzhenxing
|
4511eec383
|
【战斗】==========被动196 修改
|
2021-09-17 11:55:18 +08:00 |
gaoxin
|
38fcf555dd
|
【山河社稷图】修复战斗不一致
|
2021-09-16 22:43:38 +08:00 |
wangzhenxing
|
e584db1eaa
|
[战斗]===========被动196 200 188修改
|
2021-09-16 20:31:12 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |