412 Commits

Author SHA1 Message Date
puxuan
0223007bc4 star 2025-06-22 19:06:10 +08:00
puxuan
c530cf25b9 fix bug 2025-06-17 20:29:18 +08:00
puxuan
68da2a7313 boss技能 2025-06-11 23:52:39 +08:00
puxuan
674e9c8679 mystery_box 2025-06-10 23:37:34 +08:00
puxuan
37dc0e4dad 受击 2025-06-09 23:51:29 +08:00
puxuan
d080d9b23e hero 2025-06-05 00:14:52 +08:00
puxuan
d82329610d skill 2025-06-03 23:58:23 +08:00
puxuan
a77df017d7 hero 2025-05-28 00:21:24 +08:00
xiekaidong
10fdfacc3d fix 2024-02-21 15:35:50 +08:00
xiekaidong
956e0fc450 竞技场bug修复 2023-11-10 10:37:24 +08:00
xiekaidong
34a91873b6 锁定buff修复 2023-10-27 16:01:13 +08:00
xiekaidong
b8f3b9530e bug修复 2023-10-26 10:39:37 +08:00
xiekaidong
401c2bd48f 容错 2023-09-22 09:58:41 +08:00
xiekaidong
de5805d1dc bug修复 2023-09-22 09:52:30 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
43d34f274e 试玩功能属性加成 2023-09-20 15:16:41 +08:00
xiekaidong
16b6f9b4bc bug修复 2023-09-20 11:27:32 +08:00
xiekaidong
8a961ae07b 复活优化 2023-09-20 11:16:41 +08:00
xiekaidong
eeede315a6 优化体验 2023-09-20 10:56:35 +08:00
xiekaidong
07fb378809 优化符文副本重生 2023-09-20 10:54:41 +08:00
xiekaidong
71058ccfee 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:52:11 +08:00
xiekaidong
41434625e2 bug修复 2023-09-18 20:52:32 +08:00
xiekaidong
c54a6c48b9 更新图集,编译lua 2023-09-18 14:53:41 +08:00
xiekaidong
b6345dce5a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_lock_1.png
#	Assets/arts/textures/ui/common/common_lock_1.png.meta
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
#	Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
2023-09-18 14:51:32 +08:00
xiekaidong
ae1aeba1c5 编译lua 2023-09-18 09:39:22 +08:00
xiekaidong
1cf27e1a54 编译lua 2023-09-16 20:26:20 +08:00
Fang
0d50692a4f 请求优化 2023-09-15 20:54:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
cccce0625e pvp战斗取消元素随机加权 2023-09-15 17:41:37 +08:00
xiekaidong
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
xiekaidong
96a0a976e6 优化 2023-09-13 09:43:41 +08:00
xiekaidong
4ef44130e9 优化和上传特效 2023-09-13 09:19:18 +08:00
xiekaidong
9f0fd56ab4 修复bug 2023-09-12 19:46:47 +08:00
xiekaidong
6bfab0547f bug修复 2023-09-12 16:32:07 +08:00
xiekaidong
27308ff7fd bug修复 2023-09-12 16:22:26 +08:00
陈希
4094f79f7b Merge branch 'fang/runes' into 'dev_20230919'
符文功能

See merge request b6-client/b6-unity!17
2023-09-12 06:50:32 +00:00
xiekaidong
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
c715f838f8 bug修复 2023-09-12 10:24:46 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
81d593d09a buff修改 2023-09-11 10:49:35 +08:00
xiekaidong
2c07878a4d 判定修复 2023-09-08 10:37:37 +08:00
xiekaidong
5fe814b753 合并符文怪物表 2023-09-08 09:38:10 +08:00
xiekaidong
980d92839d 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:28:01 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
32fd1db301 bug修复 2023-09-05 20:19:56 +08:00
xiekaidong
3d439234a4 更新配置 2023-09-05 18:00:45 +08:00
xiekaidong
27be90073a buff数值上线 2023-09-05 17:15:27 +08:00
xiekaidong
4bc0e14cdf 等级修改 2023-09-05 15:32:34 +08:00