826 Commits

Author SHA1 Message Date
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
4c8eff015e 显示bug修复 2023-08-03 09:47:21 +08:00
xiekaidong
c6127ec0ae 优化显示逻辑 2023-08-02 18:47:25 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
Fang
591aee945b 增加优惠入口红点逻辑 2023-08-01 18:19:29 +08:00
Fang
536cc1dfc3 道具获取的头像品质颜色错误fix 2023-08-01 17:12:39 +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
Fang
d38ed4a99f 昵称不缓存多语言文本 2023-07-31 11:16:38 +08:00
Fang
23d9fec3ac 基金购买状态fix 2023-07-31 09:45:28 +08:00
xiekaidong
96c9cf8c18 bug修复 2023-07-28 18:51:03 +08:00
xiekaidong
ef6969c4d9 引导修改 2023-07-28 18:40:11 +08:00
Fang
228bf96ecf 容错 2023-07-28 16:10:57 +08:00
xiekaidong
3e8a90ce04 bug修复 2023-07-27 10:04:01 +08:00
Fang
e688bfd26d 英雄红点fix 2023-07-26 18:23:12 +08:00
xiekaidong
260b6f0c95 修改 2023-07-26 16:25:35 +08:00
Fang
9a3850c145 添加英雄升级标签红点,标签红点更新fix 2023-07-26 16:14:24 +08:00
Fang
a80e0b5e90 装备红点、文案 2023-07-26 15:14:44 +08:00
Fang
6d3a0748a1 fix 2023-07-25 23:32:59 +08:00
Fang
0448dd5fa2 支线基金跨阶段fix 2023-07-25 23:10:35 +08:00
Fang
5d8cb4bfff 装备礼包重登不弹窗 2023-07-25 22:48:49 +08:00
Fang
11624308ea 动效、fix 2023-07-25 22:33:51 +08:00
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