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 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
xiejun
|
937ec44bf5
|
立绘和代码修改
|
2023-07-13 14:38:34 +08:00 |
xiejun
|
ab2e8eb833
|
增加技能特效spine
|
2023-07-06 14:08:10 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
yuanshuai
|
7fc9813a7f
|
时空猪八戒技能修改
|
2023-05-16 15:19:44 +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 |
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
|
f3639bf28e
|
【神兵】========被动,红点修改提交
|
2023-04-07 16:54:53 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
478347bc6d
|
战斗============================被动441修改
|
2023-04-04 16:27:15 +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
|
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
|
d557b603b3
|
【战斗】=================效果 151提交
|
2023-01-11 11:44:40 +08:00 |
wangzhenxing
|
8b7c2bae30
|
【战斗】========添加被动443,444,445
|
2022-11-17 18:27:11 +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
|
37c8d8f6a8
|
[战斗]======逻辑修改
|
2022-08-03 14:20:57 +08:00 |
wangzhenxing
|
ec1933de1d
|
[战斗]========被动439提交
|
2022-06-06 14:39:53 +08:00 |
wangzhenxing
|
3e75dc9f6f
|
[假战斗]======修改提交
|
2022-05-24 11:57:47 +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
|
53e7c44e2a
|
[战斗]=======战斗提交
|
2022-04-19 17:23:37 +08:00 |
wangzhenxing
|
24a92b6b98
|
[战斗]=======被动387修改
|
2022-03-30 17:12:03 +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 |