puxuan
|
349f321a97
|
新增肉鸽类型
|
2025-09-19 14:49:12 +08:00 |
|
puxuan
|
526b1690c5
|
属性
|
2025-09-18 17:51:59 +08:00 |
|
puxuan
|
160cc58d78
|
boss技能
|
2025-09-05 15:04:14 +08:00 |
|
puxuan
|
9481bb830c
|
fix bug
|
2025-09-04 16:21:46 +08:00 |
|
puxuan
|
6beb44b672
|
fix bug
|
2025-06-17 20:28:43 +08:00 |
|
puxuan
|
4a6d65b9f9
|
fix bug
|
2025-06-16 20:58:37 +08:00 |
|
puxuan
|
a142d9e9d2
|
boss技能
|
2025-06-11 23:51:45 +08:00 |
|
puxuan
|
3409aa046d
|
受击动画
|
2025-06-09 23:50:58 +08:00 |
|
puxuan
|
c0237bd044
|
fix bug
|
2025-06-06 15:36:13 +08:00 |
|
puxuan
|
c026ff582c
|
skill
|
2025-06-03 23:57:45 +08:00 |
|
puxuan
|
5cfdb4c8d8
|
hero
|
2025-06-03 15:15:01 +08:00 |
|
xiekaidong
|
a29a9606bf
|
锁定buff修复
|
2023-10-27 16:00:43 +08:00 |
|
xiekaidong
|
86e1bfa704
|
梦魇减能量肉鸽技能失效问题
|
2023-10-07 09:46:16 +08:00 |
|
xiekaidong
|
45174e1f9f
|
Merge branch 'master' into dev_20230919
|
2023-09-18 14:50:51 +08:00 |
|
Fang
|
de1565f2c8
|
属性fix
|
2023-09-13 18:23:57 +08:00 |
|
xiekaidong
|
ed65ae452b
|
一些优化和审核模式处理
|
2023-09-13 14:55:52 +08:00 |
|
xiekaidong
|
94d59731c8
|
Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/const.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/monster_dungeon_rune.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/proto/proto_msg_type.lua
|
2023-09-12 10:07:33 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
xiekaidong
|
b3af360cd3
|
buff修改
|
2023-09-11 10:49:18 +08:00 |
|
xiekaidong
|
2266324f94
|
新增属性
|
2023-09-06 16:44:00 +08:00 |
|
xiekaidong
|
297dcded77
|
魅惑、免疫buff，被控状态下，技能cd不递减
|
2023-09-06 16:26:48 +08:00 |
|
xiekaidong
|
f839dc3b57
|
buff数值上线
|
2023-09-05 17:14:49 +08:00 |
|
xiekaidong
|
4d79d3ea6c
|
最大等级
|
2023-09-04 16:43:07 +08:00 |
|
xiekaidong
|
4e5021741d
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/local_data.lua
# lua/app/common/module_manager.lua
# lua/app/config/act_fourteen_bounty.lua.meta
# lua/app/config/act_fourteen_exchange.lua.meta
# lua/app/config/act_fourteen_quest.lua
# lua/app/config/act_fourteen_quest.lua.meta
# lua/app/config/activity_boss_rush_chapter.lua.meta
# lua/app/config/activity_boss_rush_exchange.lua.meta
# lua/app/config/activity_boss_rush_rank.lua.meta
# lua/app/config/activity_exchange.lua.meta
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board_bossrush.lua.meta
# lua/app/config/monster_activity.lua.meta
# lua/app/config/strings/cn/act_fourteen_quest.lua.meta
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/task_type.lua.meta
# lua/app/config/strings/de/act_fourteen_quest.lua.meta
# lua/app/config/strings/de/task_type.lua.meta
# lua/app/config/strings/en/act_fourteen_quest.lua.meta
# lua/app/config/strings/en/task_type.lua.meta
# lua/app/config/strings/es/act_fourteen_quest.lua.meta
# lua/app/config/strings/es/task_type.lua.meta
# lua/app/config/strings/fr/act_fourteen_quest.lua.meta
# lua/app/config/strings/fr/task_type.lua.meta
# lua/app/config/strings/id/act_fourteen_quest.lua.meta
# lua/app/config/strings/id/task_type.lua.meta
# lua/app/config/strings/ja/act_fourteen_quest.lua.meta
# lua/app/config/strings/ja/task_type.lua.meta
# lua/app/config/strings/ko/act_fourteen_quest.lua.meta
# lua/app/config/strings/ko/task_type.lua.meta
# lua/app/config/strings/pt/act_fourteen_quest.lua.meta
# lua/app/config/strings/pt/task_type.lua.meta
# lua/app/config/strings/ru/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/task_type.lua.meta
# lua/app/config/strings/vi/act_fourteen_quest.lua.meta
# lua/app/config/strings/vi/task_type.lua.meta
# lua/app/config/strings/zh/act_fourteen_quest.lua.meta
# lua/app/config/strings/zh/task_type.lua.meta
# lua/app/proto/proto_msg_type.lua
|
2023-09-01 21:18:54 +08:00 |
|
xiekaidong
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
xiekaidong
|
b6b342c435
|
boss_rush战斗
|
2023-09-01 10:23:48 +08:00 |
|
xiekaidong
|
0549a8b37b
|
bug修复
|
2023-08-21 10:33:14 +08:00 |
|
xiekaidong
|
aff0c425bf
|
背景特效
|
2023-08-15 14:59:15 +08:00 |
|
xiekaidong
|
5bd2b94cd8
|
技能位置
|
2023-08-15 09:21:50 +08:00 |
|
xiekaidong
|
9249ee3210
|
重生处理
|
2023-08-14 16:27:52 +08:00 |
|
xiekaidong
|
4c65578099
|
更新配置
|
2023-08-11 10:41:09 +08:00 |
|
xiekaidong
|
5eff2c3633
|
上报和容错
|
2023-08-10 18:41:24 +08:00 |
|
xiekaidong
|
5b8030552d
|
皮肤技能表现
|
2023-08-10 10:48:30 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
8ae11ac948
|
新机制
|
2023-08-08 15:58:17 +08:00 |
|
xiekaidong
|
97cddfa125
|
复活buff
|
2023-08-08 15:27:21 +08:00 |
|
xiekaidong
|
a6b05117b7
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/userdata/dungeon/dungeon_armor_entity.lua
|
2023-08-08 11:41:34 +08:00 |
|
xiekaidong
|
82823526d9
|
自愈、海洋护盾buff
|
2023-08-04 16:19:59 +08:00 |
|
xiekaidong
|
8266b13b9a
|
棋盘机制调整
|
2023-08-04 14:24:01 +08:00 |
|
xiekaidong
|
fdfeae8819
|
bug修复
|
2023-08-03 16:53:47 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
933e402b85
|
bug修复
|
2023-07-24 21:20:06 +08:00 |
|
xiekaidong
|
bfff21b619
|
伤害公式bug修复
|
2023-07-21 17:46:56 +08:00 |
|
xiekaidong
|
dbbfbf4842
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:05 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +08:00 |
|
xiekaidong
|
b1dd325b05
|
伤害公式
|
2023-07-13 18:18:22 +08:00 |
|