2306 Commits

Author SHA1 Message Date
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
5544693612 符文副本 2023-09-12 10:07:16 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
5f333b5e58 更新协议 2023-09-11 17:32:20 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
977459d074 显示问题优化 2023-09-11 10:17:21 +08:00
xiekaidong
37b12e064e 处理界面 2023-09-11 10:07:43 +08:00
xiekaidong
704ac4757e cell 2023-09-09 12:58:01 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
28c23b328d 更新协议 2023-09-08 10:56:06 +08:00
xiekaidong
b510c81e29 判定修复 2023-09-08 10:37:10 +08:00
Fang
874ecfd37b 添加容错 2023-09-08 10:01:36 +08:00
xiekaidong
be78597d74 Merge branch 'dev_20230919' into dungeon_rune 2023-09-08 09:39:12 +08:00
xiekaidong
af6b0f744c 合并符文怪物表 2023-09-08 09:37:02 +08:00
xiekaidong
c0a3356cfd 符文副本主界面 2023-09-07 19:14:39 +08:00
xiekaidong
c65718119f 资源处理 2023-09-06 18:47:55 +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
b7997bb181 Merge branch 'master' into dev_20230919 2023-09-06 10:20:56 +08:00
chenxi
3355f0ae51 更新配置 2023-09-05 22:28:39 +08:00
xiekaidong
05c32acc78 更新配置 2023-09-05 20:53:34 +08:00
xiekaidong
3a7f4576d8 更新配置 2023-09-05 20:24:35 +08:00
xiekaidong
c685261caa 更新配置 2023-09-05 20:22:27 +08:00
xiekaidong
2c7ac4fac8 bug修复 2023-09-05 20:19:51 +08:00
xiekaidong
43c03fd385 皮肤问题修复 2023-09-05 19:57:26 +08:00
xiekaidong
a0daa1e692 更新配置 2023-09-05 18:00:32 +08:00
xiekaidong
d7f60f5002 bossrush阵容 2023-09-05 17:36:43 +08:00
xiekaidong
24a88cf05a bug修复 2023-09-05 17:34:17 +08:00
xiekaidong
f839dc3b57 buff数值上线 2023-09-05 17:14:49 +08:00
xiekaidong
180c12435f 更新配置 2023-09-05 15:59:37 +08:00
xiekaidong
1e918f92f2 等级修改 2023-09-05 15:29:35 +08:00
xiekaidong
35d84fead7 bug修复 2023-09-05 15:28:24 +08:00
xiekaidong
9e75ea15c3 安卓返回键 2023-09-05 15:24:24 +08:00
xiekaidong
d67a0a8b69 优化 2023-09-05 12:01:42 +08:00
xiekaidong
8f06e996d7 bug修复 2023-09-05 11:54:32 +08:00
xiekaidong
950ecacee5 bug修复和优化 2023-09-05 11:47:28 +08:00
xiekaidong
b63a1e3ee0 bug修复 2023-09-05 10:47:55 +08:00
xiekaidong
9ce3168f39 bug修复 2023-09-05 10:06:52 +08:00
xiekaidong
94064c92ed bug修复 2023-09-05 09:58:29 +08:00
xiekaidong
4aff8fd8c2 字段名修复 2023-09-05 09:23:35 +08:00
xiekaidong
408bd933c6 bug修复 2023-09-04 20:21:02 +08:00
xiekaidong
f3d7d1c892 bug修复 2023-09-04 20:06:11 +08:00
xiekaidong
c6e44efbd6 bug修复 2023-09-04 19:25:50 +08:00
xiekaidong
b47d779cfc 修复一些bug 2023-09-04 18:21:17 +08:00
xiekaidong
ec33c7b7df 14天丢图问题 2023-09-04 17:50:32 +08:00
xiekaidong
12d5186557 倒计时优化 2023-09-04 17:25:50 +08:00
xiekaidong
b9beea2c45 倒计时优化 2023-09-04 17:24:28 +08:00
xiekaidong
11f982bd04 主动结算 2023-09-04 17:14:35 +08:00
xiekaidong
d8aa8cce2c bug修复 2023-09-04 16:54:44 +08:00
xiekaidong
d003c8a551 bug修复 2023-09-04 16:51:34 +08:00