142 Commits

Author SHA1 Message Date
puxuan
920aa71690 特权 2025-10-08 16:02:30 +08:00
puxuan
3e1693d91d 签到 2025-10-07 17:18:55 +08:00
puxuan
bc3e832daa 礼包 2025-09-29 21:09:54 +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
fa6e612330 Merge branch 'dev_hero' into dev_equip 2025-09-23 16:22:21 +08:00
puxuan
ba655fa257 fix bug 2025-09-22 10:56:34 +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
6347ed6f9c 装备 2025-09-17 17:23:26 +08:00
puxuan
4bbe1af8b1 装备 2025-09-12 09:50:19 +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
371f5f2893 背包 2025-09-08 20:00:23 +08:00
puxuan
196c03b48b 背包 2025-09-08 17:35:56 +08:00
puxuan
3e91ceadfc fix bug 2025-09-03 19:58:00 +08:00
puxuan
653c927780 fix bug 2025-09-03 16:51:27 +08:00
puxuan
c64788d22e fix bug 2025-08-28 10:38:19 +08:00
puxuan
7f822a3025 fix bug 2025-08-27 14:22:05 +08:00
puxuan
afc8818849 fix bug 2025-08-20 15:56:11 +08:00
puxuan
e9d0fe30c9 英雄 2025-08-20 11:41:37 +08:00
puxuan
afbe226434 talent 2025-08-04 09:42:30 +08:00
puxuan
90a8351f30 arena 2025-07-22 20:43:13 +08:00
puxuan
f1e44406bf arena 2025-07-21 21:05:08 +08:00
puxuan
a6245691d7 arena 2025-07-15 20:58:20 +08:00
puxuan
f5ce465420 hero 2025-06-30 22:01:18 +08:00
kai
32534e7880 hero 2025-06-28 19:06:28 +08:00
puxuan
722639abab hero 2025-05-28 00:19:06 +08:00
puxuan
f18ab0ee83 升星 2025-05-27 00:08:22 +08:00
puxuan
e0cc3842a6 hero 2025-05-25 23:31:37 +08:00
xiekaidong
c03e46432f 修复 2023-09-19 11:20:48 +08:00
Fang
33526b2d2f review 2023-09-15 19:22:15 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
24a88cf05a bug修复 2023-09-05 17:34:17 +08:00
xiekaidong
9e75ea15c3 安卓返回键 2023-09-05 15:24:24 +08:00
xiekaidong
9ce3168f39 bug修复 2023-09-05 10:06:52 +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
Fang
b40d1acf9d 点击英雄卡面,不显示皮肤fix 2023-08-31 18:10:01 +08:00
Fang
aeb1c8e24a 更换皮肤卡面变化 2023-08-30 17:31:56 +08:00
Fang
c22b887d48 加载资源优化 2023-08-29 17:11:27 +08:00
xiekaidong
eb73910628 Merge branch 'master' into dev_20230829 2023-08-29 16:02:05 +08:00
Fang
36bb8eede2 段位奖励添加奖励光效 2023-08-28 17:41:52 +08:00
Fang
7b0f71065f fix 2023-08-21 15:53:22 +08:00
Fang
a68c4c79f2 连续快速扫荡显示fix 2023-08-21 14:55:07 +08:00