hyskai
|
680c50e64e
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 06:25:51 +08:00 |
|
hyskai
|
9e6310c4eb
|
add
|
2024-10-30 06:25:33 +08:00 |
|
舒荣森
|
66be58bbeb
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 06:22:17 +08:00 |
|
舒荣森
|
36a66aaf18
|
add
|
2024-10-30 06:22:08 +08:00 |
|
|
|
a790dbed0f
|
add
|
2024-10-30 05:06:41 +08:00 |
|
hyskai
|
6289ecfd57
|
add
|
2024-10-30 04:46:20 +08:00 |
|
hyskai
|
d392f2ac3b
|
add
|
2024-10-30 04:35:56 +08:00 |
|
hyskai
|
6b0d3121ad
|
add
|
2024-10-30 04:21:58 +08:00 |
|
|
|
b89a86e776
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 03:46:10 +08:00 |
|
|
|
80bede9cdc
|
add
|
2024-10-30 03:45:54 +08:00 |
|
hyskai
|
e00fe32531
|
add
|
2024-10-30 03:43:31 +08:00 |
|
舒荣森
|
333b5d2584
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 03:42:31 +08:00 |
|
舒荣森
|
d2293d5133
|
add
|
2024-10-30 03:42:06 +08:00 |
|
hyskai
|
5f4434d631
|
add
|
2024-10-30 03:32:25 +08:00 |
|
hyskai
|
837272ef54
|
add
|
2024-10-30 02:39:12 +08:00 |
|
hyskai
|
80277e13ec
|
add
|
2024-10-30 01:34:17 +08:00 |
|
hyskai
|
f401818c64
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 01:33:47 +08:00 |
|
hyskai
|
a971720a2e
|
add
|
2024-10-30 01:33:31 +08:00 |
|
|
|
1ad4c48386
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
# meng_yao/Assets/script/Manager/Promptmgr.cs
|
2024-10-30 01:32:19 +08:00 |
|
舒荣森
|
733573c76a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 01:29:15 +08:00 |
|
hyskai
|
2e3c81564e
|
add
|
2024-10-30 01:19:18 +08:00 |
|
|
|
b002910437
|
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/script/Manager/Promptmgr.cs
|
2024-10-30 01:12:03 +08:00 |
|
|
|
407f043f93
|
add
|
2024-10-30 01:08:16 +08:00 |
|
舒荣森
|
100b866564
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 01:07:10 +08:00 |
|
舒荣森
|
088b92a5b1
|
add
|
2024-10-30 01:06:46 +08:00 |
|
hyskai
|
d598d04bba
|
add
|
2024-10-30 00:49:26 +08:00 |
|
hyskai
|
f543b2c5e4
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 21:27:13 +08:00 |
|
hyskai
|
686370f77c
|
add
|
2024-10-29 21:26:45 +08:00 |
|
舒荣森
|
45899c03d0
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 20:48:07 +08:00 |
|
舒荣森
|
45024d38b7
|
add
|
2024-10-29 20:47:58 +08:00 |
|
hyskai
|
72f4218f0f
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 16:58:14 +08:00 |
|
hyskai
|
cc65145114
|
add
|
2024-10-29 16:57:55 +08:00 |
|
舒荣森
|
f4e35d9183
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 16:01:06 +08:00 |
|
舒荣森
|
9180ab0671
|
add
|
2024-10-29 16:00:02 +08:00 |
|
hyskai
|
cf2bfa2893
|
add
|
2024-10-29 15:52:43 +08:00 |
|
hyskai
|
0a68cad15b
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 12:01:46 +08:00 |
|
hyskai
|
cc8f88dc8c
|
add
|
2024-10-29 12:01:30 +08:00 |
|
|
|
a5d5de1dc6
|
Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 11:54:54 +08:00 |
|
|
|
5fe07524a2
|
add
|
2024-10-29 11:54:22 +08:00 |
|
hyskai
|
4bb937314c
|
add
|
2024-10-29 11:35:16 +08:00 |
|
|
|
b55b8e4654
|
add
|
2024-10-28 23:10:38 +08:00 |
|
|
|
200a7e6c0b
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 22:05:30 +08:00 |
|
|
|
2c0d6ef7a8
|
add
|
2024-10-28 22:05:14 +08:00 |
|
hyskai
|
102eb8820f
|
add
|
2024-10-28 21:58:27 +08:00 |
|
hyskai
|
90fe4b1a60
|
add
|
2024-10-28 17:45:50 +08:00 |
|
hyskai
|
3e89a09605
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 17:36:07 +08:00 |
|
hyskai
|
a70c30485f
|
add
|
2024-10-28 17:23:36 +08:00 |
|
|
|
c1292d4f56
|
Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 17:07:35 +08:00 |
|
|
|
1f5a420c2c
|
add
|
2024-10-28 17:06:27 +08:00 |
|
|
|
3229b4f637
|
add
|
2024-10-28 16:41:14 +08:00 |
|
hyskai
|
5ddf1ade0d
|
ad
|
2024-10-28 16:17:07 +08:00 |
|
hyskai
|
823a283b2a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 15:43:38 +08:00 |
|
hyskai
|
3d0abc7aba
|
add
|
2024-10-28 15:43:26 +08:00 |
|
|
|
4027cd70c0
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 15:37:48 +08:00 |
|
|
|
b0b089ec67
|
add
|
2024-10-28 15:37:21 +08:00 |
|
hyskai
|
a34287a9bd
|
add
|
2024-10-28 15:33:52 +08:00 |
|
hyskai
|
a6105a85e3
|
add
|
2024-10-28 12:11:56 +08:00 |
|
hyskai
|
5c538ffe1c
|
add
|
2024-10-28 11:28:49 +08:00 |
|
hyskai
|
b22a8cdebf
|
ADD
|
2024-10-28 11:19:21 +08:00 |
|
hyskai
|
8eaeac9104
|
ADD
|
2024-10-28 11:03:55 +08:00 |
|
|
|
dfca1012bb
|
add
|
2024-10-28 10:57:19 +08:00 |
|
hyskai
|
de51e4559f
|
add
|
2024-10-28 10:55:47 +08:00 |
|
|
|
bda87bdcd1
|
add
|
2024-10-26 21:00:23 +08:00 |
|
hyskai
|
d1a6ef800c
|
add
|
2024-10-26 18:05:52 +08:00 |
|
hyskai
|
4684cd55b9
|
dotween
|
2024-10-26 17:24:48 +08:00 |
|
|
|
ab8a9ec6bb
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 16:47:29 +08:00 |
|
|
|
553ebd9908
|
add
|
2024-10-26 16:47:21 +08:00 |
|
hyskai
|
b63bc24389
|
add
|
2024-10-26 16:47:03 +08:00 |
|
|
|
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 |
|
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 |
|
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
|
57a7b50394
|
add
|
2024-10-24 19:56:01 +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 |
|
|
|
133dca9d2d
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 17:33:49 +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 |
|
