903 Commits

Author SHA1 Message Date
xiekaidong
4ce2af94e0 邮件拉去增加一个随机延时 2023-07-28 11:16:21 +08:00
xiekaidong
a003f3498c 刷新界面 2023-07-25 23:40:50 +08:00
xiekaidong
ca3ab5bf39 bug修复 2023-07-25 21:18:32 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
xiekaidong
d8c8591e40 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 21:47:52 +08:00
xiekaidong
e4647b17dc 优化 2023-07-24 21:47:45 +08:00
Fang
0d04b99d3e 显示fix 2023-07-24 21:39:18 +08:00
xiekaidong
78704c6e35 bug修复 2023-07-24 20:54:47 +08:00
xiekaidong
c6d10d8825 调整一下逻辑 2023-07-24 18:47:46 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
dc84eb073d 新增道具宝箱显示 2023-07-24 11:18:21 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
xiekaidong
bfff21b619 伤害公式bug修复 2023-07-21 17:46:56 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
ac3388b96b 新增buff和叠加方式优化 2023-07-21 14:40:11 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
xiekaidong
52dd2b1336 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-21 09:55:50 +08:00
xiekaidong
d96adead75 修改评价弹窗关卡 2023-07-21 09:55:47 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00
xiekaidong
a798a468c7 结算界面异常处理 2023-07-20 22:04:26 +08:00
xiekaidong
d68d2257fe Merge branch 'dev_20230725' into dungeon 2023-07-20 21:47:21 +08:00
xiekaidong
cd41579159 支线副本 2023-07-20 21:46:49 +08:00
Fang
015de6fc70 英雄升级显示、战斗报错fix 2023-07-20 21:23:02 +08:00
xiekaidong
ef1b59db67 支线副本战斗中的任务 2023-07-20 20:41:17 +08:00
xiekaidong
100e125c19 Merge branch 'dev_20230725' into dungeon
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2023-07-20 19:45:54 +08:00
xiekaidong
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15: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