diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index 00fcacf..45ebf13 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -34,3 +34,8 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5341383984788871445, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Settings/SampleSceneProfile.asset.meta b/Assets/Plugins/JMO Assets.meta similarity index 54% rename from Assets/Settings/SampleSceneProfile.asset.meta rename to Assets/Plugins/JMO Assets.meta index b82270c..7f5d022 100644 --- a/Assets/Settings/SampleSceneProfile.asset.meta +++ b/Assets/Plugins/JMO Assets.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 10fc4df2da32a41aaa32d77bc913491c -NativeFormatImporter: +guid: 976974e4d3018034e87caeb9f51f20f6 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset deleted file mode 100644 index c1b0f63..0000000 --- a/Assets/Settings/SampleSceneProfile.asset +++ /dev/null @@ -1,159 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7893295128165547882 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} - m_Name: Bloom - m_EditorClassIdentifier: - active: 1 - skipIterations: - m_OverrideState: 1 - m_Value: 0 - threshold: - m_OverrideState: 1 - m_Value: 1 - intensity: - m_OverrideState: 1 - m_Value: 0.25 - scatter: - m_OverrideState: 1 - m_Value: 0.5 - clamp: - m_OverrideState: 0 - m_Value: 65472 - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - highQualityFiltering: - m_OverrideState: 1 - m_Value: 1 - downscale: - m_OverrideState: 0 - m_Value: 0 - maxIterations: - m_OverrideState: 0 - m_Value: 6 - dirtTexture: - m_OverrideState: 0 - m_Value: {fileID: 0} - dimension: 1 - dirtIntensity: - m_OverrideState: 0 - m_Value: 0 ---- !u!114 &-3357603926938260329 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 899c54efeace73346a0a16faa3afe726, type: 3} - m_Name: Vignette - m_EditorClassIdentifier: - active: 1 - color: - m_OverrideState: 0 - m_Value: {r: 0, g: 0, b: 0, a: 1} - center: - m_OverrideState: 0 - m_Value: {x: 0.5, y: 0.5} - intensity: - m_OverrideState: 1 - m_Value: 0.2 - smoothness: - m_OverrideState: 0 - m_Value: 0.2 - rounded: - m_OverrideState: 0 - m_Value: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: SampleSceneProfile - m_EditorClassIdentifier: - components: - - {fileID: 849379129802519247} - - {fileID: -7893295128165547882} - - {fileID: 7391319092446245454} - - {fileID: -3357603926938260329} ---- !u!114 &849379129802519247 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} - m_Name: Tonemapping - m_EditorClassIdentifier: - active: 1 - mode: - m_OverrideState: 1 - m_Value: 1 - neutralHDRRangeReductionMode: - m_OverrideState: 0 - m_Value: 2 - acesPreset: - m_OverrideState: 0 - m_Value: 3 - hueShiftAmount: - m_OverrideState: 0 - m_Value: 0 - detectPaperWhite: - m_OverrideState: 1 - m_Value: 0 - paperWhite: - m_OverrideState: 1 - m_Value: 234 - detectBrightnessLimits: - m_OverrideState: 1 - m_Value: 1 - minNits: - m_OverrideState: 1 - m_Value: 0.005 - maxNits: - m_OverrideState: 1 - m_Value: 647 ---- !u!114 &7391319092446245454 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} - m_Name: MotionBlur - m_EditorClassIdentifier: - active: 0 - mode: - m_OverrideState: 0 - m_Value: 0 - quality: - m_OverrideState: 1 - m_Value: 2 - intensity: - m_OverrideState: 1 - m_Value: 0.6 - clamp: - m_OverrideState: 0 - m_Value: 0.05 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 533c140..6d046cd 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,7 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Scenes/Legacy/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 - enabled: 1 path: Assets/Scenes/NetworkTest.unity @@ -19,5 +19,4 @@ EditorBuildSettings: guid: 7afe0eb15714afe4cb7caee140008f5b m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: e4ca318d34698fe41ba99a765e54e4c2, type: 2} - com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 94c7611bb3f64b248940847af54844cf, type: 3} m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index a148e49..a9c37bc 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,8 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 4800000, guid: 6f27aac68f194270ad9353a4177fcf0a, type: 3} + - {fileID: 4800000, guid: 2a65a40305a962f458eb23b936f45b2c, type: 3} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ToonyColorsPro.json b/ProjectSettings/ToonyColorsPro.json new file mode 100644 index 0000000..583004e --- /dev/null +++ b/ProjectSettings/ToonyColorsPro.json @@ -0,0 +1,25 @@ +{ + "AutoNames": true, + "SubFolders": true, + "OverwriteConfig": false, + "LoadAllShaders": false, + "CustomOutputPath": "Assets/Map/Materials/Structure Materials", + "LastImplementationExportImportPath": "D:/Projects/Games/Project Reset/Assets", + "OpenedFoldouts": [ + "LIGHTING", + "STYLIZATION", + "SPECIAL EFFECTS", + "OPTIONS", + "TRANSPARENCY/BLENDING", + "SURFACE", + "SHADER STATES" + ], + "UseCustomFont": true, + "CustomFont": { + "fileID": 12800000, + "guid": "8a406076b7de34849be1f35585875a66", + "type": 3 + }, + "CustomFontInitialized": true, + "Upgrade_Hybrid1toHybrid2_Done": true +} \ No newline at end of file