回滚提交
This commit is contained in:
307941
Assets/FR2_Cache.asset
Normal file
307941
Assets/FR2_Cache.asset
Normal file
File diff suppressed because it is too large
Load Diff
11
Assets/_MechanicalAge/Resources/~$银河守护者-湖北襄阳科技馆.xlsm.meta
Normal file
11
Assets/_MechanicalAge/Resources/~$银河守护者-湖北襄阳科技馆.xlsm.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/_MechanicalAge/Resources/银河守护者-乌兰浩特万达商场.xlsm.meta
|
||||
guid: 140161a20e06e3b4191f54ea9c903d3e
|
||||
========
|
||||
guid: febcceadde1652f43ba0591f29d3fa0a
|
||||
>>>>>>>> parent of 5d015d6e (Merge remote-tracking branch 'origin/main_ZYT'):Assets/_MechanicalAge/Resources/~$银河守护者-湖北襄阳科技馆.xlsm.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,5 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/_MechanicalAge/Resources/银河守护者-乌兰浩特万达商场.xlsm.meta
|
||||
guid: 140161a20e06e3b4191f54ea9c903d3e
|
||||
========
|
||||
guid: febcceadde1652f43ba0591f29d3fa0a
|
||||
>>>>>>>> parent of 5d015d6e (Merge remote-tracking branch 'origin/main_ZYT'):Assets/_MechanicalAge/Resources/~$银河守护者-湖北襄阳科技馆.xlsm.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/_MechanicalAge/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie/NavMesh.asset.meta
|
||||
guid: d971d023c271e8049a08780c03295036
|
||||
========
|
||||
guid: 916708e003318dc4f8bc796d94c431fc
|
||||
>>>>>>>> parent of 5d015d6e (Merge remote-tracking branch 'origin/main_ZYT'):Assets/FR2_Cache.asset.meta
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 23800000
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
Reference in New Issue
Block a user