xiekaidong
|
d511ae2e86
|
更新配置
|
2023-09-16 17:57:42 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
xiekaidong
|
8173e46209
|
界面
|
2023-09-16 17:52:18 +08:00 |
|
Fang
|
b36fde93c3
|
整理代码
|
2023-09-15 20:53:50 +08:00 |
|
xiekaidong
|
ea8b6f6214
|
界面处理
|
2023-09-15 20:46:20 +08:00 |
|
Fang
|
4c27243520
|
请求优化
|
2023-09-15 20:11:50 +08:00 |
|
Fang
|
33526b2d2f
|
review
|
2023-09-15 19:22:15 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
37f93d1cd1
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:29 +08:00 |
|
xiekaidong
|
59d4dfdc61
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-15 17:38:50 +08:00 |
|
xiekaidong
|
afb44e8661
|
符文引导
|
2023-09-15 17:38:44 +08:00 |
|
Fang
|
77191e5707
|
竞技场结算时同步当前积分
|
2023-09-15 17:37:56 +08:00 |
|
xiekaidong
|
e5547541e3
|
更新配置和优化显示
|
2023-09-15 17:37:03 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
Fang
|
93582b6d39
|
新用户报错fix
|
2023-09-14 12:04:43 +08:00 |
|
Fang
|
a2b2db3485
|
报错及显示fix
|
2023-09-14 11:04:24 +08:00 |
|
Fang
|
de1565f2c8
|
属性fix
|
2023-09-13 18:23:57 +08:00 |
|
Fang
|
ae7e52d6ea
|
属性加成修改
|
2023-09-13 17:58:57 +08:00 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
xiekaidong
|
9ae91b8668
|
bug修复
|
2023-09-13 16:27:23 +08:00 |
|
xiekaidong
|
c365bc65f2
|
兼容处理
|
2023-09-13 15:53:02 +08:00 |
|
Fang
|
3f17beb2f2
|
淬炼锁定提示
|
2023-09-13 15:44:54 +08:00 |
|
xiekaidong
|
9b86946d2c
|
bug修复
|
2023-09-13 15:34:17 +08:00 |
|
Fang
|
b74a41ed00
|
bug_fix
|
2023-09-13 15:31:13 +08:00 |
|
xiekaidong
|
ed65ae452b
|
一些优化和审核模式处理
|
2023-09-13 14:55:52 +08:00 |
|
Fang
|
2d1349eae0
|
自动铸造开启等级
|
2023-09-13 10:37:44 +08:00 |
|
xiekaidong
|
394a7a37ae
|
优化
|
2023-09-13 09:43:32 +08:00 |
|
xiekaidong
|
24b8242de8
|
优化
|
2023-09-13 09:19:02 +08:00 |
|
xiekaidong
|
9b5c3ab2fc
|
优化
|
2023-09-12 20:34:26 +08:00 |
|
xiekaidong
|
b20644f4cb
|
显示bug修复
|
2023-09-12 20:26:49 +08:00 |
|
xiekaidong
|
cc9f3a9137
|
资源调整
|
2023-09-12 20:13:29 +08:00 |
|
xiekaidong
|
c8c30b9aec
|
优化点击
|
2023-09-12 20:12:07 +08:00 |
|
xiekaidong
|
f7fe3e48ab
|
点击优化
|
2023-09-12 20:10:12 +08:00 |
|
xiekaidong
|
d56fd65a70
|
显示优化
|
2023-09-12 20:07:45 +08:00 |
|
xiekaidong
|
dd62b41f00
|
修复bug
|
2023-09-12 19:46:37 +08:00 |
|
xiekaidong
|
d4c7cf71b0
|
优化一下断线续关，并增加上报
|
2023-09-12 19:43:58 +08:00 |
|
Fang
|
35d78447a8
|
bug fix
|
2023-09-12 18:43:13 +08:00 |
|
Fang
|
1e21958ae6
|
更表
|
2023-09-12 18:11:24 +08:00 |
|
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 |
|