4187 Commits

Author SHA1 Message Date
changyuxiang
db84769efd Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 18:36:18 +08:00
tuxinyu
8d32bd3c9b Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 18:33:03 +08:00
tuxinyu
ac79c3a521 111111111 2025-11-08 18:32:51 +08:00
changyuxiang
e89fe8bcf8 boss 2025-11-08 17:53:36 +08:00
puxuan
51e8b73f51 config 2025-11-08 17:52:36 +08:00
puxuan
96dbef0a3a 场景67 2025-11-08 17:49:46 +08:00
puxuan
a2ea591c82 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 17:18:09 +08:00
puxuan
071af307ab UI 2025-11-08 17:18:05 +08:00
tuxinyu
dca1c42a33 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 16:43:19 +08:00
tuxinyu
e435ddc3b4 11111111 2025-11-08 16:43:08 +08:00
puxuan
4efa87d9a9 fix bug 2025-11-08 16:15:41 +08:00
puxuan
6790fc508a fix bug 2025-11-08 15:48:15 +08:00
puxuan
cb6589ece4 fix bug 2025-11-08 14:37:45 +08:00
puxuan
0c52d1da0c res 2025-11-08 14:31:48 +08:00
changyuxiang
20fa27ac2f Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 14:14:45 +08:00
changyuxiang
ce1b168e09 1 2025-11-08 14:14:33 +08:00
puxuan
15cc99eb34 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-11-08 12:06:57 +08:00
puxuan
74cad70154 fix bug 2025-11-08 12:06:50 +08:00
changyuxiang
73bbe304cc 更新点spine 2025-11-07 20:23:06 +08:00
puxuan
0ae3b73863 fix bug 2025-11-07 17:55:21 +08:00
puxuan
3109e57735 fix bug 2025-11-07 17:43:05 +08:00
puxuan
54a49eb0ab 基金 2025-11-07 17:19:05 +08:00
puxuan
835e70e16d fix bug 2025-11-07 17:06:03 +08:00
puxuan
047c1a34f3 config 2025-11-07 16:45:13 +08:00
puxuan
1a9a8f0632 res 2025-11-07 16:37:30 +08:00
puxuan
22ea8bbea0 竞技场取消 2025-11-07 16:12:16 +08:00
puxuan
31a67ecc20 战斗力bug 2025-11-07 15:02:56 +08:00
puxuan
64bc1ddc83 fix bug 2025-11-07 14:33:21 +08:00
puxuan
78b3e35b8f 首充弹窗 2025-11-07 12:10:15 +08:00
puxuan
c0fac6edf2 召唤跳过 2025-11-07 11:47:40 +08:00
puxuan
a4befbd41f 召唤音效 2025-11-07 10:56:31 +08:00
puxuan
6565e05d5a fix bug 2025-11-06 20:12:34 +08:00
changyuxiang
b9a52ed973 公司背景 2025-11-06 19:55:24 +08:00
puxuan
76b17ad3e6 Revert "res"
This reverts commit 71dbedf9daf623bd5679b9a1dd6072f662b01b98.
2025-11-06 18:32:33 +08:00
puxuan
edcfc2edde Revert "res"
This reverts commit fde6c87a2bc88bf48513d729a16da2772a41ea8b.
2025-11-06 18:32:28 +08:00
puxuan
fde6c87a2b res 2025-11-06 18:23:39 +08:00
puxuan
71dbedf9da res 2025-11-06 18:23:35 +08:00
puxuan
31f4399df1 . 2025-11-06 18:15:02 +08:00
puxuan
af0f7be205 fix bug 2025-11-06 17:56:04 +08:00
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