puxuan
|
d719ceeb74
|
hero
|
2025-05-24 23:49:11 +08:00 |
|
puxuan
|
2b33cf3ab1
|
Merge branch 'dev_spine' into dev_hero
# Conflicts:
# lua/app/config/hero.lua
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
|
2025-05-24 15:44:37 +08:00 |
|
puxuan
|
5fd176f477
|
config
|
2025-05-24 12:00:09 +08:00 |
|
puxuan
|
41e1274309
|
hero
|
2025-05-22 23:55:14 +08:00 |
|
Fang
|
ffb5159944
|
锦标赛升级显示fix
|
2023-10-16 16:31:14 +08:00 |
|
Fang
|
c43baaddb4
|
bug fix
|
2023-09-25 18:27:21 +08:00 |
|
Fang
|
8650d1b340
|
属性调整
|
2023-09-19 16:55:52 +08:00 |
|
Fang
|
1b66ce7d16
|
符文数据修改
|
2023-09-19 15:02:06 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
Fang
|
ae7e52d6ea
|
属性加成修改
|
2023-09-13 17:58:57 +08:00 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
Fang
|
b74a41ed00
|
bug_fix
|
2023-09-13 15:31:13 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
43c03fd385
|
皮肤问题修复
|
2023-09-05 19:57:26 +08:00 |
|
xiekaidong
|
18cd61d870
|
解锁判定
|
2023-08-22 18:08:51 +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 |
|
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
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +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 |
|
chenxi
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
CloudJ
|
cc674c3204
|
更新配置表与pb 修复一些问题
|
2023-05-25 15:26:57 +08:00 |
|
CloudJ
|
df62beaafe
|
金币礼包
|
2023-05-25 14:42:52 +08:00 |
|
xiekaidong
|
528ac6a89b
|
技能tips
|
2023-05-22 15:59:17 +08:00 |
|
xiekaidong
|
d51624b93b
|
容错
|
2023-05-19 20:00:06 +08:00 |
|