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
|
27ef576c8f
|
副本入口
|
2023-07-18 21:00:12 +08:00 |
|
xiekaidong
|
c3e62e4bc2
|
修改一下命名
|
2023-07-18 17:04:09 +08:00 |
|
xiekaidong
|
2610718eb2
|
副本入口
|
2023-07-18 17:01:27 +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 |
|
Fang
|
fc98c944af
|
新号报错处理
|
2023-07-17 15:18:18 +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
|
3025a7e58a
|
review
|
2023-07-17 11:16:51 +08:00 |
|
Fang
|
e2ef9ea208
|
红点
|
2023-07-14 17:35: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
|
061ac748ec
|
试玩
|
2023-07-12 09:43:49 +08:00 |
|
Fang
|
7de42dd068
|
碎片副本奖励展示优化
|
2023-07-11 14:53:19 +08:00 |
|
xiekaidong
|
61a23d81c9
|
Merge branch 'master' into dev_20230712
|
2023-07-11 11:05:47 +08:00 |
|
xiekaidong
|
0beaf804a9
|
用户属性主线阵容上报信息错误修复，竞技场消耗上报增加段位id，竞技场结算上报增加胜负
|
2023-07-10 17:46:11 +08:00 |
|
xiekaidong
|
1759c04305
|
修改战斗伤害公式
|
2023-07-10 16:07:32 +08:00 |
|
xiekaidong
|
460a60a34f
|
木兰试玩
|
2023-07-10 12:00:32 +08:00 |
|
xiekaidong
|
b9c9b4d0ce
|
审核模式不显示竞技场礼包
|
2023-07-07 14:13:12 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
0445086500
|
竞技场日志上报
|
2023-07-06 18:08:53 +08:00 |
|
Fang
|
47418bab2e
|
竞技场宝箱增加每日次数控制
|
2023-07-06 10:24:53 +08:00 |
|
Fang
|
ebaf680eeb
|
头像框解锁fix
|
2023-07-06 10:23:56 +08:00 |
|
xiekaidong
|
f13f1f3e3a
|
引导处理一下
|
2023-07-05 21:58:38 +08:00 |
|
xiekaidong
|
55a7ec4b82
|
战斗开始时更新英雄数据
|
2023-07-05 18:24:33 +08:00 |
|
xiekaidong
|
61b76292c9
|
英雄面板属性加密
|
2023-07-05 17:25:14 +08:00 |
|
xiekaidong
|
e7028105c8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 17:05:20 +08:00 |
|
xiekaidong
|
e597b9f7be
|
战斗中属性加密
|
2023-07-05 17:05:17 +08:00 |
|
Fang
|
f24f8d5e75
|
显示修复
|
2023-07-05 15:55:44 +08:00 |
|
xiekaidong
|
9ae7f3d8a0
|
英雄红点
|
2023-07-05 11:45:41 +08:00 |
|
Fang
|
c07a54b828
|
竞技场fix
|
2023-07-05 10:51:13 +08:00 |
|
Fang
|
6099fe08fb
|
fix
|
2023-07-04 18:29:05 +08:00 |
|
xiekaidong
|
045b774449
|
战斗速度
|
2023-07-04 18:24:33 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +08:00 |
|
xiekaidong
|
ce97be9b65
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
# lua/app/module/battle/controller/battle_controller.lua
# lua/app/ui/main_city/main_city_ui.lua
|
2023-07-04 15:36:04 +08:00 |
|
Fang
|
a7aa915569
|
中途退出不重置对手
|
2023-07-04 15:24:12 +08:00 |
|
Fang
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|
xiekaidong
|
b445b12dff
|
客服系统红点
|
2023-07-04 10:41:10 +08:00 |
|
xiekaidong
|
a454faa670
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-07-03 19:57:49 +08:00 |
|
xiekaidong
|
c976166cc9
|
竞技场弹窗礼包
|
2023-07-03 19:57:39 +08:00 |
|