85 Commits

Author SHA1 Message Date
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
43c03fd385 皮肤问题修复 2023-09-05 19:57:26 +08:00
xiekaidong
20eb5d0a41 bug修复 2023-08-28 19:15:27 +08:00
xiekaidong
18cd61d870 解锁判定 2023-08-22 18:08:51 +08:00
xiekaidong
b57617a85c 排序 2023-08-22 17:46:28 +08:00
xiekaidong
7babd6aaec 英雄排序方式 2023-08-18 18:46:44 +08:00
Fang
2f59d74b96 竞技场皮肤属性完善 2023-08-15 12:20:17 +08:00
Fang
0eebc9b6cd 英雄生命值显示fix 2023-08-14 11:12:57 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +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
96c9cf8c18 bug修复 2023-07-28 18:51:03 +08:00
Fang
228bf96ecf 容错 2023-07-28 16:10:57 +08:00
Fang
9a3850c145 添加英雄升级标签红点,标签红点更新fix 2023-07-26 16:14:24 +08:00
Fang
6f18d573a9 防具属性只用计算一次 2023-07-25 19:59:31 +08:00
Fang
8f01d97ea5 修复英雄首次升级装备报错 2023-07-25 16:48:19 +08:00
Fang
e56378d804 修复报错 2023-07-25 16:32:37 +08:00
Fang
6a220afca8 属性计算修复 2023-07-25 15:44:10 +08:00
xiekaidong
c58bb1b185 bug修复 2023-07-25 15:35:55 +08:00
Fang
62a22b86c6 修复装备升级后,总属性显示错误 2023-07-24 20:33:08 +08:00
Fang
d10b9049f7 装备属性加成计算fix 2023-07-24 18:37:43 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
Fang
015de6fc70 英雄升级显示、战斗报错fix 2023-07-20 21:23:02 +08:00
Fang
95aa50bb42 英雄升级报错fix 2023-07-20 20:28:04 +08:00
Fang
7d7519b6cf review 2023-07-20 19:34:09 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +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
6f85752093 firebase、af、fb日志上报 2023-07-18 15:06:30 +08:00
Fang
e2ef9ea208 红点 2023-07-14 17:35:55 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
xiekaidong
90711c7e2a 英雄属性增加,以及战斗伤害治疗公式修改 2023-07-13 18:02:46 +08:00
xiekaidong
0beaf804a9 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:11 +08:00
xiekaidong
61b76292c9 英雄面板属性加密 2023-07-05 17:25:14 +08:00
xiekaidong
ce97be9b65 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua
2023-07-04 15:36:04 +08:00
xiekaidong
dc669243e0 英雄红点优化 2023-07-03 10:06:09 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
xiekaidong
c800a0cc31 日志上报 2023-06-07 17:25:08 +08:00
xiekaidong
8bdd4ae3d3 英雄操作bi上报 2023-06-06 17:58:58 +08:00
chenxi
88aa6a6cf3 碎片tips显示错误 2023-05-30 15:58:00 +08:00
chenxi
5a3aeceae8 英雄解锁 2023-05-30 12:16:40 +08:00
chenxi
837f54acda 英雄解锁 2023-05-30 10:17:31 +08:00
chenxi
d47baeebc1 调整一下英雄解锁的逻辑 2023-05-29 15:06:25 +08:00