xiekaidong
|
a6b05117b7
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/userdata/dungeon/dungeon_armor_entity.lua
|
2023-08-08 11:41:34 +08:00 |
|
xiekaidong
|
ad56074c71
|
新增上报
|
2023-08-07 18:15:19 +08:00 |
|
xiekaidong
|
f0ec99f24a
|
字段修改
|
2023-08-07 15:50:46 +08:00 |
|
xiekaidong
|
7aa2b95686
|
宝箱日志上报
|
2023-08-07 15:33:06 +08:00 |
|
xiekaidong
|
f74226c056
|
增加上报属性
|
2023-08-07 10:35:11 +08:00 |
|
xiekaidong
|
792a5a1672
|
优化显示
|
2023-08-07 09:37:00 +08:00 |
|
xiekaidong
|
e51b9bf86a
|
更新配置
|
2023-08-04 16:56:37 +08:00 |
|
xiekaidong
|
0045bd6e13
|
新增两个反伤护盾
|
2023-08-04 16:35:33 +08:00 |
|
Fang
|
e79f7bcfa0
|
礼包界面展示冲突处理
|
2023-08-04 15:56:54 +08:00 |
|
xiekaidong
|
2015b03a74
|
显示修复
|
2023-08-04 15:17:28 +08:00 |
|
xiekaidong
|
13a137a6fd
|
bug修复
|
2023-08-04 15:16:19 +08:00 |
|
xiekaidong
|
8266b13b9a
|
棋盘机制调整
|
2023-08-04 14:24:01 +08:00 |
|
xiekaidong
|
3753255d93
|
显示bug修复
|
2023-08-04 11:33:43 +08:00 |
|
xiekaidong
|
f3e4284916
|
修改一下上报信息
|
2023-08-04 11:28:51 +08:00 |
|
Fang
|
84e1e14d79
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:00 +08:00 |
|
xiekaidong
|
5f2269f687
|
付费项上报异常问题修复
|
2023-08-03 18:10:35 +08:00 |
|
xiekaidong
|
fdfeae8819
|
bug修复
|
2023-08-03 16:53:47 +08:00 |
|
xiekaidong
|
5922e927a4
|
bug
|
2023-08-03 16:23:53 +08:00 |
|
xiekaidong
|
bcb336d344
|
不过修复
|
2023-08-03 16:09:58 +08:00 |
|
xiekaidong
|
a47f18db07
|
日志上报
|
2023-08-03 14:20:16 +08:00 |
|
xiekaidong
|
66838d4dad
|
增加上报
|
2023-08-03 11:30:10 +08:00 |
|
xiekaidong
|
b581328fd6
|
武器副本增加体力消耗
|
2023-08-03 11:08:19 +08:00 |
|
xiekaidong
|
e0c2821f76
|
武器副本增加体力消耗
|
2023-08-03 11:08:04 +08:00 |
|
xiekaidong
|
0f5ec9aa5d
|
Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-lua into dev_20230809
|
2023-08-03 10:24:04 +08:00 |
|
xiekaidong
|
619bfad50a
|
优化局内技能显示
|
2023-08-03 10:24:00 +08:00 |
|
Fang
|
35f9f629d3
|
资源副本扫荡不关闭关卡界面
|
2023-08-03 10:09:10 +08:00 |
|
xiekaidong
|
4c8eff015e
|
显示bug修复
|
2023-08-03 09:47:21 +08:00 |
|
xiekaidong
|
24d90bfd1c
|
战斗血条优化
|
2023-08-02 20:34:25 +08:00 |
|
xiekaidong
|
cd63f0a977
|
更新配置
|
2023-08-02 19:55:24 +08:00 |
|
xiekaidong
|
2018d556bb
|
优化显示
|
2023-08-02 18:56:28 +08:00 |
|
xiekaidong
|
c6127ec0ae
|
优化显示逻辑
|
2023-08-02 18:47:25 +08:00 |
|
xiekaidong
|
041d222d53
|
更新配置
|
2023-08-02 18:30:43 +08:00 |
|
xiekaidong
|
397724e8eb
|
木兰试玩增加至5章
|
2023-08-02 16:13:23 +08:00 |
|
xiekaidong
|
e56eca3242
|
反击问题
|
2023-08-01 18:34:38 +08:00 |
|
xiekaidong
|
a90f0f4583
|
bug修复
|
2023-08-01 18:20:35 +08:00 |
|
Fang
|
591aee945b
|
增加优惠入口红点逻辑
|
2023-08-01 18:19:29 +08:00 |
|
xiekaidong
|
a94b0b1a23
|
续关记录能量
|
2023-08-01 18:02:57 +08:00 |
|
xiekaidong
|
c21607c52e
|
回合数优化
|
2023-08-01 17:38:53 +08:00 |
|
xiekaidong
|
e954484a13
|
技能机制优化
|
2023-08-01 17:35:58 +08:00 |
|
Fang
|
2d139dd23f
|
防具升级刷新不及时fix
|
2023-08-01 17:12:49 +08:00 |
|
Fang
|
536cc1dfc3
|
道具获取的头像品质颜色错误fix
|
2023-08-01 17:12:39 +08:00 |
|
Fang
|
d79e24d01f
|
装备副本材料获取界面排序
|
2023-08-01 16:43:48 +08:00 |
|
Fang
|
4bc9f441a5
|
防具升级刷新不及时fix
|
2023-08-01 14:45:49 +08:00 |
|
Fang
|
678a8fbd4c
|
添加音效
|
2023-08-01 11:10:51 +08:00 |
|
Fang
|
d30f382d40
|
道具获取的头像品质颜色错误fix
|
2023-08-01 10:28:22 +08:00 |
|
xiekaidong
|
e0882c61c6
|
更新配置
|
2023-07-31 16:27:31 +08:00 |
|
xiekaidong
|
0c840c0cc8
|
Merge branch 'battle' into dev_20230809
|
2023-07-31 16:25:48 +08:00 |
|
xiekaidong
|
80be66cc4b
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/userdata/hero/hero_entity.lua
|
2023-07-31 16:25:06 +08:00 |
|
xiekaidong
|
b846bd4ae8
|
meta
|
2023-07-31 16:23:29 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|