xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
xiejun
|
ed0681d015
|
路飞,萨博
|
2023-07-17 18:47:07 +08:00 |
xiejun
|
87dfec134c
|
修改代码
|
2023-07-13 17:04:48 +08:00 |
xiejun
|
937ec44bf5
|
立绘和代码修改
|
2023-07-13 14:38:34 +08:00 |
xiejun
|
ab2e8eb833
|
增加技能特效spine
|
2023-07-06 14:08:10 +08:00 |
xiejun
|
214151b5ca
|
修改
|
2023-07-04 10:28:57 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
xiejun
|
0bb8dfbb6e
|
凱多的live2d
|
2023-06-29 15:04:58 +08:00 |
xiejun
|
f52a94841e
|
修改战斗的代码,已经调整live2D
|
2023-06-28 15:58:29 +08:00 |
wangzhenxing
|
543bdb6579
|
=====================战斗修改及添加log
|
2023-07-04 17:43:52 +08:00 |
xiejun
|
b47c16dcb7
|
test
|
2023-06-20 18:01:51 +08:00 |
wangzhenxing
|
cea83cf20a
|
战斗兼容老板剧情英雄释放技能
|
2023-06-07 16:26:57 +08:00 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
yuanshuai
|
f472f8ba83
|
嘲讽技能修改提交
|
2023-05-17 16:36:35 +08:00 |
yuanshuai
|
f390986b97
|
嘲讽技能修改
|
2023-05-17 16:12:30 +08:00 |
yuanshuai
|
7fc9813a7f
|
时空猪八戒技能修改
|
2023-05-16 15:19:44 +08:00 |
yuanshuai
|
86ece9cc1f
|
技能修改
|
2023-05-16 09:57:52 +08:00 |
yuanshuai
|
d73e8d0bfc
|
受到伤害时,如果攻击者处于嘲讽状态回复自身[a]点怒气
|
2023-05-15 18:21:04 +08:00 |
yuanshuai
|
8005fbe6d7
|
时空猪八戒被动提交
|
2023-05-15 17:38:51 +08:00 |
yuanshuai
|
de787a85f7
|
天蓬相关技能提交
|
2023-05-12 16:55:47 +08:00 |
yuanshuai
|
4ece26aaf4
|
七界试炼输了也消耗挑战次数bug修复
|
2023-05-10 14:31:18 +08:00 |
yuanshuai
|
9f4109c16f
|
七界试炼bug修复
|
2023-05-08 15:00:52 +08:00 |
wangzhenxing
|
7c2598c7e7
|
英雄属性添加时空英雄属性
|
2023-04-19 17:49:29 +08:00 |
wangzhenxing
|
2b06b98c0b
|
【战斗】=========技能147修改
|
2023-04-19 15:20:19 +08:00 |
wangzhenxing
|
db154ba52b
|
【战斗】=============被动464修改
|
2023-04-18 16:42:35 +08:00 |
wangzhenxing
|
001e399620
|
[战斗]=========被动464 修改
|
2023-04-18 15:42:27 +08:00 |
wangzhenxing
|
2f17b7af58
|
[战斗]=======新英雄技能被动修改提交
|
2023-04-18 14:28:17 +08:00 |
wangzhenxing
|
14c546f315
|
【战斗】==============新将战斗修改提交
|
2023-04-14 16:53:08 +08:00 |
wangzhenxing
|
9b40cb5314
|
[战斗]======被动327修改
|
2023-04-12 17:44:00 +08:00 |
wangzhenxing
|
3f8a00cb14
|
[神兵]==================修改提交
|
2023-04-11 14:41:36 +08:00 |
wangzhenxing
|
0e2fc0aad2
|
战斗测试界面修改提交
|
2023-04-07 16:56:54 +08:00 |
wangzhenxing
|
f3639bf28e
|
【神兵】========被动,红点修改提交
|
2023-04-07 16:54:53 +08:00 |
wangzhenxing
|
be9f720590
|
[战斗]======神兵服务器发过来的数据处理
|
2023-04-07 16:11:39 +08:00 |
wangzhenxing
|
0681ff2a30
|
[战斗]=========战斗去除无用log
|
2023-04-07 11:33:50 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
wangzhenxing
|
ab3484709d
|
[战斗]=========添加神兵目标选择
|
2023-04-06 14:22:20 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
e4de1d7188
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-04-04 16:55:09 +08:00 |
wangzhenxing
|
d3c0c9671b
|
battlemanager 提交
|
2023-04-04 16:49:58 +08:00 |
wangzhenxing
|
478347bc6d
|
战斗============================被动441修改
|
2023-04-04 16:27:15 +08:00 |
wangzhenxing
|
a753de6a59
|
神兵技能信息预设修改提交
|
2023-03-30 13:11:09 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5 .
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
f2b6ff1412
|
[战斗]=============被动441 455修改
|
2023-03-02 17:54:57 +08:00 |
wangzhenxing
|
47074a40d0
|
[战斗]=========新英雄技能被动提交
|
2023-03-01 17:24:25 +08:00 |
wangzhenxing
|
1c60b69d1a
|
[战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制
|
2023-02-24 11:02:14 +08:00 |
wangzhenxing
|
d902496f69
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-02-16 17:48:43 +08:00 |
wangzhenxing
|
de59133024
|
【战斗】===========添加 buff金刚印记
|
2023-02-15 18:48:53 +08:00 |
wangzhenxing
|
eb010bb2a9
|
【战斗】=====================被动448修改, 死亡不释放技能修改
|
2023-02-15 14:18:54 +08:00 |
wangzhenxing
|
0a2f07e93d
|
合并dev_bt分支
|
2023-02-14 16:19:23 +08:00 |
wangzhenxing
|
41259cc2f4
|
[战斗]=======添加被动454
|
2023-02-14 16:05:08 +08:00 |
wangzhenxing
|
549e36ed7c
|
[战斗]===========法相被动修改提交
|
2023-02-14 15:10:01 +08:00 |
wangzhenxing
|
5127ef5d90
|
[战斗]===================法相被动提交
|
2023-02-14 15:08:51 +08:00 |
wangzhenxing
|
63a652ae54
|
[战斗]===========法相被动修改提交
|
2023-02-13 18:32:31 +08:00 |
wangzhenxing
|
5a82a6471c
|
[战斗]===================法相被动提交
|
2023-02-13 17:08:29 +08:00 |
wangzhenxing
|
91710e2985
|
[战斗]========================效果添加152,添加筛选逻辑权重
|
2023-02-01 16:13:50 +08:00 |
wangzhenxing
|
48e172ae28
|
云梦好礼红点修改,伤害结算界面星级修改
|
2023-01-27 10:49:10 +08:00 |
wangzhenxing
|
a3a8277390
|
战斗表现修改提交
|
2023-01-13 14:41:41 +08:00 |
wangzhenxing
|
fde119c5cb
|
【战斗】=============御甲修改
|
2023-01-12 11:02:04 +08:00 |
wangzhenxing
|
d557b603b3
|
【战斗】=================效果 151提交
|
2023-01-11 11:44:40 +08:00 |
wangzhenxing
|
4ca7445e8b
|
跳过战斗修改
|
2023-01-04 18:16:08 +08:00 |
wangzhenxing
|
21d46821f4
|
【战斗】===========================187被动对治疗神将也会生效 战斗都不一致可考虑两端是否一致
|
2022-12-15 18:26:42 +08:00 |
wangzhenxing
|
2d35f6f270
|
[bt]======添加战斗跳过
|
2022-12-07 11:41:20 +08:00 |
wangzhenxing
|
8b7c2bae30
|
【战斗】========添加被动443,444,445
|
2022-11-17 18:27:11 +08:00 |
wangzhenxing
|
51c7375d65
|
【战斗】==========人物受击后立绘变红
|
2022-11-16 13:31:13 +08:00 |
wangzhenxing
|
97036e465d
|
刷冲特权修改,战斗三倍速修改
|
2022-11-03 16:29:37 +08:00 |
wangzhenxing
|
ce0df44e22
|
[战斗]=======战斗我方不显示立绘
|
2022-11-03 14:39:58 +08:00 |
wangzhenxing
|
a5530496dd
|
[战斗]=======被动184修改
|
2022-08-30 13:51:05 +08:00 |
wangzhenxing
|
30c71ca225
|
[战斗]=======被动189修改提交
|
2022-08-29 10:57:07 +08:00 |
wangzhenxing
|
8e753cf0cb
|
[战斗]======被动273修改
|
2022-08-26 17:25:55 +08:00 |
wangzhenxing
|
0008793a34
|
[战斗]======被动387,437修改
|
2022-08-19 11:09:25 +08:00 |
wangzhenxing
|
44ffc110e7
|
[战斗]=======效果10 修改
|
2022-08-08 14:12:42 +08:00 |
wangzhenxing
|
614239f7ce
|
【战斗】========被动183修改
|
2022-08-03 16:20:45 +08:00 |
wangzhenxing
|
aceb295e0d
|
【战斗】=========白骨精连击技能不触发免疫无敌吨特性
|
2022-08-03 15:24:25 +08:00 |
wangzhenxing
|
37c8d8f6a8
|
[战斗]======逻辑修改
|
2022-08-03 14:20:57 +08:00 |
wangzhenxing
|
bf9efec5c6
|
[战斗]========战斗名称显示修改
|
2022-06-29 14:54:23 +08:00 |
wangzhenxing
|
ec1933de1d
|
[战斗]========被动439提交
|
2022-06-06 14:39:53 +08:00 |
wangzhenxing
|
f4545f127c
|
战斗表现修改
|
2022-05-24 14:09:01 +08:00 |
wangzhenxing
|
bbd485f56f
|
[假战斗]=====修改
|
2022-05-24 13:35:24 +08:00 |
wangzhenxing
|
3e75dc9f6f
|
[假战斗]======修改提交
|
2022-05-24 11:57:47 +08:00 |
wangzhenxing
|
09f2f05214
|
【战斗】=====如果之前是3倍速,就转成二倍速
|
2022-05-16 13:40:53 +08:00 |
wangzhenxing
|
e337559c30
|
【战斗】=======屏蔽战斗三倍数,2倍速改为2.5倍速
|
2022-05-16 13:23:16 +08:00 |
wangzhenxing
|
a7d570255b
|
【跳过】================战斗跳过功能提示修改
|
2022-05-16 13:03:54 +08:00 |
wangzhenxing
|
1f37ce3b4e
|
【战斗】========被动438修改
|
2022-04-26 11:14:49 +08:00 |
wangzhenxing
|
adef176142
|
[战斗]======被动304修改
|
2022-04-25 20:03:44 +08:00 |
wangzhenxing
|
fed9afed62
|
[战斗]======目标选择逻辑添加空判断
|
2022-04-24 11:38:41 +08:00 |
yuanshuai
|
d247989586
|
挑战副本bug修改
|
2022-04-21 18:43:24 +08:00 |
yuanshuai
|
bf52645eb7
|
挑战副本优化
|
2022-04-25 18:20:53 +08:00 |
wangzhenxing
|
ba45227ed1
|
[战斗]======去掉log
|
2022-04-20 13:22:26 +08:00 |
wangzhenxing
|
0cad07009a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-19 17:24:53 +08:00 |
wangzhenxing
|
53e7c44e2a
|
[战斗]=======战斗提交
|
2022-04-19 17:23:37 +08:00 |
yuanshuai
|
3c72cd688b
|
挑战副本bug修改
|
2022-04-19 16:14:55 +08:00 |
yuanshuai
|
24bf6c63e4
|
挑战副本脚本修改
|
2022-04-19 15:52:50 +08:00 |
yuanshuai
|
b907383826
|
挑战副本脚本修改
|
2022-04-19 11:53:08 +08:00 |
yuanshuai
|
bd3bed7e41
|
挑战副本脚本提交
|
2022-04-15 11:48:52 +08:00 |
wangzhenxing
|
0a52e4a549
|
[bug]=====神系英雄修改提交
|
2022-04-02 16:03:18 +08:00 |
wangzhenxing
|
eff2800c35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-31 09:51:26 +08:00 |
wangzhenxing
|
24a92b6b98
|
[战斗]=======被动387修改
|
2022-03-30 17:12:03 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
wangzhenxing
|
e936ce29ce
|
[战斗]======选择英雄添加新判断
|
2022-03-21 18:23:54 +08:00 |
wangzhenxing
|
3529402f5e
|
[战斗]=========被动431修改
|
2022-03-21 10:22:12 +08:00 |
wangzhenxing
|
3e5b67ddf6
|
【技能】=========149 150 修改提交
|
2022-03-18 16:29:03 +08:00 |
wangzhenxing
|
9e010245fe
|
[战斗]========技能149 被动429 430 431修改提交
|
2022-03-18 15:47:16 +08:00 |
wangzhenxing
|
01b3a8c35b
|
【战斗】=======护盾效果表现修改
|
2022-03-17 16:50:40 +08:00 |
wangzhenxing
|
0f2eebfe42
|
[战斗]===================被动433修改 技能添加148
|
2022-03-17 16:15:34 +08:00 |
wangzhenxing
|
a82de03880
|
[战斗]=======被动431 -434修改提交
|
2022-03-17 10:12:35 +08:00 |
wangzhenxing
|
008b3671c4
|
[战斗]======buff提示文字修改
|
2022-03-14 17:10:15 +08:00 |
wangzhenxing
|
eff4c32f68
|
[战斗]========被动431修改
|
2022-03-14 14:06:12 +08:00 |
wangzhenxing
|
8e05053512
|
【战斗】=========被动429 430 431添加提交
|
2022-03-11 16:30:38 +08:00 |
wangzhenxing
|
586b77af34
|
[战斗]======被动427修改提交
|
2022-03-04 16:25:34 +08:00 |
wangzhenxing
|
361c08b5b1
|
[战斗]======被动428修改
|
2022-03-03 17:08:01 +08:00 |
wangzhenxing
|
ba38abcdaf
|
【战斗】=========被动428提交
|
2022-03-03 16:56:33 +08:00 |
wangzhenxing
|
e9f73fb70e
|
【战斗】======被动427提交
|
2022-03-03 13:36:32 +08:00 |
wangzhenxing
|
a27d510730
|
【被动】===========339修改
|
2022-03-02 14:07:52 +08:00 |
wangzhenxing
|
e83b649e34
|
【战斗】=======新增425 426被动
|
2022-02-24 15:57:12 +08:00 |
wangzhenxing
|
255603a71a
|
[战斗]==========被动375修改
|
2022-02-23 14:36:31 +08:00 |
wangzhenxing
|
92f3dee3ab
|
【战斗】==========被动226 423 424修改添加提交
|
2022-02-18 16:26:33 +08:00 |
wangzhenxing
|
3fde93fcd7
|
【战斗】=========效果108修改
|
2022-02-11 16:27:27 +08:00 |
wangzhenxing
|
a645a1f8d7
|
【战斗】=======斩杀方法添加空判断
|
2022-02-11 15:44:36 +08:00 |
wangzhenxing
|
599ef2e0fc
|
[战斗]=========被动356 422 技能: 108修改
|
2022-02-10 15:29:24 +08:00 |
gaoxin
|
62a9cda5d3
|
【战斗】修复姑获鸟神魂五对所有人生效的问题
|
2022-01-27 13:21:07 +08:00 |
wangzhenxing
|
4af86c7e7f
|
【战斗】=====御甲初始化数值修改
|
2022-01-26 13:29:39 +08:00 |
wangzhenxing
|
9e73d667a2
|
[战斗]========加御甲显示修改
|
2022-01-24 16:20:07 +08:00 |
gaoxin
|
4c00b471ad
|
【战斗】添加头像显示
|
2022-01-21 11:59:19 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
wangzhenxing
|
692c333b34
|
[战斗]========被动421修改提交
|
2022-01-15 17:44:32 +08:00 |
wangzhenxing
|
c083c2c903
|
【战斗】====被动419修改
|
2022-01-15 14:38:56 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
gaoxin
|
8351aba49c
|
【战斗】我方buff显示位置修改
|
2022-01-13 13:56:08 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
ec1f5be131
|
[战斗]======被动414修改
|
2022-01-10 14:22:57 +08:00 |
wangzhenxing
|
ac0718f8b8
|
[战斗]======御甲叠加逻辑修改
|
2022-01-07 14:19:24 +08:00 |
wangzhenxing
|
f89526d96a
|
[战斗]===========被动新增 414 -417
|
2022-01-06 15:30:40 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
gaoxin
|
5724728062
|
【职业筛选】颜色修改,添加混乱
|
2022-01-04 15:45:06 +08:00 |
wangzhenxing
|
2f2634eb39
|
【飞升】=====代码预设提交
|
2021-12-31 13:50:49 +08:00 |
wangzhenxing
|
db071514f9
|
【战斗】======被动283修改
|
2021-12-29 17:59:48 +08:00 |
wangzhenxing
|
d158a9451a
|
[战斗]=======被动414 修改
|
2021-12-29 17:09:27 +08:00 |
wangzhenxing
|
33f1934d02
|
【战斗】========角色皮肤释放技能表现修改
|
2021-12-29 13:08:32 +08:00 |
wangzhenxing
|
73d92664de
|
[飞升]=======飞升逻辑提交
|
2021-12-28 16:20:07 +08:00 |
wangzhenxing
|
07a90b7279
|
[战斗]=========战斗记录老虎上无敌盾记录修改
|
2021-12-27 15:42:38 +08:00 |
wangzhenxing
|
d3253c5edb
|
【战斗】========技能释放逻辑修改,技能播放技能攻击动作
|
2021-12-24 16:11:53 +08:00 |
wangzhenxing
|
ca17383879
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-24 14:55:22 +08:00 |
wangzhenxing
|
6e2b1c1a17
|
[战斗]=======被动56 被动368修改
|
2021-12-24 14:00:51 +08:00 |