You've already forked taptap2024_GJ_chidouren
Merge remote-tracking branch 'origin/MapXiaoXiong'
# Conflicts: # Assets/GameRes/Scenes/InitScene.unity
This commit is contained in:
8
Assets/GameRes/AutoSource/Part.meta
Normal file
8
Assets/GameRes/AutoSource/Part.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ba2e5310885598643851f1a417094c8d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
7724
Assets/GameRes/AutoSource/Part/Part1.prefab
Normal file
7724
Assets/GameRes/AutoSource/Part/Part1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part1.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 98030ba8188caef46945e068d5c4d1d3
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1436
Assets/GameRes/AutoSource/Part/Part2.prefab
Normal file
1436
Assets/GameRes/AutoSource/Part/Part2.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part2.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part2.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ea0a30a6565e64c4396be393ea2490eb
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1436
Assets/GameRes/AutoSource/Part/Part3.prefab
Normal file
1436
Assets/GameRes/AutoSource/Part/Part3.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameRes/AutoSource/Part/Part3.prefab.meta
Normal file
7
Assets/GameRes/AutoSource/Part/Part3.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8dc64110ad0cd6a4dbfe8ccb18663107
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dc9953bf48964825ac0d8e85c98e90e4
|
||||
timeCreated: 1719889198
|
||||
Reference in New Issue
Block a user