180 Commits

Author SHA1 Message Date
puxuan
526b1690c5 属性 2025-09-18 17:51:59 +08:00
puxuan
e1d389b02d 每日挑战 2025-09-15 17:20:14 +08:00
puxuan
96fe08e143 战斗力 2025-09-09 19:24:42 +08:00
puxuan
196c03b48b 背包 2025-09-08 17:35:56 +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
8df787b289 fix bug 2025-08-27 16:23:13 +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
9f41da288b fix bug 2025-08-19 20:31:19 +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
667d76fcde 战斗力 2025-08-13 20:54:58 +08:00
puxuan
ab824968e0 Merge branch 'dev_equip' into dev_hero 2025-08-13 20:07:57 +08:00
puxuan
66c6437612 抽卡 2025-08-11 20:37:29 +08:00
puxuan
6ab80119eb 局内 2025-08-08 11:41:36 +08:00
puxuan
93cd085ccf task 2025-08-06 20:46:06 +08:00
puxuan
afbe226434 talent 2025-08-04 09:42:30 +08:00
puxuan
7062211624 equip 2025-07-30 18:10:24 +08:00
puxuan
f1e44406bf arena 2025-07-21 21:05:08 +08:00
puxuan
a6245691d7 arena 2025-07-15 20:58:20 +08:00
kai
a2d6fcc50e 主界面 2025-06-29 13:37:33 +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
e5cff3bde0 star 2025-06-23 00:01:23 +08:00
puxuan
443bf10a2d star 2025-06-22 19:05:14 +08:00
puxuan
30fcf69843 mystery_box 2025-06-10 23:36:41 +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
Fang
8650d1b340 属性调整 2023-09-19 16:55:52 +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
1f93123171 显示fix 2023-09-12 15:27:27 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
94d59731c8 Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/const.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/monster_dungeon_rune.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/proto/proto_msg_type.lua
2023-09-12 10:07:33 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
977459d074 显示问题优化 2023-09-11 10:17:21 +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