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 |
|
xiekaidong
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
xiekaidong
|
049d7508ea
|
bossrush
|
2023-08-31 20:18:14 +08:00 |
|
xiekaidong
|
211d7cc71e
|
boss_rush
|
2023-08-30 19:11:38 +08:00 |
|
xiekaidong
|
d5afdffecf
|
封号功能和屏蔽一些网络冗余操作
|
2023-08-28 14:04:23 +08:00 |
|
xiekaidong
|
bc42d8e4a8
|
界面处理
|
2023-08-23 17:46:31 +08:00 |
|
xiekaidong
|
7fdadd75b4
|
层级调整
|
2023-08-16 11:27:54 +08:00 |
|
Fang
|
0eebc9b6cd
|
英雄生命值显示fix
|
2023-08-14 11:12:57 +08:00 |
|
Fang
|
69790fd563
|
新加颜色生命值加成
|
2023-08-11 18:15:27 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
bafb8673ec
|
装备升级材料获取
|
2023-07-21 09:50:45 +08:00 |
|
xiekaidong
|
100e125c19
|
Merge branch 'dev_20230725' into dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/module_manager.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-07-20 19:45:54 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
Fang
|
28bf5ab6ad
|
装备系统
|
2023-07-20 10:15:42 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
Fang
|
b2dba1de2e
|
英雄图鉴
|
2023-07-14 17:07:03 +08:00 |
|
xiekaidong
|
29bcf831a3
|
Merge branch 'battle' into dev_20230725
|
2023-07-13 18:03:03 +08:00 |
|
xiekaidong
|
90711c7e2a
|
英雄属性增加，以及战斗伤害治疗公式修改
|
2023-07-13 18:02:46 +08:00 |
|
xiekaidong
|
dde65f49c3
|
设置界面新增社区链接按钮
|
2023-07-11 15:45:14 +08:00 |
|
xiekaidong
|
61b76292c9
|
英雄面板属性加密
|
2023-07-05 17:25:14 +08:00 |
|
xiekaidong
|
e597b9f7be
|
战斗中属性加密
|
2023-07-05 17:05:17 +08:00 |
|
xiekaidong
|
87cacec30c
|
竞技场暂停界面
|
2023-07-04 15:03:37 +08:00 |
|
Fang
|
c2843e5a88
|
完善细节
|
2023-07-03 18:34:51 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|
Fang
|
cd09e79bca
|
竞技场
|
2023-06-27 18:27:11 +08:00 |
|
Fang
|
6e3c2523a5
|
英雄编队拆分出来
|
2023-06-20 11:02:45 +08:00 |
|