xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
yuanshuai
|
f390986b97
|
嘲讽技能修改
|
2023-05-17 16:12:30 +08:00 |
yuanshuai
|
de787a85f7
|
天蓬相关技能提交
|
2023-05-12 16:55:47 +08:00 |
wangzhenxing
|
14c546f315
|
【战斗】==============新将战斗修改提交
|
2023-04-14 16:53:08 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
de59133024
|
【战斗】===========添加 buff金刚印记
|
2023-02-15 18:48:53 +08:00 |
wangzhenxing
|
aceb295e0d
|
【战斗】=========白骨精连击技能不触发免疫无敌吨特性
|
2022-08-03 15:24:25 +08:00 |
wangzhenxing
|
37c8d8f6a8
|
[战斗]======逻辑修改
|
2022-08-03 14:20:57 +08:00 |
wangzhenxing
|
53e7c44e2a
|
[战斗]=======战斗提交
|
2022-04-19 17:23:37 +08:00 |
wangzhenxing
|
01b3a8c35b
|
【战斗】=======护盾效果表现修改
|
2022-03-17 16:50:40 +08:00 |
wangzhenxing
|
a82de03880
|
[战斗]=======被动431 -434修改提交
|
2022-03-17 10:12:35 +08:00 |
wangzhenxing
|
8e05053512
|
【战斗】=========被动429 430 431添加提交
|
2022-03-11 16:30:38 +08:00 |
wangzhenxing
|
255603a71a
|
[战斗]==========被动375修改
|
2022-02-23 14:36:31 +08:00 |
wangzhenxing
|
4af86c7e7f
|
【战斗】=====御甲初始化数值修改
|
2022-01-26 13:29:39 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
wangzhenxing
|
ef680be056
|
[战斗]======护盾效果修改
|
2021-12-17 17:31:58 +08:00 |
wangzhenxing
|
b46519d9c8
|
【战斗】=======反伤盾类型修改
|
2021-12-15 18:06:48 +08:00 |
wangzhenxing
|
95f22a2be6
|
[战斗]======盾buff去除log
|
2021-12-13 15:09:57 +08:00 |
wangzhenxing
|
150e37ae78
|
[战斗]======效果144修改 护盾buff修改
|
2021-12-10 15:22:18 +08:00 |
wangzhenxing
|
cecb0ddfc7
|
【战斗】========被动405 407 409修改
|
2021-12-10 14:01:04 +08:00 |
wangzhenxing
|
33d25289b3
|
【战斗】=======变身卡技能提交
|
2021-12-10 11:52:10 +08:00 |
wangzhenxing
|
889a49576c
|
【战斗】=======第五期神魂提交
|
2021-12-09 14:25:02 +08:00 |
wangzhenxing
|
7277afdf9b
|
[战斗]=====被动257 不灭buff修改
|
2021-12-08 10:30:18 +08:00 |
wangzhenxing
|
acc1be3885
|
【战斗】=====buff图标显示销毁修改
|
2021-12-06 13:18:50 +08:00 |
wangzhenxing
|
e9f9010c12
|
【战斗】======被动401修改
|
2021-12-06 09:40:51 +08:00 |
wangzhenxing
|
40e639098b
|
[战斗]======仙音环绕修改
|
2021-12-03 18:19:29 +08:00 |
wangzhenxing
|
b9763ad25e
|
【战斗】=====变身卡提交
|
2021-12-03 17:17:47 +08:00 |
wangzhenxing
|
bbef7796ca
|
[战斗]=======第四期神魂
|
2021-12-02 17:42:31 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
wangzhenxing
|
f71bbbdf95
|
[战斗]===========第二期神魂被动提交
|
2021-11-11 14:01:32 +08:00 |
wangzhenxing
|
661ea27421
|
[战斗]======被动357修改 御甲buff修改
|
2021-11-04 16:57:06 +08:00 |
wangzhenxing
|
74dea991bc
|
[战斗]======被动355-363 提交
|
2021-10-28 09:48:01 +08:00 |
wangzhenxing
|
5e541238de
|
[战斗]=============128 129 130 131 修改 添加最大限制
|
2021-10-22 17:34:15 +08:00 |
wangzhenxing
|
fc3edefd82
|
【战斗】=====hot buff修改提交
|
2021-10-22 14:11:25 +08:00 |
wangzhenxing
|
7b7879ce89
|
[战斗]=========效果130修改
|
2021-10-20 22:00:01 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
wangzhenxing
|
01e446fed3
|
[战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗
|
2021-09-17 16:55:49 +08:00 |
wangzhenxing
|
4ee0741896
|
[战斗]==============被动338修改 护甲逻辑修改
|
2021-09-15 11:23:04 +08:00 |
wangzhenxing
|
dbf05190bc
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua
|
2021-09-14 10:32:25 +08:00 |
wangzhenxing
|
6ef1d6c643
|
【战斗】===========被动115 DOT类Buff 清除逻辑修改
|
2021-08-27 18:02:50 +08:00 |
wangzhenxing
|
08d02a0b6d
|
[战斗]==========后续紫府神印提交
|
2021-08-12 15:11:38 +08:00 |
wangzhenxing
|
d943d3044b
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-06-21 15:29:16 +08:00 |
gaoxin
|
ac7501a1d5
|
【战斗】修复群体性的免疫效果不会正常消失的问题
|
2021-06-17 16:01:48 +08:00 |
wangzhenxing
|
27b3d6e5c7
|
【战斗】=============被动56,被动283,被动324修改 不灭修改
|
2021-06-17 14:12:34 +08:00 |
wangzhenxing
|
b1425236af
|
[战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交
|
2021-06-16 10:27:56 +08:00 |