1192 Commits

Author SHA1 Message Date
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
fd27091c5e 优化 2023-09-12 16:16:48 +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
Fang
a92ceb5650 添加容错 2023-09-12 11:24:42 +08:00
xiekaidong
61b73d9c8f zancun 2023-09-12 11:15:52 +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
5544693612 符文副本 2023-09-12 10:07:16 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +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
Fang
874ecfd37b 添加容错 2023-09-08 10:01:36 +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 2023-09-06 16:53:58 +08:00
xiekaidong
1f85dc4681 配置 2023-09-05 23:42:01 +08:00
xiekaidong
24a88cf05a bug修复 2023-09-05 17:34:17 +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
950ecacee5 bug修复和优化 2023-09-05 11:47:28 +08:00
xiekaidong
9ce3168f39 bug修复 2023-09-05 10:06:52 +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
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
xiekaidong
3e06b26e1f 侧边栏 2023-09-04 16:48:15 +08:00
xiekaidong
b5204ce133 跳转 2023-09-04 16:31:04 +08:00
xiekaidong
0cdb8515ca 侧边栏 2023-09-04 16:06:42 +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
3dbfc8458c review 2023-09-01 17:45:29 +08:00
Fang
6eea9de2e5 代码调整 2023-09-01 15:58:52 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
fe245efaba 接入数据 2023-09-01 11:55:16 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00