xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
xiekaidong
|
c2dc577fc6
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-19 20:18:27 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
chenxi
|
be2e185a77
|
Merge branch 'master' into dev_20230725
|
2023-07-19 09:48:56 +08:00 |
|
xiekaidong
|
c3e62e4bc2
|
修改一下命名
|
2023-07-18 17:04:09 +08:00 |
|
xiekaidong
|
ed400f1b75
|
处理一下跨等级上报
|
2023-07-18 15:28:22 +08:00 |
|
xiekaidong
|
6f85752093
|
firebase、af、fb日志上报
|
2023-07-18 15:06:30 +08:00 |
|
xiekaidong
|
3ed70b6c87
|
Merge branch 'master' into dev_20230725
|
2023-07-18 09:33:07 +08:00 |
|
xiekaidong
|
8ea47bc34f
|
战斗引导问题
|
2023-07-17 18:35:17 +08:00 |
|
xiekaidong
|
e2d08a7ffa
|
战报阵容
|
2023-07-17 15:52:04 +08:00 |
|
xiekaidong
|
85f016086d
|
层数buff完善
|
2023-07-17 14:46:02 +08:00 |
|
xiekaidong
|
ac9d7dd776
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-17 14:28:58 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +08:00 |
|
Fang
|
b2dba1de2e
|
英雄图鉴
|
2023-07-14 17:07:03 +08:00 |
|
chenxi
|
6848735fd9
|
merge master
|
2023-07-14 17:06:39 +08:00 |
|
xiekaidong
|
b1dd325b05
|
伤害公式
|
2023-07-13 18:18:22 +08:00 |
|
xiekaidong
|
29bcf831a3
|
Merge branch 'battle' into dev_20230725
|
2023-07-13 18:03:03 +08:00 |
|
xiekaidong
|
90711c7e2a
|
英雄属性增加，以及战斗伤害治疗公式修改
|
2023-07-13 18:02:46 +08:00 |
|
xiekaidong
|
c0c0c8f93e
|
优化章节礼包弹出逻辑
|
2023-07-13 16:52:38 +08:00 |
|
xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +08:00 |
|
xiekaidong
|
f527141d7b
|
Merge branch 'master' into dev_20230712
|
2023-07-12 09:48:18 +08:00 |
|
xiekaidong
|
68567319a6
|
Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-lua into dev_20230712
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-07-11 15:45:24 +08:00 |
|
xiekaidong
|
dde65f49c3
|
设置界面新增社区链接按钮
|
2023-07-11 15:45:14 +08:00 |
|
Fang
|
7de42dd068
|
碎片副本奖励展示优化
|
2023-07-11 14:53:19 +08:00 |
|
xiekaidong
|
95a13a09bb
|
修复bug
|
2023-07-11 11:41:57 +08:00 |
|
xiekaidong
|
61a23d81c9
|
Merge branch 'master' into dev_20230712
|
2023-07-11 11:05:47 +08:00 |
|
xiekaidong
|
0157ca5d27
|
一些日志上报混乱修复
|
2023-07-11 11:02:14 +08:00 |
|
xiekaidong
|
b1561991c6
|
更新配置
|
2023-07-10 18:30:30 +08:00 |
|
xiekaidong
|
0beaf804a9
|
用户属性主线阵容上报信息错误修复，竞技场消耗上报增加段位id，竞技场结算上报增加胜负
|
2023-07-10 17:46:11 +08:00 |
|
xiekaidong
|
1759c04305
|
修改战斗伤害公式
|
2023-07-10 16:07:32 +08:00 |
|
xiekaidong
|
e12bb83ac2
|
竞技场引导优化
|
2023-07-10 15:46:48 +08:00 |
|
xiekaidong
|
0a78db2330
|
竞技场匹配阵容提示优化
|
2023-07-10 15:39:39 +08:00 |
|
xiekaidong
|
e68de8da6c
|
竞技场引导问题修复
|
2023-07-10 15:22:20 +08:00 |
|
xiekaidong
|
460a60a34f
|
木兰试玩
|
2023-07-10 12:00:32 +08:00 |
|
xiekaidong
|
da664585a0
|
Merge branch 'master' into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller.lua
|
2023-07-07 17:17:01 +08:00 |
|
Fang
|
b16f75f42e
|
竞技场挑战前判断阵容、超框
|
2023-07-07 11:54:27 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
xiekaidong
|
a2f900eed4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 18:43:05 +08:00 |
|
xiekaidong
|
28b9d2bc7f
|
bug修复
|
2023-07-06 18:43:02 +08:00 |
|
Fang
|
34dfc5edb2
|
fix
|
2023-07-06 18:30:17 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
0445086500
|
竞技场日志上报
|
2023-07-06 18:08:53 +08:00 |
|
xiekaidong
|
8ee590a831
|
bug修复
|
2023-07-06 17:41:58 +08:00 |
|
xiekaidong
|
dc386c2bdb
|
网络模块优化，重连被拒绝后，后台静默重新登陆
|
2023-07-06 17:20:16 +08:00 |
|
xiekaidong
|
f65285bf46
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 14:43:51 +08:00 |
|
xiekaidong
|
994e93468c
|
引导延迟
|
2023-07-06 14:43:48 +08:00 |
|
Fang
|
9a7b8d316d
|
竞技场bi上报
|
2023-07-06 11:59:28 +08:00 |
|
xiekaidong
|
c9b32741cb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 17:55:03 +08:00 |
|
xiekaidong
|
7abf7a253b
|
bug修复
|
2023-07-05 17:54:59 +08:00 |
|