4148 Commits

Author SHA1 Message Date
puxuan
bca7dfb3a1 fix bug 2025-11-06 11:37:23 +08:00
puxuan
7f5194d192 1 2025-11-06 10:27:43 +08:00
puxuan
068f382c47 Merge branch 'dev_hero' into dev_hero_2
# Conflicts:
#	Assets/arts/sounds/sfx/battle/20007001.wav.meta
#	Assets/arts/sounds/sfx/battle/20007005.wav.meta
#	Assets/arts/sounds/sfx/battle/20008001.wav.meta
#	Assets/arts/sounds/sfx/battle/20008004.wav.meta
2025-11-06 10:26:25 +08:00
puxuan
0b5888e268 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-06 10:25:55 +08:00
puxuan
e84346116b url 2025-11-06 10:25:52 +08:00
tuxinyu
9e6146fce1 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-05 21:38:39 +08:00
tuxinyu
3c445a7572 111111111 2025-11-05 21:38:12 +08:00
changyuxiang
cc6f58cc39 改点东西 2025-11-05 21:17:07 +08:00
tuxinyu
2e79493e48 111111 2025-11-05 21:04:59 +08:00
tuxinyu
82c88440fa 111111111 2025-11-05 20:58:00 +08:00
changyuxiang
65a1f43e6b 改点东西 2025-11-05 20:48:01 +08:00
tuxinyu
99698904cb 1111111111111 2025-11-05 20:28:17 +08:00
puxuan
407df4f874 res 2025-11-05 19:02:57 +08:00
puxuan
21dc13c024 fix bug 2025-11-05 18:47:52 +08:00
puxuan
43565d918e 自愈buff回复bug 2025-11-05 18:22:28 +08:00
puxuan
8ce6e84459 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-05 17:26:38 +08:00
puxuan
ac0c17307d fix bug 2025-11-05 17:26:35 +08:00
changyuxiang
405b5e5a2d 1 2025-11-05 12:13:00 +08:00
puxuan
02588a83fb fix bug 2025-11-05 11:59:15 +08:00
puxuan
40045cc7e6 config 2025-11-05 11:09:28 +08:00
puxuan
0b0efd278c 删除资源 2025-11-05 10:47:59 +08:00
puxuan
19533189dd Merge branch 'dev_hero' into dev_hero_2 2025-11-05 10:33:34 +08:00
tuxinyu
d4839a56d7 1111111111 2025-11-04 21:46:07 +08:00
tuxinyu
282b5a9eea 111111111 2025-11-04 21:24:44 +08:00
changyuxiang
b913aa2870 特权卡 2025-11-04 20:41:20 +08:00
changyuxiang
0d0f55d9e4 1 2025-11-04 20:36:16 +08:00
changyuxiang
478db2f30d Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-04 20:25:37 +08:00
changyuxiang
d9d75cca2b 1 2025-11-04 20:24:59 +08:00
puxuan
fac7fa6812 fix bug 2025-11-04 19:58:53 +08:00
puxuan
0641a93040 fix bug 2025-11-04 19:51:08 +08:00
puxuan
6a04896a5f 竞技场动画 2025-11-04 18:33:51 +08:00
puxuan
1841186071 fix bug 2025-11-04 18:05:38 +08:00
puxuan
9f3cffab69 删除不用资源 2025-11-04 16:20:02 +08:00
puxuan
834a29e5e7 fix bug 2025-11-04 15:34:06 +08:00
puxuan
d7964113c3 fix bug 2025-11-04 10:42:32 +08:00
puxuan
887eb5a9c0 config 2025-11-04 09:48:04 +08:00
puxuan
3448608f15 Merge branch 'dev_hero' into dev_hero_2 2025-11-04 09:46:54 +08:00
tuxinyu
bbd66e3e00 1111111111111 2025-11-03 21:29:58 +08:00
changyuxiang
befedf64ec wwwwwwwwwwwwwwwwwwwww 2025-11-03 21:25:38 +08:00
tuxinyu
5386c24504 11111111111 2025-11-03 21:05:13 +08:00
puxuan
d686512f63 引导 2025-11-03 20:38:20 +08:00
puxuan
8adf53316b Merge branch 'dev_hero' into dev_hero_2 2025-11-03 20:36:06 +08:00
puxuan
b92e5b89ec res 2025-11-03 20:33:57 +08:00
tuxinyu
3ced501994 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-11-03 20:21:25 +08:00
tuxinyu
3093ef4090 11111111 2025-11-03 20:20:10 +08:00
changyuxiang
df95c52b96 改命名 2025-11-03 19:33:16 +08:00
changyuxiang
6d73ccff00 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-03 19:28:25 +08:00
puxuan
66232f5e98 fix bug 2025-11-03 17:00:05 +08:00
puxuan
950316ee4b ui 2025-11-03 15:07:13 +08:00
puxuan
39388fd074 fix bug 2025-11-03 12:11:19 +08:00