434 Commits

Author SHA1 Message Date
puxuan
1c96c3a82f fix bug 2025-10-15 20:39:32 +08:00
kai
f841ca153f 肉鸽技能直接带入 2025-10-14 15:38:38 +08:00
puxuan
6d5a74b44c fix bug 2025-10-13 18:23:24 +08:00
puxuan
077a4d0f14 副本 2025-10-10 19:46:33 +08:00
puxuan
e32c238a90 副本 2025-10-10 19:22:45 +08:00
puxuan
4aa2e6f2a7 Merge branch 'dev_hero' into dev_act
# Conflicts:
#	Assets/lua/app/config/buff.lua.bytes
#	Assets/lua/app/config/fx.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/attr.lua.bytes
#	Assets/lua/app/config/strings/cn/task_type.lua.bytes
#	Assets/lua/app/config/strings/de/attr.lua.bytes
#	Assets/lua/app/config/strings/en/attr.lua.bytes
#	Assets/lua/app/config/strings/en/task_type.lua.bytes
#	Assets/lua/app/config/strings/es/attr.lua.bytes
#	Assets/lua/app/config/strings/es/task_type.lua.bytes
#	Assets/lua/app/config/strings/fr/attr.lua.bytes
#	Assets/lua/app/config/strings/id/attr.lua.bytes
#	Assets/lua/app/config/strings/id/task_type.lua.bytes
#	Assets/lua/app/config/strings/ja/attr.lua.bytes
#	Assets/lua/app/config/strings/ja/task_type.lua.bytes
#	Assets/lua/app/config/strings/ko/attr.lua.bytes
#	Assets/lua/app/config/strings/ko/task_type.lua.bytes
#	Assets/lua/app/config/strings/pt/attr.lua.bytes
#	Assets/lua/app/config/strings/pt/task_type.lua.bytes
#	Assets/lua/app/config/strings/ru/attr.lua.bytes
#	Assets/lua/app/config/strings/th/attr.lua.bytes
#	Assets/lua/app/config/strings/th/task_type.lua.bytes
#	Assets/lua/app/config/strings/vi/attr.lua.bytes
#	Assets/lua/app/config/strings/vi/task_type.lua.bytes
#	Assets/lua/app/config/strings/zh/attr.lua.bytes
#	Assets/lua/app/config/strings/zh/task_type.lua.bytes
2025-10-07 18:30:51 +08:00
puxuan
614909a19f 每日挑战 2025-10-07 18:28:34 +08:00
puxuan
dc4c1fc49e 活动 2025-09-28 16:11:00 +08:00
puxuan
a831629459 敌方属性计算 2025-09-23 20:00:40 +08:00
puxuan
e36dd5e583 新增肉鸽类型 2025-09-19 14:50:04 +08:00
puxuan
21b5b2b20a 属性 2025-09-18 17:52:48 +08:00
puxuan
63ad8832a9 每日挑战 2025-09-15 17:20:59 +08:00
puxuan
13e846a688 fix bug 2025-09-08 14:31:58 +08:00
puxuan
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
6488cf581a fix bug 2025-08-28 20:52:01 +08:00
puxuan
c36dec1a7b fix bug 2025-08-27 20:54:49 +08:00
puxuan
862a3f0177 还原boss 2025-08-27 20:35:09 +08:00
puxuan
945a1ce922 fix bug 2025-08-27 18:57:27 +08:00
puxuan
5654eb7445 .. 2025-08-15 20:12:27 +08:00
puxuan
40ae361190 局内 2025-08-15 17:34:34 +08:00
puxuan
d385b8c795 局内 2025-08-08 11:42:15 +08:00
puxuan
2080d5d643 挂机 2025-07-28 20:37:09 +08:00
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