|
|
5ae2a71053
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 16:22:13 +08:00 |
|
|
|
820384f14e
|
add
|
2024-10-26 16:21:29 +08:00 |
|
hyskai
|
ccedc4ea80
|
add.animation
|
2024-10-26 15:38:06 +08:00 |
|
hyskai
|
d6515fc3ed
|
add
|
2024-10-26 15:10:11 +08:00 |
|
hyskai
|
a300066627
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 15:08:31 +08:00 |
|
hyskai
|
05c93d4ec3
|
addd
|
2024-10-26 15:08:13 +08:00 |
|
|
|
8436260691
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
# meng_yao/Assets/Scenes/mining_buyingTalents_Scene.unity
|
2024-10-26 14:21:12 +08:00 |
|
|
|
cb7d7b8f40
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 14:11:41 +08:00 |
|
hyskai
|
647bd625aa
|
add
|
2024-10-26 10:52:38 +08:00 |
|
hyskai
|
6af7fe0cc5
|
add
|
2024-10-26 00:34:58 +08:00 |
|
hyskai
|
2b2052a4e5
|
ADD
|
2024-10-26 00:06:09 +08:00 |
|
hyskai
|
02ac6c93c3
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
# meng_yao/Assets/Scenes/cultivation_Jinsha_mine_slices.unity
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_1.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_9.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_9.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_9.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_5.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_5.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_5.png.meta
|
2024-10-25 23:54:16 +08:00 |
|
|
|
3eadf6a0c1
|
动画提交
|
2024-10-25 21:55:00 +08:00 |
|
|
|
9e7334d512
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-25 20:04:36 +08:00 |
|
hyskai
|
6cce7ad8c7
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-25 20:04:04 +08:00 |
|
|
|
93f8a3dfd8
|
add
|
2024-10-25 19:14:26 +08:00 |
|
hyskai
|
45ed17d777
|
add
|
2024-10-25 19:14:25 +08:00 |
|
|
|
58cf911211
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-25 15:39:37 +08:00 |
|
hyskai
|
f39fa7c9c3
|
add
|
2024-10-25 15:39:27 +08:00 |
|
hyskai
|
c374ce6346
|
add
|
2024-10-24 22:11:23 +08:00 |
|
|
|
ec7686fffd
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 21:46:08 +08:00 |
|
|
|
f54b708023
|
add
|
2024-10-24 21:45:43 +08:00 |
|
|
|
275f98ef6c
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 20:23:45 +08:00 |
|
hyskai
|
7c6b747d61
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 20:23:38 +08:00 |
|
hyskai
|
0c1f39a3b4
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 19:57:01 +08:00 |
|
hyskai
|
57a7b50394
|
add
|
2024-10-24 19:56:01 +08:00 |
|
|
|
9b0d2efaec
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 18:13:11 +08:00 |
|
hyskai
|
e88c29f703
|
add
|
2024-10-24 18:12:56 +08:00 |
|
hyskai
|
27c8ecf7d9
|
add
|
2024-10-24 17:59:07 +08:00 |
|
hyskai
|
81ede3e160
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 17:40:40 +08:00 |
|
|
|
ef43154b30
|
ADD
|
2024-10-24 17:39:01 +08:00 |
|
hyskai
|
e5e7020e54
|
add
|
2024-10-24 17:35:43 +08:00 |
|
|
|
d1f72bc428
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 17:34:19 +08:00 |
|
|
|
133dca9d2d
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 17:33:49 +08:00 |
|
|
|
c372356bed
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 16:25:31 +08:00 |
|
|
|
9d8139c26c
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 16:25:25 +08:00 |
|
hyskai
|
9412e30a3b
|
add
|
2024-10-24 16:10:18 +08:00 |
|
hyskai
|
03ccd98561
|
add
|
2024-10-24 15:52:42 +08:00 |
|
|
|
002d63a0a0
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 12:51:21 +08:00 |
|
|
|
8f2ce33d3c
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 12:50:54 +08:00 |
|
|
|
65fd569490
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 12:49:40 +08:00 |
|
hyskai
|
ef4f40c7b5
|
add
|
2024-10-24 12:48:27 +08:00 |
|
hyskai
|
188e3cfcd9
|
add
|
2024-10-24 10:48:04 +08:00 |
|
hyskai
|
30616b8029
|
add
|
2024-10-24 09:59:58 +08:00 |
|
|
|
f4d43eafcf
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 09:12:38 +08:00 |
|
hyskai
|
9a8b0d3e56
|
add
|
2024-10-24 09:11:20 +08:00 |
|
|
|
c11754b0f1
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 09:05:53 +08:00 |
|
hyskai
|
ef8f871210
|
add
|
2024-10-23 20:53:18 +08:00 |
|
|
|
f3874dda7e
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-23 19:38:16 +08:00 |
|
hyskai
|
a274b9a71e
|
add
|
2024-10-23 19:37:45 +08:00 |
|
