puxuan
|
45e600be69
|
新加任务
|
2025-10-07 19:59:53 +08:00 |
|
puxuan
|
bc3e832daa
|
礼包
|
2025-09-29 21:09:54 +08:00 |
|
puxuan
|
8cf688aeae
|
活动
|
2025-09-29 17:02:47 +08:00 |
|
puxuan
|
218a75adfe
|
冲刺
|
2025-09-29 15:37:24 +08:00 |
|
puxuan
|
9a9254de99
|
活动
|
2025-09-28 20:04:42 +08:00 |
|
puxuan
|
0736e58c5f
|
主界面图标
|
2025-09-28 16:09:37 +08:00 |
|
puxuan
|
c41b85349a
|
冲刺活动
|
2025-09-28 14:42:58 +08:00 |
|
puxuan
|
d98418b50f
|
config
|
2025-09-26 15:41:46 +08:00 |
|
puxuan
|
6546675a6f
|
冲刺活动
|
2025-09-25 20:12:22 +08:00 |
|
puxuan
|
a20f3f0dd1
|
活动
|
2025-09-25 16:04:15 +08:00 |
|
puxuan
|
35059a2f70
|
签到
|
2025-09-25 11:40:28 +08:00 |
|
puxuan
|
56936f582b
|
商店
|
2025-09-24 16:21:47 +08:00 |
|
puxuan
|
d4089cb823
|
敌方属性计算
|
2025-09-23 19:55:35 +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
|
a2eaf90572
|
装备
|
2025-09-09 19:39:38 +08:00 |
|
puxuan
|
8b49352830
|
。
|
2025-08-13 17:17:24 +08:00 |
|
puxuan
|
66c6437612
|
抽卡
|
2025-08-11 20:37:29 +08:00 |
|
puxuan
|
93cd085ccf
|
task
|
2025-08-06 20:46:06 +08:00 |
|
puxuan
|
a1a3238192
|
天赋
|
2025-08-04 11:43:40 +08:00 |
|
puxuan
|
afbe226434
|
talent
|
2025-08-04 09:42:30 +08:00 |
|
puxuan
|
f1e44406bf
|
arena
|
2025-07-21 21:05:08 +08:00 |
|
puxuan
|
a9e90aaf41
|
屏蔽报错
|
2025-07-07 19:57:13 +08:00 |
|
puxuan
|
10575642e1
|
英雄基础数据
|
2025-05-25 19:19:05 +08:00 |
|
Fang
|
327cffeb56
|
竞技场锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
Fang
|
f6c4010add
|
波次锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
Fang
|
2a62f2a94e
|
添加主线阵容符文数据上报
|
2023-09-19 16:55:52 +08:00 |
|
xiekaidong
|
7e292c16de
|
初始化顺序调整
|
2023-09-19 15:01:48 +08:00 |
|
Fang
|
f27bdc4cd2
|
圆月活动结束不正常fix
|
2023-09-18 18:39:58 +08:00 |
|
xiekaidong
|
4badcc0064
|
循环活动的一些处理
|
2023-09-18 14:43:04 +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 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +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
|
fe245efaba
|
接入数据
|
2023-09-01 11:55:16 +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
|
6409d60ae2
|
登录状态
|
2023-08-28 14:19:41 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
5b119201cf
|
界面和协议
|
2023-08-17 18:16:06 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
Fang
|
28bf5ab6ad
|
装备系统
|
2023-07-20 10:15:42 +08:00 |
|