602 Commits

Author SHA1 Message Date
Fang
3dbb432b51 显示fix 2023-07-25 21:01:32 +08:00
Fang
1cfc1c5631 审核模式侧边栏不显示装备礼包入口 2023-07-25 20:16:49 +08:00
Fang
1fe31d8035 装备礼包每次战斗后重复弹出 2023-07-25 20:14:33 +08:00
Fang
6f18d573a9 防具属性只用计算一次 2023-07-25 19:59:31 +08:00
Fang
a5d2749ede 支线基金看完广告直接领奖 2023-07-25 19:59:31 +08:00
Fang
27affc743b 装备数值显示与计算分开处理 2023-07-25 17:18:43 +08:00
Fang
8f01d97ea5 修复英雄首次升级装备报错 2023-07-25 16:48:19 +08:00
Fang
e56378d804 修复报错 2023-07-25 16:32:37 +08:00
Fang
5fcf27a659 基金ad奖励显示fix 2023-07-25 15:44:10 +08:00
Fang
6a220afca8 属性计算修复 2023-07-25 15:44:10 +08:00
xiekaidong
c58bb1b185 bug修复 2023-07-25 15:35:55 +08:00
xiekaidong
933e402b85 bug修复 2023-07-24 21:20:06 +08:00
Fang
62a22b86c6 修复装备升级后,总属性显示错误 2023-07-24 20:33:08 +08:00
xiekaidong
03febf108a Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-26 00:16:40 +08:00
xiekaidong
7d9265a831 bug修复 2023-07-26 00:16:32 +08:00
Fang
5bfb500ed8 装备阶段计算fix 2023-07-24 20:10:10 +08:00
xiekaidong
e59b7f1ccb Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 18:47:54 +08:00
xiekaidong
c6d10d8825 调整一下逻辑 2023-07-24 18:47:46 +08:00
Fang
d10b9049f7 装备属性加成计算fix 2023-07-24 18:37:43 +08:00
Fang
f99f54b8f8 装备礼包弹出规则fix 2023-07-24 17:07:05 +08:00
Fang
0a0fc7c127 商城特惠加装备banner 2023-07-24 17:07:05 +08:00
Fang
fddf41fca5 bug fix 2023-07-24 14:34:52 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +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
Fang
10ea4ca114 通行证赛季更新 2023-07-21 11:18:55 +08:00
xiekaidong
e85f2ba4f2 bug修复 2023-07-21 10:00:13 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00
xiekaidong
d68d2257fe Merge branch 'dev_20230725' into dungeon 2023-07-20 21:47:21 +08:00
Fang
015de6fc70 英雄升级显示、战斗报错fix 2023-07-20 21:23:02 +08:00
xiekaidong
ef1b59db67 支线副本战斗中的任务 2023-07-20 20:41:17 +08:00
Fang
95aa50bb42 英雄升级报错fix 2023-07-20 20:28:04 +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
Fang
7d7519b6cf review 2023-07-20 19:34:09 +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
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