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 |
|
tuxinyu
|
0845703721
|
1111
|
2025-07-03 20:40:51 +08:00 |
|
changyuxiang
|
10693e85b3
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-07-02 20:39:09 +08:00 |
|
changyuxiang
|
d06e38ae36
|
1
|
2025-07-02 20:39:02 +08:00 |
|
tuxinyu
|
bbcbdabe27
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-06-30 22:14:50 +08:00 |
|
tuxinyu
|
194eef9612
|
1111111
|
2025-06-30 22:14:34 +08:00 |
|
puxuan
|
d92df2510a
|
hero
|
2025-06-30 22:05:54 +08:00 |
|
puxuan
|
d66db62d4b
|
hero
|
2025-06-30 22:02:12 +08:00 |
|
changyuxiang
|
d128fb5203
|
怪
|
2025-06-30 20:08:39 +08:00 |
|
kai
|
d5bdd59e65
|
.
|
2025-06-29 16:45:09 +08:00 |
|
kai
|
3a47091fa5
|
主界面
|
2025-06-29 16:36:24 +08:00 |
|
kai
|
d988308e79
|
主界面
|
2025-06-29 15:15:37 +08:00 |
|
kai
|
4bd8a963ce
|
主界面
|
2025-06-29 13:38:53 +08:00 |
|
kai
|
d8fe750a63
|
竞技场报错
|
2025-06-29 11:34:35 +08:00 |
|
kai
|
8611677a5d
|
商店报错
|
2025-06-29 10:37:02 +08:00 |
|
kai
|
f199aa4642
|
hero
|
2025-06-28 19:10:51 +08:00 |
|
puxuan
|
bab3c5b294
|
hero
|
2025-06-28 14:15:41 +08:00 |
|
puxuan
|
1d826dca2d
|
英雄界面
|
2025-06-26 21:34:10 +08:00 |
|
puxuan
|
5d042832ad
|
hero
|
2025-06-26 00:14:17 +08:00 |
|
puxuan
|
c8ef9aa7e7
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-06-26 00:13:52 +08:00 |
|
puxuan
|
3e707f40a6
|
res
|
2025-06-25 22:44:41 +08:00 |
|
puxuan
|
d1c1de9e75
|
res
|
2025-06-25 22:42:55 +08:00 |
|
changyuxiang
|
f526f0fcfb
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-06-25 19:30:41 +08:00 |
|
changyuxiang
|
e6eca956a3
|
更新怪
|
2025-06-25 19:30:37 +08:00 |
|