103 Commits

Author SHA1 Message Date
puxuan
1a4a8ff880 fix bug 2025-09-23 20:57:51 +08:00
puxuan
526b1690c5 属性 2025-09-18 17:51:59 +08:00
puxuan
1e8c35c9a0 抽卡 2025-09-12 15:11:47 +08:00
puxuan
96fe08e143 战斗力 2025-09-09 19:24:42 +08:00
puxuan
653c927780 fix bug 2025-09-03 16:51:27 +08:00
puxuan
0ad11e3e21 fix bug 2025-09-02 20:44:41 +08:00
puxuan
8d4d25974b 技能弹窗 2025-08-29 14:39:02 +08:00
puxuan
7f822a3025 fix bug 2025-08-27 14:22:05 +08:00
puxuan
466c8543f1 fix bug 2025-08-21 21:05:33 +08:00
puxuan
e9d0fe30c9 英雄 2025-08-20 11:41:37 +08:00
puxuan
9f41da288b fix bug 2025-08-19 20:31:19 +08:00
puxuan
9a2a667282 英雄技能 2025-08-18 18:12:22 +08:00
puxuan
667d76fcde 战斗力 2025-08-13 20:54:58 +08:00
kai
32534e7880 hero 2025-06-28 19:06:28 +08:00
puxuan
22ba335f36 英雄界面 2025-06-26 21:33:39 +08:00
puxuan
bd30d1737c 属性 2025-06-25 18:32:03 +08:00
puxuan
ecbae1e4e6 属性 2025-06-23 22:10:39 +08:00
puxuan
e5cff3bde0 star 2025-06-23 00:01:23 +08:00
puxuan
443bf10a2d star 2025-06-22 19:05:14 +08:00
puxuan
e516654be1 fix bug 2025-06-18 21:23:45 +08:00
puxuan
ba3e8ad16d fix bug 2025-06-17 21:00:07 +08:00
puxuan
6beb44b672 fix bug 2025-06-17 20:28:43 +08:00
puxuan
463d5ff3aa fix bug 2025-06-17 19:39:54 +08:00
puxuan
4a6d65b9f9 fix bug 2025-06-16 20:58:37 +08:00
puxuan
a6c0a22942 hero 2025-06-05 00:14:21 +08:00
puxuan
5cfdb4c8d8 hero 2025-06-03 15:15:01 +08:00
puxuan
722639abab hero 2025-05-28 00:19:06 +08:00
puxuan
f18ab0ee83 升星 2025-05-27 00:08:22 +08:00
puxuan
10575642e1 英雄基础数据 2025-05-25 19:19:05 +08:00
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