舒荣森
|
7e1d431cf6
|
add
|
2024-11-01 05:26:28 +08:00 |
|
hyskai
|
f7e21b67b3
|
ADD
|
2024-10-31 20:40:09 +08:00 |
|
舒荣森
|
35c17756ee
|
add
|
2024-10-31 20:16:46 +08:00 |
|
舒荣森
|
fbacd20c4c
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-31 16:51:02 +08:00 |
|
舒荣森
|
9082a536ce
|
add
|
2024-10-31 16:50:35 +08:00 |
|
hyskai
|
8ece294163
|
add
|
2024-10-31 16:04:45 +08:00 |
|
舒荣森
|
c4709d7803
|
add
|
2024-10-31 13:27:31 +08:00 |
|
hyskai
|
d4dbcbec7e
|
add
|
2024-10-31 02:49:53 +08:00 |
|
hyskai
|
a28a221302
|
add
|
2024-10-31 01:19:19 +08:00 |
|
舒荣森
|
4d14f14085
|
add
|
2024-10-30 23:45:19 +08:00 |
|
舒荣森
|
1df706fa79
|
add
|
2024-10-30 23:18:31 +08:00 |
|
舒荣森
|
eb2b4211cd
|
add
|
2024-10-30 22:11:06 +08:00 |
|
舒荣森
|
228192a5c1
|
add
|
2024-10-30 22:03:04 +08:00 |
|
hyskai
|
598f279303
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 19:50:32 +08:00 |
|
hyskai
|
b0ace2f84b
|
add
|
2024-10-30 19:50:13 +08:00 |
|
舒荣森
|
6738e67c14
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 19:43:38 +08:00 |
|
舒荣森
|
a114da04ba
|
add
|
2024-10-30 19:42:59 +08:00 |
|
hyskai
|
581aeb516c
|
add
|
2024-10-30 19:10:14 +08:00 |
|
hyskai
|
f51b5f1d5a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:49:33 +08:00 |
|
hyskai
|
bb2bfb3c8f
|
add
|
2024-10-30 18:49:18 +08:00 |
|
|
|
2a7695903f
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:45:26 +08:00 |
|
|
|
86eb86152a
|
add
|
2024-10-30 18:45:08 +08:00 |
|
hyskai
|
2981849562
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:36:03 +08:00 |
|
hyskai
|
e113b604ff
|
add
|
2024-10-30 18:35:29 +08:00 |
|
舒荣森
|
9398dd1cda
|
add
|
2024-10-30 16:58:44 +08:00 |
|
舒荣森
|
d3fc9bcae6
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 16:41:05 +08:00 |
|
舒荣森
|
9d363e3c19
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
# meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs
|
2024-10-30 16:40:56 +08:00 |
|
hyskai
|
61bb10a75b
|
add
|
2024-10-30 15:47:47 +08:00 |
|
hyskai
|
88cd822977
|
Resolve merge conflicts
|
2024-10-30 13:21:35 +08:00 |
|
舒荣森
|
158c5f5263
|
add
|
2024-10-30 13:18:20 +08:00 |
|
hyskai
|
96caa4d13e
|
Resolve merge conflicts
|
2024-10-30 13:16:11 +08:00 |
|
hyskai
|
52890f81d5
|
改了一个字体，然后修改了商店
|
2024-10-30 13:07:34 +08:00 |
|
舒荣森
|
8550d5d74b
|
add
|
2024-10-30 12:27:47 +08:00 |
|
hyskai
|
fb16438f99
|
add
|
2024-10-30 06:34:34 +08:00 |
|
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
|
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 |
|
hyskai
|
5f4434d631
|
add
|
2024-10-30 03:32:25 +08:00 |
|
hyskai
|
837272ef54
|
add
|
2024-10-30 02:39:12 +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 |
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
820384f14e
|
add
|
2024-10-26 16:21:29 +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
|
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 |
|
|
|
93f8a3dfd8
|
add
|
2024-10-25 19:14:26 +08:00 |
|
