xiekaidong
|
71b4b2b4e0
|
战斗任务参数修改
|
2023-06-12 16:30:04 +08:00 |
|
xiekaidong
|
99694fc1d8
|
整合一下战斗任务参数
|
2023-06-12 16:25:11 +08:00 |
|
xiekaidong
|
f07822161f
|
战斗
|
2023-06-12 16:05:58 +08:00 |
|
xiekaidong
|
ee826d12c8
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/config/monster_dungeon_gold.lua
# lua/app/config/monster_dungeon_gold.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/module/dungeon/dungeon_manager.lua
# lua/app/ui/dungeon/dungeon_board_cell.lua
# lua/app/ui/dungeon/dungeon_difficulty_ui.lua
# lua/app/ui/main_city/component/dungeon_comp.lua
# lua/app/ui/main_city/main_city_ui.lua
# lua/app/userdata/dungeon/dungeon_data.lua
# lua/app/userdata/dungeon/dungeon_data_base_comp.lua
# lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
# lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
|
2023-06-12 15:43:30 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
7a0efdbe09
|
逻辑处理
|
2023-06-12 15:38:32 +08:00 |
|
xiekaidong
|
1c46acc425
|
优化一版战斗结构
|
2023-06-12 15:30:00 +08:00 |
|
xiekaidong
|
5be91b491c
|
暂存
|
2023-06-12 15:21:26 +08:00 |
|
xiekaidong
|
47ee292697
|
更改近身攻击距离
|
2023-06-12 10:09:42 +08:00 |
|
xiekaidong
|
225fa8ad1f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:46:51 +08:00 |
|
chenxi
|
acccd99660
|
adjust事件
|
2023-06-09 19:00:54 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
chenxi
|
608eb91087
|
英雄tips
|
2023-06-08 21:34:28 +08:00 |
|
chenxi
|
ba2903a60f
|
Merge branch 'dev_20230607_hotupdate' into dev
|
2023-06-07 20:57:35 +08:00 |
|
chenxi
|
4fd27dab0e
|
账号相关
|
2023-06-07 19:44:10 +08:00 |
|
chenxi
|
304ed48943
|
账号相关
|
2023-06-07 19:32:22 +08:00 |
|
chenxi
|
74a9205f30
|
账号绑定的bug
|
2023-06-07 19:13:20 +08:00 |
|
xiekaidong
|
fddb727eb4
|
删除冗余代码
|
2023-06-07 19:03:32 +08:00 |
|
xiekaidong
|
cb8006c377
|
显示修复
|
2023-06-07 17:47:29 +08:00 |
|
xiekaidong
|
c800a0cc31
|
日志上报
|
2023-06-07 17:25:08 +08:00 |
|
xiekaidong
|
0b1b9f262e
|
新增一些上报信息
|
2023-06-07 15:27:11 +08:00 |
|
xiekaidong
|
7aa6dad65d
|
登陆界面复制账号
|
2023-06-06 21:05:12 +08:00 |
|
chenxi
|
3ccfaec8d0
|
战令
|
2023-06-06 18:22:48 +08:00 |
|
chenxi
|
01054b8e3b
|
merge bireport
|
2023-06-06 18:14:34 +08:00 |
|
chenxi
|
ec3ae95cc4
|
上报相关
|
2023-06-06 18:14:07 +08:00 |
|
xiekaidong
|
6cb971d493
|
战斗bi日志上报
|
2023-06-06 18:06:38 +08:00 |
|
xiekaidong
|
e69b7a14e5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-06 17:59:30 +08:00 |
|
xiekaidong
|
8bdd4ae3d3
|
英雄操作bi上报
|
2023-06-06 17:58:58 +08:00 |
|
Fang
|
be6d42fe88
|
战斗退出后显示主界面控制
|
2023-06-06 17:30:50 +08:00 |
|
chenxi
|
e59e40435d
|
上报玩家升级
|
2023-06-06 17:13:44 +08:00 |
|
xiekaidong
|
32df7d9516
|
修改上报
|
2023-06-06 15:25:21 +08:00 |
|
xiekaidong
|
0867e84815
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:12:50 +08:00 |
|
chenxi
|
f63a2bf876
|
音效
|
2023-06-06 11:29:34 +08:00 |
|
chenxi
|
53f18c5b8a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 11:10:39 +08:00 |
|
chenxi
|
7a83365fe2
|
只有战斗胜利才算完成任务
|
2023-06-06 11:10:29 +08:00 |
|
CloudJ
|
17984d56ae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/audio_manager.lua
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
9a5d42c753
|
音效
|
2023-06-06 11:08:37 +08:00 |
|
xiekaidong
|
c218e5a359
|
音效
|
2023-06-06 10:59:34 +08:00 |
|
xiekaidong
|
611d962181
|
增加棋盘查看字段
|
2023-06-05 21:07:38 +08:00 |
|
xiekaidong
|
cc77a77193
|
消除显示优化
|
2023-06-05 20:51:50 +08:00 |
|
chenxi
|
baa1c4280e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 18:32:54 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|
xiekaidong
|
0441e09d12
|
bug修复
|
2023-06-05 18:24:06 +08:00 |
|
chenxi
|
6e20c37abf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:25:44 +08:00 |
|
chenxi
|
30d134ecc8
|
调整一下侧边栏的按钮顺序
|
2023-06-05 16:25:41 +08:00 |
|
xiekaidong
|
e3420eeb8a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 16:24:22 +08:00 |
|
xiekaidong
|
628da8aade
|
音效容错
|
2023-06-05 16:24:06 +08:00 |
|
chenxi
|
253ae25580
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:23:58 +08:00 |
|
chenxi
|
5216c8ff69
|
侧边栏优化
|
2023-06-05 16:23:55 +08:00 |
|
xiekaidong
|
f8871a3109
|
加一个GM快速查看棋盘
|
2023-06-05 16:13:05 +08:00 |
|