Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop
This commit is contained in:
commit
88ac882f68
6
.gitignore
vendored
6
.gitignore
vendored
@ -98,11 +98,7 @@ Packages/com.distantlands.cozy.core/Samples~/Legacy Integrations/*.unitypackage.
|
|||||||
Assets/_DDD/_Addressables/Sprites/*
|
Assets/_DDD/_Addressables/Sprites/*
|
||||||
.autosave/
|
.autosave/
|
||||||
|
|
||||||
Assets/AddressableAssetsData/AssetGroups/
|
Assets/AddressableAssetsData/
|
||||||
Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
|
|
||||||
Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
|
|
||||||
Assets/AddressableAssetsData/AddressableAssetSettings.asset
|
|
||||||
Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
|
|
||||||
ProjectSettings/Packages/com.unity.probuilder/Settings.json
|
ProjectSettings/Packages/com.unity.probuilder/Settings.json
|
||||||
*.DotSettings
|
*.DotSettings
|
||||||
.vsconfig
|
.vsconfig
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: aae35240a94dde0429e214ff4f327227
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f804fe78e7005554f9ba60273aade35b
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 012f657ef2322a6499255e9c9c78a5a3
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: bc395fca191c52b4ea851fe83a40f16a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 08e47763d1d3ddc49a7fcb10ebe3b33e
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: b90bfb60ccafb7e4cb8900f9a52b89d7
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3ee9e3ad901c06e43af50dbd33b132b1
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/DefaultObject.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/DefaultObject.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 8aedbecfee36f6f47b57e6359672a64f
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 7ddc9a444b5824bcc9421fef5212845b
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d9a4d86327d0e384886ef63152a4778d
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 0b182ffdf506f3247a6c27b5196f69c6
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user