Fang
|
d4aaf40b55
|
皮肤收集不需要帮助按钮
|
2023-08-09 16:47:03 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
xiekaidong
|
1eb1295c1c
|
金猪
|
2023-08-09 10:21:13 +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
|
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
|
38cd167a9b
|
显示调整
|
2023-08-07 17:21:45 +08:00 |
|
xiekaidong
|
7aa2b95686
|
宝箱日志上报
|
2023-08-07 15:33:06 +08:00 |
|
xiekaidong
|
792a5a1672
|
优化显示
|
2023-08-07 09:37:00 +08:00 |
|
Fang
|
e79f7bcfa0
|
礼包界面展示冲突处理
|
2023-08-04 15:56:54 +08:00 |
|
Fang
|
84e1e14d79
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:00 +08:00 |
|
xiekaidong
|
1620d69548
|
英雄竞技场段位解锁
|
2023-08-03 18:07:24 +08:00 |
|
xiekaidong
|
fdfeae8819
|
bug修复
|
2023-08-03 16:53:47 +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
|
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
|
24d90bfd1c
|
战斗血条优化
|
2023-08-02 20:34:25 +08:00 |
|
xiekaidong
|
2018d556bb
|
优化显示
|
2023-08-02 18:56:28 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
a90f0f4583
|
bug修复
|
2023-08-01 18:20:35 +08:00 |
|
Fang
|
591aee945b
|
增加优惠入口红点逻辑
|
2023-08-01 18:19:29 +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
|
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
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
9c04ce2fe0
|
增加gm
|
2023-07-31 14:11:25 +08:00 |
|
Fang
|
bdd7aaaf26
|
超框
|
2023-07-31 10:06:11 +08:00 |
|
Fang
|
532feae309
|
支线基金奖励领取按钮文案修改
|
2023-07-31 09:57:06 +08:00 |
|
xiekaidong
|
ef6969c4d9
|
引导修改
|
2023-07-28 18:40:11 +08:00 |
|
Fang
|
7145fb758a
|
修改副本入口命名
|
2023-07-28 18:04:24 +08:00 |
|
Fang
|
1b435f5c4b
|
1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值
|
2023-07-28 17:58:21 +08:00 |
|
Fang
|
3cd7442a8e
|
英雄未解锁时显示初始数值
|
2023-07-28 15:35:28 +08:00 |
|
Fang
|
d89238a763
|
抽卡界面不展示装备升级红点
|
2023-07-28 12:05:32 +08:00 |
|
Fang
|
7c7d201e01
|
技能tips
|
2023-07-28 11:46:22 +08:00 |
|
xiekaidong
|
63269b6af6
|
Merge branch 'dev_20230728_hotupdate' of http://git.juzugame.com/b6-client/b6-lua into dev_20230728_hotupdate
|
2023-07-28 10:49:18 +08:00 |
|
xiekaidong
|
0fd125dcfc
|
增加容错
|
2023-07-28 10:49:14 +08:00 |
|
Fang
|
29a149dab5
|
英雄收集文案fix、武器升级动效显示fix
|
2023-07-28 09:50:16 +08:00 |
|
Fang
|
9740e4b4f6
|
红点修改
|
2023-07-27 12:02:48 +08:00 |
|