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
|
8005fbe6d7
|
时空猪八戒被动提交
|
2023-05-15 17:38:51 +08:00 |
yuanshuai
|
de787a85f7
|
天蓬相关技能提交
|
2023-05-12 16:55:47 +08:00 |
wangzhenxing
|
7c2598c7e7
|
英雄属性添加时空英雄属性
|
2023-04-19 17:49:29 +08:00 |
wangzhenxing
|
14c546f315
|
【战斗】==============新将战斗修改提交
|
2023-04-14 16:53:08 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
d3c0c9671b
|
battlemanager 提交
|
2023-04-04 16:49:58 +08:00 |
wangzhenxing
|
a753de6a59
|
神兵技能信息预设修改提交
|
2023-03-30 13:11:09 +08:00 |
wangzhenxing
|
de59133024
|
【战斗】===========添加 buff金刚印记
|
2023-02-15 18:48:53 +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
|
37c8d8f6a8
|
[战斗]======逻辑修改
|
2022-08-03 14:20:57 +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
|
bd3bed7e41
|
挑战副本脚本提交
|
2022-04-15 11:48:52 +08:00 |
wangzhenxing
|
3529402f5e
|
[战斗]=========被动431修改
|
2022-03-21 10:22:12 +08:00 |
wangzhenxing
|
a82de03880
|
[战斗]=======被动431 -434修改提交
|
2022-03-17 10:12:35 +08:00 |
wangzhenxing
|
255603a71a
|
[战斗]==========被动375修改
|
2022-02-23 14:36:31 +08:00 |
wangzhenxing
|
f89526d96a
|
[战斗]===========被动新增 414 -417
|
2022-01-06 15:30:40 +08:00 |
gaoxin
|
5724728062
|
【职业筛选】颜色修改,添加混乱
|
2022-01-04 15:45:06 +08:00 |
wangzhenxing
|
b46519d9c8
|
【战斗】=======反伤盾类型修改
|
2021-12-15 18:06:48 +08:00 |
wangzhenxing
|
23467d0ff6
|
[战斗]=====变身卡复活机制提交
|
2021-12-13 14:52: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
|
b9763ad25e
|
【战斗】=====变身卡提交
|
2021-12-03 17:17:47 +08:00 |
wangzhenxing
|
bbef7796ca
|
[战斗]=======第四期神魂
|
2021-12-02 17:42:31 +08:00 |
wangzhenxing
|
f67006e041
|
【战斗】============战斗超时pvp类型检测添加类型
|
2021-11-22 16:57:46 +08:00 |
wangzhenxing
|
ed8ef42849
|
[战斗]========被动112 258修改
|
2021-11-22 12:01:55 +08:00 |
gaoxin
|
9ce1d26fa9
|
【战斗】添加一些战斗类型
|
2021-11-19 17:29:40 +08:00 |
wangzhenxing
|
9830c04a4b
|
【战斗】======御甲增加表现
|
2021-11-19 11:18:15 +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
|
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 |
gaoxin
|
37000619e3
|
【战斗】加入克制属性的计算
|
2021-11-17 17:29:46 +08:00 |
gaoxin
|
fe13249728
|
【人物属性】新增爆伤减免属性,战斗适用
|
2021-11-17 16:01:14 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
gaoxin
|
ce5042eb86
|
【克制属性】添加
|
2021-11-16 16:59:59 +08:00 |
wangzhenxing
|
878b12f574
|
【战斗】===============被动364-371 提交 307 360修改
|
2021-11-04 10:27:02 +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
|
8035e3f6f3
|
[战斗]==============战斗消息位置修改
|
2021-10-22 14:04:15 +08:00 |
wangzhenxing
|
2a6f3389b3
|
[战斗]=============被动199 历战之躯 修改
|
2021-10-22 13:35:44 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
wangzhenxing
|
4ee0741896
|
[战斗]==============被动338修改 护甲逻辑修改
|
2021-09-15 11:23:04 +08:00 |
wangzhenxing
|
08d02a0b6d
|
[战斗]==========后续紫府神印提交
|
2021-08-12 15:11:38 +08:00 |
wangzhenxing
|
d00d69ff68
|
[战斗]============第二期紫府神印提交
|
2021-07-02 09:56:06 +08:00 |