761 Commits

Author SHA1 Message Date
Fang
b36fde93c3 整理代码 2023-09-15 20:53:50 +08:00
Fang
4c27243520 请求优化 2023-09-15 20:11:50 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
Fang
77191e5707 竞技场结算时同步当前积分 2023-09-15 17:37:56 +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
Fang
3f17beb2f2 淬炼锁定提示 2023-09-13 15:44:54 +08:00
Fang
b74a41ed00 bug_fix 2023-09-13 15:31:13 +08:00
Fang
2d1349eae0 自动铸造开启等级 2023-09-13 10:37:44 +08:00
Fang
35d78447a8 bug fix 2023-09-12 18:43:13 +08:00
Fang
6f010c00b4 容错 2023-09-12 17:59:10 +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
1ef1f34c7a 战斗优化调整 2023-09-12 12:23:07 +08:00
Fang
a92ceb5650 添加容错 2023-09-12 11:24:42 +08:00
xiekaidong
e151b5329e 优化 2023-09-12 10:49:44 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +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
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
Fang
874ecfd37b 添加容错 2023-09-08 10:01:36 +08:00
xiekaidong
c0a3356cfd 符文副本主界面 2023-09-07 19:14:39 +08:00
xiekaidong
2266324f94 新增属性 2023-09-06 16:44:00 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +08:00
Fang
afd1cdbcf6 兑换红点修改 2023-09-06 10:16:04 +08:00
xiekaidong
43c03fd385 皮肤问题修复 2023-09-05 19:57:26 +08:00
xiekaidong
d7f60f5002 bossrush阵容 2023-09-05 17:36:43 +08:00
xiekaidong
f839dc3b57 buff数值上线 2023-09-05 17:14:49 +08:00
xiekaidong
35d84fead7 bug修复 2023-09-05 15:28:24 +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
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
c6e44efbd6 bug修复 2023-09-04 19:25:50 +08:00
xiekaidong
b47d779cfc 修复一些bug 2023-09-04 18:21:17 +08:00
xiekaidong
d003c8a551 bug修复 2023-09-04 16:51:34 +08:00
xiekaidong
4d79d3ea6c 最大等级 2023-09-04 16:43:07 +08:00
xiekaidong
4e5021741d Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
2023-09-01 21:18:54 +08:00
xiekaidong
e182698950 红点 2023-09-01 21:16:56 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
Fang
1743386c44 bug fix 2023-09-01 18:35:38 +08:00
Fang
3dbfc8458c review 2023-09-01 17:45:29 +08:00
Fang
6eea9de2e5 代码调整 2023-09-01 15:58:52 +08:00