MeowmentArt主项目测试推送
This commit is contained in:
parent
ea529dc208
commit
f2b640c299
@ -1 +1 @@
|
||||
Subproject commit c6dee857ed48a68615fde76a67d4023a29be75c4
|
||||
Subproject commit 4f1f1ecf5065b3443d2c07f844735728f08dd823
|
||||
@ -19,7 +19,7 @@ MonoBehaviour:
|
||||
defaultInstantiateLoop: 1
|
||||
showHierarchyIcons: 1
|
||||
setTextureImporterSettings: 1
|
||||
textureSettingsReference:
|
||||
textureSettingsReference: Assets/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset
|
||||
blendModeMaterialMultiply: {fileID: 0}
|
||||
blendModeMaterialScreen: {fileID: 0}
|
||||
blendModeMaterialAdditive: {fileID: 0}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dfd4844d3390b814eaa08859bf39da0d
|
||||
guid: 1a95e7d4584b7e0498cb4b8545b276b3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
47860
Assets/Scenes/Decorate.unity
Normal file
47860
Assets/Scenes/Decorate.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/Decorate.unity.meta
Normal file
7
Assets/Scenes/Decorate.unity.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dfd4844d3390b814eaa08859bf39da0d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Sprites.meta
Normal file
8
Assets/Sprites.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7a619b8c9a4cdbe4791a32407fe55ed8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
16
ProjectSettings/TimelineSettings.asset
Normal file
16
ProjectSettings/TimelineSettings.asset
Normal file
@ -0,0 +1,16 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &1
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 53
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetDefaultFramerate: 60
|
||||
m_DefaultFrameRate: 60
|
||||
Loading…
Reference in New Issue
Block a user