shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
05c93d4ec3
Cute_demon_attacks/meng_yao/Assets/Prefabs
History
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
..
AssetsPanel.prefab add 2024-10-20 21:17:14 +08:00
AssetsPanel.prefab.meta 商店界面 2024-10-20 17:57:57 +08:00
buyingTalent.prefab add 2024-10-25 19:14:25 +08:00
buyingTalent.prefab.meta add 2024-10-25 19:14:25 +08:00
clanNumer.prefab add 2024-10-24 21:45:43 +08:00
clanNumer.prefab.meta add 2024-10-24 21:45:43 +08:00
Discount.prefab 商店界面 2024-10-20 17:57:57 +08:00
Discount.prefab.meta 商店界面 2024-10-20 17:57:57 +08:00
first_charge_2.prefab add 2024-10-25 19:14:26 +08:00
first_charge_2.prefab.meta add 2024-10-25 19:14:26 +08:00
first_charge.prefab add 2024-10-25 19:14:26 +08:00
first_charge.prefab.meta add 2024-10-25 19:14:26 +08:00
forging_item.prefab add 2024-10-24 15:52:42 +08:00
forging_item.prefab.meta add 2024-10-24 15:52:42 +08:00
head_photo.prefab add 2024-10-24 17:35:43 +08:00
head_photo.prefab.meta add 2024-10-24 17:35:43 +08:00
lock.prefab addd 2024-10-23 19:22:46 +08:00
lock.prefab.meta addd 2024-10-23 19:22:46 +08:00
MainFunctionPanel.prefab add 2024-10-20 21:11:00 +08:00
MainFunctionPanel.prefab.meta 主界面 2024-10-19 02:39:27 +08:00
minbtn.prefab add 2024-10-25 19:14:25 +08:00
minbtn.prefab.meta add 2024-10-24 10:48:04 +08:00
return_btn.prefab add 2024-10-24 17:35:43 +08:00
return_btn.prefab.meta add 2024-10-24 17:35:43 +08:00
ShopItem.prefab add 2024-10-24 17:35:43 +08:00
ShopItem.prefab.meta 商店界面 2024-10-20 17:57:57 +08:00
Wcological.prefab add 2024-10-25 19:14:26 +08:00
Wcological.prefab.meta add 2024-10-25 19:14:26 +08:00