Fang
|
6f010c00b4
|
容错
|
2023-09-12 17:59:10 +08:00 |
|
xiekaidong
|
97cef0d41d
|
bug修复
|
2023-09-12 16:31:27 +08:00 |
|
xiekaidong
|
0426fe03a6
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-12 16:22:18 +08:00 |
|
xiekaidong
|
178de4c506
|
bug修复
|
2023-09-12 16:22:10 +08:00 |
|
Fang
|
fd27091c5e
|
优化
|
2023-09-12 16:16:48 +08:00 |
|
Fang
|
5c490ce2b6
|
显示fix
|
2023-09-12 16:03:22 +08:00 |
|
Fang
|
1f93123171
|
显示fix
|
2023-09-12 15:27:27 +08:00 |
|
Fang
|
1a4b4e9764
|
容错处理
|
2023-09-12 15:02:58 +08:00 |
|
陈希
|
0abdb166d2
|
Merge branch 'fang/runes' into 'dev_20230919'
符文功能
See merge request b6-client/b6-lua!15
|
2023-09-12 06:50:28 +00:00 |
|
xiekaidong
|
577d7392e2
|
Merge branch 'master' into dev_20230919
|
2023-09-12 14:42:04 +08:00 |
|
xiekaidong
|
1687c7fcea
|
回合数提示
|
2023-09-12 14:34:46 +08:00 |
|
xiekaidong
|
1ef1f34c7a
|
战斗优化调整
|
2023-09-12 12:23:07 +08:00 |
|
xiekaidong
|
4cf830d917
|
调整
v.1.2.9_android
v.1.3.9_ios
|
2023-09-12 11:40:20 +08:00 |
|
Fang
|
a92ceb5650
|
添加容错
|
2023-09-12 11:24:42 +08:00 |
|
xiekaidong
|
04b3908c0c
|
更新配置
|
2023-09-12 11:23:15 +08:00 |
|
xiekaidong
|
c9f1f356bf
|
bug修复
|
2023-09-12 11:21:52 +08:00 |
|
xiekaidong
|
61b73d9c8f
|
zancun
|
2023-09-12 11:15:52 +08:00 |
|
xiekaidong
|
e151b5329e
|
优化
|
2023-09-12 10:49:44 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
b9b8a10cc4
|
bug修复
|
2023-09-12 10:24:02 +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
|
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 |
|
Fang
|
1b610b9e72
|
礼包红点刷新fix
v.1.2.8_android
v.1.3.8_ios
|
2023-09-06 16:53:58 +08:00 |
|
xiekaidong
|
a554ab91a5
|
更新配置
|
2023-09-06 16:49:44 +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 |
|
Fang
|
afd1cdbcf6
|
兑换红点修改
|
2023-09-06 10:16:04 +08:00 |
|
xiekaidong
|
1f85dc4681
|
配置
|
2023-09-05 23:42:01 +08:00 |
|
chenxi
|
3355f0ae51
|
更新配置
v.1.2.7_android
v.1.3.7_ios
|
2023-09-05 22:28:39 +08:00 |
|
xiekaidong
|
e073dd09cf
|
Merge branch 'master' into dev_20230905
|
2023-09-05 22:20:59 +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 |
|