xiekaidong
|
1ecb11124d
|
补充
|
2023-08-09 17:18:14 +08:00 |
|
xiekaidong
|
e8ad813399
|
删除打印
|
2023-08-09 16:50:39 +08:00 |
|
Fang
|
d4aaf40b55
|
皮肤收集不需要帮助按钮
|
2023-08-09 16:47:03 +08:00 |
|
xiekaidong
|
996f3deeee
|
添加打印
|
2023-08-09 16:21:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
92a147c14c
|
装备礼包弹出fix
|
2023-08-09 10:57:58 +08:00 |
|
xiekaidong
|
c7c6d5829c
|
bug修复
|
2023-08-09 10:26:20 +08:00 |
|
xiekaidong
|
1eb1295c1c
|
金猪
|
2023-08-09 10:21:13 +08:00 |
|
Fang
|
a81f9de468
|
装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:19:42 +08:00 |
|
Fang
|
c6de387e85
|
材料本扫荡后次数刷新不及时fix
|
2023-08-09 09:52:28 +08:00 |
|
xiekaidong
|
a33851f519
|
bug修复
|
2023-08-08 18:10:25 +08:00 |
|
xiekaidong
|
189d421c2b
|
反伤bug修复
|
2023-08-08 17:49:03 +08:00 |
|
xiekaidong
|
c950bc52be
|
排序
|
2023-08-08 16:55:43 +08:00 |
|
xiekaidong
|
ccb0f42081
|
新buff和新机制
|
2023-08-08 16:38:54 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
8ae11ac948
|
新机制
|
2023-08-08 15:58:17 +08:00 |
|
xiekaidong
|
97cddfa125
|
复活buff
|
2023-08-08 15:27:21 +08:00 |
|
xiekaidong
|
d5e8786233
|
更新配置
|
2023-08-08 11:44:16 +08:00 |
|
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
|
38cd167a9b
|
显示调整
|
2023-08-07 17:21:45 +08:00 |
|
xiekaidong
|
f0ec99f24a
|
字段修改
|
2023-08-07 15:50:46 +08:00 |
|
xiekaidong
|
7aa2b95686
|
宝箱日志上报
|
2023-08-07 15:33:06 +08:00 |
|
xiekaidong
|
8b2d0c6046
|
完善一下结算
|
2023-08-07 11:45:16 +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 |
|
xiekaidong
|
82823526d9
|
自愈、海洋护盾buff
|
2023-08-04 16:19:59 +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
|
1620d69548
|
英雄竞技场段位解锁
|
2023-08-03 18:07:24 +08:00 |
|
xiekaidong
|
6cdae47b74
|
更新配置
|
2023-08-03 16:59:40 +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
|
e05f02088c
|
统一接口，金币不足提示弹窗询问
|
2023-08-03 14:53:51 +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 |
|