changyuxiang
|
e1b1bafd78
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-28 21:05:51 +08:00 |
|
changyuxiang
|
5810bba3d8
|
精英5个
|
2025-07-28 21:05:35 +08:00 |
|
tuxinyu
|
7bb1df9f35
|
111111
|
2025-07-28 21:04:58 +08:00 |
|
tuxinyu
|
f0bb21c710
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-28 21:00:08 +08:00 |
|
tuxinyu
|
f7b00effe8
|
1111111
|
2025-07-28 20:59:27 +08:00 |
|
changyuxiang
|
a0c49f6a6e
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-28 20:42:55 +08:00 |
|
changyuxiang
|
e4aadf984d
|
1
|
2025-07-28 20:42:43 +08:00 |
|
puxuan
|
a335e07912
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-28 20:37:13 +08:00 |
|
puxuan
|
2080d5d643
|
挂机
|
2025-07-28 20:37:09 +08:00 |
|
tuxinyu
|
b50725a99c
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-28 20:15:46 +08:00 |
|
tuxinyu
|
6d7ddf4a25
|
1111111
|
2025-07-28 20:15:25 +08:00 |
|
puxuan
|
f12dad8c7f
|
config
|
2025-07-23 20:06:30 +08:00 |
|
changyuxiang
|
3c60d66567
|
1
|
2025-07-22 21:02:55 +08:00 |
|
changyuxiang
|
2b95659045
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-22 20:48:32 +08:00 |
|
changyuxiang
|
2018520302
|
1
|
2025-07-22 20:48:26 +08:00 |
|
puxuan
|
d0fa3731bb
|
arena
|
2025-07-22 20:43:38 +08:00 |
|
puxuan
|
7db28b8e49
|
arena
|
2025-07-21 21:05:32 +08:00 |
|
tuxinyu
|
bec8324c7b
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-17 19:28:15 +08:00 |
|
tuxinyu
|
cdb2e850fb
|
11111
|
2025-07-17 19:27:37 +08:00 |
|
kai
|
3f12d50201
|
每日挑战
|
2025-07-16 21:58:51 +08:00 |
|
kai
|
4fb30c128d
|
每日挑战
|
2025-07-16 21:56:44 +08:00 |
|
changyuxiang
|
b2cd80a254
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-16 21:38:24 +08:00 |
|
changyuxiang
|
f3b8eec0cd
|
1
|
2025-07-16 21:38:20 +08:00 |
|
puxuan
|
3510a6bef5
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-15 20:59:50 +08:00 |
|
puxuan
|
94227802b4
|
arena
|
2025-07-15 20:59:15 +08:00 |
|
changyuxiang
|
c17c28f4fe
|
过热小莫、火花机
|
2025-07-15 20:53:38 +08:00 |
|
changyuxiang
|
97ba55700d
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-14 21:42:00 +08:00 |
|
changyuxiang
|
080cb76743
|
1
|
2025-07-14 21:41:57 +08:00 |
|
puxuan
|
b921faab86
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-14 21:32:58 +08:00 |
|
puxuan
|
7515a0ef1b
|
arena
|
2025-07-14 21:32:49 +08:00 |
|
changyuxiang
|
61e7e50afd
|
最后一个怪
|
2025-07-14 20:59:43 +08:00 |
|
puxuan
|
86f8891173
|
主界面箱子
|
2025-07-14 20:48:32 +08:00 |
|
kai
|
4429fb0e24
|
竞技场
|
2025-07-13 23:09:23 +08:00 |
|
changyuxiang
|
776d33f119
|
1
|
2025-07-09 22:04:58 +08:00 |
|
changyuxiang
|
a8e400309d
|
一波小怪
|
2025-07-09 21:22:43 +08:00 |
|
tuxinyu
|
6cfa99a2fd
|
11111111
|
2025-07-09 20:49:33 +08:00 |
|
tuxinyu
|
ff7526810b
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-09 20:00:33 +08:00 |
|
tuxinyu
|
bff03d9595
|
1111111
|
2025-07-09 20:00:22 +08:00 |
|
kai
|
e1abcbf979
|
主界面
|
2025-07-07 23:37:57 +08:00 |
|
puxuan
|
d7db1af006
|
Merge branch 'dev_chapter' into dev_hero
|
2025-07-07 21:39:59 +08:00 |
|
puxuan
|
ccf4d4cf3e
|
主界面
|
2025-07-07 21:39:35 +08:00 |
|
changyuxiang
|
ac48012ed0
|
传两个小怪，差6个
|
2025-07-07 20:38:27 +08:00 |
|
puxuan
|
c47f373913
|
Merge branch 'dev_3' into dev_hero
|
2025-07-07 19:59:32 +08:00 |
|
puxuan
|
6fbcf645cb
|
屏蔽报错
|
2025-07-07 19:58:01 +08:00 |
|
puxuan
|
b4c27e47f0
|
Merge branch 'dev_hero' into dev_chapter
# Conflicts:
# Assets/arts/atlas/ui/main.spriteatlas
# Assets/arts/textures/ui/main/main_bar_2_bg.png.meta
# Assets/arts/textures/ui/main/main_bg_4.png.meta
|
2025-07-04 12:56:52 +08:00 |
|
puxuan
|
a4c4632f98
|
res
|
2025-07-04 12:54:20 +08:00 |
|
puxuan
|
fd3cac4e2e
|
proto
|
2025-07-04 12:51:21 +08:00 |
|
puxuan
|
424c407aba
|
proto
|
2025-07-04 12:49:14 +08:00 |
|
puxuan
|
604b634b80
|
chapter
|
2025-07-03 20:56:56 +08:00 |
|
tuxinyu
|
c7b30dcf87
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-03 20:46:14 +08:00 |
|