Commit Graph

529 Commits

Author SHA1 Message Date
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
8f2ce33d3c Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-24 12:50:54 +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
87ee91b809 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 19:31:37 +08:00
hyskai
05d674024e addd 2024-10-23 19:22:46 +08:00
eeb5662b8b Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 19:07:57 +08:00
895f070015 add 2024-10-23 19:06:35 +08:00
hyskai
52415eac94 add 2024-10-23 17:10:04 +08:00
hyskai
9cefc56793 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 15:36:25 +08:00
99c66ddd6f add 2024-10-23 15:35:12 +08:00
GL
7a2e678201 add 2024-10-22 22:26:05 +08:00
0802c6c6e8 add 2024-10-20 22:46:28 +08:00
hyskai
647e3a09a0 add 2024-10-20 22:04:23 +08:00
GL
69a1cb3f8b 排行榜 2024-10-20 21:57:46 +08:00
hyskai
911d7c52c5 add 2024-10-20 21:39:16 +08:00
hyskai
31ad8f6d17 add 2024-10-20 21:17:14 +08:00
49215d6ac6 add 2024-10-20 21:14:33 +08:00
869fbd1e95 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-20 21:14:05 +08:00
e1db31886c add 2024-10-20 21:11:00 +08:00
hyskai
989a6ebc70 add 2024-10-20 20:45:50 +08:00
hyskai
04678a3358 add 2024-10-20 19:54:05 +08:00
hyskai
4ca822aa60 add 2024-10-20 18:29:41 +08:00
GL
a5fed7e37a 商店界面 2024-10-20 17:57:57 +08:00
4b0ad2dd3a add 2024-10-20 17:07:38 +08:00
hyskai
81121e6e0a add 2024-10-20 15:49:56 +08:00
GL
fffeb15e16 add 2024-10-20 15:41:40 +08:00
GL
2811ccaccf Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-20 15:40:40 +08:00
hyskai
74a127a61e add 2024-10-20 15:36:58 +08:00
GL
38404511fb Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-20 15:25:36 +08:00
hyskai
7fce11c5a4 add 2024-10-19 16:54:28 +08:00
c25411cb0f add 2024-10-19 03:01:21 +08:00
hyskai
f0fcfed2da add 2024-10-19 02:50:58 +08:00
hyskai
8eb002db50 add 2024-10-19 02:50:18 +08:00
448efd915e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Scenes/main_scene.unity.meta
#	meng_yao/Assets/communal.meta
2024-10-19 02:46:04 +08:00
d2d25d069d add 2024-10-19 02:41:26 +08:00
GL
b09ebeaff2 主界面 2024-10-19 02:39:27 +08:00
hyskai
ba15d26b24 add 2024-10-18 23:43:56 +08:00
hyskai
68dc7e80eb add 2024-10-18 23:16:30 +08:00
GL
bdf1344b26 啊大大。 2024-10-18 23:06:26 +08:00
7f137d6681 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-18 22:37:06 +08:00
97e322538c add 2024-10-18 22:33:49 +08:00
GL
b2e87ed535 add 2024-10-18 22:23:56 +08:00
GL
bccb56daf1 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/res/main_slices/主界面.png
2024-10-18 22:15:04 +08:00
GL
6451a74e15 add 2024-10-18 22:13:36 +08:00
hyskai
a4e0c4559a add 2024-10-18 22:07:51 +08:00
hyskai
43cecbdb97 add 2024-10-18 20:50:18 +08:00
hyskai
a26406e7c6 add 2024-10-18 20:46:37 +08:00
hyskai
87483ee227 add 2024-10-18 20:31:25 +08:00
hyskai
37051bf192 add 2024-10-18 20:27:16 +08:00
f127610077 add 2024-10-18 18:16:21 +08:00
70b20e31a0 add 2024-10-18 18:15:20 +08:00
30524183b5 add 2024-10-18 18:14:18 +08:00
747f9da564 add 2024-10-18 18:05:46 +08:00