xiekaidong
|
75be639da9
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/module/battle/controller/battle_base_controller.lua
|
2023-08-15 09:36:53 +08:00 |
|
xiekaidong
|
de16254cb0
|
bug修复
|
2023-08-11 17:50:15 +08:00 |
|
xiekaidong
|
866094a76f
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:28 +08:00 |
|
xiekaidong
|
213e82f2c1
|
优化逻辑
|
2023-08-11 11:59:47 +08:00 |
|
xiekaidong
|
f5ed280271
|
优化木棍障碍物
|
2023-08-11 11:24:52 +08:00 |
|
xiekaidong
|
84f22f6123
|
bug修复
|
2023-08-10 17:33:30 +08:00 |
|
xiekaidong
|
e8ad813399
|
删除打印
|
2023-08-09 16:50:39 +08:00 |
|
xiekaidong
|
996f3deeee
|
添加打印
|
2023-08-09 16:21:12 +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
|
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
|
8b2d0c6046
|
完善一下结算
|
2023-08-07 11:45:16 +08:00 |
|
xiekaidong
|
13a137a6fd
|
bug修复
|
2023-08-04 15:16:19 +08:00 |
|
xiekaidong
|
8266b13b9a
|
棋盘机制调整
|
2023-08-04 14:24:01 +08:00 |
|
xiekaidong
|
bcb336d344
|
不过修复
|
2023-08-03 16:09:58 +08:00 |
|
xiekaidong
|
4c8eff015e
|
显示bug修复
|
2023-08-03 09:47:21 +08:00 |
|
xiekaidong
|
24d90bfd1c
|
战斗血条优化
|
2023-08-02 20:34:25 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
e954484a13
|
技能机制优化
|
2023-08-01 17:35:58 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
78704c6e35
|
bug修复
|
2023-07-24 20:54:47 +08:00 |
|
xiekaidong
|
b8751b9229
|
支线副本
|
2023-07-20 19:44:41 +08:00 |
|
xiekaidong
|
8ea47bc34f
|
战斗引导问题
|
2023-07-17 18:35:17 +08:00 |
|
xiekaidong
|
21365f487e
|
显示问题修复
|
2023-07-05 14:25:27 +08:00 |
|
xiekaidong
|
c1592accae
|
敌方也显示combo
|
2023-07-04 21:04:50 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +08:00 |
|
xiekaidong
|
a51ee6d872
|
竞技场战斗流程更改
|
2023-06-30 20:47:22 +08:00 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|