3853 Commits

Author SHA1 Message Date
puxuan
5935f650b8 . 2025-10-10 15:16:00 +08:00
puxuan
80db106cd1 Merge branch 'dev_act' into dev_hero 2025-10-10 15:15:22 +08:00
puxuan
c1e793fbe3 . 2025-10-10 15:14:29 +08:00
changyuxiang
7b5d3c5836 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-09 21:38:39 +08:00
tuxinyu
f8e5991c68 1111111 2025-10-09 21:12:09 +08:00
tuxinyu
190d53f430 111111111 2025-10-09 20:50:08 +08:00
changyuxiang
9708208fd5 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-09 20:47:38 +08:00
changyuxiang
58bc0cc529 1 2025-10-09 20:47:23 +08:00
tuxinyu
961fbf6146 1111111 2025-10-09 20:42:30 +08:00
tuxinyu
2659d9950c 111111111111 2025-10-09 20:39:00 +08:00
puxuan
5bd296efe4 fix bug 2025-10-09 19:57:40 +08:00
puxuan
ddb9b12654 1 2025-10-09 17:03:34 +08:00
tuxinyu
49e7708675 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-08 21:41:18 +08:00
tuxinyu
2ac928f6a2 11111111 2025-10-08 21:40:57 +08:00
changyuxiang
8dfc52ced1 死灵法师改一下 2025-10-08 18:36:29 +08:00
puxuan
d9cbbb3337 特权 2025-10-08 18:17:27 +08:00
changyuxiang
271308d569 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-08 17:55:46 +08:00
changyuxiang
572ea3e46e 英雄加影子 2025-10-08 17:55:42 +08:00
puxuan
c01bb6dd49 七天乐 2025-10-08 17:26:12 +08:00
tuxinyu
46b4b73cda 11111111 2025-10-08 17:01:57 +08:00
tuxinyu
92ff9e6393 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-08 16:56:02 +08:00
tuxinyu
1a89a7e49a 11111111 2025-10-08 16:54:57 +08:00
puxuan
743d0f097b 特权 2025-10-08 16:03:28 +08:00
changyuxiang
033bdbf11f 狼加影子,改抽奖UI动效 2025-10-08 15:23:15 +08:00
changyuxiang
e0d20294fe 1 2025-10-08 14:27:29 +08:00
changyuxiang
d6ea584023 改45001技能 2025-10-08 14:25:10 +08:00
changyuxiang
d161fac759 补充一个,改点东西 2025-10-08 14:07:54 +08:00
changyuxiang
f04c3f44e9 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-07 20:09:03 +08:00
changyuxiang
007dbf7d4f 改几个动作 2025-10-07 20:08:47 +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
changyuxiang
cd4622580a 改俩动画 2025-10-07 17:10:38 +08:00
puxuan
9c290fa178 活动 2025-10-07 11:21:54 +08:00
tuxinyu
5f4f6087d2 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-09-30 19:25:37 +08:00
tuxinyu
9858563402 111111 2025-09-30 19:25:26 +08:00
puxuan
479c5976ec Merge branch 'dev_hero' into dev_act 2025-09-30 09:32:23 +08:00
changyuxiang
603a25ed57 改怪 2025-09-29 21:34:01 +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
changyuxiang
bb804e059a 抽奖 2025-09-28 21:27:28 +08:00