4004 Commits

Author SHA1 Message Date
changyuxiang
aa4f2bba5f 1 2025-10-27 20:38:43 +08:00
puxuan
95851df2af Merge branch 'dev_hero_2' into dev_hero 2025-10-26 18:11:36 +08:00
puxuan
639ceeb387 装备属性 2025-10-26 18:11:16 +08:00
tuxinyu
275bca1375 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-26 17:46:21 +08:00
tuxinyu
9886fc088c 1111111111 2025-10-26 17:46:08 +08:00
puxuan
7d62cb408e 升级升星属性 2025-10-24 17:52:16 +08:00
puxuan
97b91ec0d9 fix bug 2025-10-24 16:37:31 +08:00
puxuan
513ee323df fix bug 2025-10-24 14:37:15 +08:00
puxuan
6f3d42635e 资源整理 2025-10-24 12:02:08 +08:00
puxuan
265b5474e1 config 2025-10-24 11:40:12 +08:00
puxuan
b727316a77 背包 2025-10-24 11:05:09 +08:00
puxuan
598f288902 Merge branch 'dev_hero' into dev_hero_2 2025-10-24 09:54:54 +08:00
puxuan
31be75d787 ui 2025-10-24 09:54:31 +08:00
changyuxiang
a6d99ba19b 首充-火花姬 2025-10-23 21:31:00 +08:00
puxuan
5f867a9a84 冲刺 2025-10-23 20:09:26 +08:00
puxuan
a572fe571d fix bug 2025-10-23 18:21:29 +08:00
puxuan
d51954e25f fix bug 2025-10-23 18:11:39 +08:00
puxuan
1e99c284b0 资源整理 2025-10-23 18:10:58 +08:00
puxuan
46b11ccf9e 资源整理 2025-10-23 17:33:51 +08:00
puxuan
c40bb80cca . 2025-10-23 17:19:17 +08:00
puxuan
2dc4bdae98 res 2025-10-23 17:17:49 +08:00
puxuan
418dd48412 资源整理 2025-10-23 17:14:08 +08:00
puxuan
0e44ceaff7 资源整理 2025-10-23 16:10:53 +08:00
puxuan
f27864d87e 背包 2025-10-23 16:00:11 +08:00
puxuan
7dfed34849 特权 2025-10-23 11:31:30 +08:00
puxuan
5d5fd03238 商店 2025-10-22 20:51:21 +08:00
puxuan
9d1e561916 fix bug 2025-10-22 18:34:13 +08:00
puxuan
c26a8289be fix bug 2025-10-22 17:33:37 +08:00
puxuan
fc2bc97405 fix bug 2025-10-22 15:06:27 +08:00
puxuan
ab66a2dd52 fix bug 2025-10-22 11:59:47 +08:00
puxuan
6448443c0f 主界面 2025-10-22 11:46:57 +08:00
puxuan
049a754327 副本 2025-10-22 11:14:43 +08:00
puxuan
5d8bf297e8 res 2025-10-22 10:22:14 +08:00
puxuan
6b062362f2 fix bug 2025-10-22 10:14:27 +08:00
puxuan
965b98f0a8 fix bug 2025-10-22 09:30:00 +08:00
puxuan
2ed2daabf2 fix bug 2025-10-21 18:23:54 +08:00
puxuan
79d68e8caf 天赋动画 2025-10-21 16:07:49 +08:00
puxuan
7ecf780dab Merge branch 'dev_hero_2' into dev_hero
# Conflicts:
#	Assets/prefabs/effects/battle/sfx_c1_p35002_05.prefab
2025-10-21 10:30:18 +08:00
puxuan
7116c6a74a 基金 2025-10-21 10:28:57 +08:00
puxuan
79c7a15552 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-10-20 21:20:55 +08:00
puxuan
a91941b139 fix bug 2025-10-20 21:20:52 +08:00
tuxinyu
11a4631d28 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-10-20 21:10:48 +08:00
tuxinyu
7d761de229 1111111111111 2025-10-20 21:10:38 +08:00
puxuan
c9f22e7671 . 2025-10-20 20:54:34 +08:00
puxuan
8570d9dd2d .. 2025-10-20 20:53:21 +08:00
tuxinyu
53bd3da968 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-10-20 20:45:09 +08:00
tuxinyu
8f20ac7cb0 111111111111 2025-10-20 20:45:01 +08:00
puxuan
7a4e927513 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-10-20 20:37:18 +08:00
puxuan
24901b3966 fix bug 2025-10-20 20:37:13 +08:00
tuxinyu
3943be89c5 Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2 2025-10-20 20:31:53 +08:00