67 Commits

Author SHA1 Message Date
xiekaidong
b20644f4cb 显示bug修复 2023-09-12 20:26:49 +08:00
xiekaidong
1ef1f34c7a 战斗优化调整 2023-09-12 12:23:07 +08:00
xiekaidong
61b73d9c8f zancun 2023-09-12 11:15:52 +08:00
xiekaidong
11f982bd04 主动结算 2023-09-04 17:14:35 +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
38cd167a9b 显示调整 2023-08-07 17:21:45 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
c21607c52e 回合数优化 2023-08-01 17:38:53 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
xiekaidong
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
xiekaidong
f17eeb8e68 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-26 15:28:43 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
xiekaidong
95c6377dbb bug修复 2023-06-21 17:15:18 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
f215a8124a bug修复 2023-06-15 14:07:10 +08:00
xiekaidong
2807860d92 容错 2023-06-14 19:09:26 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
09e4b06ccd 显示优化 2023-06-01 22:10:01 +08:00
xiekaidong
3259281fe8 修复bug 2023-05-31 20:18:22 +08:00
xiekaidong
694ef22777 格子支持一下spine 2023-05-31 20:11:00 +08:00
xiekaidong
c3c2e63ed6 层级调整 2023-05-30 22:04:32 +08:00
xiekaidong
71daac9cb7 表现优化 2023-05-30 15:06:33 +08:00
xiekaidong
528ac6a89b 技能tips 2023-05-22 15:59:17 +08:00
xiekaidong
97e5506ab2 神灯障碍物 2023-05-16 21:22:52 +08:00
xiekaidong
4605282d53 障碍物 2023-05-16 19:13:08 +08:00
xiekaidong
39a2eee61a 格子类型的一些配置改为配置表控制 2023-05-12 11:43:49 +08:00
xiekaidong
c01cc5c9db bug修复 2023-04-27 15:24:24 +08:00
xiekaidong
d52d40d741 显示优化 2023-04-25 22:24:01 +08:00
xiekaidong
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +08:00
xiekaidong
c1ed407a0f 显示修改 2023-04-25 15:49:24 +08:00
xiekaidong
4acf0850f8 技能特效 2023-04-24 21:03:39 +08:00
xiekaidong
5844567d70 特效 2023-04-24 17:16:26 +08:00
xiekaidong
43ef1a5a8d 显示优化 2023-04-24 14:16:19 +08:00
xiekaidong
eb73f1b943 bug修复 2023-04-24 10:14:23 +08:00
xiekaidong
b250299dc4 消除技能特效 2023-04-23 19:02:44 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00
xiekaidong
d8bf6274d8 动画 2023-04-23 14:19:44 +08:00
xiekaidong
34312754ef 修改特效,消除影响改为十字形 2023-04-22 00:46:36 +08:00
chenxi
594d5ac6c6 伤害统计 2023-04-21 22:41:32 +08:00
xiekaidong
565cfbc817 动画 2023-04-21 10:57:27 +08:00
xiekaidong
a2e20a7c37 技能解锁 2023-04-20 21:26:35 +08:00
xiekaidong
a11f8613e1 动画调整 2023-04-20 20:30:35 +08:00
xiekaidong
1f0cba25d6 修复 2023-04-20 18:57:04 +08:00
xiekaidong
ccddeb8aa3 修复 2023-04-20 18:50:19 +08:00
xiekaidong
b9a42b317b 动画 2023-04-20 18:45:38 +08:00
xiekaidong
c874c9026b 特效 2023-04-20 18:13:56 +08:00