1785 Commits

Author SHA1 Message Date
puxuan
f75e0fccf6 装备红点 2025-10-13 12:02:26 +08:00
puxuan
e7a00cd1e4 . 2025-10-11 16:46:34 +08:00
puxuan
1b10f1854f config 2025-10-11 15:57:58 +08:00
puxuan
c623b9f038 config 2025-10-11 15:52:08 +08:00
puxuan
d527822974 装备 2025-10-11 15:48:03 +08:00
puxuan
077a4d0f14 副本 2025-10-10 19:46:33 +08:00
puxuan
e32c238a90 副本 2025-10-10 19:22:45 +08:00
puxuan
40bb3b0c0f Merge branch 'dev_hero' into dev_hero_2 2025-10-10 15:19:54 +08:00
puxuan
c1e793fbe3 . 2025-10-10 15:14:29 +08:00
puxuan
39878f292c 英雄 2025-10-10 15:12:41 +08:00
puxuan
5bd296efe4 fix bug 2025-10-09 19:57:40 +08:00
puxuan
f78071e910 升级 2025-10-09 17:48:18 +08:00
puxuan
a3771c610b 升级 2025-10-09 17:29:10 +08:00
puxuan
ddb9b12654 1 2025-10-09 17:03:34 +08:00
puxuan
d9cbbb3337 特权 2025-10-08 18:17:27 +08:00
puxuan
c01bb6dd49 七天乐 2025-10-08 17:26:12 +08:00
puxuan
743d0f097b 特权 2025-10-08 16:03:28 +08:00
puxuan
ddcb2c72f0 新加任务 2025-10-07 20:00:23 +08:00
puxuan
4fc4b6b23e lua 2025-10-07 18:32:30 +08:00
puxuan
4aa2e6f2a7 Merge branch 'dev_hero' into dev_act
# Conflicts:
#	Assets/lua/app/config/buff.lua.bytes
#	Assets/lua/app/config/fx.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/attr.lua.bytes
#	Assets/lua/app/config/strings/cn/task_type.lua.bytes
#	Assets/lua/app/config/strings/de/attr.lua.bytes
#	Assets/lua/app/config/strings/en/attr.lua.bytes
#	Assets/lua/app/config/strings/en/task_type.lua.bytes
#	Assets/lua/app/config/strings/es/attr.lua.bytes
#	Assets/lua/app/config/strings/es/task_type.lua.bytes
#	Assets/lua/app/config/strings/fr/attr.lua.bytes
#	Assets/lua/app/config/strings/id/attr.lua.bytes
#	Assets/lua/app/config/strings/id/task_type.lua.bytes
#	Assets/lua/app/config/strings/ja/attr.lua.bytes
#	Assets/lua/app/config/strings/ja/task_type.lua.bytes
#	Assets/lua/app/config/strings/ko/attr.lua.bytes
#	Assets/lua/app/config/strings/ko/task_type.lua.bytes
#	Assets/lua/app/config/strings/pt/attr.lua.bytes
#	Assets/lua/app/config/strings/pt/task_type.lua.bytes
#	Assets/lua/app/config/strings/ru/attr.lua.bytes
#	Assets/lua/app/config/strings/th/attr.lua.bytes
#	Assets/lua/app/config/strings/th/task_type.lua.bytes
#	Assets/lua/app/config/strings/vi/attr.lua.bytes
#	Assets/lua/app/config/strings/vi/task_type.lua.bytes
#	Assets/lua/app/config/strings/zh/attr.lua.bytes
#	Assets/lua/app/config/strings/zh/task_type.lua.bytes
2025-10-07 18:30:51 +08:00
puxuan
7b6ede56cc 2025-10-07 18:30:02 +08:00
puxuan
614909a19f 每日挑战 2025-10-07 18:28:34 +08:00
puxuan
8060568ced 签到 2025-10-07 17:19:46 +08:00
puxuan
9c290fa178 活动 2025-10-07 11:21:54 +08:00
puxuan
6fc419c7ce . 2025-09-29 21:17:42 +08:00
puxuan
c819d7ce8a 礼包 2025-09-29 21:10:50 +08:00
puxuan
7b4916851e 基金 2025-09-29 19:53:13 +08:00
puxuan
2a6bdfd66e Merge branch 'dev_hero' into dev_act 2025-09-29 17:38:08 +08:00
puxuan
23ac799d02 召唤 2025-09-29 17:33:25 +08:00
puxuan
e911269404 活动 2025-09-29 17:03:14 +08:00
puxuan
e57618f534 冲刺 2025-09-29 16:27:54 +08:00
puxuan
d8249cc3ac 冲刺 2025-09-29 15:37:57 +08:00
puxuan
778505742a lua 2025-09-28 20:37:41 +08:00
puxuan
c3ce4f0615 Merge branch 'dev_hero' into dev_act 2025-09-28 20:36:36 +08:00
puxuan
f93e31fb95 活动 2025-09-28 20:05:55 +08:00
puxuan
dc4c1fc49e 活动 2025-09-28 16:11:00 +08:00
puxuan
e10aa91ae9 冲刺活动 2025-09-28 14:43:19 +08:00
puxuan
6a5c903e48 fix bug 2025-09-26 16:48:34 +08:00
puxuan
4369ed4075 config 2025-09-26 15:42:14 +08:00
puxuan
0ac2b10096 活动 2025-09-26 09:44:45 +08:00
puxuan
e91c3d797d 冲刺活动 2025-09-25 20:13:36 +08:00
puxuan
1c5b577038 活动 2025-09-25 16:05:10 +08:00
puxuan
18296991a2 商业化 2025-09-25 11:41:03 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
puxuan
8ae9b1c288 2025-09-24 12:04:04 +08:00
puxuan
87b4c11a9c 阵容 2025-09-24 12:03:05 +08:00
puxuan
aa3cd49667 Merge branch 'dev_hero' into dev_equip
# Conflicts:
#	Assets/lua/app/ui/hero/hero_comp.lua.bytes
2025-09-24 11:06:41 +08:00
puxuan
be9a8be241 fix bug 2025-09-23 21:10:20 +08:00
puxuan
dee92b0594 fix bug 2025-09-23 20:58:26 +08:00
puxuan
689e1a7ef3 fix bug 2025-09-23 20:48:50 +08:00