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
|
e4aa6e2edd
|
更新配置
|
2023-09-01 21:21:02 +08:00 |
|
xiekaidong
|
deae480ef3
|
诅咒回血被腐败影响
|
2023-08-18 18:56:09 +08:00 |
|
xiekaidong
|
9cdeac081d
|
编译lua
|
2023-08-15 09:38:22 +08:00 |
|
Fang
|
0531830c75
|
配置更新
|
2023-08-14 14:44:04 +08:00 |
|
xiekaidong
|
62907b1a83
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:49 +08:00 |
|
xiekaidong
|
d93593b5fb
|
优化木棍障碍物
|
2023-08-11 11:25:22 +08:00 |
|
xiekaidong
|
5c1fa9be63
|
更新配置
|
2023-08-10 09:41:33 +08:00 |
|
xiekaidong
|
977b3c8c91
|
Merge branch 'master' into dev_20230815
# Conflicts:
# Assets/lua/app/config/arena_bounty_level.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/avatar_frame.lua.bytes
# Assets/lua/app/config/chapter.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/monster_chapter.lua.bytes
# Assets/lua/app/config/monster_daily_challenge.lua.bytes
# Assets/lua/app/config/monster_dungeon_armor.lua.bytes
# Assets/lua/app/config/strings/cn/avatar.lua.bytes
# Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/en/avatar.lua.bytes
# Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/es/avatar.lua.bytes
# Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/id/avatar.lua.bytes
# Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ja/avatar.lua.bytes
# Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ko/avatar.lua.bytes
# Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/pt/avatar.lua.bytes
# Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/th/avatar.lua.bytes
# Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/vi/avatar.lua.bytes
# Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/zh/avatar.lua.bytes
# Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
# Assets/lua/app/config/summon.lua.bytes
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/battle/team/battle_team.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
|
2023-08-10 09:38:07 +08:00 |
|
xiekaidong
|
30b58e0e39
|
删除打印
|
2023-08-09 16:51:27 +08:00 |
|
xiekaidong
|
56abe8a87b
|
添加打印
|
2023-08-09 16:03:28 +08:00 |
|
xiekaidong
|
ce7ad3cb8c
|
新buff和新机制
|
2023-08-08 16:39:03 +08:00 |
|
xiekaidong
|
433ec88ba1
|
编译lua
|
2023-08-08 16:00:08 +08:00 |
|
xiekaidong
|
3b61c03934
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# Assets/lua/app/common/local_data.lua.bytes
# Assets/lua/app/config/act_gift.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/const.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/cn/buff.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/de/item.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/fr/item.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/ru/item.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill.lua.bytes
# Assets/lua/app/global/global_func.lua.bytes
# Assets/lua/app/module/arena/arena_manager.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/equip/equip_manager.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
# Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
# Assets/lua/app/ui/ui_manager.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-08 15:59:22 +08:00 |
|
xiekaidong
|
dd1a91051a
|
bug修复
|
2023-08-04 16:59:30 +08:00 |
|
xiekaidong
|
51d857b64e
|
新增两个反伤护盾
|
2023-08-04 16:35:56 +08:00 |
|
xiekaidong
|
22b6a4092a
|
bug
|
2023-08-03 16:24:06 +08:00 |
|
xiekaidong
|
e0a51b64ba
|
bug'修复
|
2023-08-03 16:10:15 +08:00 |
|
xiekaidong
|
93bd2796b6
|
战斗血条优化
|
2023-08-02 20:34:37 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
fa42e29552
|
续关记录能量
|
2023-08-01 18:03:38 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
2bb3d99058
|
伤害公式bug修复
|
2023-07-21 17:47:07 +08:00 |
|
Fang
|
043dbf29c1
|
review
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
6f8acc2673
|
新号报错处理
|
2023-07-17 15:18:57 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
xiekaidong
|
641deeedf0
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:56 +08:00 |
|
xiekaidong
|
47a5446628
|
修改战斗伤害公式
|
2023-07-10 16:07:46 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
xiekaidong
|
826cdd1c32
|
战斗系数
|
2023-06-29 21:57:26 +08:00 |
|
xiekaidong
|
cbca95b111
|
战斗bug修复
|
2023-06-29 21:25:44 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
xiekaidong
|
3fc9c15755
|
bug修复
|
2023-06-20 16:29:21 +08:00 |
|
xiekaidong
|
9d0901dc2b
|
免控
|
2023-06-19 11:55:52 +08:00 |
|
xiekaidong
|
c0e16123f8
|
bug修复
|
2023-06-16 14:30:30 +08:00 |
|
xiekaidong
|
a3a9ac1fb7
|
连携提示
|
2023-06-14 18:21:48 +08:00 |
|
xiekaidong
|
f3c87a786f
|
修改上报
|
2023-06-06 15:25:51 +08:00 |
|
CloudJ
|
30983ba637
|
编译
|
2023-06-02 20:35:37 +08:00 |
|
xiekaidong
|
0fc01c78b6
|
战斗相关bug修复
|
2023-05-31 14:24:15 +08:00 |
|
xiekaidong
|
2d14102407
|
反伤bug、反击bug、死亡时带有流血buff触发机制实现
|
2023-05-26 21:37:35 +08:00 |
|
xiekaidong
|
1dbe6be188
|
禁锢效果
|
2023-05-26 18:09:46 +08:00 |
|
xiekaidong
|
47b32345d6
|
反击表现
|
2023-05-23 20:10:54 +08:00 |
|
xiekaidong
|
97953f1958
|
格挡动作表现、反击界面表现
|
2023-05-23 16:40:45 +08:00 |
|
xiekaidong
|
1d657e3128
|
boss入场动画
|
2023-05-22 20:32:26 +08:00 |
|
xiekaidong
|
36950a4364
|
更新pb
|
2023-05-19 18:23:35 +08:00 |
|
chenxi
|
d2b296fe95
|
宝箱tips
|
2023-05-19 16:37:44 +08:00 |
|