puxuan
|
c7447cf848
|
fix bug
|
2025-10-24 12:01:29 +08:00 |
|
puxuan
|
c6b4df528f
|
fix bug
|
2025-10-20 20:05:40 +08:00 |
|
puxuan
|
3692ef1e34
|
fix bug
|
2025-10-15 20:03:34 +08:00 |
|
puxuan
|
d55ed9669a
|
首充
|
2025-10-13 21:06:55 +08:00 |
|
puxuan
|
91ac8062ba
|
fix bug
|
2025-10-13 18:22:38 +08:00 |
|
puxuan
|
4ecf8a87dd
|
副本
|
2025-10-10 19:21:42 +08:00 |
|
puxuan
|
1ccc4dcae0
|
特权
|
2025-10-08 18:17:02 +08:00 |
|
puxuan
|
920aa71690
|
特权
|
2025-10-08 16:02:30 +08:00 |
|
puxuan
|
3e1693d91d
|
签到
|
2025-10-07 17:18:55 +08:00 |
|
puxuan
|
6546675a6f
|
冲刺活动
|
2025-09-25 20:12:22 +08:00 |
|
puxuan
|
35059a2f70
|
签到
|
2025-09-25 11:40:28 +08:00 |
|
puxuan
|
56936f582b
|
商店
|
2025-09-24 16:21:47 +08:00 |
|
puxuan
|
3d1a5203a7
|
Merge branch 'dev_hero' into dev_equip
|
2025-09-19 14:51:57 +08:00 |
|
puxuan
|
526b1690c5
|
属性
|
2025-09-18 17:51:59 +08:00 |
|
puxuan
|
2960713f83
|
Merge branch 'dev_hero' into dev_equip
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2025-09-16 16:12:53 +08:00 |
|
puxuan
|
e1d389b02d
|
每日挑战
|
2025-09-15 17:20:14 +08:00 |
|
puxuan
|
c8e5d669ab
|
装备
|
2025-09-11 10:45:22 +08:00 |
|
puxuan
|
a2eaf90572
|
装备
|
2025-09-09 19:39:38 +08:00 |
|
puxuan
|
96fe08e143
|
战斗力
|
2025-09-09 19:24:42 +08:00 |
|
puxuan
|
26df427916
|
skill
|
2025-09-08 15:48:43 +08:00 |
|
puxuan
|
6e938240d7
|
场景3 4
|
2025-08-29 11:57:13 +08:00 |
|
puxuan
|
e2b12a917d
|
fix bug
|
2025-08-28 16:36:40 +08:00 |
|
puxuan
|
2b2d448247
|
头像
|
2025-08-22 17:58:43 +08:00 |
|
puxuan
|
25b80d6f67
|
fix bug
|
2025-08-22 10:55:23 +08:00 |
|
puxuan
|
3824222f1c
|
fix bug
|
2025-08-20 17:44:03 +08:00 |
|
puxuan
|
e9d0fe30c9
|
英雄
|
2025-08-20 11:41:37 +08:00 |
|
puxuan
|
11bb4e4017
|
fix bug
|
2025-08-18 20:49:25 +08:00 |
|
puxuan
|
dd4b156c07
|
chapter
|
2025-08-15 21:35:16 +08:00 |
|
puxuan
|
66c6437612
|
抽卡
|
2025-08-11 20:37:29 +08:00 |
|
puxuan
|
6ab80119eb
|
局内
|
2025-08-08 11:41:36 +08:00 |
|
puxuan
|
afbe226434
|
talent
|
2025-08-04 09:42:30 +08:00 |
|
puxuan
|
a6245691d7
|
arena
|
2025-07-15 20:58:20 +08:00 |
|
kai
|
32534e7880
|
hero
|
2025-06-28 19:06:28 +08:00 |
|
puxuan
|
22ba335f36
|
英雄界面
|
2025-06-26 21:33:39 +08:00 |
|
puxuan
|
ecbae1e4e6
|
属性
|
2025-06-23 22:10:39 +08:00 |
|
puxuan
|
443bf10a2d
|
star
|
2025-06-22 19:05:14 +08:00 |
|
puxuan
|
a6c0a22942
|
hero
|
2025-06-05 00:14:21 +08:00 |
|
puxuan
|
722639abab
|
hero
|
2025-05-28 00:19:06 +08:00 |
|
puxuan
|
102b4bb6b2
|
fix bug
|
2025-05-20 23:11:46 +08:00 |
|
Fang
|
327cffeb56
|
竞技场锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
Fang
|
f6c4010add
|
波次锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
xiekaidong
|
2038237e6c
|
界面优化
|
2023-09-16 18:45:50 +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
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
a817d25305
|
符文副本
|
2023-09-08 18:53:46 +08:00 |
|
xiekaidong
|
c0a3356cfd
|
符文副本主界面
|
2023-09-07 19:14:39 +08:00 |
|
xiekaidong
|
2266324f94
|
新增属性
|
2023-09-06 16:44:00 +08:00 |
|
xiekaidong
|
4e5021741d
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/local_data.lua
# lua/app/common/module_manager.lua
# lua/app/config/act_fourteen_bounty.lua.meta
# lua/app/config/act_fourteen_exchange.lua.meta
# lua/app/config/act_fourteen_quest.lua
# lua/app/config/act_fourteen_quest.lua.meta
# lua/app/config/activity_boss_rush_chapter.lua.meta
# lua/app/config/activity_boss_rush_exchange.lua.meta
# lua/app/config/activity_boss_rush_rank.lua.meta
# lua/app/config/activity_exchange.lua.meta
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board_bossrush.lua.meta
# lua/app/config/monster_activity.lua.meta
# lua/app/config/strings/cn/act_fourteen_quest.lua.meta
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/task_type.lua.meta
# lua/app/config/strings/de/act_fourteen_quest.lua.meta
# lua/app/config/strings/de/task_type.lua.meta
# lua/app/config/strings/en/act_fourteen_quest.lua.meta
# lua/app/config/strings/en/task_type.lua.meta
# lua/app/config/strings/es/act_fourteen_quest.lua.meta
# lua/app/config/strings/es/task_type.lua.meta
# lua/app/config/strings/fr/act_fourteen_quest.lua.meta
# lua/app/config/strings/fr/task_type.lua.meta
# lua/app/config/strings/id/act_fourteen_quest.lua.meta
# lua/app/config/strings/id/task_type.lua.meta
# lua/app/config/strings/ja/act_fourteen_quest.lua.meta
# lua/app/config/strings/ja/task_type.lua.meta
# lua/app/config/strings/ko/act_fourteen_quest.lua.meta
# lua/app/config/strings/ko/task_type.lua.meta
# lua/app/config/strings/pt/act_fourteen_quest.lua.meta
# lua/app/config/strings/pt/task_type.lua.meta
# lua/app/config/strings/ru/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/task_type.lua.meta
# lua/app/config/strings/vi/act_fourteen_quest.lua.meta
# lua/app/config/strings/vi/task_type.lua.meta
# lua/app/config/strings/zh/act_fourteen_quest.lua.meta
# lua/app/config/strings/zh/task_type.lua.meta
# lua/app/proto/proto_msg_type.lua
|
2023-09-01 21:18:54 +08:00 |
|