diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta index 487e3cac..4cb9c104 100644 --- a/Assets/Plugins.meta +++ b/Assets/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08442478db0e36548b46ffd96e0cd8a4 +guid: 6fc7df2fb4b6a4945b5ea017d86a65cf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/ScheduleOne.meta b/Assets/Plugins/ScheduleOne.meta index dd992023..59f80217 100644 --- a/Assets/Plugins/ScheduleOne.meta +++ b/Assets/Plugins/ScheduleOne.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe988d8c2ad5abe47924337531905af4 +guid: 828b8c1c9371c284ea0cd4a04b8dbfd1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.Demo.dll.meta b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.Demo.dll.meta index 44f3fce8..959dd22e 100644 --- a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.Demo.dll.meta +++ b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.Demo.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 684f59f1d933a984abd62565dd392705 +guid: 1ab5d85eeee0b13bb05d6a24787e4694 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.InputSystemSupport.dll.meta b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.InputSystemSupport.dll.meta index feb75f7f..b4c463e9 100644 --- a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.InputSystemSupport.dll.meta +++ b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.InputSystemSupport.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: b9e1d9fa271686b458780750deeac1a0 +guid: 2b3651e1de64496effd571125492945b +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.dll.meta b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.dll.meta index 1fcd3760..5cb9788b 100644 --- a/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.dll.meta +++ b/Assets/Plugins/ScheduleOne/AeLa.EasyFeedback.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 4c36e074bde8c474d82c6502be2919b5 +guid: 112e070ee4e7513bf41ec30c0d97756c +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/AmplifyImpostors.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/AmplifyImpostors.Runtime.dll.meta index 094f6345..c2c82412 100644 --- a/Assets/Plugins/ScheduleOne/AmplifyImpostors.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/AmplifyImpostors.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 65aef68da54428e458b8127e2a31b320 +guid: bc7a2bfd4ae12cd0cbbf50a8bd13a688 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/AmplifyImpostors.dll.meta b/Assets/Plugins/ScheduleOne/AmplifyImpostors.dll.meta index cab4f170..0e417010 100644 --- a/Assets/Plugins/ScheduleOne/AmplifyImpostors.dll.meta +++ b/Assets/Plugins/ScheduleOne/AmplifyImpostors.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 3088b44883a065f4b91424e5fdf7fc4a +guid: 656cf83236e2143530ba2c644798736d +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Assembly-CSharp-firstpass.dll.meta b/Assets/Plugins/ScheduleOne/Assembly-CSharp-firstpass.dll.meta index 7e69f5ea..f96086d6 100644 --- a/Assets/Plugins/ScheduleOne/Assembly-CSharp-firstpass.dll.meta +++ b/Assets/Plugins/ScheduleOne/Assembly-CSharp-firstpass.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce4444bea52ab6349a36721fd259171d +guid: 1883f1b663a6e3a4bab07f8d87dc683d PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,6 +11,16 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude Win: 0 + Exclude Win64: 0 - first: Any: second: @@ -19,9 +29,35 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU - first: Windows Store Apps: WindowsStoreApps second: diff --git a/Assets/Plugins/ScheduleOne/AstarPathfindingProject.dll.meta b/Assets/Plugins/ScheduleOne/AstarPathfindingProject.dll.meta index 549554ba..810f0256 100644 --- a/Assets/Plugins/ScheduleOne/AstarPathfindingProject.dll.meta +++ b/Assets/Plugins/ScheduleOne/AstarPathfindingProject.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 1064674e3161efe4795434153f1a83dd +guid: a3825d626d49b4e8366365dfd9c12e64 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Autodesk.Fbx.dll.meta b/Assets/Plugins/ScheduleOne/Autodesk.Fbx.dll.meta index bdace540..55da0fec 100644 --- a/Assets/Plugins/ScheduleOne/Autodesk.Fbx.dll.meta +++ b/Assets/Plugins/ScheduleOne/Autodesk.Fbx.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 1238fcc692a9b5e40a8f39167e49438b +guid: 70c8d96c7c0cf79843e3d6bf686b9d52 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Boxophobic.AtmosphericHeightFog.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Boxophobic.AtmosphericHeightFog.Runtime.dll.meta index 8ea9188f..2556824c 100644 --- a/Assets/Plugins/ScheduleOne/Boxophobic.AtmosphericHeightFog.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/Boxophobic.AtmosphericHeightFog.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 665bf2f33b3ac60449782b58f2e3c1e5 +guid: e5d1c367d3fa1b147342e786569263b6 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Boxophobic.Utils.Scripts.dll.meta b/Assets/Plugins/ScheduleOne/Boxophobic.Utils.Scripts.dll.meta index b894c866..802995a1 100644 --- a/Assets/Plugins/ScheduleOne/Boxophobic.Utils.Scripts.dll.meta +++ b/Assets/Plugins/ScheduleOne/Boxophobic.Utils.Scripts.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 53ef20f0e3dd27849a5e76c284dbdc80 +guid: fe104cb540f410e1facdb78c5c305c4e +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Cinemachine.dll.meta b/Assets/Plugins/ScheduleOne/Cinemachine.dll.meta index 9b4ca9b3..c5a1928b 100644 --- a/Assets/Plugins/ScheduleOne/Cinemachine.dll.meta +++ b/Assets/Plugins/ScheduleOne/Cinemachine.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: d376b68969af8674c9ef9a16f50f97c2 +guid: 248a19188c2dffaa949fefc5fd6f973a +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/CorgiGodRays.dll.meta b/Assets/Plugins/ScheduleOne/CorgiGodRays.dll.meta index 3c3cedbd..3b5ca0a5 100644 --- a/Assets/Plugins/ScheduleOne/CorgiGodRays.dll.meta +++ b/Assets/Plugins/ScheduleOne/CorgiGodRays.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 77317683d5e3a254f9603d713b9ae372 +guid: 6a8d074da30c1eab1e5c1b6ebad4068e +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/EasyButtons.dll.meta b/Assets/Plugins/ScheduleOne/EasyButtons.dll.meta index 387a8101..57f55d0a 100644 --- a/Assets/Plugins/ScheduleOne/EasyButtons.dll.meta +++ b/Assets/Plugins/ScheduleOne/EasyButtons.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 5b9e5dc29a0c3ae45a4af3b1d70a3179 +guid: 793d292c1594f031c56c23dd775d4712 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Edgegap.dll.meta b/Assets/Plugins/ScheduleOne/Edgegap.dll.meta index 4dfb847f..e6ca1cbb 100644 --- a/Assets/Plugins/ScheduleOne/Edgegap.dll.meta +++ b/Assets/Plugins/ScheduleOne/Edgegap.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 39eac80c633a7264c87aa2a4725cfdd6 +guid: 6ae1346f7c804078a8a4509fe97f046b +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/FbxBuildTestAssets.dll.meta b/Assets/Plugins/ScheduleOne/FbxBuildTestAssets.dll.meta index e3e2dfca..5092019e 100644 --- a/Assets/Plugins/ScheduleOne/FbxBuildTestAssets.dll.meta +++ b/Assets/Plugins/ScheduleOne/FbxBuildTestAssets.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: b484694e27bcddb4bae54a0baf24aafc +guid: 4aef544d0b44661fa1507e78674dc455 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/FishNet.CodeAnalysis.dll.meta b/Assets/Plugins/ScheduleOne/FishNet.CodeAnalysis.dll.meta index 251b01a4..02876ad1 100644 --- a/Assets/Plugins/ScheduleOne/FishNet.CodeAnalysis.dll.meta +++ b/Assets/Plugins/ScheduleOne/FishNet.CodeAnalysis.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 5ee844cbe60a99c4fb670da1315f2bf6 +guid: 83aaffa981de19e17d06e6a0fb225725 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/FishNet.Demos.dll.meta b/Assets/Plugins/ScheduleOne/FishNet.Demos.dll.meta index f9afbf0a..702502e5 100644 --- a/Assets/Plugins/ScheduleOne/FishNet.Demos.dll.meta +++ b/Assets/Plugins/ScheduleOne/FishNet.Demos.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 604e18b6bfcb00a43ac0b95b52831f57 +guid: 9e6b79a1d4675da2a9104cff2a804727 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/FishNet.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/FishNet.Runtime.dll.meta index 034e117b..5cc8de7a 100644 --- a/Assets/Plugins/ScheduleOne/FishNet.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/FishNet.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 03534c54b8bf06c4582c469513b5492d +guid: 1f191796bb5acf747b48ef6cf55d4ccf +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/GameKit.Dependencies.dll.meta b/Assets/Plugins/ScheduleOne/GameKit.Dependencies.dll.meta index d48768d1..d35b6689 100644 --- a/Assets/Plugins/ScheduleOne/GameKit.Dependencies.dll.meta +++ b/Assets/Plugins/ScheduleOne/GameKit.Dependencies.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 7be7ccfa1d939eb498c2e65136a9f6fa +guid: 2c7dbe087f51370cff944bbda964d321 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/GameKit.Utilities.dll.meta b/Assets/Plugins/ScheduleOne/GameKit.Utilities.dll.meta index a91f5ce9..2dbe37b1 100644 --- a/Assets/Plugins/ScheduleOne/GameKit.Utilities.dll.meta +++ b/Assets/Plugins/ScheduleOne/GameKit.Utilities.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: f655bacd9155b6b41ba3b0efb8d6a9f0 +guid: 5d22075c738923094fb867c7f69d496b +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/HBAO.Demo.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/HBAO.Demo.Runtime.dll.meta index 718f79c9..977e6e40 100644 --- a/Assets/Plugins/ScheduleOne/HBAO.Demo.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/HBAO.Demo.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: cdae81b48859a2547b2ac3bc2915245b +guid: 0a58a93899bac142eaac00dd82144a4d +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/HBAO.Demo.Universal.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/HBAO.Demo.Universal.Runtime.dll.meta index 8dd56991..1a4db9e5 100644 --- a/Assets/Plugins/ScheduleOne/HBAO.Demo.Universal.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/HBAO.Demo.Universal.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 2b766c0618705d14683a70a03f26dc42 +guid: dce95b7bb3ca8c53bbec0f97815fe4f4 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/HBAO.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/HBAO.Runtime.dll.meta index aef111ab..95385be5 100644 --- a/Assets/Plugins/ScheduleOne/HBAO.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/HBAO.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 72845ec9d9567e0418b29df48fe63513 +guid: e329c3f98b1df86080fa0d9ac8069706 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/HBAO.Universal.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/HBAO.Universal.Runtime.dll.meta index cf20ef4f..f538f10d 100644 --- a/Assets/Plugins/ScheduleOne/HBAO.Universal.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/HBAO.Universal.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: fd2fcddf95328d94b959d3e6ba1d1dce +guid: b36de7c4fd83a4f0518cd53b5aa7931f +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/HSVPicker.dll.meta b/Assets/Plugins/ScheduleOne/HSVPicker.dll.meta index 37ed0323..acd55d7f 100644 --- a/Assets/Plugins/ScheduleOne/HSVPicker.dll.meta +++ b/Assets/Plugins/ScheduleOne/HSVPicker.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 4371c9917b5c79946a84d37fbf9adf2d +guid: c3a7a4536cc2aef1dfe68a91fe7f0b62 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/LokoSolo.PinchableScrollRect.dll.meta b/Assets/Plugins/ScheduleOne/LokoSolo.PinchableScrollRect.dll.meta index 2c525517..b6dd381e 100644 --- a/Assets/Plugins/ScheduleOne/LokoSolo.PinchableScrollRect.dll.meta +++ b/Assets/Plugins/ScheduleOne/LokoSolo.PinchableScrollRect.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: e48fe3a84fe20b84fa5f63f446fc8eb0 +guid: 2f9a5671b18d18352f2920f25b6cb87a +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Mono.Security.dll.meta b/Assets/Plugins/ScheduleOne/Mono.Security.dll.meta deleted file mode 100644 index fe861279..00000000 --- a/Assets/Plugins/ScheduleOne/Mono.Security.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a6dfdfc55e2dd4842929eca3ebf84bc8 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Newtonsoft.Json.dll.meta b/Assets/Plugins/ScheduleOne/Newtonsoft.Json.dll.meta index ea2a7ed9..b6aeed43 100644 --- a/Assets/Plugins/ScheduleOne/Newtonsoft.Json.dll.meta +++ b/Assets/Plugins/ScheduleOne/Newtonsoft.Json.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 6ba1555e3a99ab343be6063c99de26e2 +guid: e63744a55a356f07c2753641296e1f92 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Pathfinding.ClipperLib.dll.meta b/Assets/Plugins/ScheduleOne/Pathfinding.ClipperLib.dll.meta index bb200b40..68d65e91 100644 --- a/Assets/Plugins/ScheduleOne/Pathfinding.ClipperLib.dll.meta +++ b/Assets/Plugins/ScheduleOne/Pathfinding.ClipperLib.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: aca65e50f16bec049b4325fcefb66c2b +guid: ee10511591ecfcdc218885b572dd40a6 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Pathfinding.Ionic.Zip.Reduced.dll.meta b/Assets/Plugins/ScheduleOne/Pathfinding.Ionic.Zip.Reduced.dll.meta index 498ab81b..1515e449 100644 --- a/Assets/Plugins/ScheduleOne/Pathfinding.Ionic.Zip.Reduced.dll.meta +++ b/Assets/Plugins/ScheduleOne/Pathfinding.Ionic.Zip.Reduced.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: d48edc1044e24194296e1409917e14e8 +guid: 24d01fa34c32e3e5b52bcfe62e4f69c8 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Pathfinding.Poly2Tri.dll.meta b/Assets/Plugins/ScheduleOne/Pathfinding.Poly2Tri.dll.meta index 4ad6cdfc..96fe0b33 100644 --- a/Assets/Plugins/ScheduleOne/Pathfinding.Poly2Tri.dll.meta +++ b/Assets/Plugins/ScheduleOne/Pathfinding.Poly2Tri.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: b15426f8b45cfae48987b383f68495dc +guid: b77bcdda8a4de8d0d00fd9f0f2e7384e +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/RadiantGI.dll.meta b/Assets/Plugins/ScheduleOne/RadiantGI.dll.meta index 8a4c2cd5..4b4b853f 100644 --- a/Assets/Plugins/ScheduleOne/RadiantGI.dll.meta +++ b/Assets/Plugins/ScheduleOne/RadiantGI.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 62f46801e5159904cb1a2e69ea082a96 +guid: cdc6d5e9fec9962927804935676716c9 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/RootMotion.dll.meta b/Assets/Plugins/ScheduleOne/RootMotion.dll.meta index e8750869..41d4dfb4 100644 --- a/Assets/Plugins/ScheduleOne/RootMotion.dll.meta +++ b/Assets/Plugins/ScheduleOne/RootMotion.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: cb935eb9c34eea04db3b4588811a8be5 +guid: b032a67059f297f3bee00aab4a3ce85d +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/RuntimePreviewGenerator.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/RuntimePreviewGenerator.Runtime.dll.meta index 1d81afce..f4d99468 100644 --- a/Assets/Plugins/ScheduleOne/RuntimePreviewGenerator.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/RuntimePreviewGenerator.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 9e66673068d5a1e478dbd79668471ae4 +guid: 6cda9946fb2adba2fe252ef2ae70b0e2 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/StylizedWaterForURP.dll.meta b/Assets/Plugins/ScheduleOne/StylizedWaterForURP.dll.meta index 3833fc3a..1db420a2 100644 --- a/Assets/Plugins/ScheduleOne/StylizedWaterForURP.dll.meta +++ b/Assets/Plugins/ScheduleOne/StylizedWaterForURP.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 4e53c83fb900f814f953c4121f01b243 +guid: 5b10f4a12ebed0eb2c593f79ffd50d3b +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.AI.Navigation.dll.meta b/Assets/Plugins/ScheduleOne/Unity.AI.Navigation.dll.meta deleted file mode 100644 index f8488f4a..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.AI.Navigation.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: f33aaef80aef6c845a38fe3f0598434b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Burst.Unsafe.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Burst.Unsafe.dll.meta deleted file mode 100644 index 4bf5c9a6..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Burst.Unsafe.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 8e62210457eac2941aadecc9d931b185 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Burst.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Burst.dll.meta deleted file mode 100644 index 9cf0a07e..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Burst.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: bffa2025662e18a4e80d7b55d8f90a40 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Collections.LowLevel.ILSupport.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Collections.LowLevel.ILSupport.dll.meta deleted file mode 100644 index 140b75ec..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Collections.LowLevel.ILSupport.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2cd5be5be8d419245885e38ad5d0bc46 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Collections.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Collections.dll.meta deleted file mode 100644 index ca7f93af..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Collections.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b0ce895a2120d1e4dabaeab71b65b0f4 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Formats.Fbx.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Formats.Fbx.Runtime.dll.meta deleted file mode 100644 index 5f6913d6..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Formats.Fbx.Runtime.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 36f8fdc7503126b42a64873728347487 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.InputSystem.ForUI.dll.meta b/Assets/Plugins/ScheduleOne/Unity.InputSystem.ForUI.dll.meta deleted file mode 100644 index 24594b4f..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.InputSystem.ForUI.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 43338430f6258554a926606b67b4f762 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.InputSystem.RebindingUI.dll.meta b/Assets/Plugins/ScheduleOne/Unity.InputSystem.RebindingUI.dll.meta deleted file mode 100644 index 7779588e..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.InputSystem.RebindingUI.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4799be8dbbd726f41a60d069c00d9ca4 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.InputSystem.dll.meta b/Assets/Plugins/ScheduleOne/Unity.InputSystem.dll.meta deleted file mode 100644 index ef88aa54..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.InputSystem.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4f91e47c5fc08b544a73b31e26042f50 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Mathematics.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Mathematics.dll.meta deleted file mode 100644 index 909fe7cf..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Mathematics.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 7fb54d7d3030b5c4d999641955d11bbb -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.MemoryProfiler.dll.meta b/Assets/Plugins/ScheduleOne/Unity.MemoryProfiler.dll.meta deleted file mode 100644 index c526bf89..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.MemoryProfiler.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2395e99d6ded3c8409217240641280d0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Postprocessing.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Postprocessing.Runtime.dll.meta index 262a4c42..a6ab69f2 100644 --- a/Assets/Plugins/ScheduleOne/Unity.Postprocessing.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.Postprocessing.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 30a36e00c4f00f34d924cc3eb3767661 +guid: e161fae64b898bc22624d03ed611378f +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.ProGrids.dll.meta b/Assets/Plugins/ScheduleOne/Unity.ProGrids.dll.meta deleted file mode 100644 index 5ab3f7bb..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.ProGrids.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b436c11de1ba05d4c87902c86d4bab18 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipeline.Universal.ShaderLibrary.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipeline.Universal.ShaderLibrary.dll.meta index 82a74c2b..353e314f 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipeline.Universal.ShaderLibrary.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipeline.Universal.ShaderLibrary.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: c1fe19c046d8da34f9e96a98be0a873b +guid: 63b56368cfda4a6094baf9123f30bd22 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.Runtime.dll.meta index dccdc108..a42110bc 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 407f153bcec0b0f4c8078371553362be +guid: 57c9a3e5193e26c4b968cc86e528416d +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.ShaderLibrary.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.ShaderLibrary.dll.meta index c2b09d57..1797270f 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.ShaderLibrary.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Core.ShaderLibrary.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 113584bf34bf1cd458efe8b2b311439c +guid: e41a77bf8f26206001242b871055fcd5 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll.meta index 6bf94456..732b6377 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 4d85b826d2acab84abdeef9a96270913 +guid: d2363b1531aa08d22a23432cb68423e3 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Config.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Config.Runtime.dll.meta index 23ca5459..e0c41409 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Config.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Config.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 8496ceb0675a2f74e8141c962b21d2bc +guid: 669453fb8924da93f42bd2040a6b3f2d +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Runtime.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Runtime.dll.meta index 06d80e91..da8acab8 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 3f720ba87ef028548ba29ce91f19cb0b +guid: c88ab7b37c4f350242674d2efd621c19 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Shaders.dll.meta b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Shaders.dll.meta index e91f4c02..292de913 100644 --- a/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Shaders.dll.meta +++ b/Assets/Plugins/ScheduleOne/Unity.RenderPipelines.Universal.Shaders.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 55fe03b58eeed9647bbf5f09f29765bb +guid: 5fc41f5af4260e5ea4000d44e30d7315 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Analytics.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Analytics.dll.meta deleted file mode 100644 index 1d584467..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Analytics.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 365f610c13b0b154eb5107b5e6c35cfc -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.CloudDiagnostics.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.CloudDiagnostics.dll.meta deleted file mode 100644 index bf7fe558..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.CloudDiagnostics.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 51993e9a9691e1a4ba0119268f4fa269 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Analytics.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Analytics.dll.meta deleted file mode 100644 index 2e0e7172..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Analytics.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 9d45173ec2e27ce44ad2b9ab32d745b6 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Configuration.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Configuration.dll.meta deleted file mode 100644 index e2068fb2..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Configuration.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 66c5928226f31b143b55a3b2098603ba -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Device.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Device.dll.meta deleted file mode 100644 index b8c9577a..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Device.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: d3f40471a0c421f4abe199322c85b9cd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.Internal.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.Internal.dll.meta deleted file mode 100644 index 69f04336..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.Internal.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: fd6bbc167be4bc14d8563e110a249e19 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.dll.meta deleted file mode 100644 index a7929e62..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Environments.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 6c430cb897b9d044a86c5f7949ba4f95 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Internal.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Internal.dll.meta deleted file mode 100644 index 92d76239..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Internal.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 867aeab7ae395d044a22854e1f1a526f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Networking.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Networking.dll.meta deleted file mode 100644 index 36a20e74..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Networking.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b797bd99e00be4a4d92441d2354b3268 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Registration.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Registration.dll.meta deleted file mode 100644 index b5d5f417..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Registration.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 6f7425f48dc60ea41a3c43eafbd486cc -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Scheduler.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Scheduler.dll.meta deleted file mode 100644 index 6558565d..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Scheduler.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2b9425892791258439a8950c83bf7f26 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Telemetry.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Telemetry.dll.meta deleted file mode 100644 index 942475de..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Telemetry.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 5ec90e34e915bf24194144a5e41ab4e2 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Threading.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.Threading.dll.meta deleted file mode 100644 index bd9e45ec..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.Threading.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4cfb2f863550d3140b901ec14bd9c186 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Services.Core.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Services.Core.dll.meta deleted file mode 100644 index 6ba1dfa1..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Services.Core.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 739fc923f3a747545990fb4bfbc85b4b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.TerrainTools.dll.meta b/Assets/Plugins/ScheduleOne/Unity.TerrainTools.dll.meta deleted file mode 100644 index d7949ff6..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.TerrainTools.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b6c2d6463f7bd744aa19b91675fb66b8 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.TextMeshPro.dll.meta b/Assets/Plugins/ScheduleOne/Unity.TextMeshPro.dll.meta deleted file mode 100644 index 56bf8fc2..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.TextMeshPro.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a7eab95464826bd4f908cd73639326c8 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/Unity.Timeline.dll.meta b/Assets/Plugins/ScheduleOne/Unity.Timeline.dll.meta deleted file mode 100644 index 1784e31d..00000000 --- a/Assets/Plugins/ScheduleOne/Unity.Timeline.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: ff2738ef9da0369408ef7bb9d379547d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AIModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AIModule.dll.meta deleted file mode 100644 index 3d785111..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AIModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 89501b5663a0f86418aee5d4fb2d7f7c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ARModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ARModule.dll.meta deleted file mode 100644 index 099c6a81..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ARModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a9f81adbe9488c540b8ec208bc47490e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AccessibilityModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AccessibilityModule.dll.meta deleted file mode 100644 index bdd409fa..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AccessibilityModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: e5fc06d25e906be4395431df8b83d0f1 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AndroidJNIModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AndroidJNIModule.dll.meta deleted file mode 100644 index 1de7e870..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AndroidJNIModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4cf4093264b22624489b5d9416febba1 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AnimationModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AnimationModule.dll.meta deleted file mode 100644 index 764cc036..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AnimationModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 16fa6f31e0c8c75478748c92ec037681 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AssetBundleModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AssetBundleModule.dll.meta deleted file mode 100644 index adfad32d..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AssetBundleModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: c38e10e87e6554b4382b32198be1ef93 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.AudioModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.AudioModule.dll.meta deleted file mode 100644 index fe4038a7..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.AudioModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 0167e41a18b8be14da827c7372476a4e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ClothModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ClothModule.dll.meta deleted file mode 100644 index 426f7583..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ClothModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 1ed4ccc7614d1b349abdfcae5f4f3ac6 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ClusterInputModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ClusterInputModule.dll.meta deleted file mode 100644 index e2278511..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ClusterInputModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: e6e721bc29ec44e4da4c7c2513d228f5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ClusterRendererModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ClusterRendererModule.dll.meta deleted file mode 100644 index 4791737f..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ClusterRendererModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: d439d3700c2f8ee4a989075db77130c0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ContentLoadModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ContentLoadModule.dll.meta deleted file mode 100644 index 3b742cf6..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ContentLoadModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 457df05f178183140a4678e8b8426765 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.CoreModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.CoreModule.dll.meta deleted file mode 100644 index eb491b21..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.CoreModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: e75a814a61c53fe4ab0095c11112df8a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.CrashReportingModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.CrashReportingModule.dll.meta deleted file mode 100644 index df77ebd6..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.CrashReportingModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: f2fb672df52158440a2dca7d59298402 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.DSPGraphModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.DSPGraphModule.dll.meta deleted file mode 100644 index 5b1c7797..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.DSPGraphModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4b00fd64027eb7d41999b06b8355eecd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.DirectorModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.DirectorModule.dll.meta deleted file mode 100644 index 97934471..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.DirectorModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a80968d71cd22914e899db8536640230 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.GIModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.GIModule.dll.meta deleted file mode 100644 index d555c9ce..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.GIModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: f706b98276160a245aa59de6801f8d50 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.GameCenterModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.GameCenterModule.dll.meta deleted file mode 100644 index 7d0dd4c1..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.GameCenterModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: ec464ad5c9a998c4b8ebe0ba4951dd05 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.GridModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.GridModule.dll.meta deleted file mode 100644 index ebf3ec55..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.GridModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 49017b1437da45040a04c5920dd5d7cd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.HotReloadModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.HotReloadModule.dll.meta deleted file mode 100644 index e881c07b..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.HotReloadModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b0b80c80a02edc84284541e81e91dda0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.IMGUIModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.IMGUIModule.dll.meta deleted file mode 100644 index 65da5d9d..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.IMGUIModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 94c28b78d323661449f37b4edc93ec94 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ImageConversionModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ImageConversionModule.dll.meta deleted file mode 100644 index 8a26a9ee..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ImageConversionModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 19b5e4703b4af98428b7f9fdd0104194 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.InputLegacyModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.InputLegacyModule.dll.meta deleted file mode 100644 index d74f6a5f..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.InputLegacyModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 53c44172e81f604419029e3af9277cd3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.InputModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.InputModule.dll.meta deleted file mode 100644 index d477b03d..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.InputModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 0ffbc3d34f0509048aa0e0b2c18aad1d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.JSONSerializeModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.JSONSerializeModule.dll.meta deleted file mode 100644 index c668ac2c..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.JSONSerializeModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: bac7ba1aeb3f57e45b4ae2801ab5a241 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.LocalizationModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.LocalizationModule.dll.meta deleted file mode 100644 index f60cafcd..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.LocalizationModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 7c7727f467eb18f419b0321bb437bc2e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.NVIDIAModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.NVIDIAModule.dll.meta deleted file mode 100644 index b9bd0a0a..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.NVIDIAModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 9697d418c6e9abf4a977f51cb1633650 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ParticleSystemModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ParticleSystemModule.dll.meta deleted file mode 100644 index 6ea9f7ba..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ParticleSystemModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a59bdc5622217724eac98193640b7934 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.PerformanceReportingModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.PerformanceReportingModule.dll.meta deleted file mode 100644 index 55b75592..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.PerformanceReportingModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2c8a403ce306736488b3238c0bc006d0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.Physics2DModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.Physics2DModule.dll.meta deleted file mode 100644 index e64cca3b..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.Physics2DModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2fa4adbc5356be14599d7a9d9065fb45 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.PhysicsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.PhysicsModule.dll.meta deleted file mode 100644 index c2e3d44a..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.PhysicsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 8485a8b447c21764dbdccb2dfe9a227d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ProfilerModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ProfilerModule.dll.meta deleted file mode 100644 index 8555a33e..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ProfilerModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a570e6d88364acd4a8bd5165e5c73552 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.PropertiesModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.PropertiesModule.dll.meta deleted file mode 100644 index 4f16d078..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.PropertiesModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 31c96fb0ddc9a9a42b18be83653564db -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll.meta deleted file mode 100644 index 84036f00..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: eac751827f1b52647965dd1feb285896 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.ScreenCaptureModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.ScreenCaptureModule.dll.meta deleted file mode 100644 index 2547d602..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.ScreenCaptureModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b271d374b8a169f44aa7c16dda513191 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.SharedInternalsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.SharedInternalsModule.dll.meta deleted file mode 100644 index f80e6b22..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.SharedInternalsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 079b6c913b8e9f646a584eb247c11715 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.SpriteMaskModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.SpriteMaskModule.dll.meta deleted file mode 100644 index 9e7114f2..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.SpriteMaskModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 91971a274a434f642a228abcafef5d8b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.SpriteShapeModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.SpriteShapeModule.dll.meta deleted file mode 100644 index 231d3aac..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.SpriteShapeModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 5353328924f7c2f42860fa1d653f7d4b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.StreamingModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.StreamingModule.dll.meta deleted file mode 100644 index 56a8ed2d..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.StreamingModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: ac5b47d4662a70140a703f60439f52c1 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.SubstanceModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.SubstanceModule.dll.meta deleted file mode 100644 index 9595e07f..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.SubstanceModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4ecc65c9eef136644951be06f6692380 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.SubsystemsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.SubsystemsModule.dll.meta deleted file mode 100644 index 6dd49df4..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.SubsystemsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 76aa8590cc16af5428137327079d6a92 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TLSModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TLSModule.dll.meta deleted file mode 100644 index 51f06aad..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TLSModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 36934cb748e832e4d8c91c976a3806fc -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TerrainModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TerrainModule.dll.meta deleted file mode 100644 index a2b08d7e..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TerrainModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 654a7ba19d86ef04caa2da096161bb63 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TerrainPhysicsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TerrainPhysicsModule.dll.meta deleted file mode 100644 index 0c68bf87..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TerrainPhysicsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a1e71ad626e27fd4db328889a0cdf483 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreFontEngineModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreFontEngineModule.dll.meta deleted file mode 100644 index a53bfab5..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreFontEngineModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a7ae9b0147c3bd441901267e7187abb6 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreTextEngineModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreTextEngineModule.dll.meta deleted file mode 100644 index 83f8e456..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TextCoreTextEngineModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 600ba0d0600499a44998e660fb7aba1a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TextRenderingModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TextRenderingModule.dll.meta deleted file mode 100644 index da25aa4b..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TextRenderingModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 1da41f76fb6f0c34f920d54943938920 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.TilemapModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.TilemapModule.dll.meta deleted file mode 100644 index 54d5e654..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.TilemapModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 233636f4a68bf1140afd87349f0737e5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UI.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UI.dll.meta deleted file mode 100644 index f6cfa8d9..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UI.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a212264085df964449b94881a914b9db -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UIElementsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UIElementsModule.dll.meta deleted file mode 100644 index e3e9c7dd..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UIElementsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: cac2612d09dd71c4d8efd75d3bbcafbb -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UIModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UIModule.dll.meta deleted file mode 100644 index 4de1a1a3..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UIModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a9efc5cc39aa82c4bb16ffc76d12f737 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UmbraModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UmbraModule.dll.meta deleted file mode 100644 index 54ec3f71..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UmbraModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 3e333398335d78f4cad73bbf0ef191fb -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsCommonModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsCommonModule.dll.meta deleted file mode 100644 index fd5d82c6..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsCommonModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: be57ea01034642348a3fe1cd48518e50 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsModule.dll.meta deleted file mode 100644 index de965750..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityAnalyticsModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: ab6ff278dfc81524896f47cca5f2aa87 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityConnectModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityConnectModule.dll.meta deleted file mode 100644 index 0a202ace..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityConnectModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: d1b6a98c07c99244e823caeae9e60019 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityCurlModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityCurlModule.dll.meta deleted file mode 100644 index ce1ecc57..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityCurlModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 1cae6f4c262eac54db806be5e91f540b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityTestProtocolModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityTestProtocolModule.dll.meta deleted file mode 100644 index ad05a687..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityTestProtocolModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b8ea9d50aff7b4147974d3b368d5b6f3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAssetBundleModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAssetBundleModule.dll.meta deleted file mode 100644 index a66b5542..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAssetBundleModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4d5d51f8a5ca80544b88f283ddbd3305 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAudioModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAudioModule.dll.meta deleted file mode 100644 index 7a8d3fde..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestAudioModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 9119276726f9cbc42815096a984d2d00 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestModule.dll.meta deleted file mode 100644 index 07aeb988..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 4fd90c1626e36be4080d25bc518aec45 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestTextureModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestTextureModule.dll.meta deleted file mode 100644 index 7cedd07f..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestTextureModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: ed05bcd0dc7dad04bb3bcf6772413acc -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestWWWModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestWWWModule.dll.meta deleted file mode 100644 index 4d13dbb0..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.UnityWebRequestWWWModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 7b63d02d1457f75448dfb1d29b776d01 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.VFXModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.VFXModule.dll.meta deleted file mode 100644 index 3e97e67a..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.VFXModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 2985c1477fe6dab4f942496424682199 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.VRModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.VRModule.dll.meta deleted file mode 100644 index 0671e8b2..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.VRModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 6a75fe31f55fa824faedff592923553e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.VehiclesModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.VehiclesModule.dll.meta deleted file mode 100644 index cdf68b9c..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.VehiclesModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a4f52652bc07ea3408ee26dc77f73353 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.VideoModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.VideoModule.dll.meta deleted file mode 100644 index 7ac1f575..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.VideoModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b1807ccf2e7b8b0489f2e3b1fd8c6ca9 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.VirtualTexturingModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.VirtualTexturingModule.dll.meta deleted file mode 100644 index 3e8d331e..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.VirtualTexturingModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a01e4815a85b7a34a8121cb5852a0685 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.WindModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.WindModule.dll.meta deleted file mode 100644 index acb0aca8..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.WindModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: b682df7df6f1b7449a9552124335e5f3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/UnityEngine.XRModule.dll.meta b/Assets/Plugins/ScheduleOne/UnityEngine.XRModule.dll.meta deleted file mode 100644 index 2c2acecb..00000000 --- a/Assets/Plugins/ScheduleOne/UnityEngine.XRModule.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: af48f1054c16e964b81932f0aa457356 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/VisualDesignCafe.Nature.dll.meta b/Assets/Plugins/ScheduleOne/VisualDesignCafe.Nature.dll.meta index 97ca96ba..6f67b68d 100644 --- a/Assets/Plugins/ScheduleOne/VisualDesignCafe.Nature.dll.meta +++ b/Assets/Plugins/ScheduleOne/VisualDesignCafe.Nature.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 458dba7078d48a342a5e243bf5e7c568 +guid: 3291608ac9c0d477a9e2eabb7764189a +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/VisualDesignCafe.Packages.dll.meta b/Assets/Plugins/ScheduleOne/VisualDesignCafe.Packages.dll.meta index b71164f9..2e26431c 100644 --- a/Assets/Plugins/ScheduleOne/VisualDesignCafe.Packages.dll.meta +++ b/Assets/Plugins/ScheduleOne/VisualDesignCafe.Packages.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: ac06bce09580ed943b0fb65c0452ce03 +guid: 222cfe96d8c88801774ddde87f76b5e3 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/VisualDesignCafe.ShaderX.dll.meta b/Assets/Plugins/ScheduleOne/VisualDesignCafe.ShaderX.dll.meta index 3f0719a8..80c713e2 100644 --- a/Assets/Plugins/ScheduleOne/VisualDesignCafe.ShaderX.dll.meta +++ b/Assets/Plugins/ScheduleOne/VisualDesignCafe.ShaderX.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 9748a5031b6b63c448e817f11c1d5af6 +guid: afbd391bd2ee2355005b64f5f3fee8ec +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/com.rlabrecque.steamworks.net.dll.meta b/Assets/Plugins/ScheduleOne/com.rlabrecque.steamworks.net.dll.meta index e85e4e80..5605a97f 100644 --- a/Assets/Plugins/ScheduleOne/com.rlabrecque.steamworks.net.dll.meta +++ b/Assets/Plugins/ScheduleOne/com.rlabrecque.steamworks.net.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 68d63d451b18a8c4fa10ccc37beff0c0 +guid: 36210fec9108ab21ed73dec2ced14ec9 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/sc.stylizedgrass.runtime.dll.meta b/Assets/Plugins/ScheduleOne/sc.stylizedgrass.runtime.dll.meta index 375cc6f2..42f93957 100644 --- a/Assets/Plugins/ScheduleOne/sc.stylizedgrass.runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/sc.stylizedgrass.runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: fe3493a4dece5d940abdb8bea7b6a427 +guid: 135a72e61202ca134ba4bfdc31fa50da +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ScheduleOne/sc.stylizedwater2.runtime.dll.meta b/Assets/Plugins/ScheduleOne/sc.stylizedwater2.runtime.dll.meta index 659d7080..e2f33490 100644 --- a/Assets/Plugins/ScheduleOne/sc.stylizedwater2.runtime.dll.meta +++ b/Assets/Plugins/ScheduleOne/sc.stylizedwater2.runtime.dll.meta @@ -1,18 +1,20 @@ fileFormatVersion: 2 -guid: 3b09e531d51f9ba4283b0ec4a2d0d4d9 +guid: 99a41f8d0e4fbc2f70c52fbe2a837468 +timeCreated: 1744220834 +licenseType: Free PluginImporter: - externalObjects: {} serializedVersion: 2 + externalObjects: {} iconMap: {} executionOrder: {} defineConstraints: [] isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 - validateReferences: 1 + validateReferences: 0 platformData: - first: - Any: + Any: second: enabled: 1 settings: {} @@ -21,13 +23,10 @@ PluginImporter: second: enabled: 0 settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + - DefaultValueInitialized: true + output: + dllType: 0 + scriptingRuntimeVersion: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta index 188158f0..7e2fac6f 100644 --- a/Assets/Scripts.meta +++ b/Assets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9f75510b415acad468c21963311add89 +guid: cc6d85053dc33dc4aaac44d0056fb344 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ACpipeModular.cs b/Assets/Scripts/ACpipeModular.cs index dcd4ee66..fd380714 100644 --- a/Assets/Scripts/ACpipeModular.cs +++ b/Assets/Scripts/ACpipeModular.cs @@ -1,26 +1,29 @@ -[global::UnityEngine.ExecuteInEditMode] -public class ACpipeModular : global::UnityEngine.MonoBehaviour +using System.Collections.Generic; +using UnityEngine; + +[ExecuteInEditMode] +public class ACpipeModular : MonoBehaviour { - [global::UnityEngine.HideInInspector] - public global::System.Collections.Generic.List itemsList; + [HideInInspector] + public List itemsList; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.GameObject largeACPipe; + [HideInInspector] + public GameObject largeACPipe; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.GameObject smallACpipe; + [HideInInspector] + public GameObject smallACpipe; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.GameObject innerCorner; + [HideInInspector] + public GameObject innerCorner; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.GameObject outerCorner; + [HideInInspector] + public GameObject outerCorner; private void Start() { } - public void BuildNextItem(global::UnityEngine.GameObject item) + public void BuildNextItem(GameObject item) { } diff --git a/Assets/Scripts/ACpipeModular.cs.meta b/Assets/Scripts/ACpipeModular.cs.meta index 2321f2f6..9f04e56d 100644 --- a/Assets/Scripts/ACpipeModular.cs.meta +++ b/Assets/Scripts/ACpipeModular.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2f7163427a69bc01e79882515fb71927 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem.meta b/Assets/Scripts/AdvancedPeopleSystem.meta index 78023aed..833dae5c 100644 --- a/Assets/Scripts/AdvancedPeopleSystem.meta +++ b/Assets/Scripts/AdvancedPeopleSystem.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bf7c441d1836b34bb239f7c49d221e9 +guid: 4fe88511dca6eb4479cf7bed59710bca folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs b/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs index 62ce130d..23b4c11f 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs @@ -1,13 +1,16 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class BlendshapeEmotionValue { - public global::AdvancedPeopleSystem.CharacterBlendShapeType BlendType; + public CharacterBlendShapeType BlendType; - [global::UnityEngine.Range(-100f, 100f)] + [Range(-100f, 100f)] public float BlendValue; - public global::UnityEngine.AnimationCurve BlendAnimationCurve; + public AnimationCurve BlendAnimationCurve; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs.meta index 4360f44d..c992d3d2 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/BlendshapeEmotionValue.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29257981012a6fd498a0b14878930463 +guid: 0eac72e08b74f8244bac427aa7ed0049 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/BodyColorPart.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/BodyColorPart.cs.meta index 9c50521e..fc646074 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/BodyColorPart.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/BodyColorPart.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5789c2b642d7814faa175ce5177684e +guid: b593a3e2ac3d98a44b5ff5a888578f72 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs index 6eb2c3e7..a7d54c17 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs @@ -1,23 +1,27 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterAnimationPreset { public string name; - public global::System.Collections.Generic.List blendshapes; + public List blendshapes; public bool UseGlobalBlendCurve; - public global::UnityEngine.AnimationCurve GlobalBlendAnimationCurve; + public AnimationCurve GlobalBlendAnimationCurve; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float AnimationPlayDuration; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float weightPower; - [global::UnityEngine.Header("May decrease performance")] + [Header("May decrease performance")] public bool applyToAllCharacterMeshes; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs.meta index 51227140..44694e3e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterAnimationPreset.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b93240eaf0f00c245aff4676b7722fe6 +guid: 3dd417a791b5f0745bd612d32998b6c3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeGroup.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeGroup.cs.meta index 15cfc77d..59546118 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeGroup.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71ed36bbad507df40ae5ee108304b355 +guid: ed0a15481c539d648a0d0a54d5046774 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeType.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeType.cs.meta index c9f94e79..1382d3df 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeType.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendShapeType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b0cfa341e330f940bc3fc152798b112 +guid: d7d303227113a794b87023ffc144c125 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs index 25e1b442..255973d0 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs @@ -1,18 +1,21 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterBlendshapeData { public string blendshapeName; - public global::AdvancedPeopleSystem.CharacterBlendShapeType type; + public CharacterBlendShapeType type; - public global::AdvancedPeopleSystem.CharacterBlendShapeGroup group; + public CharacterBlendShapeGroup group; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float value; - public CharacterBlendshapeData(string name, global::AdvancedPeopleSystem.CharacterBlendShapeType t, global::AdvancedPeopleSystem.CharacterBlendShapeGroup g, float value = 0f) + public CharacterBlendshapeData(string name, CharacterBlendShapeType t, CharacterBlendShapeGroup g, float value = 0f) { } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs.meta index d7347273..fc584191 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterBlendshapeData.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a129995df1214942a9a06317b9d3af4 +guid: 2596222bd4ab24146a3823e857f58013 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs index 62c46842..afa370cb 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs @@ -1,33 +1,36 @@ +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::UnityEngine.DisallowMultipleComponent] - [global::UnityEngine.AddComponentMenu("Advanced People Pack/Character Customizable", -1)] - public class CharacterCustomization : global::UnityEngine.MonoBehaviour + [DisallowMultipleComponent] + [AddComponentMenu("Advanced People Pack/Character Customizable", -1)] + public class CharacterCustomization : MonoBehaviour { - [global::UnityEngine.SerializeField] + [SerializeField] public bool isSettingsExpanded; - public global::AdvancedPeopleSystem.CharacterSettings selectedsettings; + public CharacterSettings selectedsettings; - [global::UnityEngine.SerializeField] - private global::AdvancedPeopleSystem.CharacterSettings _settings; + [SerializeField] + private CharacterSettings _settings; - public global::System.Collections.Generic.List characterParts; + public List characterParts; public string prefabPath; - [global::UnityEngine.SerializeField] - public global::AdvancedPeopleSystem.CharacterInstanceStatus instanceStatus; + [SerializeField] + public CharacterInstanceStatus instanceStatus; - public global::UnityEngine.Transform originHip; + public Transform originHip; - public global::UnityEngine.Transform headHip; + public Transform headHip; - public global::System.Collections.Generic.List clothesAnchors; + public List clothesAnchors; - public global::UnityEngine.Animator animator; + public Animator animator; - public global::AdvancedPeopleSystem.CharacterSelectedElements characterSelectedElements; + public CharacterSelectedElements characterSelectedElements; public float heightValue; @@ -35,51 +38,51 @@ public class CharacterCustomization : global::UnityEngine.MonoBehaviour public float feetOffset; - public global::System.Collections.Generic.List characterBlendshapeDatas; + public List characterBlendshapeDatas; - public global::UnityEngine.Color Skin; + public Color Skin; - public global::UnityEngine.Color Eye; + public Color Eye; - public global::UnityEngine.Color Hair; + public Color Hair; - public global::UnityEngine.Color Underpants; + public Color Underpants; - public global::UnityEngine.Color OralCavity; + public Color OralCavity; - public global::UnityEngine.Color Teeth; + public Color Teeth; - public global::UnityEngine.MaterialPropertyBlock bodyPropertyBlock; + public MaterialPropertyBlock bodyPropertyBlock; - public global::AdvancedPeopleSystem.CurrentBlendshapeAnimation currentBlendshapeAnimation; + public CurrentBlendshapeAnimation currentBlendshapeAnimation; - public global::AdvancedPeopleSystem.CombinerState CurrentCombinerState; + public CombinerState CurrentCombinerState; - public global::AdvancedPeopleSystem.CharacterPreBuilt combinedCharacter; + public CharacterPreBuilt combinedCharacter; - public global::UnityEngine.Transform ProbesAnchorOverride; + public Transform ProbesAnchorOverride; - public global::AdvancedPeopleSystem.CharacterGeneratorSettings CharacterGenerator_settings; + public CharacterGeneratorSettings CharacterGenerator_settings; public bool UpdateWhenOffscreenMeshes; - [global::UnityEngine.SerializeField] + [SerializeField] public int MinLODLevels; - [global::UnityEngine.SerializeField] + [SerializeField] public int MaxLODLevels; - private global::UnityEngine.LODGroup _lodGroup; + private LODGroup _lodGroup; - public global::UnityEngine.Transform _transform; + public Transform _transform; public bool applyFeetOffset; public bool notAPP2Shader; - private global::UnityEngine.GameObject prebuiltPrefab; + private GameObject prebuiltPrefab; - public global::AdvancedPeopleSystem.CharacterSettings Settings => null; + public CharacterSettings Settings => null; private void Awake() { @@ -105,7 +108,7 @@ public void SwitchCharacterSettings(string selectorName) { } - public void InitializeMeshes(global::AdvancedPeopleSystem.CharacterSettings newSettings = null, bool resetAll = true) + public void InitializeMeshes(CharacterSettings newSettings = null, bool resetAll = true) { } @@ -113,7 +116,7 @@ public void UpdateSkinnedMeshesOffscreenBounds() { } - public global::System.Collections.Generic.List GetCharacterSettingsSelectors() + public List GetCharacterSettingsSelectors() { return null; } @@ -130,7 +133,7 @@ public void ResetBodyColors() { } - public void SetBlendshapeValue(global::AdvancedPeopleSystem.CharacterBlendShapeType type, float weight, string[] forPart = null, global::AdvancedPeopleSystem.CharacterElementType[] forClothPart = null) + public void SetBlendshapeValue(CharacterBlendShapeType type, float weight, string[] forPart = null, CharacterElementType[] forClothPart = null) { } @@ -138,11 +141,11 @@ public void ForceLOD(int lodLevel) { } - public void SetElementByIndex(global::AdvancedPeopleSystem.CharacterElementType type, int index) + public void SetElementByIndex(CharacterElementType type, int index) { } - public void ClearElement(global::AdvancedPeopleSystem.CharacterElementType type) + public void ClearElement(CharacterElementType type) { } @@ -154,7 +157,7 @@ public void SetHeadSize(float size) { } - public void SetFeetOffset(global::UnityEngine.Vector3 offset) + public void SetFeetOffset(Vector3 offset) { } @@ -166,27 +169,27 @@ private void SetBeardByIndex(int index) { } - public global::AdvancedPeopleSystem.ClothesAnchor GetClothesAnchor(global::AdvancedPeopleSystem.CharacterElementType type) + public ClothesAnchor GetClothesAnchor(CharacterElementType type) { return null; } - public global::AdvancedPeopleSystem.CharacterPart GetCharacterPart(string name) + public CharacterPart GetCharacterPart(string name) { return null; } - public global::System.Collections.Generic.List GetAllMeshesByLod(int lod) + public List GetAllMeshesByLod(int lod) { return null; } - public global::System.Collections.Generic.List GetAllMeshes() + public List GetAllMeshes() { return null; } - public global::System.Collections.Generic.List GetAllMeshes(bool onlyBodyMeshes = false, string[] excludeNames = null) + public List GetAllMeshes(bool onlyBodyMeshes = false, string[] excludeNames = null) { return null; } @@ -195,29 +198,29 @@ public void HideParts(string[] parts) { } - public void UnHideParts(string[] parts, global::AdvancedPeopleSystem.CharacterElementType hidePartsForElement) + public void UnHideParts(string[] parts, CharacterElementType hidePartsForElement) { } - public void SetBodyColor(global::AdvancedPeopleSystem.BodyColorPart bodyColorPart, global::UnityEngine.Color color) + public void SetBodyColor(BodyColorPart bodyColorPart, Color color) { } - public global::UnityEngine.Color GetBodyColor(global::AdvancedPeopleSystem.BodyColorPart bodyColorPart) + public Color GetBodyColor(BodyColorPart bodyColorPart) { - return default(global::UnityEngine.Color); + return default(Color); } - public void SetCharacterSetup(global::AdvancedPeopleSystem.CharacterCustomizationSetup characterCustomizationSetup) + public void SetCharacterSetup(CharacterCustomizationSetup characterCustomizationSetup) { } - public global::AdvancedPeopleSystem.CharacterCustomizationSetup GetSetup() + public CharacterCustomizationSetup GetSetup() { return null; } - public void ApplySavedCharacterData(global::AdvancedPeopleSystem.SavedCharacterData data) + public void ApplySavedCharacterData(SavedCharacterData data) { } @@ -225,12 +228,12 @@ public void LoadCharacterFromFile(string path) { } - public global::System.Collections.Generic.List GetSavedCharacterDatas(string path = "") + public List GetSavedCharacterDatas(string path = "") { return null; } - public void ClearSavedData(global::AdvancedPeopleSystem.SavedCharacterData data) + public void ClearSavedData(SavedCharacterData data) { } @@ -238,7 +241,7 @@ public void ClearSavedData() { } - public void SaveCharacterToFile(global::AdvancedPeopleSystem.CharacterCustomizationSetup.CharacterFileSaveFormat format, string path = "", string name = "") + public void SaveCharacterToFile(CharacterCustomizationSetup.CharacterFileSaveFormat format, string path = "", string name = "") { } @@ -271,17 +274,17 @@ public bool IsBaked() return false; } - public global::AdvancedPeopleSystem.CharacterElementsPreset GetElementsPreset(global::AdvancedPeopleSystem.CharacterElementType type, int index) + public CharacterElementsPreset GetElementsPreset(CharacterElementType type, int index) { return null; } - public global::AdvancedPeopleSystem.CharacterElementsPreset GetElementsPreset(global::AdvancedPeopleSystem.CharacterElementType type, string name) + public CharacterElementsPreset GetElementsPreset(CharacterElementType type, string name) { return null; } - public global::System.Collections.Generic.List GetElementsPresets(global::AdvancedPeopleSystem.CharacterElementType type) + public List GetElementsPresets(CharacterElementType type) { return null; } @@ -302,7 +305,7 @@ public void Randomize() { } - public global::UnityEngine.Animator GetAnimator() + public Animator GetAnimator() { return null; } @@ -331,31 +334,31 @@ public void UpdateActualCharacterInstanceStatus(bool igroneUserNonPrefab = false { } - public global::AdvancedPeopleSystem.CharacterInstanceStatus GetCharacterInstanceStatus() + public CharacterInstanceStatus GetCharacterInstanceStatus() { - return default(global::AdvancedPeopleSystem.CharacterInstanceStatus); + return default(CharacterInstanceStatus); } - public void SetNewCharacterInstanceStatus(global::AdvancedPeopleSystem.CharacterInstanceStatus characterInstanceStatus) + public void SetNewCharacterInstanceStatus(CharacterInstanceStatus characterInstanceStatus) { } - public global::AdvancedPeopleSystem.CharacterBlendshapeData GetBlendshapeData(global::AdvancedPeopleSystem.CharacterBlendShapeType type) + public CharacterBlendshapeData GetBlendshapeData(CharacterBlendShapeType type) { return null; } - public global::AdvancedPeopleSystem.CharacterBlendshapeData GetBlendshapeData(string name) + public CharacterBlendshapeData GetBlendshapeData(string name) { return null; } - public global::System.Collections.Generic.List GetBlendshapeDatasByGroup(global::AdvancedPeopleSystem.CharacterBlendShapeGroup group) + public List GetBlendshapeDatasByGroup(CharacterBlendShapeGroup group) { return null; } - private void DestroyObjects(global::UnityEngine.Object[] objects) + private void DestroyObjects(Object[] objects) { } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs.meta index 7e1e48e4..0b128cb5 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomization.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3743019ea4a63c7151605aeafda36a69 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs index 251fa9f8..d25ff284 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs @@ -1,38 +1,45 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace AdvancedPeopleSystem { public class CharacterCustomizationCombiner { private class MeshInstance { - public global::System.Collections.Generic.Dictionary> combine_instances; + public Dictionary> combine_instances; - public global::System.Collections.Generic.List unique_materials; + public List unique_materials; - public global::UnityEngine.Mesh combined_new_mesh; + public Mesh combined_new_mesh; - public global::System.Collections.Generic.List combined_vertices; + public List combined_vertices; - public global::System.Collections.Generic.List combined_uv; + public List combined_uv; - public global::System.Collections.Generic.List combined_uv2; + public List combined_uv2; - public global::System.Collections.Generic.List combined_uv3; + public List combined_uv3; - public global::System.Collections.Generic.List combined_uv4; + public List combined_uv4; - public global::System.Collections.Generic.List normals; + public List normals; - public global::System.Collections.Generic.List tangents; + public List tangents; - public global::System.Collections.Generic.Dictionary> combined_submesh_indices; + public Dictionary> combined_submesh_indices; - public global::System.Collections.Generic.List combined_bone_weights; + public List combined_bone_weights; - public global::System.Collections.Generic.List blendShapeNames; + public List blendShapeNames; - public global::System.Collections.Generic.List blendShapeValues; + public List blendShapeValues; - public global::System.Collections.Generic.Dictionary vertex_offset_map; + public Dictionary vertex_offset_map; public int vertex_index_offset; @@ -41,30 +48,30 @@ private class MeshInstance private struct CombineInstanceWithSM { - public global::UnityEngine.SkinnedMeshRenderer skinnedMesh; + public SkinnedMeshRenderer skinnedMesh; - public global::UnityEngine.CombineInstance instance; + public CombineInstance instance; } private struct BlendWeightData { - public global::UnityEngine.Vector3[] deltaVerts; + public Vector3[] deltaVerts; - public global::UnityEngine.Vector3[] deltaNormals; + public Vector3[] deltaNormals; - public global::UnityEngine.Vector3[] deltaTangents; + public Vector3[] deltaTangents; } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CBlendshapeTransfer_003Ed__11 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CBlendshapeTransfer_003Ed__11 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::AdvancedPeopleSystem.CharacterCustomizationCombiner.MeshInstance meshInstance; + public MeshInstance meshInstance; - public global::UnityEngine.SkinnedMeshRenderer smr; + public SkinnedMeshRenderer smr; public float waitTime; @@ -72,35 +79,35 @@ private sealed class _003CBlendshapeTransfer_003Ed__11 : global::System.Collecti public int lod; - private global::AdvancedPeopleSystem.CharacterCustomization _003CcharacterSystem_003E5__2; + private CharacterCustomization _003CcharacterSystem_003E5__2; private int _003Cbs_003E5__3; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CBlendshapeTransfer_003Ed__11(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -109,39 +116,39 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - private static global::UnityEngine.Matrix4x4[] bindPoses; + private static Matrix4x4[] bindPoses; - private static global::System.Collections.Generic.List LODMeshInstances; + private static List LODMeshInstances; - private static global::AdvancedPeopleSystem.CharacterCustomization currentCharacter; + private static CharacterCustomization currentCharacter; private static bool useExportToAnotherObject; private static bool BlendshapeTransferWork; - private static global::System.Action> _callback; + private static Action> _callback; - private static global::System.Collections.Generic.List returnSkinnedMeshes; + private static List returnSkinnedMeshes; - public static global::System.Collections.Generic.List MakeCombinedMeshes(global::AdvancedPeopleSystem.CharacterCustomization character, global::UnityEngine.GameObject exportInCustomObject = null, float blendshapeAddDelay = 0.001f, global::System.Action> callback = null) + public static List MakeCombinedMeshes(CharacterCustomization character, GameObject exportInCustomObject = null, float blendshapeAddDelay = 0.001f, Action> callback = null) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::AdvancedPeopleSystem.CharacterCustomizationCombiner._003CBlendshapeTransfer_003Ed__11))] - private static global::System.Collections.IEnumerator BlendshapeTransfer(global::AdvancedPeopleSystem.CharacterCustomizationCombiner.MeshInstance meshInstance, float waitTime, global::UnityEngine.SkinnedMeshRenderer smr, int lod, bool yieldUse = true) + [IteratorStateMachine(typeof(_003CBlendshapeTransfer_003Ed__11))] + private static IEnumerator BlendshapeTransfer(MeshInstance meshInstance, float waitTime, SkinnedMeshRenderer smr, int lod, bool yieldUse = true) { return null; } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs.meta index 7cb247b2..26573d92 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationCombiner.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9a99e191d80249e740e78c3391544172 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs index 0be457c9..240ce808 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs @@ -1,6 +1,9 @@ +using System; +using System.Collections.Generic; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterCustomizationSetup { public enum CharacterFileSaveFormat @@ -12,9 +15,9 @@ public enum CharacterFileSaveFormat public string settingsName; - public global::AdvancedPeopleSystem.CharacterSelectedElements selectedElements; + public CharacterSelectedElements selectedElements; - public global::System.Collections.Generic.List blendshapes; + public List blendshapes; public int MinLod; @@ -36,16 +39,16 @@ public enum CharacterFileSaveFormat public float HeadSize; - public void ApplyToCharacter(global::AdvancedPeopleSystem.CharacterCustomization cc) + public void ApplyToCharacter(CharacterCustomization cc) { } - public string Serialize(global::AdvancedPeopleSystem.CharacterCustomizationSetup.CharacterFileSaveFormat format) + public string Serialize(CharacterFileSaveFormat format) { return null; } - public static global::AdvancedPeopleSystem.CharacterCustomizationSetup Deserialize(string data, global::AdvancedPeopleSystem.CharacterCustomizationSetup.CharacterFileSaveFormat format) + public static CharacterCustomizationSetup Deserialize(string data, CharacterFileSaveFormat format) { return null; } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs.meta index 07d27cfe..91b30fe0 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterCustomizationSetup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6e731004f9485004d12ecbbb8e206919 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementType.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementType.cs.meta index a07ec277..aa888fe6 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementType.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 139f72b89c00d294180176bad19f9448 +guid: 18d58ed78d6b59f4383c7caf89e654f3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs index 81b4d9c3..038693e8 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs @@ -1,16 +1,19 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterElementsPreset { public string name; - public global::UnityEngine.Mesh[] mesh; + public Mesh[] mesh; public string[] hideParts; public float yOffset; - public global::UnityEngine.Material[] mats; + public Material[] mats; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs.meta index b0910ecc..a4f541ec 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterElementsPreset.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62fdbba7d0826a24eb0b1a0efefcfbbe +guid: 7b86f16468fe5ea4b9a15e8c168b7a69 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs index d6ada826..49040400 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs @@ -2,7 +2,7 @@ namespace AdvancedPeopleSystem { public static class CharacterGenerator { - public static void Generate(global::AdvancedPeopleSystem.CharacterCustomization cc) + public static void Generate(CharacterCustomization cc) { } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs.meta index d0029134..fb5f405c 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterGenerator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ea604cb92a62db467ed4309ddff451f9 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs index 5624fd2c..d0a49f16 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs @@ -1,46 +1,49 @@ +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::UnityEngine.CreateAssetMenu(fileName = "NewCharacterGenerator", menuName = "Advanced People Pack/CharacterGenerator", order = 1)] - public class CharacterGeneratorSettings : global::UnityEngine.ScriptableObject + [CreateAssetMenu(fileName = "NewCharacterGenerator", menuName = "Advanced People Pack/CharacterGenerator", order = 1)] + public class CharacterGeneratorSettings : ScriptableObject { - public global::AdvancedPeopleSystem.MinMaxIndex hair; + public MinMaxIndex hair; - public global::AdvancedPeopleSystem.MinMaxIndex beard; + public MinMaxIndex beard; - public global::AdvancedPeopleSystem.MinMaxIndex hat; + public MinMaxIndex hat; - public global::AdvancedPeopleSystem.MinMaxIndex accessory; + public MinMaxIndex accessory; - public global::AdvancedPeopleSystem.MinMaxIndex shirt; + public MinMaxIndex shirt; - public global::AdvancedPeopleSystem.MinMaxIndex pants; + public MinMaxIndex pants; - public global::AdvancedPeopleSystem.MinMaxIndex shoes; + public MinMaxIndex shoes; - [global::UnityEngine.Space(10f)] - public global::AdvancedPeopleSystem.MinMaxColor skinColors; + [Space(10f)] + public MinMaxColor skinColors; - public global::AdvancedPeopleSystem.MinMaxColor eyeColors; + public MinMaxColor eyeColors; - public global::AdvancedPeopleSystem.MinMaxColor hairColors; + public MinMaxColor hairColors; - [global::UnityEngine.Space(10f)] - public global::AdvancedPeopleSystem.MinMaxBlendshapes headSize; + [Space(10f)] + public MinMaxBlendshapes headSize; - public global::AdvancedPeopleSystem.MinMaxBlendshapes headOffset; + public MinMaxBlendshapes headOffset; - public global::AdvancedPeopleSystem.MinMaxBlendshapes height; + public MinMaxBlendshapes height; - public global::AdvancedPeopleSystem.MinMaxBlendshapes fat; + public MinMaxBlendshapes fat; - public global::AdvancedPeopleSystem.MinMaxBlendshapes muscles; + public MinMaxBlendshapes muscles; - public global::AdvancedPeopleSystem.MinMaxBlendshapes thin; + public MinMaxBlendshapes thin; - [global::UnityEngine.Space(15f)] - public global::System.Collections.Generic.List facialBlendshapes; + [Space(15f)] + public List facialBlendshapes; - [global::UnityEngine.Space(15f)] - public global::System.Collections.Generic.List excludes; + [Space(15f)] + public List excludes; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs.meta index 668dcfb0..f14b244e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterGeneratorSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3734e6f13a49aa271c27e5b7795894f6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterInstanceStatus.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterInstanceStatus.cs.meta index 5faae7ce..4ec47c70 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterInstanceStatus.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterInstanceStatus.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3046f5f6b2e940247ac417f7b8d14778 +guid: 2d1ca232417c5f94db2e3500c7d0eb0b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs index b7f58a2b..2eed192f 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs @@ -1,10 +1,14 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterPart { public string name; - public global::System.Collections.Generic.List skinnedMesh; + public List skinnedMesh; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs.meta index d43ccf2f..374b5e70 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterPart.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9314506a1bc48964b95c96a511c6f80b +guid: 3fca07f8c17836448b4aa632ef10dd93 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs index 990644b6..4d3355d2 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs @@ -1,14 +1,17 @@ +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - public class CharacterPreBuilt : global::UnityEngine.ScriptableObject + public class CharacterPreBuilt : ScriptableObject { - [global::UnityEngine.SerializeField] - public global::AdvancedPeopleSystem.CharacterSettings settings; + [SerializeField] + public CharacterSettings settings; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List preBuiltDatas; + [SerializeField] + public List preBuiltDatas; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List blendshapes; + [SerializeField] + public List blendshapes; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs.meta index 3b2f6fbb..4f4e1b68 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterPreBuilt.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cda7263e0909a9d43756df2eca3e7af5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs index 587d6a92..77e0be1e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs @@ -1,7 +1,9 @@ +using System; + namespace AdvancedPeopleSystem { - [global::System.Serializable] - public class CharacterSelectedElements : global::System.ICloneable + [Serializable] + public class CharacterSelectedElements : ICloneable { public int Hair; @@ -24,12 +26,12 @@ public object Clone() return null; } - public int GetSelectedIndex(global::AdvancedPeopleSystem.CharacterElementType type) + public int GetSelectedIndex(CharacterElementType type) { return 0; } - public void SetSelectedIndex(global::AdvancedPeopleSystem.CharacterElementType type, int newIndex) + public void SetSelectedIndex(CharacterElementType type, int newIndex) { } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs.meta index 4a575278..f44ffa1e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSelectedElements.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be48193667b385f4bba7e21e1043c2e2 +guid: ba60deb9761818d4ea5ebf8c3e044f4c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs index 03555ac4..42a48060 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs @@ -1,50 +1,53 @@ +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::UnityEngine.CreateAssetMenu(fileName = "NewCharacterSettings", menuName = "Advanced People Pack/Settings", order = 1)] - public class CharacterSettings : global::UnityEngine.ScriptableObject + [CreateAssetMenu(fileName = "NewCharacterSettings", menuName = "Advanced People Pack/Settings", order = 1)] + public class CharacterSettings : ScriptableObject { - public global::UnityEngine.GameObject OriginalMesh; + public GameObject OriginalMesh; - public global::UnityEngine.Material bodyMaterial; + public Material bodyMaterial; - [global::UnityEngine.Space(20f)] - public global::System.Collections.Generic.List characterAnimationPresets; + [Space(20f)] + public List characterAnimationPresets; - [global::UnityEngine.Space(20f)] - public global::System.Collections.Generic.List characterBlendshapeDatas; + [Space(20f)] + public List characterBlendshapeDatas; - [global::UnityEngine.Space(20f)] - public global::System.Collections.Generic.List hairPresets; + [Space(20f)] + public List hairPresets; - public global::System.Collections.Generic.List beardPresets; + public List beardPresets; - public global::System.Collections.Generic.List hatsPresets; + public List hatsPresets; - public global::System.Collections.Generic.List accessoryPresets; + public List accessoryPresets; - public global::System.Collections.Generic.List shirtsPresets; + public List shirtsPresets; - public global::System.Collections.Generic.List pantsPresets; + public List pantsPresets; - public global::System.Collections.Generic.List shoesPresets; + public List shoesPresets; - public global::System.Collections.Generic.List item1Presets; + public List item1Presets; - [global::UnityEngine.Space(20f)] - public global::System.Collections.Generic.List settingsSelectors; + [Space(20f)] + public List settingsSelectors; - [global::UnityEngine.Space(20f)] - public global::UnityEngine.RuntimeAnimatorController Animator; + [Space(20f)] + public RuntimeAnimatorController Animator; - public global::UnityEngine.Avatar Avatar; + public Avatar Avatar; - [global::UnityEngine.Space(20f)] - public global::AdvancedPeopleSystem.CharacterGeneratorSettings generator; + [Space(20f)] + public CharacterGeneratorSettings generator; - [global::UnityEngine.Space(20f)] - public global::AdvancedPeopleSystem.CharacterSelectedElements DefaultSelectedElements; + [Space(20f)] + public CharacterSelectedElements DefaultSelectedElements; - [global::UnityEngine.Space(20f)] + [Space(20f)] public bool DisableBlendshapeModifier; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs.meta index c01f09ac..c9a943da 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6ad6ddb50478ee80f2adb92af9bcffe4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs index 57108413..54546881 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs @@ -1,10 +1,12 @@ +using System; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class CharacterSettingsSelector { public string name; - public global::AdvancedPeopleSystem.CharacterSettings settings; + public CharacterSettings settings; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs.meta index e965637d..3579304a 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSettingsSelector.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e168c37da004724da32c4a1feb784f8 +guid: 27db5a7db2f65ba488efb2e002f37e0a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs b/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs index bf47c730..b03f82bd 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs @@ -1,13 +1,15 @@ +using UnityEngine; + namespace AdvancedPeopleSystem { public static class CharacterSystemUpdater { - [global::UnityEngine.RuntimeInitializeOnLoadMethod] + [RuntimeInitializeOnLoadMethod] private static void updateCharacters() { } - public static void UpdateCharactersOnScene(bool revertPrefabs = false, global::AdvancedPeopleSystem.CharacterCustomization reverbObject = null) + public static void UpdateCharactersOnScene(bool revertPrefabs = false, CharacterCustomization reverbObject = null) { } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs.meta index 2d98d9c2..f884fd61 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CharacterSystemUpdater.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 733990ec525f974adc912e4227c935cb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs b/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs index 951ef0a0..5c77b530 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs @@ -1,10 +1,14 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class ClothesAnchor { - public global::AdvancedPeopleSystem.CharacterElementType partType; + public CharacterElementType partType; - public global::System.Collections.Generic.List skinnedMesh; + public List skinnedMesh; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs.meta index 8a189480..80ca905d 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/ClothesAnchor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37d4db49db3182c46ab322dbbc2c3f99 +guid: d948da8d10122b547b34df635a4b7669 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CombinerState.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CombinerState.cs.meta index 61c9a296..65918636 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CombinerState.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CombinerState.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf6c2688ba9de834b843a33219159489 +guid: 1d6912f223af0af4f8c648722600cb64 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs b/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs index ea90f31b..93203f2a 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs @@ -1,10 +1,12 @@ +using System.Collections.Generic; + namespace AdvancedPeopleSystem { public class CurrentBlendshapeAnimation { - public global::AdvancedPeopleSystem.CharacterAnimationPreset preset; + public CharacterAnimationPreset preset; - public global::System.Collections.Generic.List blendShapesTemp; + public List blendShapesTemp; public float timer; } diff --git a/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs.meta index 89e3dc64..d32fc0eb 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/CurrentBlendshapeAnimation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e41704afc3477ff4199960582747baa8 +guid: 359204549a91d2942a24cefdc587729d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs b/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs index d7508762..6f342b36 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs @@ -1,9 +1,11 @@ +using System; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class ExcludeIndexes { - public global::AdvancedPeopleSystem.ExcludeItem item; + public ExcludeItem item; public int index; } diff --git a/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs.meta index cf27d103..0a770c9f 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/ExcludeIndexes.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bbb12969e9b4f764aa38cc6a0ae594f7 +guid: 2338a503ea0ba644c92b518068a841dc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/ExcludeItem.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/ExcludeItem.cs.meta index a4e2b224..b98fbda4 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/ExcludeItem.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/ExcludeItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ef441f04288bdd44b92c0b8585dbee8 +guid: 6323a78967e6e05459f1bc14d1e032e1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs b/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs index 7bb4fce4..9db0e237 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs @@ -1,12 +1,15 @@ +using System; +using System.Collections.Generic; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class GeneratorExclude { - public global::AdvancedPeopleSystem.ExcludeItem ExcludeItem; + public ExcludeItem ExcludeItem; public int targetIndex; - public global::System.Collections.Generic.List exclude; + public List exclude; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs.meta index 926c1508..1761a3f8 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/GeneratorExclude.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ed20377ce53c3144845c5bffd754040 +guid: 4f71021bbb77a0c4c8a4b1c502e87225 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs b/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs index 902f3d2d..06a2492e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs @@ -1,12 +1,15 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class MinMaxBlendshapes { - [global::UnityEngine.Range(-100f, 100f)] + [Range(-100f, 100f)] public float Min; - [global::UnityEngine.Range(-100f, 100f)] + [Range(-100f, 100f)] public float Max; public float GetRandom() diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs.meta index e88c070d..282b3de4 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxBlendshapes.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d163b7d5e2cb70a4893a5f7e936a5f5a +guid: c7a5b708eacb16d4ebc8956a295ee8e4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs b/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs index 1d0fb3de..9b280213 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs @@ -1,15 +1,19 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class MinMaxColor { - public global::System.Collections.Generic.List minColors; + public List minColors; - public global::System.Collections.Generic.List maxColors; + public List maxColors; - public global::UnityEngine.Color GetRandom() + public Color GetRandom() { - return default(global::UnityEngine.Color); + return default(Color); } } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs.meta index 0f445910..470fa33f 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxColor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e23935780713c74bbab5f0600338e78 +guid: 32b5ab6497c308949b2ca5ed85eb7f7b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs b/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs index c5d5ea47..6adbe811 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs @@ -1,14 +1,17 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class MinMaxFacialBlendshapes { public string name; - [global::UnityEngine.Range(-100f, 100f)] + [Range(-100f, 100f)] public float Min; - [global::UnityEngine.Range(-100f, 100f)] + [Range(-100f, 100f)] public float Max; public float GetRandom() diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs.meta index e78735b7..c07a2b08 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxFacialBlendshapes.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 003338cc3018dec41a81bad359fd7018 +guid: c520e7bc94faeda469693865b0244b21 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs b/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs index b70ca860..bea16cc6 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs @@ -1,6 +1,8 @@ +using System; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class MinMaxIndex { public int Min; diff --git a/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs.meta index 7591c14f..f97d5f5b 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/MinMaxIndex.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f43a022d07544914e9ab67cf39b90f60 +guid: 1704bb31bc6ef2c4ab88f8d010419883 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs index a89dc347..6dd91fe8 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs @@ -1,12 +1,15 @@ +using System; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class PreBuiltBlendshape { - [global::UnityEngine.SerializeField] + [SerializeField] public string name; - [global::UnityEngine.SerializeField] + [SerializeField] public float weight; public PreBuiltBlendshape(string name, float weight) diff --git a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs.meta index 6e3abf6e..9c29024e 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltBlendshape.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a9172383df7af968dd0359f593d867d7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs index a8a40610..ae3c75a1 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs +++ b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs @@ -1,15 +1,19 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AdvancedPeopleSystem { - [global::System.Serializable] + [Serializable] public class PreBuiltData { - [global::UnityEngine.SerializeField] + [SerializeField] public string GroupName; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List meshes; + [SerializeField] + public List meshes; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List materials; + [SerializeField] + public List materials; } } diff --git a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs.meta index f1917b3d..42c18819 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/PreBuiltData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 98e03583d01dd408fde6ef0b30edd04e -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AdvancedPeopleSystem/SavedCharacterData.cs.meta b/Assets/Scripts/AdvancedPeopleSystem/SavedCharacterData.cs.meta index 7ac18409..faa53ddc 100644 --- a/Assets/Scripts/AdvancedPeopleSystem/SavedCharacterData.cs.meta +++ b/Assets/Scripts/AdvancedPeopleSystem/SavedCharacterData.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ffaf6aca6a7243f408d1d7a9aaab4a97 +guid: 2fa140ce1effe5440aad6a0f1d958b3d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor.meta b/Assets/Scripts/AmplifyColor.meta index 5f98858d..65b1f7f0 100644 --- a/Assets/Scripts/AmplifyColor.meta +++ b/Assets/Scripts/AmplifyColor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07d896046fe01b6439fa78a888f88912 +guid: 4db43f69675c6b14fa6043e8eac7b82b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/AmplifyColor/Quality.cs.meta b/Assets/Scripts/AmplifyColor/Quality.cs.meta index 10323118..181103ae 100644 --- a/Assets/Scripts/AmplifyColor/Quality.cs.meta +++ b/Assets/Scripts/AmplifyColor/Quality.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d6653e85cc75664c9232cf4ece896f3 +guid: 144e9265b0a159f48b5d60b9316e6353 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/RenderLayer.cs b/Assets/Scripts/AmplifyColor/RenderLayer.cs index c128c3b0..8e2e002b 100644 --- a/Assets/Scripts/AmplifyColor/RenderLayer.cs +++ b/Assets/Scripts/AmplifyColor/RenderLayer.cs @@ -1,16 +1,19 @@ +using System; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public struct RenderLayer { - public global::UnityEngine.LayerMask mask; + public LayerMask mask; - public global::UnityEngine.Color color; + public Color color; - public RenderLayer(global::UnityEngine.LayerMask mask, global::UnityEngine.Color color) + public RenderLayer(LayerMask mask, Color color) { - this.mask = default(global::UnityEngine.LayerMask); - this.color = default(global::UnityEngine.Color); + this.mask = mask; + this.color = color; } } } diff --git a/Assets/Scripts/AmplifyColor/RenderLayer.cs.meta b/Assets/Scripts/AmplifyColor/RenderLayer.cs.meta index 2240cad8..39b8e2a4 100644 --- a/Assets/Scripts/AmplifyColor/RenderLayer.cs.meta +++ b/Assets/Scripts/AmplifyColor/RenderLayer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c288aa6a32d3ff4a88f6c28d22af365 +guid: 0b3a4b61dc1012c438f0f83fe0ab0d0e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/Tonemapping.cs.meta b/Assets/Scripts/AmplifyColor/Tonemapping.cs.meta index 754716b7..0d257265 100644 --- a/Assets/Scripts/AmplifyColor/Tonemapping.cs.meta +++ b/Assets/Scripts/AmplifyColor/Tonemapping.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4117a69003784ff4d81b0d12c54385d9 +guid: cb6d5ebffe084a342ad0f721729e3e1b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VersionInfo.cs b/Assets/Scripts/AmplifyColor/VersionInfo.cs index 498f7261..aa0333bf 100644 --- a/Assets/Scripts/AmplifyColor/VersionInfo.cs +++ b/Assets/Scripts/AmplifyColor/VersionInfo.cs @@ -1,6 +1,9 @@ +using System; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VersionInfo { public const byte Major = 1; @@ -13,13 +16,13 @@ public class VersionInfo private static string TrialSuffix; - [global::UnityEngine.SerializeField] + [SerializeField] private int m_major; - [global::UnityEngine.SerializeField] + [SerializeField] private int m_minor; - [global::UnityEngine.SerializeField] + [SerializeField] private int m_release; public static int FullNumber => 0; @@ -44,12 +47,12 @@ private VersionInfo(byte major, byte minor, byte release) { } - public static global::AmplifyColor.VersionInfo Current() + public static VersionInfo Current() { return null; } - public static bool Matches(global::AmplifyColor.VersionInfo version) + public static bool Matches(VersionInfo version) { return false; } diff --git a/Assets/Scripts/AmplifyColor/VersionInfo.cs.meta b/Assets/Scripts/AmplifyColor/VersionInfo.cs.meta index 698776bd..39e43dbf 100644 --- a/Assets/Scripts/AmplifyColor/VersionInfo.cs.meta +++ b/Assets/Scripts/AmplifyColor/VersionInfo.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f4b75d87ddc92e8f0aaf47dad57aa965 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffect.cs b/Assets/Scripts/AmplifyColor/VolumeEffect.cs index 2e410c47..5221c2cd 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffect.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffect.cs @@ -1,27 +1,31 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffect { public AmplifyColorEffect gameObject; - public global::System.Collections.Generic.List components; + public List components; public VolumeEffect(AmplifyColorEffect effect) { } - public static global::AmplifyColor.VolumeEffect BlendValuesToVolumeEffect(global::AmplifyColor.VolumeEffectFlags flags, global::AmplifyColor.VolumeEffect volume1, global::AmplifyColor.VolumeEffect volume2, float blend) + public static VolumeEffect BlendValuesToVolumeEffect(VolumeEffectFlags flags, VolumeEffect volume1, VolumeEffect volume2, float blend) { return null; } - public global::AmplifyColor.VolumeEffectComponent AddComponent(global::UnityEngine.Component c, global::AmplifyColor.VolumeEffectComponentFlags compFlags) + public VolumeEffectComponent AddComponent(Component c, VolumeEffectComponentFlags compFlags) { return null; } - public void RemoveEffectComponent(global::AmplifyColor.VolumeEffectComponent comp) + public void RemoveEffectComponent(VolumeEffectComponent comp) { } @@ -33,16 +37,16 @@ public void SetValues(AmplifyColorEffect targetColor) { } - public void BlendValues(AmplifyColorEffect targetColor, global::AmplifyColor.VolumeEffect other, float blendAmount) + public void BlendValues(AmplifyColorEffect targetColor, VolumeEffect other, float blendAmount) { } - public global::AmplifyColor.VolumeEffectComponent FindEffectComponent(string compName) + public VolumeEffectComponent FindEffectComponent(string compName) { return null; } - public static global::UnityEngine.Component[] ListAcceptableComponents(AmplifyColorEffect go) + public static Component[] ListAcceptableComponents(AmplifyColorEffect go) { return null; } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffect.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffect.cs.meta index aea1ec6b..a84076c9 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffect.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffect.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5236e3beda7048840ab6c61545f8c84b +guid: 1854763e77ac3a94a9b6f940a5014c58 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs b/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs index ed975f4f..d0bb6446 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs @@ -1,44 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectComponent { public string componentName; - public global::System.Collections.Generic.List fields; + public List fields; public VolumeEffectComponent(string name) { } - public global::AmplifyColor.VolumeEffectField AddField(global::System.Reflection.FieldInfo pi, global::UnityEngine.Component c) + public VolumeEffectField AddField(FieldInfo pi, Component c) { return null; } - public global::AmplifyColor.VolumeEffectField AddField(global::System.Reflection.FieldInfo pi, global::UnityEngine.Component c, int position) + public VolumeEffectField AddField(FieldInfo pi, Component c, int position) { return null; } - public void RemoveEffectField(global::AmplifyColor.VolumeEffectField field) + public void RemoveEffectField(VolumeEffectField field) { } - public VolumeEffectComponent(global::UnityEngine.Component c, global::AmplifyColor.VolumeEffectComponentFlags compFlags) + public VolumeEffectComponent(Component c, VolumeEffectComponentFlags compFlags) { } - public void UpdateComponent(global::UnityEngine.Component c, global::AmplifyColor.VolumeEffectComponentFlags compFlags) + public void UpdateComponent(Component c, VolumeEffectComponentFlags compFlags) { } - public global::AmplifyColor.VolumeEffectField FindEffectField(string fieldName) + public VolumeEffectField FindEffectField(string fieldName) { return null; } - public static global::System.Reflection.FieldInfo[] ListAcceptableFields(global::UnityEngine.Component c) + public static FieldInfo[] ListAcceptableFields(Component c) { return null; } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs.meta index 8448f4e2..7e8fbc63 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectComponent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 885a7113612934b448c98b7e2f022e42 +guid: a79efac9ea7e30b47a8d725135ac192f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs b/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs index 9478228b..3f6e9ace 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs @@ -1,11 +1,15 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectComponentFlags { public string componentName; - public global::System.Collections.Generic.List componentFields; + public List componentFields; public bool blendFlag; @@ -13,19 +17,19 @@ public VolumeEffectComponentFlags(string name) { } - public VolumeEffectComponentFlags(global::AmplifyColor.VolumeEffectComponent comp) + public VolumeEffectComponentFlags(VolumeEffectComponent comp) { } - public VolumeEffectComponentFlags(global::UnityEngine.Component c) + public VolumeEffectComponentFlags(Component c) { } - public void UpdateComponentFlags(global::AmplifyColor.VolumeEffectComponent comp) + public void UpdateComponentFlags(VolumeEffectComponent comp) { } - public void UpdateComponentFlags(global::UnityEngine.Component c) + public void UpdateComponentFlags(Component c) { } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs.meta index 42c7611c..05c32102 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectComponentFlags.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6467c996a00182b4185d397be9474fde +guid: 7432f553ed431c44094e07ba01b42f0c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs b/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs index 74a45147..d33d1343 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs @@ -1,25 +1,28 @@ +using System; +using System.Collections.Generic; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectContainer { - public global::System.Collections.Generic.List volumes; + public List volumes; public void AddColorEffect(AmplifyColorEffect colorEffect) { } - public global::AmplifyColor.VolumeEffect AddJustColorEffect(AmplifyColorEffect colorEffect) + public VolumeEffect AddJustColorEffect(AmplifyColorEffect colorEffect) { return null; } - public global::AmplifyColor.VolumeEffect FindVolumeEffect(AmplifyColorEffect colorEffect) + public VolumeEffect FindVolumeEffect(AmplifyColorEffect colorEffect) { return null; } - public void RemoveVolumeEffect(global::AmplifyColor.VolumeEffect volume) + public void RemoveVolumeEffect(VolumeEffect volume) { } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs.meta index b669eb4a..70dae074 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectContainer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 575ffb97bf71467448cb971fe32591b6 +guid: 8c518d35a7077aa43ada23f849037e71 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectField.cs b/Assets/Scripts/AmplifyColor/VolumeEffectField.cs index c33253f9..1427ccf3 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectField.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectField.cs @@ -1,6 +1,10 @@ +using System; +using System.Reflection; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectField { public string fieldName; @@ -9,21 +13,21 @@ public class VolumeEffectField public float valueSingle; - public global::UnityEngine.Color valueColor; + public Color valueColor; public bool valueBoolean; - public global::UnityEngine.Vector2 valueVector2; + public Vector2 valueVector2; - public global::UnityEngine.Vector3 valueVector3; + public Vector3 valueVector3; - public global::UnityEngine.Vector4 valueVector4; + public Vector4 valueVector4; public VolumeEffectField(string fieldName, string fieldType) { } - public VolumeEffectField(global::System.Reflection.FieldInfo pi, global::UnityEngine.Component c) + public VolumeEffectField(FieldInfo pi, Component c) { } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectField.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectField.cs.meta index 13bf38ae..107e4969 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectField.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectField.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0f6865c3612ad92c1738b52d3e12bd8c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs b/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs index e2941d94..c4ac4dd9 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs @@ -1,6 +1,9 @@ +using System; +using System.Reflection; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectFieldFlags { public string fieldName; @@ -9,11 +12,11 @@ public class VolumeEffectFieldFlags public bool blendFlag; - public VolumeEffectFieldFlags(global::System.Reflection.FieldInfo pi) + public VolumeEffectFieldFlags(FieldInfo pi) { } - public VolumeEffectFieldFlags(global::AmplifyColor.VolumeEffectField field) + public VolumeEffectFieldFlags(VolumeEffectField field) { } } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs.meta index 773c118e..82a34085 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectFieldFlags.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 927dc3ae2e5887b3d01715cf063a8ec1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs b/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs index 29cf4830..df5c1e55 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs +++ b/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs @@ -1,15 +1,19 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace AmplifyColor { - [global::System.Serializable] + [Serializable] public class VolumeEffectFlags { - public global::System.Collections.Generic.List components; + public List components; - public void AddComponent(global::UnityEngine.Component c) + public void AddComponent(Component c) { } - public void UpdateFlags(global::AmplifyColor.VolumeEffect effectVol) + public void UpdateFlags(VolumeEffect effectVol) { } @@ -17,12 +21,12 @@ public static void UpdateCamFlags(AmplifyColorEffect[] effects, AmplifyColorVolu { } - public global::AmplifyColor.VolumeEffect GenerateEffectData(AmplifyColorEffect go) + public VolumeEffect GenerateEffectData(AmplifyColorEffect go) { return null; } - public global::AmplifyColor.VolumeEffectComponentFlags FindComponentFlags(string compName) + public VolumeEffectComponentFlags FindComponentFlags(string compName) { return null; } diff --git a/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs.meta b/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs.meta index 3865d0ea..586c7dc5 100644 --- a/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs.meta +++ b/Assets/Scripts/AmplifyColor/VolumeEffectFlags.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 69cbe728e8b30804ea9dd8aaeb6e888d +guid: 031aaebeeb0e70b448aa60d9762cf871 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorEffect.cs b/Assets/Scripts/AmplifyColorEffect.cs index 1f949c39..24eaded0 100644 --- a/Assets/Scripts/AmplifyColorEffect.cs +++ b/Assets/Scripts/AmplifyColorEffect.cs @@ -1,8 +1,14 @@ -[global::UnityEngine.ImageEffectAllowedInSceneView] -[global::UnityEngine.ImageEffectTransformsToLDR] -[global::UnityEngine.ExecuteInEditMode] -[global::UnityEngine.AddComponentMenu("Image Effects/Amplify Color")] -public class AmplifyColorEffect : global::UnityEngine.MonoBehaviour +using System; +using System.Collections.Generic; +using AmplifyColor; +using UnityEngine; +using UnityEngine.Serialization; + +[ImageEffectAllowedInSceneView] +[ImageEffectTransformsToLDR] +[ExecuteInEditMode] +[AddComponentMenu("Image Effects/Amplify Color")] +public class AmplifyColorEffect : MonoBehaviour { public const int LutSize = 32; @@ -12,82 +18,82 @@ public class AmplifyColorEffect : global::UnityEngine.MonoBehaviour private const int DepthCurveLutRange = 1024; - public global::AmplifyColor.Tonemapping Tonemapper; + public Tonemapping Tonemapper; public float Exposure; public float LinearWhitePoint; - [global::UnityEngine.Serialization.FormerlySerializedAs("UseDithering")] + [FormerlySerializedAs("UseDithering")] public bool ApplyDithering; - public global::AmplifyColor.Quality QualityLevel; + public Quality QualityLevel; public float BlendAmount; - public global::UnityEngine.Texture LutTexture; + public Texture LutTexture; - public global::UnityEngine.Texture LutBlendTexture; + public Texture LutBlendTexture; - public global::UnityEngine.Texture MaskTexture; + public Texture MaskTexture; public bool UseDepthMask; - public global::UnityEngine.AnimationCurve DepthMaskCurve; + public AnimationCurve DepthMaskCurve; public bool UseVolumes; public float ExitVolumeBlendTime; - public global::UnityEngine.Transform TriggerVolumeProxy; + public Transform TriggerVolumeProxy; - public global::UnityEngine.LayerMask VolumeCollisionMask; + public LayerMask VolumeCollisionMask; - private global::UnityEngine.Camera ownerCamera; + private Camera ownerCamera; - private global::UnityEngine.Shader shaderBase; + private Shader shaderBase; - private global::UnityEngine.Shader shaderBlend; + private Shader shaderBlend; - private global::UnityEngine.Shader shaderBlendCache; + private Shader shaderBlendCache; - private global::UnityEngine.Shader shaderMask; + private Shader shaderMask; - private global::UnityEngine.Shader shaderMaskBlend; + private Shader shaderMaskBlend; - private global::UnityEngine.Shader shaderDepthMask; + private Shader shaderDepthMask; - private global::UnityEngine.Shader shaderDepthMaskBlend; + private Shader shaderDepthMaskBlend; - private global::UnityEngine.Shader shaderProcessOnly; + private Shader shaderProcessOnly; - private global::UnityEngine.RenderTexture blendCacheLut; + private RenderTexture blendCacheLut; - private global::UnityEngine.Texture2D defaultLut; + private Texture2D defaultLut; - private global::UnityEngine.Texture2D depthCurveLut; + private Texture2D depthCurveLut; - private global::UnityEngine.Color32[] depthCurveColors; + private Color32[] depthCurveColors; - private global::UnityEngine.ColorSpace colorSpace; + private ColorSpace colorSpace; - private global::AmplifyColor.Quality qualityLevel; + private Quality qualityLevel; - private global::UnityEngine.Material materialBase; + private Material materialBase; - private global::UnityEngine.Material materialBlend; + private Material materialBlend; - private global::UnityEngine.Material materialBlendCache; + private Material materialBlendCache; - private global::UnityEngine.Material materialMask; + private Material materialMask; - private global::UnityEngine.Material materialMaskBlend; + private Material materialMaskBlend; - private global::UnityEngine.Material materialDepthMask; + private Material materialDepthMask; - private global::UnityEngine.Material materialDepthMaskBlend; + private Material materialDepthMaskBlend; - private global::UnityEngine.Material materialProcessOnly; + private Material materialProcessOnly; private bool blending; @@ -95,9 +101,9 @@ public class AmplifyColorEffect : global::UnityEngine.MonoBehaviour private float blendingTimeCountdown; - private global::System.Action onFinishBlend; + private Action onFinishBlend; - private global::UnityEngine.AnimationCurve prevDepthMaskCurve; + private AnimationCurve prevDepthMaskCurve; private bool volumesBlending; @@ -105,23 +111,23 @@ public class AmplifyColorEffect : global::UnityEngine.MonoBehaviour private float volumesBlendingTimeCountdown; - private global::UnityEngine.Texture volumesLutBlendTexture; + private Texture volumesLutBlendTexture; private float volumesBlendAmount; - private global::UnityEngine.Texture worldLUT; + private Texture worldLUT; private AmplifyColorVolumeBase currentVolumeLut; - private global::UnityEngine.RenderTexture midBlendLUT; + private RenderTexture midBlendLUT; private bool blendingFromMidBlend; - private global::AmplifyColor.VolumeEffect worldVolumeEffects; + private VolumeEffect worldVolumeEffects; - private global::AmplifyColor.VolumeEffect currentVolumeEffects; + private VolumeEffect currentVolumeEffects; - private global::AmplifyColor.VolumeEffect blendVolumeEffects; + private VolumeEffect blendVolumeEffects; private float worldExposure; @@ -131,20 +137,20 @@ public class AmplifyColorEffect : global::UnityEngine.MonoBehaviour private float effectVolumesBlendAdjust; - private global::System.Collections.Generic.List enteredVolumes; + private List enteredVolumes; private AmplifyColorTriggerProxyBase actualTriggerProxy; - [global::UnityEngine.HideInInspector] - public global::AmplifyColor.VolumeEffectFlags EffectFlags; + [HideInInspector] + public VolumeEffectFlags EffectFlags; - [global::UnityEngine.SerializeField] - [global::UnityEngine.HideInInspector] + [SerializeField] + [HideInInspector] private string sharedInstanceID; private bool silentError; - public global::UnityEngine.Texture2D DefaultLut => null; + public Texture2D DefaultLut => null; public bool IsBlending => false; @@ -166,7 +172,7 @@ private void ReportNotSupported() { } - private bool CheckShader(global::UnityEngine.Shader s) + private bool CheckShader(Shader s) { return false; } @@ -189,11 +195,11 @@ private void OnDisable() { } - private void VolumesBlendTo(global::UnityEngine.Texture blendTargetLUT, float blendTimeInSec) + private void VolumesBlendTo(Texture blendTargetLUT, float blendTimeInSec) { } - public void BlendTo(global::UnityEngine.Texture blendTargetLUT, float blendTimeInSec, global::System.Action onFinishBlend) + public void BlendTo(Texture blendTargetLUT, float blendTimeInSec, Action onFinishBlend) { } @@ -229,12 +235,12 @@ private void ReleaseMaterials() { } - private global::UnityEngine.Texture2D CreateDefaultLut() + private Texture2D CreateDefaultLut() { return null; } - private global::UnityEngine.Texture2D CreateDepthCurveLut() + private Texture2D CreateDepthCurveLut() { return null; } @@ -251,7 +257,7 @@ private void CreateHelperTextures() { } - private bool CheckMaterialAndShader(global::UnityEngine.Material material, string name) + private bool CheckMaterialAndShader(Material material, string name) { return false; } @@ -265,7 +271,7 @@ private void SetMaterialKeyword(string keyword, bool state) { } - private void SafeRelease(ref T obj) where T : global::UnityEngine.Object + private void SafeRelease(ref T obj) where T : UnityEngine.Object { } @@ -273,7 +279,7 @@ private void ReleaseTextures() { } - public static bool ValidateLutDimensions(global::UnityEngine.Texture lut) + public static bool ValidateLutDimensions(Texture lut) { return false; } @@ -287,7 +293,7 @@ private int ComputeShaderPass() return 0; } - private void OnRenderImage(global::UnityEngine.RenderTexture source, global::UnityEngine.RenderTexture destination) + private void OnRenderImage(RenderTexture source, RenderTexture destination) { } } diff --git a/Assets/Scripts/AmplifyColorEffect.cs.meta b/Assets/Scripts/AmplifyColorEffect.cs.meta index b6135bbf..2cb941e5 100644 --- a/Assets/Scripts/AmplifyColorEffect.cs.meta +++ b/Assets/Scripts/AmplifyColorEffect.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: caa52ac7a791b510cda40d12a23e1579 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorRenderMask.cs b/Assets/Scripts/AmplifyColorRenderMask.cs index 4bb7a5c7..391c2e2d 100644 --- a/Assets/Scripts/AmplifyColorRenderMask.cs +++ b/Assets/Scripts/AmplifyColorRenderMask.cs @@ -1,21 +1,25 @@ -[global::UnityEngine.ExecuteInEditMode] -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Camera))] -[global::UnityEngine.RequireComponent(typeof(AmplifyColorEffect))] -[global::UnityEngine.AddComponentMenu("Image Effects/Amplify Color Render Mask")] -public class AmplifyColorRenderMask : global::UnityEngine.MonoBehaviour +using AmplifyColor; +using UnityEngine; +using UnityEngine.Serialization; + +[ExecuteInEditMode] +[RequireComponent(typeof(Camera))] +[RequireComponent(typeof(AmplifyColorEffect))] +[AddComponentMenu("Image Effects/Amplify Color Render Mask")] +public class AmplifyColorRenderMask : MonoBehaviour { - [global::UnityEngine.Serialization.FormerlySerializedAs("clearColor")] - public global::UnityEngine.Color ClearColor; + [FormerlySerializedAs("clearColor")] + public Color ClearColor; - [global::UnityEngine.Serialization.FormerlySerializedAs("renderLayers")] - public global::AmplifyColor.RenderLayer[] RenderLayers; + [FormerlySerializedAs("renderLayers")] + public RenderLayer[] RenderLayers; - [global::UnityEngine.Serialization.FormerlySerializedAs("debug")] + [FormerlySerializedAs("debug")] public bool DebugMask; - private global::UnityEngine.Camera referenceCamera; + private Camera referenceCamera; - private global::UnityEngine.Camera maskCamera; + private Camera maskCamera; private AmplifyColorEffect colorEffect; @@ -23,9 +27,9 @@ public class AmplifyColorRenderMask : global::UnityEngine.MonoBehaviour private int height; - private global::UnityEngine.RenderTexture maskTexture; + private RenderTexture maskTexture; - private global::UnityEngine.Shader colorMaskShader; + private Shader colorMaskShader; private bool singlePassStereo; diff --git a/Assets/Scripts/AmplifyColorRenderMask.cs.meta b/Assets/Scripts/AmplifyColorRenderMask.cs.meta index 987c0b85..9d391209 100644 --- a/Assets/Scripts/AmplifyColorRenderMask.cs.meta +++ b/Assets/Scripts/AmplifyColorRenderMask.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 50f6d17ab7960e96b471d08a64b675fc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorTriggerProxy.cs b/Assets/Scripts/AmplifyColorTriggerProxy.cs index fed98393..edde7c24 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxy.cs +++ b/Assets/Scripts/AmplifyColorTriggerProxy.cs @@ -1,11 +1,13 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Rigidbody))] -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.SphereCollider))] -[global::UnityEngine.AddComponentMenu("")] +using UnityEngine; + +[RequireComponent(typeof(Rigidbody))] +[RequireComponent(typeof(SphereCollider))] +[AddComponentMenu("")] public class AmplifyColorTriggerProxy : AmplifyColorTriggerProxyBase { - private global::UnityEngine.SphereCollider sphereCollider; + private SphereCollider sphereCollider; - private global::UnityEngine.Rigidbody rigidBody; + private Rigidbody rigidBody; private void Start() { diff --git a/Assets/Scripts/AmplifyColorTriggerProxy.cs.meta b/Assets/Scripts/AmplifyColorTriggerProxy.cs.meta index dcb12563..80ddede1 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxy.cs.meta +++ b/Assets/Scripts/AmplifyColorTriggerProxy.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c3da9341dcf8621479520cc84d97e440 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorTriggerProxy2D.cs b/Assets/Scripts/AmplifyColorTriggerProxy2D.cs index 54e054c8..d5011984 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxy2D.cs +++ b/Assets/Scripts/AmplifyColorTriggerProxy2D.cs @@ -1,11 +1,13 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Rigidbody2D))] -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.CircleCollider2D))] -[global::UnityEngine.AddComponentMenu("")] +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +[RequireComponent(typeof(CircleCollider2D))] +[AddComponentMenu("")] public class AmplifyColorTriggerProxy2D : AmplifyColorTriggerProxyBase { - private global::UnityEngine.CircleCollider2D circleCollider; + private CircleCollider2D circleCollider; - private global::UnityEngine.Rigidbody2D rigidBody; + private Rigidbody2D rigidBody; private void Start() { diff --git a/Assets/Scripts/AmplifyColorTriggerProxy2D.cs.meta b/Assets/Scripts/AmplifyColorTriggerProxy2D.cs.meta index a95d0062..c37c3f81 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxy2D.cs.meta +++ b/Assets/Scripts/AmplifyColorTriggerProxy2D.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 299a36656d82e7620da5fa05609d3659 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorTriggerProxyBase.cs b/Assets/Scripts/AmplifyColorTriggerProxyBase.cs index a61c84e4..5f372198 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxyBase.cs +++ b/Assets/Scripts/AmplifyColorTriggerProxyBase.cs @@ -1,7 +1,9 @@ -[global::UnityEngine.AddComponentMenu("")] -public class AmplifyColorTriggerProxyBase : global::UnityEngine.MonoBehaviour +using UnityEngine; + +[AddComponentMenu("")] +public class AmplifyColorTriggerProxyBase : MonoBehaviour { - public global::UnityEngine.Transform Reference; + public Transform Reference; public AmplifyColorEffect OwnerEffect; } diff --git a/Assets/Scripts/AmplifyColorTriggerProxyBase.cs.meta b/Assets/Scripts/AmplifyColorTriggerProxyBase.cs.meta index fec532db..214ff875 100644 --- a/Assets/Scripts/AmplifyColorTriggerProxyBase.cs.meta +++ b/Assets/Scripts/AmplifyColorTriggerProxyBase.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1983b1d3aa9e807cfe2026dab84f600a -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorVolume.cs b/Assets/Scripts/AmplifyColorVolume.cs index aa381aed..f519219b 100644 --- a/Assets/Scripts/AmplifyColorVolume.cs +++ b/Assets/Scripts/AmplifyColorVolume.cs @@ -1,12 +1,14 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.BoxCollider))] -[global::UnityEngine.AddComponentMenu("Image Effects/Amplify Color Volume")] +using UnityEngine; + +[RequireComponent(typeof(BoxCollider))] +[AddComponentMenu("Image Effects/Amplify Color Volume")] public class AmplifyColorVolume : AmplifyColorVolumeBase { - private void OnTriggerEnter(global::UnityEngine.Collider other) + private void OnTriggerEnter(Collider other) { } - private void OnTriggerExit(global::UnityEngine.Collider other) + private void OnTriggerExit(Collider other) { } } diff --git a/Assets/Scripts/AmplifyColorVolume.cs.meta b/Assets/Scripts/AmplifyColorVolume.cs.meta index b0ab4c61..102b29a2 100644 --- a/Assets/Scripts/AmplifyColorVolume.cs.meta +++ b/Assets/Scripts/AmplifyColorVolume.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 128ab7d8beb01f33f981a5694e5014e7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorVolume2D.cs b/Assets/Scripts/AmplifyColorVolume2D.cs index d9c8e93f..387bc507 100644 --- a/Assets/Scripts/AmplifyColorVolume2D.cs +++ b/Assets/Scripts/AmplifyColorVolume2D.cs @@ -1,12 +1,14 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.BoxCollider2D))] -[global::UnityEngine.AddComponentMenu("Image Effects/Amplify Color Volume 2D")] +using UnityEngine; + +[RequireComponent(typeof(BoxCollider2D))] +[AddComponentMenu("Image Effects/Amplify Color Volume 2D")] public class AmplifyColorVolume2D : AmplifyColorVolumeBase { - private void OnTriggerEnter2D(global::UnityEngine.Collider2D other) + private void OnTriggerEnter2D(Collider2D other) { } - private void OnTriggerExit2D(global::UnityEngine.Collider2D other) + private void OnTriggerExit2D(Collider2D other) { } } diff --git a/Assets/Scripts/AmplifyColorVolume2D.cs.meta b/Assets/Scripts/AmplifyColorVolume2D.cs.meta index a37bc3b0..614d392f 100644 --- a/Assets/Scripts/AmplifyColorVolume2D.cs.meta +++ b/Assets/Scripts/AmplifyColorVolume2D.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dcd2df48a3d3b605bacc43fe642ee986 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/AmplifyColorVolumeBase.cs b/Assets/Scripts/AmplifyColorVolumeBase.cs index 0fe7783b..70ee6b5c 100644 --- a/Assets/Scripts/AmplifyColorVolumeBase.cs +++ b/Assets/Scripts/AmplifyColorVolumeBase.cs @@ -1,8 +1,11 @@ -[global::UnityEngine.ExecuteInEditMode] -[global::UnityEngine.AddComponentMenu("")] -public class AmplifyColorVolumeBase : global::UnityEngine.MonoBehaviour +using AmplifyColor; +using UnityEngine; + +[ExecuteInEditMode] +[AddComponentMenu("")] +public class AmplifyColorVolumeBase : MonoBehaviour { - public global::UnityEngine.Texture2D LutTexture; + public Texture2D LutTexture; public float Exposure; @@ -12,8 +15,8 @@ public class AmplifyColorVolumeBase : global::UnityEngine.MonoBehaviour public bool ShowInSceneView; - [global::UnityEngine.HideInInspector] - public global::AmplifyColor.VolumeEffectContainer EffectContainer; + [HideInInspector] + public VolumeEffectContainer EffectContainer; private void OnDrawGizmos() { diff --git a/Assets/Scripts/AmplifyColorVolumeBase.cs.meta b/Assets/Scripts/AmplifyColorVolumeBase.cs.meta index 1f0cf3de..f01607a9 100644 --- a/Assets/Scripts/AmplifyColorVolumeBase.cs.meta +++ b/Assets/Scripts/AmplifyColorVolumeBase.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1a275e56e19790c7f51c742d1ee5a4c5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Ardenfall.meta b/Assets/Scripts/Ardenfall.meta index 27540e08..fd0607fe 100644 --- a/Assets/Scripts/Ardenfall.meta +++ b/Assets/Scripts/Ardenfall.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db524592ea10d4b4e96507d273d3e93f +guid: ea4eda6584373d74592a831054ed7c1a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Ardenfall/Utilities.meta b/Assets/Scripts/Ardenfall/Utilities.meta index 79270e29..a8383101 100644 --- a/Assets/Scripts/Ardenfall/Utilities.meta +++ b/Assets/Scripts/Ardenfall/Utilities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6652d925629a86489109681603b6f29 +guid: b1dbf393ab5eb3e42aaf0552025180bd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs b/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs index c9b4dc66..8084e6ef 100644 --- a/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs +++ b/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs @@ -1,32 +1,35 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Ardenfall.Utilities { - [global::UnityEngine.CreateAssetMenu(menuName = "Ardenfall/Foliage/Billboard Asset")] - public class BillboardAsset : global::UnityEngine.ScriptableObject + [CreateAssetMenu(menuName = "Ardenfall/Foliage/Billboard Asset")] + public class BillboardAsset : ScriptableObject { - public global::UnityEngine.GameObject prefab; + public GameObject prefab; - public global::Ardenfall.Utilities.BillboardRenderSettings renderSettings; + public BillboardRenderSettings renderSettings; - [global::UnityEngine.Header("Values")] + [Header("Values")] public int textureSize; public float cutoff; - [global::UnityEngine.Header("LODs")] + [Header("LODs")] public bool pickLastLOD; public int LODIndex; - [global::UnityEngine.HideInInspector] - public global::System.Collections.Generic.List generatedTextures; + [HideInInspector] + public List generatedTextures; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.Mesh generatedMesh; + [HideInInspector] + public Mesh generatedMesh; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.Material generatedMaterial; + [HideInInspector] + public Material generatedMaterial; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.GameObject generatedPrefab; + [HideInInspector] + public GameObject generatedPrefab; } } diff --git a/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs.meta b/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs.meta index b51f9b81..faabdf52 100644 --- a/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs.meta +++ b/Assets/Scripts/Ardenfall/Utilities/BillboardAsset.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 14858467bb5918565d1306c9766c71c3 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs b/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs index 35c77b89..12898447 100644 --- a/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs +++ b/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs @@ -1,9 +1,13 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Ardenfall.Utilities { - [global::UnityEngine.CreateAssetMenu(menuName = "Ardenfall/Foliage/Billboard Render Settings")] - public class BillboardRenderSettings : global::UnityEngine.ScriptableObject + [CreateAssetMenu(menuName = "Ardenfall/Foliage/Billboard Render Settings")] + public class BillboardRenderSettings : ScriptableObject { - [global::System.Serializable] + [Serializable] public class BillboardTexture { public string textureId; @@ -12,20 +16,20 @@ public class BillboardTexture public bool alphaIsTransparency; - public global::System.Collections.Generic.List bakePasses; + public List bakePasses; - public global::UnityEngine.TextureFormat GetFormat() + public TextureFormat GetFormat() { - return default(global::UnityEngine.TextureFormat); + return default(TextureFormat); } } - [global::System.Serializable] + [Serializable] public class BakePass { - public global::UnityEngine.Shader customShader; + public Shader customShader; - public global::Ardenfall.Utilities.MaterialOverrides materialOverrides; + public MaterialOverrides materialOverrides; public bool r; @@ -36,8 +40,8 @@ public class BakePass public bool a; } - public global::System.Collections.Generic.List billboardTextures; + public List billboardTextures; - public global::UnityEngine.Shader billboardShader; + public Shader billboardShader; } } diff --git a/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs.meta b/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs.meta index d471134f..ed48cacd 100644 --- a/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs.meta +++ b/Assets/Scripts/Ardenfall/Utilities/BillboardRenderSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a6b72e19aeadd23817ac389cd206a22d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs b/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs index 86d67799..ead02bea 100644 --- a/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs +++ b/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs @@ -1,17 +1,21 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Ardenfall.Utilities { - [global::System.Serializable] + [Serializable] public class MaterialOverrides { - [global::System.Serializable] + [Serializable] public class TextureProperty { public string propertyName; - public global::UnityEngine.Texture2D propertyValue; + public Texture2D propertyValue; } - [global::System.Serializable] + [Serializable] public class FloatProperty { public string propertyName; @@ -19,7 +23,7 @@ public class FloatProperty public float propertyValue; } - [global::System.Serializable] + [Serializable] public class IntProperty { public string propertyName; @@ -27,33 +31,33 @@ public class IntProperty public int propertyValue; } - [global::System.Serializable] + [Serializable] public class VectorProperty { public string propertyName; - public global::UnityEngine.Vector4 propertyValue; + public Vector4 propertyValue; } - [global::System.Serializable] + [Serializable] public class ColorProperty { public string propertyName; - public global::UnityEngine.Color propertyValue; + public Color propertyValue; } - public global::System.Collections.Generic.List textureOverrides; + public List textureOverrides; - public global::System.Collections.Generic.List floatOverrides; + public List floatOverrides; - public global::System.Collections.Generic.List intOverrides; + public List intOverrides; - public global::System.Collections.Generic.List vectorOverrides; + public List vectorOverrides; - public global::System.Collections.Generic.List colorOverrides; + public List colorOverrides; - public void OverrideMaterial(global::UnityEngine.Material material) + public void OverrideMaterial(Material material) { } } diff --git a/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs.meta b/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs.meta index 8dc7ca03..714b41e4 100644 --- a/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs.meta +++ b/Assets/Scripts/Ardenfall/Utilities/MaterialOverrides.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 58b3f40d6ffcbbb431ebb7c5db12973c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/BaseStarDataRenderer.cs b/Assets/Scripts/BaseStarDataRenderer.cs index 08611d39..dffe9909 100644 --- a/Assets/Scripts/BaseStarDataRenderer.cs +++ b/Assets/Scripts/BaseStarDataRenderer.cs @@ -1,8 +1,12 @@ +using System.Collections; +using System.Runtime.CompilerServices; +using UnityEngine; + public abstract class BaseStarDataRenderer { public delegate void StarDataProgress(BaseStarDataRenderer renderer, float progress); - public delegate void StarDataComplete(BaseStarDataRenderer renderer, global::UnityEngine.Texture2D texture, bool success); + public delegate void StarDataComplete(BaseStarDataRenderer renderer, Texture2D texture, bool success); public float density; @@ -16,31 +20,31 @@ public abstract class BaseStarDataRenderer protected bool isCancelled; - public event BaseStarDataRenderer.StarDataProgress progressCallback + public event StarDataProgress progressCallback { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public event BaseStarDataRenderer.StarDataComplete completionCallback + public event StarDataComplete completionCallback { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public abstract global::System.Collections.IEnumerator ComputeStarData(); + public abstract IEnumerator ComputeStarData(); public virtual void Cancel() { @@ -50,7 +54,7 @@ protected void SendProgress(float progress) { } - protected void SendCompletion(global::UnityEngine.Texture2D texture, bool success) + protected void SendCompletion(Texture2D texture, bool success) { } } diff --git a/Assets/Scripts/BaseStarDataRenderer.cs.meta b/Assets/Scripts/BaseStarDataRenderer.cs.meta index 246badb1..74a3e45d 100644 --- a/Assets/Scripts/BaseStarDataRenderer.cs.meta +++ b/Assets/Scripts/BaseStarDataRenderer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ac5bd371e5533120f0233ff6a68298ae -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Beautify.meta b/Assets/Scripts/Beautify.meta index cac2b2b1..f835392c 100644 --- a/Assets/Scripts/Beautify.meta +++ b/Assets/Scripts/Beautify.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d010719e94cfc44bb82f85411d826cc +guid: 6497d74cbc593d54d96868aff12bf00a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Beautify/Demos.meta b/Assets/Scripts/Beautify/Demos.meta index 952af269..0b2cc3cc 100644 --- a/Assets/Scripts/Beautify/Demos.meta +++ b/Assets/Scripts/Beautify/Demos.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff4982dbb1b5d4a43b16d2663ede0d81 +guid: 8ae070727fea6704090a498c301c570d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Beautify/Demos/Demo.cs b/Assets/Scripts/Beautify/Demos/Demo.cs index 674e9962..d1eedec0 100644 --- a/Assets/Scripts/Beautify/Demos/Demo.cs +++ b/Assets/Scripts/Beautify/Demos/Demo.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace Beautify.Demos { - public class Demo : global::UnityEngine.MonoBehaviour + public class Demo : MonoBehaviour { - public global::UnityEngine.Texture lutTexture; + public Texture lutTexture; private void Start() { diff --git a/Assets/Scripts/Beautify/Demos/Demo.cs.meta b/Assets/Scripts/Beautify/Demos/Demo.cs.meta index 23521129..e278f141 100644 --- a/Assets/Scripts/Beautify/Demos/Demo.cs.meta +++ b/Assets/Scripts/Beautify/Demos/Demo.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: addb6b17271031d8f2a298e09337e368 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Beautify/Demos/ToggleDoF.cs b/Assets/Scripts/Beautify/Demos/ToggleDoF.cs index 7d3b6ea6..c612ac8a 100644 --- a/Assets/Scripts/Beautify/Demos/ToggleDoF.cs +++ b/Assets/Scripts/Beautify/Demos/ToggleDoF.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Beautify.Demos { - public class ToggleDoF : global::UnityEngine.MonoBehaviour + public class ToggleDoF : MonoBehaviour { private void Update() { diff --git a/Assets/Scripts/Beautify/Demos/ToggleDoF.cs.meta b/Assets/Scripts/Beautify/Demos/ToggleDoF.cs.meta index 3936411c..2a6b66d8 100644 --- a/Assets/Scripts/Beautify/Demos/ToggleDoF.cs.meta +++ b/Assets/Scripts/Beautify/Demos/ToggleDoF.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7547313436c4f2ade0be742b43a1fdcf -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Beautify/Universal.meta b/Assets/Scripts/Beautify/Universal.meta index 519875c3..09abc12a 100644 --- a/Assets/Scripts/Beautify/Universal.meta +++ b/Assets/Scripts/Beautify/Universal.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 89a294ab249065c469c4bb18628d73b9 +guid: e4b9e28b35116574fa05bd66d4fc8a70 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Beautify/Universal/CameraAnimator.cs b/Assets/Scripts/Beautify/Universal/CameraAnimator.cs index 9469583d..3b6e7193 100644 --- a/Assets/Scripts/Beautify/Universal/CameraAnimator.cs +++ b/Assets/Scripts/Beautify/Universal/CameraAnimator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Beautify.Universal { - public class CameraAnimator : global::UnityEngine.MonoBehaviour + public class CameraAnimator : MonoBehaviour { private void Update() { diff --git a/Assets/Scripts/Beautify/Universal/CameraAnimator.cs.meta b/Assets/Scripts/Beautify/Universal/CameraAnimator.cs.meta index cbf864fb..9859fc23 100644 --- a/Assets/Scripts/Beautify/Universal/CameraAnimator.cs.meta +++ b/Assets/Scripts/Beautify/Universal/CameraAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c089b3b8d6f77a0e7e1db49c379f07bf -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Beautify/Universal/LUTBlending.cs b/Assets/Scripts/Beautify/Universal/LUTBlending.cs index 96edc975..9dbb8b78 100644 --- a/Assets/Scripts/Beautify/Universal/LUTBlending.cs +++ b/Assets/Scripts/Beautify/Universal/LUTBlending.cs @@ -1,7 +1,9 @@ +using UnityEngine; + namespace Beautify.Universal { - [global::UnityEngine.ExecuteInEditMode] - public class LUTBlending : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class LUTBlending : MonoBehaviour { private static class ShaderParams { @@ -10,26 +12,26 @@ private static class ShaderParams public static int Phase; } - public global::UnityEngine.Texture2D LUT1; + public Texture2D LUT1; - public global::UnityEngine.Texture2D LUT2; + public Texture2D LUT2; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float LUT1Intensity; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float LUT2Intensity; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float phase; - public global::UnityEngine.Shader lerpShader; + public Shader lerpShader; private float oldPhase; - private global::UnityEngine.RenderTexture rt; + private RenderTexture rt; - private global::UnityEngine.Material lerpMat; + private Material lerpMat; private void OnEnable() { diff --git a/Assets/Scripts/Beautify/Universal/LUTBlending.cs.meta b/Assets/Scripts/Beautify/Universal/LUTBlending.cs.meta index 3e15843b..a694d75d 100644 --- a/Assets/Scripts/Beautify/Universal/LUTBlending.cs.meta +++ b/Assets/Scripts/Beautify/Universal/LUTBlending.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7ea701de7c6ffafc9172faa472397d68 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Beautify/Universal/SphereAnimator.cs b/Assets/Scripts/Beautify/Universal/SphereAnimator.cs index 8187f2a8..24cf07fa 100644 --- a/Assets/Scripts/Beautify/Universal/SphereAnimator.cs +++ b/Assets/Scripts/Beautify/Universal/SphereAnimator.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace Beautify.Universal { - public class SphereAnimator : global::UnityEngine.MonoBehaviour + public class SphereAnimator : MonoBehaviour { - private global::UnityEngine.Rigidbody rb; + private Rigidbody rb; private void Start() { diff --git a/Assets/Scripts/Beautify/Universal/SphereAnimator.cs.meta b/Assets/Scripts/Beautify/Universal/SphereAnimator.cs.meta index 6b69f3f0..5923b35a 100644 --- a/Assets/Scripts/Beautify/Universal/SphereAnimator.cs.meta +++ b/Assets/Scripts/Beautify/Universal/SphereAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 38a30864f5d63884404c565bc9865ea4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/BuildingLODMaker.cs b/Assets/Scripts/BuildingLODMaker.cs index f5f403ef..74ca3b9a 100644 --- a/Assets/Scripts/BuildingLODMaker.cs +++ b/Assets/Scripts/BuildingLODMaker.cs @@ -1,18 +1,22 @@ -public class BuildingLODMaker : global::UnityEngine.MonoBehaviour +using System; +using EasyButtons; +using UnityEngine; + +public class BuildingLODMaker : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class LODGroupData { public string ObjectName; - public global::UnityEngine.GameObject LODObject; + public GameObject LODObject; } - public BuildingLODMaker.LODGroupData[] LODGroups; + public LODGroupData[] LODGroups; - public global::UnityEngine.LODGroup LodGroup; + public LODGroup LodGroup; - [global::EasyButtons.Button] + [Button] public void CreateLODs() { } diff --git a/Assets/Scripts/BuildingLODMaker.cs.meta b/Assets/Scripts/BuildingLODMaker.cs.meta index 7f325856..de4d5b1d 100644 --- a/Assets/Scripts/BuildingLODMaker.cs.meta +++ b/Assets/Scripts/BuildingLODMaker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cc8dc631ad8b811317d4a73cb2d0d58b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/CircularTextMeshPro.cs b/Assets/Scripts/CircularTextMeshPro.cs index fc431006..be300948 100644 --- a/Assets/Scripts/CircularTextMeshPro.cs +++ b/Assets/Scripts/CircularTextMeshPro.cs @@ -1,10 +1,13 @@ -[global::UnityEngine.ExecuteAlways] -public class CircularTextMeshPro : global::UnityEngine.MonoBehaviour +using TMPro; +using UnityEngine; + +[ExecuteAlways] +public class CircularTextMeshPro : MonoBehaviour { - [global::UnityEngine.SerializeField] - private global::TMPro.TMP_Text text; + [SerializeField] + private TMP_Text text; - public global::UnityEngine.AnimationCurve vertexCurve; + public AnimationCurve vertexCurve; public float yCurveScaling; @@ -30,7 +33,7 @@ private void OnValidate() { } - private void ReactToTextChanged(global::UnityEngine.Object obj) + private void ReactToTextChanged(Object obj) { } diff --git a/Assets/Scripts/CircularTextMeshPro.cs.meta b/Assets/Scripts/CircularTextMeshPro.cs.meta index 526aec2a..99d4f9c3 100644 --- a/Assets/Scripts/CircularTextMeshPro.cs.meta +++ b/Assets/Scripts/CircularTextMeshPro.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 877fdd979186cb34b5bbe7c18311ee23 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ColorPicker.cs b/Assets/Scripts/ColorPicker.cs index 3c28b75d..c019f1b5 100644 --- a/Assets/Scripts/ColorPicker.cs +++ b/Assets/Scripts/ColorPicker.cs @@ -1,22 +1,25 @@ -public class ColorPicker : global::UnityEngine.MonoBehaviour +using UnityEngine; +using UnityEngine.UI; + +public class ColorPicker : MonoBehaviour { - private global::UnityEngine.UI.Image mainImage; + private Image mainImage; - public global::UnityEngine.RectTransform pickerIcon; + public RectTransform pickerIcon; - public global::UnityEngine.UI.Image colorPreview; + public Image colorPreview; private bool _activeCursor; - public global::UnityEngine.Vector2 offset; + public Vector2 offset; public UIControllerDEMO UIControllerDEMO; - public global::UnityEngine.Canvas Canvas; + public Canvas Canvas; - private global::UnityEngine.Color _findColor; + private Color _findColor; - public global::UnityEngine.Vector2 realSize; + public Vector2 realSize; private void Awake() { diff --git a/Assets/Scripts/ColorPicker.cs.meta b/Assets/Scripts/ColorPicker.cs.meta index d228d103..705cd9b8 100644 --- a/Assets/Scripts/ColorPicker.cs.meta +++ b/Assets/Scripts/ColorPicker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f275ebe1896adeb9b7a0a3bcbe4a750d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/EasyButtons.meta b/Assets/Scripts/EasyButtons.meta index a4c46725..2c572ddd 100644 --- a/Assets/Scripts/EasyButtons.meta +++ b/Assets/Scripts/EasyButtons.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e3cb8552493d3f4184d3aa99f553776 +guid: 713036819be79294d90cc65be40f59b6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/EasyButtons/Example.meta b/Assets/Scripts/EasyButtons/Example.meta index 847cab4c..5407711f 100644 --- a/Assets/Scripts/EasyButtons/Example.meta +++ b/Assets/Scripts/EasyButtons/Example.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 870fe683c11b08044846a81e6ed892e1 +guid: d685e95e9b3acee4994b5c7daff6618f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs b/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs index 59f94f89..7b12af65 100644 --- a/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs +++ b/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs @@ -1,48 +1,50 @@ +using UnityEngine; + namespace EasyButtons.Example { - public class ButtonsExample : global::UnityEngine.MonoBehaviour + public class ButtonsExample : MonoBehaviour { - [global::EasyButtons.Button] + [Button] public void SayMyName() { } - [global::EasyButtons.Button(Mode = global::EasyButtons.ButtonMode.DisabledInPlayMode)] + [Button(Mode = ButtonMode.DisabledInPlayMode)] protected void SayHelloEditor() { } - [global::EasyButtons.Button(Mode = global::EasyButtons.ButtonMode.EnabledInPlayMode)] + [Button(Mode = ButtonMode.EnabledInPlayMode)] private void SayHelloInRuntime() { } - [global::EasyButtons.Button("Special Name", Spacing = global::EasyButtons.ButtonSpacing.Before)] + [Button("Special Name", Spacing = ButtonSpacing.Before)] private void TestButtonName() { } - [global::EasyButtons.Button("Special Name Editor Only", Mode = global::EasyButtons.ButtonMode.DisabledInPlayMode)] + [Button("Special Name Editor Only", Mode = ButtonMode.DisabledInPlayMode)] private void TestButtonNameEditorOnly() { } - [global::EasyButtons.Button] + [Button] private static void TestStaticMethod() { } - [global::EasyButtons.Button("Space Before and After", Spacing = (global::EasyButtons.ButtonSpacing.Before | global::EasyButtons.ButtonSpacing.After))] + [Button("Space Before and After", Spacing = (ButtonSpacing.Before | ButtonSpacing.After))] private void TestButtonSpaceBoth() { } - [global::EasyButtons.Button("Button With Parameters")] + [Button("Button With Parameters")] private void TestButtonWithParams(string message, int number) { } - [global::EasyButtons.Button("Expanded Button Example", Expanded = true)] + [Button("Expanded Button Example", Expanded = true)] private void TestExpandedButton(string message) { } diff --git a/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs.meta b/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs.meta index 382d2c72..a93bce27 100644 --- a/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs.meta +++ b/Assets/Scripts/EasyButtons/Example/ButtonsExample.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2d1468ef92ef09fb308f5ef7caf589f5 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs b/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs index 42373d08..cb0d0a85 100644 --- a/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs +++ b/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs @@ -1,13 +1,15 @@ +using UnityEngine; + namespace EasyButtons.Example { - public class CustomEditorButtonsExample : global::UnityEngine.MonoBehaviour + public class CustomEditorButtonsExample : MonoBehaviour { - [global::EasyButtons.Button("Custom Editor Example")] + [Button("Custom Editor Example")] private void SayHello() { } - [global::EasyButtons.Button] + [Button] private void SecondButton() { } diff --git a/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs.meta b/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs.meta index a5748001..29f2624b 100644 --- a/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs.meta +++ b/Assets/Scripts/EasyButtons/Example/CustomEditorButtonsExample.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 042f9f2fb5eea5519b6c073a6f778fb2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs b/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs index c69e4265..8f41798a 100644 --- a/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs +++ b/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs @@ -1,19 +1,21 @@ +using UnityEngine; + namespace EasyButtons.Example { - [global::UnityEngine.CreateAssetMenu(fileName = "ScriptableObjectExample.asset", menuName = "EasyButtons/ScriptableObjectExample")] - public class ScriptableObjectExample : global::UnityEngine.ScriptableObject + [CreateAssetMenu(fileName = "ScriptableObjectExample.asset", menuName = "EasyButtons/ScriptableObjectExample")] + public class ScriptableObjectExample : ScriptableObject { - [global::EasyButtons.Button] + [Button] public void SayHello() { } - [global::EasyButtons.Button(Mode = global::EasyButtons.ButtonMode.DisabledInPlayMode)] + [Button(Mode = ButtonMode.DisabledInPlayMode)] public void SayHelloEditor() { } - [global::EasyButtons.Button(Mode = global::EasyButtons.ButtonMode.EnabledInPlayMode)] + [Button(Mode = ButtonMode.EnabledInPlayMode)] public void SayHelloPlayMode() { } diff --git a/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs.meta b/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs.meta index 2056a746..335553d4 100644 --- a/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs.meta +++ b/Assets/Scripts/EasyButtons/Example/ScriptableObjectExample.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f257f1bcbd3d5553dd032a298fab9104 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/EditorPrefsStrings.cs.meta b/Assets/Scripts/EditorPrefsStrings.cs.meta index 5fc60082..67d55145 100644 --- a/Assets/Scripts/EditorPrefsStrings.cs.meta +++ b/Assets/Scripts/EditorPrefsStrings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3292fa93d023f6899db2356108f78281 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ExampleWheelController.cs b/Assets/Scripts/ExampleWheelController.cs index 21c801ce..4793bfea 100644 --- a/Assets/Scripts/ExampleWheelController.cs +++ b/Assets/Scripts/ExampleWheelController.cs @@ -1,4 +1,6 @@ -public class ExampleWheelController : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class ExampleWheelController : MonoBehaviour { private static class Uniforms { @@ -7,9 +9,9 @@ private static class Uniforms public float acceleration; - public global::UnityEngine.Renderer motionVectorRenderer; + public Renderer motionVectorRenderer; - private global::UnityEngine.Rigidbody m_Rigidbody; + private Rigidbody m_Rigidbody; private void Start() { diff --git a/Assets/Scripts/ExampleWheelController.cs.meta b/Assets/Scripts/ExampleWheelController.cs.meta index ac215486..d84d1626 100644 --- a/Assets/Scripts/ExampleWheelController.cs.meta +++ b/Assets/Scripts/ExampleWheelController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c6fd02d152b83a6e8189125aebe200f6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FanRotator.cs b/Assets/Scripts/FanRotator.cs index 749a65f0..c8637bed 100644 --- a/Assets/Scripts/FanRotator.cs +++ b/Assets/Scripts/FanRotator.cs @@ -1,6 +1,8 @@ -public class FanRotator : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class FanRotator : MonoBehaviour { - private global::UnityEngine.Transform thisTransform; + private Transform thisTransform; public float speed; diff --git a/Assets/Scripts/FanRotator.cs.meta b/Assets/Scripts/FanRotator.cs.meta index cfeaa3bc..0f6eb890 100644 --- a/Assets/Scripts/FanRotator.cs.meta +++ b/Assets/Scripts/FanRotator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e4071b17d717d6dfb759afe78ae4c9c0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FirebaseManager.cs b/Assets/Scripts/FirebaseManager.cs index 3ed6c6bb..0bcad0d8 100644 --- a/Assets/Scripts/FirebaseManager.cs +++ b/Assets/Scripts/FirebaseManager.cs @@ -1,39 +1,47 @@ -public class FirebaseManager : global::UnityEngine.MonoBehaviour +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; +using UnityEngine.Networking; + +public class FirebaseManager : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CFetchActiveVote_003Ed__0 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CFetchActiveVote_003Ed__0 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - private global::UnityEngine.Networking.UnityWebRequest _003Crequest_003E5__2; + private UnityWebRequest _003Crequest_003E5__2; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CFetchActiveVote_003Ed__0(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -42,7 +50,7 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); @@ -52,14 +60,14 @@ private void _003C_003Em__Finally1() { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(FirebaseManager._003CFetchActiveVote_003Ed__0))] - private global::System.Collections.IEnumerator FetchActiveVote() + [IteratorStateMachine(typeof(_003CFetchActiveVote_003Ed__0))] + private IEnumerator FetchActiveVote() { return null; } diff --git a/Assets/Scripts/FirebaseManager.cs.meta b/Assets/Scripts/FirebaseManager.cs.meta index a398851d..9ced9ac4 100644 --- a/Assets/Scripts/FirebaseManager.cs.meta +++ b/Assets/Scripts/FirebaseManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a929f871cda44afefcad8016b7d5da2b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishNet.meta b/Assets/Scripts/FishNet.meta index 5775146f..14305dcf 100644 --- a/Assets/Scripts/FishNet.meta +++ b/Assets/Scripts/FishNet.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d55670a95931d44c917f106a8991ea3 +guid: d94184e225758ff46a6417d2f047ab58 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishNet/Serializing.meta b/Assets/Scripts/FishNet/Serializing.meta index b19bf338..9c1d0713 100644 --- a/Assets/Scripts/FishNet/Serializing.meta +++ b/Assets/Scripts/FishNet/Serializing.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 593eee58f508ed54aa530806576ebd92 +guid: 6fb39c74cb6d7964d84f4c1b0b8457a9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishNet/Serializing/Generated.meta b/Assets/Scripts/FishNet/Serializing/Generated.meta index e523c75d..9a2ed808 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated.meta +++ b/Assets/Scripts/FishNet/Serializing/Generated.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8ddac14325d7d7744aa0d707b98e09b4 +guid: 99fc8643d01635f43aa9a9b443bee866 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs index c24272bb..ef91e50f 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs @@ -1,9 +1,12 @@ +using System.Runtime.InteropServices; +using UnityEngine; + namespace FishNet.Serializing.Generated { - [global::System.Runtime.InteropServices.StructLayout(global::System.Runtime.InteropServices.LayoutKind.Auto, CharSet = global::System.Runtime.InteropServices.CharSet.Auto)] + [StructLayout(LayoutKind.Auto, CharSet = CharSet.Auto)] public static class GeneratedComparers___Internal { - [global::UnityEngine.RuntimeInitializeOnLoadMethod] + [RuntimeInitializeOnLoadMethod] private static void InitializeOnce() { } diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs.meta b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs.meta index 913f6cab..93e961d6 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs.meta +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedComparers___Internal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf463eca7cf26164b8be7d59f33aadb0 +guid: 9af90105a9853f44cb6cd0e64b655e0c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs index 75622cf9..1af5299b 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs @@ -1,434 +1,467 @@ +using System.Collections.Generic; +using System.Runtime.InteropServices; +using FishNet.Object; +using ScheduleOne.AvatarFramework; +using ScheduleOne.AvatarFramework.Customization; +using ScheduleOne.Casino; +using ScheduleOne.Combat; +using ScheduleOne.Delivery; +using ScheduleOne.DevUtilities; +using ScheduleOne.Doors; +using ScheduleOne.Economy; +using ScheduleOne.Employees; +using ScheduleOne.GameTime; +using ScheduleOne.ItemFramework; +using ScheduleOne.Law; +using ScheduleOne.Levelling; +using ScheduleOne.Management; +using ScheduleOne.Messaging; +using ScheduleOne.ObjectScripts; +using ScheduleOne.Persistence; +using ScheduleOne.Persistence.Datas; +using ScheduleOne.PlayerScripts; +using ScheduleOne.Product; +using ScheduleOne.Property; +using ScheduleOne.Quests; +using ScheduleOne.Tiles; +using ScheduleOne.UI.Handover; +using ScheduleOne.UI.Phone.Messages; +using ScheduleOne.Vehicles; +using ScheduleOne.Vehicles.Modification; +using ScheduleOne.Vision; +using UnityEngine; + namespace FishNet.Serializing.Generated { - [global::System.Runtime.InteropServices.StructLayout(global::System.Runtime.InteropServices.LayoutKind.Auto, CharSet = global::System.Runtime.InteropServices.CharSet.Auto)] + [StructLayout(LayoutKind.Auto, CharSet = CharSet.Auto)] public static class GeneratedReaders___Internal { - [global::UnityEngine.RuntimeInitializeOnLoadMethod] + [RuntimeInitializeOnLoadMethod] private static void InitializeOnce() { } - public static global::ScheduleOne.Vision.VisionEventReceipt Read___ScheduleOne_002EVision_002EVisionEventReceiptFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static VisionEventReceipt Read___ScheduleOne_002EVision_002EVisionEventReceiptFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.PlayerScripts.PlayerVisualState.EVisualState Read___ScheduleOne_002EPlayerScripts_002EPlayerVisualState_002FEVisualStateFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static PlayerVisualState.EVisualState Read___ScheduleOne_002EPlayerScripts_002EPlayerVisualState_002FEVisualStateFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.PlayerScripts.PlayerVisualState.EVisualState); + return default(PlayerVisualState.EVisualState); } - public static global::ScheduleOne.Vision.VisionCone.EEventLevel Read___ScheduleOne_002EVision_002EVisionCone_002FEEventLevelFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static VisionCone.EEventLevel Read___ScheduleOne_002EVision_002EVisionCone_002FEEventLevelFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Vision.VisionCone.EEventLevel); + return default(VisionCone.EEventLevel); } - public static global::ScheduleOne.Quests.ContractInfo Read___ScheduleOne_002EQuests_002EContractInfoFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ContractInfo Read___ScheduleOne_002EQuests_002EContractInfoFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.ProductList Read___ScheduleOne_002EProduct_002EProductListFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ProductList Read___ScheduleOne_002EProduct_002EProductListFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.ProductList.Entry Read___ScheduleOne_002EProduct_002EProductList_002FEntryFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ProductList.Entry Read___ScheduleOne_002EProduct_002EProductList_002FEntryFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ItemFramework.EQuality Read___ScheduleOne_002EItemFramework_002EEQualityFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EQuality Read___ScheduleOne_002EItemFramework_002EEQualityFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.ItemFramework.EQuality); + return default(EQuality); } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EProduct_002EProductList_002FEntry_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EProduct_002EProductList_002FEntry_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Quests.QuestWindowConfig Read___ScheduleOne_002EQuests_002EQuestWindowConfigFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static QuestWindowConfig Read___ScheduleOne_002EQuests_002EQuestWindowConfigFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.GameTime.GameDateTime Read___ScheduleOne_002EGameTime_002EGameDateTimeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static GameDateTime Read___ScheduleOne_002EGameTime_002EGameDateTimeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.GameTime.GameDateTime); + return default(GameDateTime); } - public static global::ScheduleOne.Quests.QuestManager.EQuestAction Read___ScheduleOne_002EQuests_002EQuestManager_002FEQuestActionFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static QuestManager.EQuestAction Read___ScheduleOne_002EQuests_002EQuestManager_002FEQuestActionFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Quests.QuestManager.EQuestAction); + return default(QuestManager.EQuestAction); } - public static global::ScheduleOne.Quests.EQuestState Read___ScheduleOne_002EQuests_002EEQuestStateFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EQuestState Read___ScheduleOne_002EQuests_002EEQuestStateFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Quests.EQuestState); + return default(EQuestState); } - public static global::ScheduleOne.Combat.Impact Read___ScheduleOne_002ECombat_002EImpactFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Impact Read___ScheduleOne_002ECombat_002EImpactFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Combat.EImpactType Read___ScheduleOne_002ECombat_002EEImpactTypeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EImpactType Read___ScheduleOne_002ECombat_002EEImpactTypeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Combat.EImpactType); + return default(EImpactType); } - public static global::ScheduleOne.Vehicles.LandVehicle Read___ScheduleOne_002EVehicles_002ELandVehicleFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static LandVehicle Read___ScheduleOne_002EVehicles_002ELandVehicleFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Law.CheckpointManager.ECheckpointLocation Read___ScheduleOne_002ELaw_002ECheckpointManager_002FECheckpointLocationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static CheckpointManager.ECheckpointLocation Read___ScheduleOne_002ELaw_002ECheckpointManager_002FECheckpointLocationFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Law.CheckpointManager.ECheckpointLocation); + return default(CheckpointManager.ECheckpointLocation); } - public static global::ScheduleOne.PlayerScripts.Player Read___ScheduleOne_002EPlayerScripts_002EPlayerFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Player Read___ScheduleOne_002EPlayerScripts_002EPlayerFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CSystem_002EString_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CSystem_002EString_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.DevUtilities.StringIntPair Read___ScheduleOne_002EDevUtilities_002EStringIntPairFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static StringIntPair Read___ScheduleOne_002EDevUtilities_002EStringIntPairFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.DevUtilities.StringIntPair[] Read___ScheduleOne_002EDevUtilities_002EStringIntPair_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static StringIntPair[] Read___ScheduleOne_002EDevUtilities_002EStringIntPair_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Messaging.Message Read___ScheduleOne_002EMessaging_002EMessageFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Message Read___ScheduleOne_002EMessaging_002EMessageFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Messaging.Message.ESenderType Read___ScheduleOne_002EMessaging_002EMessage_002FESenderTypeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Message.ESenderType Read___ScheduleOne_002EMessaging_002EMessage_002FESenderTypeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Messaging.Message.ESenderType); + return default(Message.ESenderType); } - public static global::ScheduleOne.UI.Phone.Messages.MessageChain Read___ScheduleOne_002EUI_002EPhone_002EMessages_002EMessageChainFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static MessageChain Read___ScheduleOne_002EUI_002EPhone_002EMessages_002EMessageChainFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.MSGConversationData Read___ScheduleOne_002EPersistence_002EDatas_002EMSGConversationDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static MSGConversationData Read___ScheduleOne_002EPersistence_002EDatas_002EMSGConversationDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.TextMessageData Read___ScheduleOne_002EPersistence_002EDatas_002ETextMessageDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static TextMessageData Read___ScheduleOne_002EPersistence_002EDatas_002ETextMessageDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.TextMessageData[] Read___ScheduleOne_002EPersistence_002EDatas_002ETextMessageData_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static TextMessageData[] Read___ScheduleOne_002EPersistence_002EDatas_002ETextMessageData_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.TextResponseData Read___ScheduleOne_002EPersistence_002EDatas_002ETextResponseDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static TextResponseData Read___ScheduleOne_002EPersistence_002EDatas_002ETextResponseDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.TextResponseData[] Read___ScheduleOne_002EPersistence_002EDatas_002ETextResponseData_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static TextResponseData[] Read___ScheduleOne_002EPersistence_002EDatas_002ETextResponseData_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Messaging.Response Read___ScheduleOne_002EMessaging_002EResponseFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Response Read___ScheduleOne_002EMessaging_002EResponseFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EMessaging_002EResponse_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EMessaging_002EResponse_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CFishNet_002EObject_002ENetworkObject_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CFishNet_002EObject_002ENetworkObject_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.AdvancedTransitRouteData Read___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static AdvancedTransitRouteData Read___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Management.ManagementItemFilter.EMode Read___ScheduleOne_002EManagement_002EManagementItemFilter_002FEModeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ManagementItemFilter.EMode Read___ScheduleOne_002EManagement_002EManagementItemFilter_002FEModeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Management.ManagementItemFilter.EMode); + return default(ManagementItemFilter.EMode); } - public static global::ScheduleOne.Persistence.Datas.AdvancedTransitRouteData[] Read___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteData_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static AdvancedTransitRouteData[] Read___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteData_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Levelling.ERank Read___ScheduleOne_002ELevelling_002EERankFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ERank Read___ScheduleOne_002ELevelling_002EERankFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Levelling.ERank); + return default(ERank); } - public static global::ScheduleOne.Levelling.FullRank Read___ScheduleOne_002ELevelling_002EFullRankFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static FullRank Read___ScheduleOne_002ELevelling_002EFullRankFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Levelling.FullRank); + return default(FullRank); } - public static global::ScheduleOne.Persistence.Datas.PlayerData Read___ScheduleOne_002EPersistence_002EDatas_002EPlayerDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static PlayerData Read___ScheduleOne_002EPersistence_002EDatas_002EPlayerDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.VariableData Read___ScheduleOne_002EPersistence_002EDatas_002EVariableDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static VariableData Read___ScheduleOne_002EPersistence_002EDatas_002EVariableDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.VariableData[] Read___ScheduleOne_002EPersistence_002EDatas_002EVariableData_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static VariableData[] Read___ScheduleOne_002EPersistence_002EDatas_002EVariableData_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.AvatarFramework.AvatarSettings Read___ScheduleOne_002EAvatarFramework_002EAvatarSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static AvatarSettings Read___ScheduleOne_002EAvatarFramework_002EAvatarSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration Read___ScheduleOne_002EAvatarFramework_002EEye_002FEyeLidConfigurationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Eye.EyeLidConfiguration Read___ScheduleOne_002EAvatarFramework_002EEye_002FEyeLidConfigurationFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration); + return default(Eye.EyeLidConfiguration); } - public static global::ScheduleOne.AvatarFramework.AvatarSettings.LayerSetting Read___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSettingFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static AvatarSettings.LayerSetting Read___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSettingFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.AvatarFramework.AvatarSettings.LayerSetting); + return default(AvatarSettings.LayerSetting); } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSetting_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSetting_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.AvatarFramework.AvatarSettings.AccessorySetting Read___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySettingFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static AvatarSettings.AccessorySetting Read___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySettingFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySetting_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySetting_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.AvatarFramework.Customization.BasicAvatarSettings Read___ScheduleOne_002EAvatarFramework_002ECustomization_002EBasicAvatarSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static BasicAvatarSettings Read___ScheduleOne_002EAvatarFramework_002ECustomization_002EBasicAvatarSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.PlayerScripts.PlayerCrimeData.EPursuitLevel Read___ScheduleOne_002EPlayerScripts_002EPlayerCrimeData_002FEPursuitLevelFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static PlayerCrimeData.EPursuitLevel Read___ScheduleOne_002EPlayerScripts_002EPlayerCrimeData_002FEPursuitLevelFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.PlayerScripts.PlayerCrimeData.EPursuitLevel); + return default(PlayerCrimeData.EPursuitLevel); } - public static global::ScheduleOne.Property.Property Read___ScheduleOne_002EProperty_002EPropertyFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Property Read___ScheduleOne_002EProperty_002EPropertyFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Employees.EEmployeeType Read___ScheduleOne_002EEmployees_002EEEmployeeTypeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EEmployeeType Read___ScheduleOne_002EEmployees_002EEEmployeeTypeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Employees.EEmployeeType); + return default(EEmployeeType); } - public static global::ScheduleOne.Economy.EDealWindow Read___ScheduleOne_002EEconomy_002EEDealWindowFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EDealWindow Read___ScheduleOne_002EEconomy_002EEDealWindowFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Economy.EDealWindow); + return default(EDealWindow); } - public static global::ScheduleOne.UI.Handover.HandoverScreen.EHandoverOutcome Read___ScheduleOne_002EUI_002EHandover_002EHandoverScreen_002FEHandoverOutcomeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static HandoverScreen.EHandoverOutcome Read___ScheduleOne_002EUI_002EHandover_002EHandoverScreen_002FEHandoverOutcomeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.UI.Handover.HandoverScreen.EHandoverOutcome); + return default(HandoverScreen.EHandoverOutcome); } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EItemFramework_002EItemInstance_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EItemFramework_002EItemInstance_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Persistence.Datas.CustomerData Read___ScheduleOne_002EPersistence_002EDatas_002ECustomerDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ScheduleOne.Persistence.Datas.CustomerData Read___ScheduleOne_002EPersistence_002EDatas_002ECustomerDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static string[] Read___System_002EString_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static string[] Read___System_002EString_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static float[] Read___System_002ESingle_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static float[] Read___System_002ESingle_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.EDrugType Read___ScheduleOne_002EProduct_002EEDrugTypeFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EDrugType Read___ScheduleOne_002EProduct_002EEDrugTypeFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Product.EDrugType); + return default(EDrugType); } - public static global::ScheduleOne.Persistence.Datas.GameData Read___ScheduleOne_002EPersistence_002EDatas_002EGameDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static GameData Read___ScheduleOne_002EPersistence_002EDatas_002EGameDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.DevUtilities.GameSettings Read___ScheduleOne_002EDevUtilities_002EGameSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static GameSettings Read___ScheduleOne_002EDevUtilities_002EGameSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Delivery.DeliveryInstance Read___ScheduleOne_002EDelivery_002EDeliveryInstanceFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static DeliveryInstance Read___ScheduleOne_002EDelivery_002EDeliveryInstanceFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Delivery.EDeliveryStatus Read___ScheduleOne_002EDelivery_002EEDeliveryStatusFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EDeliveryStatus Read___ScheduleOne_002EDelivery_002EEDeliveryStatusFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Delivery.EDeliveryStatus); + return default(EDeliveryStatus); } - public static global::ScheduleOne.Combat.ExplosionData Read___ScheduleOne_002ECombat_002EExplosionDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ExplosionData Read___ScheduleOne_002ECombat_002EExplosionDataFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Combat.ExplosionData); + return default(ExplosionData); } - public static global::ScheduleOne.Casino.PlayingCard.ECardSuit Read___ScheduleOne_002ECasino_002EPlayingCard_002FECardSuitFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static PlayingCard.ECardSuit Read___ScheduleOne_002ECasino_002EPlayingCard_002FECardSuitFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Casino.PlayingCard.ECardSuit); + return default(PlayingCard.ECardSuit); } - public static global::ScheduleOne.Casino.PlayingCard.ECardValue Read___ScheduleOne_002ECasino_002EPlayingCard_002FECardValueFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static PlayingCard.ECardValue Read___ScheduleOne_002ECasino_002EPlayingCard_002FECardValueFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Casino.PlayingCard.ECardValue); + return default(PlayingCard.ECardValue); } - public static global::FishNet.Object.NetworkObject[] Read___FishNet_002EObject_002ENetworkObject_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static NetworkObject[] Read___FishNet_002EObject_002ENetworkObject_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Casino.RTBGameController.EStage Read___ScheduleOne_002ECasino_002ERTBGameController_002FEStageFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static RTBGameController.EStage Read___ScheduleOne_002ECasino_002ERTBGameController_002FEStageFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Casino.RTBGameController.EStage); + return default(RTBGameController.EStage); } - public static global::ScheduleOne.Casino.SlotMachine.ESymbol Read___ScheduleOne_002ECasino_002ESlotMachine_002FESymbolFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static SlotMachine.ESymbol Read___ScheduleOne_002ECasino_002ESlotMachine_002FESymbolFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Casino.SlotMachine.ESymbol); + return default(SlotMachine.ESymbol); } - public static global::ScheduleOne.Casino.SlotMachine.ESymbol[] Read___ScheduleOne_002ECasino_002ESlotMachine_002FESymbol_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static SlotMachine.ESymbol[] Read___ScheduleOne_002ECasino_002ESlotMachine_002FESymbol_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Doors.EDoorSide Read___ScheduleOne_002EDoors_002EEDoorSideFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EDoorSide Read___ScheduleOne_002EDoors_002EEDoorSideFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Doors.EDoorSide); + return default(EDoorSide); } - public static global::ScheduleOne.Vehicles.Modification.EVehicleColor Read___ScheduleOne_002EVehicles_002EModification_002EEVehicleColorFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EVehicleColor Read___ScheduleOne_002EVehicles_002EModification_002EEVehicleColorFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Vehicles.Modification.EVehicleColor); + return default(EVehicleColor); } - public static global::ScheduleOne.Vehicles.ParkData Read___ScheduleOne_002EVehicles_002EParkDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ParkData Read___ScheduleOne_002EVehicles_002EParkDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Vehicles.EParkingAlignment Read___ScheduleOne_002EVehicles_002EEParkingAlignmentFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static EParkingAlignment Read___ScheduleOne_002EVehicles_002EEParkingAlignmentFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Vehicles.EParkingAlignment); + return default(EParkingAlignment); } - public static global::ScheduleOne.Persistence.TrashContentData Read___ScheduleOne_002EPersistence_002ETrashContentDataFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static TrashContentData Read___ScheduleOne_002EPersistence_002ETrashContentDataFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static int[] Read___System_002EInt32_005B_005DFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static int[] Read___System_002EInt32_005B_005DFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Tiles.Coordinate Read___ScheduleOne_002ETiles_002ECoordinateFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Coordinate Read___ScheduleOne_002ETiles_002ECoordinateFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.WeedAppearanceSettings Read___ScheduleOne_002EProduct_002EWeedAppearanceSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static WeedAppearanceSettings Read___ScheduleOne_002EProduct_002EWeedAppearanceSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.CocaineAppearanceSettings Read___ScheduleOne_002EProduct_002ECocaineAppearanceSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static CocaineAppearanceSettings Read___ScheduleOne_002EProduct_002ECocaineAppearanceSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.MethAppearanceSettings Read___ScheduleOne_002EProduct_002EMethAppearanceSettingsFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static MethAppearanceSettings Read___ScheduleOne_002EProduct_002EMethAppearanceSettingsFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.Product.NewMixOperation Read___ScheduleOne_002EProduct_002ENewMixOperationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static NewMixOperation Read___ScheduleOne_002EProduct_002ENewMixOperationFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ObjectScripts.Recycler.EState Read___ScheduleOne_002EObjectScripts_002ERecycler_002FEStateFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static Recycler.EState Read___ScheduleOne_002EObjectScripts_002ERecycler_002FEStateFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.ObjectScripts.Recycler.EState); + return default(Recycler.EState); } - public static global::ScheduleOne.Tiles.CoordinateProceduralTilePair Read___ScheduleOne_002ETiles_002ECoordinateProceduralTilePairFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static CoordinateProceduralTilePair Read___ScheduleOne_002ETiles_002ECoordinateProceduralTilePairFishNet_002ESerializing_002EGenerateds(Reader reader) { - return default(global::ScheduleOne.Tiles.CoordinateProceduralTilePair); + return default(CoordinateProceduralTilePair); } - public static global::System.Collections.Generic.List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002ETiles_002ECoordinateProceduralTilePair_003EFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static List Read___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002ETiles_002ECoordinateProceduralTilePair_003EFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ObjectScripts.ChemistryCookOperation Read___ScheduleOne_002EObjectScripts_002EChemistryCookOperationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static ChemistryCookOperation Read___ScheduleOne_002EObjectScripts_002EChemistryCookOperationFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ObjectScripts.DryingOperation Read___ScheduleOne_002EObjectScripts_002EDryingOperationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static DryingOperation Read___ScheduleOne_002EObjectScripts_002EDryingOperationFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ObjectScripts.OvenCookOperation Read___ScheduleOne_002EObjectScripts_002EOvenCookOperationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static OvenCookOperation Read___ScheduleOne_002EObjectScripts_002EOvenCookOperationFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } - public static global::ScheduleOne.ObjectScripts.MixOperation Read___ScheduleOne_002EObjectScripts_002EMixOperationFishNet_002ESerializing_002EGenerateds(global::FishNet.Serializing.Reader reader) + public static MixOperation Read___ScheduleOne_002EObjectScripts_002EMixOperationFishNet_002ESerializing_002EGenerateds(Reader reader) { return null; } diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs.meta b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs.meta index 2823846a..66043301 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs.meta +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedReaders___Internal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4047c5b5968c705418100472e4f27c7a +guid: c6066589dee5d2d4ab45bad851c06925 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs index f895798d..b3c2c2de 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs @@ -1,350 +1,383 @@ +using System.Collections.Generic; +using System.Runtime.InteropServices; +using FishNet.Object; +using ScheduleOne.AvatarFramework; +using ScheduleOne.AvatarFramework.Customization; +using ScheduleOne.Casino; +using ScheduleOne.Combat; +using ScheduleOne.Delivery; +using ScheduleOne.DevUtilities; +using ScheduleOne.Doors; +using ScheduleOne.Economy; +using ScheduleOne.Employees; +using ScheduleOne.GameTime; +using ScheduleOne.ItemFramework; +using ScheduleOne.Law; +using ScheduleOne.Levelling; +using ScheduleOne.Management; +using ScheduleOne.Messaging; +using ScheduleOne.ObjectScripts; +using ScheduleOne.Persistence; +using ScheduleOne.Persistence.Datas; +using ScheduleOne.PlayerScripts; +using ScheduleOne.Product; +using ScheduleOne.Property; +using ScheduleOne.Quests; +using ScheduleOne.Tiles; +using ScheduleOne.UI.Handover; +using ScheduleOne.UI.Phone.Messages; +using ScheduleOne.Vehicles; +using ScheduleOne.Vehicles.Modification; +using ScheduleOne.Vision; +using UnityEngine; + namespace FishNet.Serializing.Generated { - [global::System.Runtime.InteropServices.StructLayout(global::System.Runtime.InteropServices.LayoutKind.Auto, CharSet = global::System.Runtime.InteropServices.CharSet.Auto)] + [StructLayout(LayoutKind.Auto, CharSet = CharSet.Auto)] public static class GeneratedWriters___Internal { - [global::UnityEngine.RuntimeInitializeOnLoadMethod] + [RuntimeInitializeOnLoadMethod] private static void InitializeOnce() { } - public static void Write___ScheduleOne_002EVision_002EVisionEventReceiptFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vision.VisionEventReceipt value) + public static void Write___ScheduleOne_002EVision_002EVisionEventReceiptFishNet_002ESerializing_002EGenerated(this Writer writer, VisionEventReceipt value) { } - public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerVisualState_002FEVisualStateFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.PlayerScripts.PlayerVisualState.EVisualState value) + public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerVisualState_002FEVisualStateFishNet_002ESerializing_002EGenerated(this Writer writer, PlayerVisualState.EVisualState value) { } - public static void Write___ScheduleOne_002EVision_002EVisionCone_002FEEventLevelFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vision.VisionCone.EEventLevel value) + public static void Write___ScheduleOne_002EVision_002EVisionCone_002FEEventLevelFishNet_002ESerializing_002EGenerated(this Writer writer, VisionCone.EEventLevel value) { } - public static void Write___ScheduleOne_002EQuests_002EContractInfoFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Quests.ContractInfo value) + public static void Write___ScheduleOne_002EQuests_002EContractInfoFishNet_002ESerializing_002EGenerated(this Writer writer, ContractInfo value) { } - public static void Write___ScheduleOne_002EProduct_002EProductListFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.ProductList value) + public static void Write___ScheduleOne_002EProduct_002EProductListFishNet_002ESerializing_002EGenerated(this Writer writer, ProductList value) { } - public static void Write___ScheduleOne_002EProduct_002EProductList_002FEntryFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.ProductList.Entry value) + public static void Write___ScheduleOne_002EProduct_002EProductList_002FEntryFishNet_002ESerializing_002EGenerated(this Writer writer, ProductList.Entry value) { } - public static void Write___ScheduleOne_002EItemFramework_002EEQualityFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ItemFramework.EQuality value) + public static void Write___ScheduleOne_002EItemFramework_002EEQualityFishNet_002ESerializing_002EGenerated(this Writer writer, EQuality value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EProduct_002EProductList_002FEntry_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EProduct_002EProductList_002FEntry_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EQuests_002EQuestWindowConfigFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Quests.QuestWindowConfig value) + public static void Write___ScheduleOne_002EQuests_002EQuestWindowConfigFishNet_002ESerializing_002EGenerated(this Writer writer, QuestWindowConfig value) { } - public static void Write___ScheduleOne_002EGameTime_002EGameDateTimeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.GameTime.GameDateTime value) + public static void Write___ScheduleOne_002EGameTime_002EGameDateTimeFishNet_002ESerializing_002EGenerated(this Writer writer, GameDateTime value) { } - public static void Write___ScheduleOne_002EQuests_002EQuestManager_002FEQuestActionFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Quests.QuestManager.EQuestAction value) + public static void Write___ScheduleOne_002EQuests_002EQuestManager_002FEQuestActionFishNet_002ESerializing_002EGenerated(this Writer writer, QuestManager.EQuestAction value) { } - public static void Write___ScheduleOne_002EQuests_002EEQuestStateFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Quests.EQuestState value) + public static void Write___ScheduleOne_002EQuests_002EEQuestStateFishNet_002ESerializing_002EGenerated(this Writer writer, EQuestState value) { } - public static void Write___ScheduleOne_002ECombat_002EImpactFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Combat.Impact value) + public static void Write___ScheduleOne_002ECombat_002EImpactFishNet_002ESerializing_002EGenerated(this Writer writer, Impact value) { } - public static void Write___ScheduleOne_002ECombat_002EEImpactTypeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Combat.EImpactType value) + public static void Write___ScheduleOne_002ECombat_002EEImpactTypeFishNet_002ESerializing_002EGenerated(this Writer writer, EImpactType value) { } - public static void Write___ScheduleOne_002EVehicles_002ELandVehicleFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vehicles.LandVehicle value) + public static void Write___ScheduleOne_002EVehicles_002ELandVehicleFishNet_002ESerializing_002EGenerated(this Writer writer, LandVehicle value) { } - public static void Write___ScheduleOne_002ELaw_002ECheckpointManager_002FECheckpointLocationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Law.CheckpointManager.ECheckpointLocation value) + public static void Write___ScheduleOne_002ELaw_002ECheckpointManager_002FECheckpointLocationFishNet_002ESerializing_002EGenerated(this Writer writer, CheckpointManager.ECheckpointLocation value) { } - public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.PlayerScripts.Player value) + public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerFishNet_002ESerializing_002EGenerated(this Writer writer, Player value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CSystem_002EString_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CSystem_002EString_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EDevUtilities_002EStringIntPairFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.DevUtilities.StringIntPair value) + public static void Write___ScheduleOne_002EDevUtilities_002EStringIntPairFishNet_002ESerializing_002EGenerated(this Writer writer, StringIntPair value) { } - public static void Write___ScheduleOne_002EDevUtilities_002EStringIntPair_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.DevUtilities.StringIntPair[] value) + public static void Write___ScheduleOne_002EDevUtilities_002EStringIntPair_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, StringIntPair[] value) { } - public static void Write___ScheduleOne_002EMessaging_002EMessageFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Messaging.Message value) + public static void Write___ScheduleOne_002EMessaging_002EMessageFishNet_002ESerializing_002EGenerated(this Writer writer, Message value) { } - public static void Write___ScheduleOne_002EMessaging_002EMessage_002FESenderTypeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Messaging.Message.ESenderType value) + public static void Write___ScheduleOne_002EMessaging_002EMessage_002FESenderTypeFishNet_002ESerializing_002EGenerated(this Writer writer, Message.ESenderType value) { } - public static void Write___ScheduleOne_002EUI_002EPhone_002EMessages_002EMessageChainFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.UI.Phone.Messages.MessageChain value) + public static void Write___ScheduleOne_002EUI_002EPhone_002EMessages_002EMessageChainFishNet_002ESerializing_002EGenerated(this Writer writer, MessageChain value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EMSGConversationDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.MSGConversationData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EMSGConversationDataFishNet_002ESerializing_002EGenerated(this Writer writer, MSGConversationData value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextMessageDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.TextMessageData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextMessageDataFishNet_002ESerializing_002EGenerated(this Writer writer, TextMessageData value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextMessageData_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.TextMessageData[] value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextMessageData_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, TextMessageData[] value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextResponseDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.TextResponseData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextResponseDataFishNet_002ESerializing_002EGenerated(this Writer writer, TextResponseData value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextResponseData_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.TextResponseData[] value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002ETextResponseData_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, TextResponseData[] value) { } - public static void Write___ScheduleOne_002EMessaging_002EResponseFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Messaging.Response value) + public static void Write___ScheduleOne_002EMessaging_002EResponseFishNet_002ESerializing_002EGenerated(this Writer writer, Response value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EMessaging_002EResponse_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EMessaging_002EResponse_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CFishNet_002EObject_002ENetworkObject_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CFishNet_002EObject_002ENetworkObject_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.AdvancedTransitRouteData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteDataFishNet_002ESerializing_002EGenerated(this Writer writer, AdvancedTransitRouteData value) { } - public static void Write___ScheduleOne_002EManagement_002EManagementItemFilter_002FEModeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Management.ManagementItemFilter.EMode value) + public static void Write___ScheduleOne_002EManagement_002EManagementItemFilter_002FEModeFishNet_002ESerializing_002EGenerated(this Writer writer, ManagementItemFilter.EMode value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteData_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.AdvancedTransitRouteData[] value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EAdvancedTransitRouteData_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, AdvancedTransitRouteData[] value) { } - public static void Write___ScheduleOne_002ELevelling_002EERankFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Levelling.ERank value) + public static void Write___ScheduleOne_002ELevelling_002EERankFishNet_002ESerializing_002EGenerated(this Writer writer, ERank value) { } - public static void Write___ScheduleOne_002ELevelling_002EFullRankFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Levelling.FullRank value) + public static void Write___ScheduleOne_002ELevelling_002EFullRankFishNet_002ESerializing_002EGenerated(this Writer writer, FullRank value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EPlayerDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.PlayerData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EPlayerDataFishNet_002ESerializing_002EGenerated(this Writer writer, PlayerData value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EVariableDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.VariableData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EVariableDataFishNet_002ESerializing_002EGenerated(this Writer writer, VariableData value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EVariableData_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.VariableData[] value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EVariableData_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, VariableData[] value) { } - public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.AvatarFramework.AvatarSettings value) + public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, AvatarSettings value) { } - public static void Write___ScheduleOne_002EAvatarFramework_002EEye_002FEyeLidConfigurationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration value) + public static void Write___ScheduleOne_002EAvatarFramework_002EEye_002FEyeLidConfigurationFishNet_002ESerializing_002EGenerated(this Writer writer, Eye.EyeLidConfiguration value) { } - public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSettingFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.AvatarFramework.AvatarSettings.LayerSetting value) + public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSettingFishNet_002ESerializing_002EGenerated(this Writer writer, AvatarSettings.LayerSetting value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSetting_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FLayerSetting_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySettingFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.AvatarFramework.AvatarSettings.AccessorySetting value) + public static void Write___ScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySettingFishNet_002ESerializing_002EGenerated(this Writer writer, AvatarSettings.AccessorySetting value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySetting_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EAvatarFramework_002EAvatarSettings_002FAccessorySetting_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EAvatarFramework_002ECustomization_002EBasicAvatarSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.AvatarFramework.Customization.BasicAvatarSettings value) + public static void Write___ScheduleOne_002EAvatarFramework_002ECustomization_002EBasicAvatarSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, BasicAvatarSettings value) { } - public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerCrimeData_002FEPursuitLevelFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.PlayerScripts.PlayerCrimeData.EPursuitLevel value) + public static void Write___ScheduleOne_002EPlayerScripts_002EPlayerCrimeData_002FEPursuitLevelFishNet_002ESerializing_002EGenerated(this Writer writer, PlayerCrimeData.EPursuitLevel value) { } - public static void Write___ScheduleOne_002EProperty_002EPropertyFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Property.Property value) + public static void Write___ScheduleOne_002EProperty_002EPropertyFishNet_002ESerializing_002EGenerated(this Writer writer, Property value) { } - public static void Write___ScheduleOne_002EEmployees_002EEEmployeeTypeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Employees.EEmployeeType value) + public static void Write___ScheduleOne_002EEmployees_002EEEmployeeTypeFishNet_002ESerializing_002EGenerated(this Writer writer, EEmployeeType value) { } - public static void Write___ScheduleOne_002EEconomy_002EEDealWindowFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Economy.EDealWindow value) + public static void Write___ScheduleOne_002EEconomy_002EEDealWindowFishNet_002ESerializing_002EGenerated(this Writer writer, EDealWindow value) { } - public static void Write___ScheduleOne_002EUI_002EHandover_002EHandoverScreen_002FEHandoverOutcomeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.UI.Handover.HandoverScreen.EHandoverOutcome value) + public static void Write___ScheduleOne_002EUI_002EHandover_002EHandoverScreen_002FEHandoverOutcomeFishNet_002ESerializing_002EGenerated(this Writer writer, HandoverScreen.EHandoverOutcome value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EItemFramework_002EItemInstance_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002EItemFramework_002EItemInstance_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002ECustomerDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.CustomerData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002ECustomerDataFishNet_002ESerializing_002EGenerated(this Writer writer, ScheduleOne.Persistence.Datas.CustomerData value) { } - public static void Write___System_002EString_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, string[] value) + public static void Write___System_002EString_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, string[] value) { } - public static void Write___System_002ESingle_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, float[] value) + public static void Write___System_002ESingle_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, float[] value) { } - public static void Write___ScheduleOne_002EProduct_002EEDrugTypeFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.EDrugType value) + public static void Write___ScheduleOne_002EProduct_002EEDrugTypeFishNet_002ESerializing_002EGenerated(this Writer writer, EDrugType value) { } - public static void Write___ScheduleOne_002EPersistence_002EDatas_002EGameDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.Datas.GameData value) + public static void Write___ScheduleOne_002EPersistence_002EDatas_002EGameDataFishNet_002ESerializing_002EGenerated(this Writer writer, GameData value) { } - public static void Write___ScheduleOne_002EDevUtilities_002EGameSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.DevUtilities.GameSettings value) + public static void Write___ScheduleOne_002EDevUtilities_002EGameSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, GameSettings value) { } - public static void Write___ScheduleOne_002EDelivery_002EDeliveryInstanceFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Delivery.DeliveryInstance value) + public static void Write___ScheduleOne_002EDelivery_002EDeliveryInstanceFishNet_002ESerializing_002EGenerated(this Writer writer, DeliveryInstance value) { } - public static void Write___ScheduleOne_002EDelivery_002EEDeliveryStatusFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Delivery.EDeliveryStatus value) + public static void Write___ScheduleOne_002EDelivery_002EEDeliveryStatusFishNet_002ESerializing_002EGenerated(this Writer writer, EDeliveryStatus value) { } - public static void Write___ScheduleOne_002ECombat_002EExplosionDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Combat.ExplosionData value) + public static void Write___ScheduleOne_002ECombat_002EExplosionDataFishNet_002ESerializing_002EGenerated(this Writer writer, ExplosionData value) { } - public static void Write___ScheduleOne_002ECasino_002EPlayingCard_002FECardSuitFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Casino.PlayingCard.ECardSuit value) + public static void Write___ScheduleOne_002ECasino_002EPlayingCard_002FECardSuitFishNet_002ESerializing_002EGenerated(this Writer writer, PlayingCard.ECardSuit value) { } - public static void Write___ScheduleOne_002ECasino_002EPlayingCard_002FECardValueFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + public static void Write___ScheduleOne_002ECasino_002EPlayingCard_002FECardValueFishNet_002ESerializing_002EGenerated(this Writer writer, PlayingCard.ECardValue value) { } - public static void Write___FishNet_002EObject_002ENetworkObject_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::FishNet.Object.NetworkObject[] value) + public static void Write___FishNet_002EObject_002ENetworkObject_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, NetworkObject[] value) { } - public static void Write___ScheduleOne_002ECasino_002ERTBGameController_002FEStageFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Casino.RTBGameController.EStage value) + public static void Write___ScheduleOne_002ECasino_002ERTBGameController_002FEStageFishNet_002ESerializing_002EGenerated(this Writer writer, RTBGameController.EStage value) { } - public static void Write___ScheduleOne_002ECasino_002ESlotMachine_002FESymbolFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Casino.SlotMachine.ESymbol value) + public static void Write___ScheduleOne_002ECasino_002ESlotMachine_002FESymbolFishNet_002ESerializing_002EGenerated(this Writer writer, SlotMachine.ESymbol value) { } - public static void Write___ScheduleOne_002ECasino_002ESlotMachine_002FESymbol_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Casino.SlotMachine.ESymbol[] value) + public static void Write___ScheduleOne_002ECasino_002ESlotMachine_002FESymbol_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, SlotMachine.ESymbol[] value) { } - public static void Write___ScheduleOne_002EDoors_002EEDoorSideFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Doors.EDoorSide value) + public static void Write___ScheduleOne_002EDoors_002EEDoorSideFishNet_002ESerializing_002EGenerated(this Writer writer, EDoorSide value) { } - public static void Write___ScheduleOne_002EVehicles_002EModification_002EEVehicleColorFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vehicles.Modification.EVehicleColor value) + public static void Write___ScheduleOne_002EVehicles_002EModification_002EEVehicleColorFishNet_002ESerializing_002EGenerated(this Writer writer, EVehicleColor value) { } - public static void Write___ScheduleOne_002EVehicles_002EParkDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vehicles.ParkData value) + public static void Write___ScheduleOne_002EVehicles_002EParkDataFishNet_002ESerializing_002EGenerated(this Writer writer, ParkData value) { } - public static void Write___ScheduleOne_002EVehicles_002EEParkingAlignmentFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Vehicles.EParkingAlignment value) + public static void Write___ScheduleOne_002EVehicles_002EEParkingAlignmentFishNet_002ESerializing_002EGenerated(this Writer writer, EParkingAlignment value) { } - public static void Write___ScheduleOne_002EPersistence_002ETrashContentDataFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Persistence.TrashContentData value) + public static void Write___ScheduleOne_002EPersistence_002ETrashContentDataFishNet_002ESerializing_002EGenerated(this Writer writer, TrashContentData value) { } - public static void Write___System_002EInt32_005B_005DFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, int[] value) + public static void Write___System_002EInt32_005B_005DFishNet_002ESerializing_002EGenerated(this Writer writer, int[] value) { } - public static void Write___ScheduleOne_002ETiles_002ECoordinateFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Tiles.Coordinate value) + public static void Write___ScheduleOne_002ETiles_002ECoordinateFishNet_002ESerializing_002EGenerated(this Writer writer, Coordinate value) { } - public static void Write___ScheduleOne_002EProduct_002EWeedAppearanceSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.WeedAppearanceSettings value) + public static void Write___ScheduleOne_002EProduct_002EWeedAppearanceSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, WeedAppearanceSettings value) { } - public static void Write___ScheduleOne_002EProduct_002ECocaineAppearanceSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.CocaineAppearanceSettings value) + public static void Write___ScheduleOne_002EProduct_002ECocaineAppearanceSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, CocaineAppearanceSettings value) { } - public static void Write___ScheduleOne_002EProduct_002EMethAppearanceSettingsFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.MethAppearanceSettings value) + public static void Write___ScheduleOne_002EProduct_002EMethAppearanceSettingsFishNet_002ESerializing_002EGenerated(this Writer writer, MethAppearanceSettings value) { } - public static void Write___ScheduleOne_002EProduct_002ENewMixOperationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Product.NewMixOperation value) + public static void Write___ScheduleOne_002EProduct_002ENewMixOperationFishNet_002ESerializing_002EGenerated(this Writer writer, NewMixOperation value) { } - public static void Write___ScheduleOne_002EObjectScripts_002ERecycler_002FEStateFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ObjectScripts.Recycler.EState value) + public static void Write___ScheduleOne_002EObjectScripts_002ERecycler_002FEStateFishNet_002ESerializing_002EGenerated(this Writer writer, Recycler.EState value) { } - public static void Write___ScheduleOne_002ETiles_002ECoordinateProceduralTilePairFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.Tiles.CoordinateProceduralTilePair value) + public static void Write___ScheduleOne_002ETiles_002ECoordinateProceduralTilePairFishNet_002ESerializing_002EGenerated(this Writer writer, CoordinateProceduralTilePair value) { } - public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002ETiles_002ECoordinateProceduralTilePair_003EFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::System.Collections.Generic.List value) + public static void Write___System_002ECollections_002EGeneric_002EList_00601_003CScheduleOne_002ETiles_002ECoordinateProceduralTilePair_003EFishNet_002ESerializing_002EGenerated(this Writer writer, List value) { } - public static void Write___ScheduleOne_002EObjectScripts_002EChemistryCookOperationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ObjectScripts.ChemistryCookOperation value) + public static void Write___ScheduleOne_002EObjectScripts_002EChemistryCookOperationFishNet_002ESerializing_002EGenerated(this Writer writer, ChemistryCookOperation value) { } - public static void Write___ScheduleOne_002EObjectScripts_002EDryingOperationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ObjectScripts.DryingOperation value) + public static void Write___ScheduleOne_002EObjectScripts_002EDryingOperationFishNet_002ESerializing_002EGenerated(this Writer writer, DryingOperation value) { } - public static void Write___ScheduleOne_002EObjectScripts_002EOvenCookOperationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ObjectScripts.OvenCookOperation value) + public static void Write___ScheduleOne_002EObjectScripts_002EOvenCookOperationFishNet_002ESerializing_002EGenerated(this Writer writer, OvenCookOperation value) { } - public static void Write___ScheduleOne_002EObjectScripts_002EMixOperationFishNet_002ESerializing_002EGenerated(this global::FishNet.Serializing.Writer writer, global::ScheduleOne.ObjectScripts.MixOperation value) + public static void Write___ScheduleOne_002EObjectScripts_002EMixOperationFishNet_002ESerializing_002EGenerated(this Writer writer, MixOperation value) { } } diff --git a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs.meta b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs.meta index fd417c05..16c4f472 100644 --- a/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs.meta +++ b/Assets/Scripts/FishNet/Serializing/Generated/GeneratedWriters___Internal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13ecd5814b5cacf4a905eae747a0f304 +guid: b529bad6ca2fd6e458a6660d10aa128f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks.meta b/Assets/Scripts/FishySteamworks.meta index d9ddfa46..27860f39 100644 --- a/Assets/Scripts/FishySteamworks.meta +++ b/Assets/Scripts/FishySteamworks.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a804f72201447544389f5c0298cccd42 +guid: 312f2645c2341494c9fb8f110d45c753 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs b/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs index ea7b703e..c57dc04d 100644 --- a/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs +++ b/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs @@ -1,20 +1,23 @@ +using System.Collections; +using System.Collections.Generic; + namespace FishySteamworks { - public class BidirectionalDictionary : global::System.Collections.IEnumerable + public class BidirectionalDictionary : IEnumerable { - private global::System.Collections.Generic.Dictionary t1ToT2Dict; + private Dictionary t1ToT2Dict; - private global::System.Collections.Generic.Dictionary t2ToT1Dict; + private Dictionary t2ToT1Dict; - public global::System.Collections.Generic.IEnumerable FirstTypes => null; + public IEnumerable FirstTypes => null; - public global::System.Collections.Generic.IEnumerable SecondTypes => null; + public IEnumerable SecondTypes => null; public int Count => 0; - public global::System.Collections.Generic.Dictionary First => null; + public Dictionary First => null; - public global::System.Collections.Generic.Dictionary Second => null; + public Dictionary Second => null; public T1 this[T2 key] { @@ -38,7 +41,7 @@ public T2 this[T1 key] } } - public global::System.Collections.IEnumerator GetEnumerator() + public IEnumerator GetEnumerator() { return null; } diff --git a/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs.meta b/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs.meta index 5bd85e53..4f7a6f60 100644 --- a/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs.meta +++ b/Assets/Scripts/FishySteamworks/BidirectionalDictionary.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5ea5b5d7ffc095045aeec97afb632e10 +guid: 7f698105ee54a7b47b9739a7463a7095 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/Client.meta b/Assets/Scripts/FishySteamworks/Client.meta index 10e804e5..16aaeab9 100644 --- a/Assets/Scripts/FishySteamworks/Client.meta +++ b/Assets/Scripts/FishySteamworks/Client.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 225aa465c96bba74cbf6c26f49c2ea89 +guid: 2775b10fb4c6c034da26256475dd35bc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs b/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs index e3f4be16..1b5f9b0d 100644 --- a/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs +++ b/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs @@ -1,21 +1,26 @@ +using System; +using System.Collections.Generic; +using FishNet.Transporting; +using FishySteamworks.Server; + namespace FishySteamworks.Client { - public class ClientHostSocket : global::FishySteamworks.CommonSocket + public class ClientHostSocket : CommonSocket { - private global::FishySteamworks.Server.ServerSocket _server; + private ServerSocket _server; - private global::System.Collections.Generic.Queue _incoming; + private Queue _incoming; internal void CheckSetStarted() { } - internal bool StartConnection(global::FishySteamworks.Server.ServerSocket serverSocket) + internal bool StartConnection(ServerSocket serverSocket) { return false; } - protected override void SetLocalConnectionState(global::FishNet.Transporting.LocalConnectionState connectionState, bool server) + protected override void SetLocalConnectionState(LocalConnectionState connectionState, bool server) { } @@ -28,11 +33,11 @@ internal void IterateIncoming() { } - internal void ReceivedFromLocalServer(global::FishySteamworks.LocalPacket packet) + internal void ReceivedFromLocalServer(LocalPacket packet) { } - internal void SendToServer(byte channelId, global::System.ArraySegment segment) + internal void SendToServer(byte channelId, ArraySegment segment) { } } diff --git a/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs.meta b/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs.meta index 9dfc991a..3ddca957 100644 --- a/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs.meta +++ b/Assets/Scripts/FishySteamworks/Client/ClientHostSocket.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 81e26be504f7d72f6bc03011ea90bd7d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs b/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs index bea0dbe0..5d6edfdb 100644 --- a/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs +++ b/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs @@ -1,14 +1,18 @@ +using System; +using System.Threading; +using Steamworks; + namespace FishySteamworks.Client { - public class ClientSocket : global::FishySteamworks.CommonSocket + public class ClientSocket : CommonSocket { - private global::Steamworks.Callback _onLocalConnectionStateCallback; + private Callback _onLocalConnectionStateCallback; - private global::Steamworks.CSteamID _hostSteamID; + private CSteamID _hostSteamID; - private global::Steamworks.HSteamNetConnection _socket; + private HSteamNetConnection _socket; - private global::System.Threading.Thread _timeoutThread; + private Thread _timeoutThread; private float _connectTimeout; @@ -23,7 +27,7 @@ internal bool StartConnection(string address, ushort port, bool peerToPeer) return false; } - private void OnLocalConnectionState(global::Steamworks.SteamNetConnectionStatusChangedCallback_t args) + private void OnLocalConnectionState(SteamNetConnectionStatusChangedCallback_t args) { } @@ -36,7 +40,7 @@ internal void IterateIncoming() { } - internal void SendToServer(byte channelId, global::System.ArraySegment segment) + internal void SendToServer(byte channelId, ArraySegment segment) { } diff --git a/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs.meta b/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs.meta index d9c254aa..3aea2229 100644 --- a/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs.meta +++ b/Assets/Scripts/FishySteamworks/Client/ClientSocket.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3fe64f1355d538844784882552a0cf8c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/CommonSocket.cs b/Assets/Scripts/FishySteamworks/CommonSocket.cs index 0c3b37db..405fe731 100644 --- a/Assets/Scripts/FishySteamworks/CommonSocket.cs +++ b/Assets/Scripts/FishySteamworks/CommonSocket.cs @@ -1,29 +1,35 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using FishNet.Transporting; +using Steamworks; + namespace FishySteamworks { public abstract class CommonSocket { - private global::FishNet.Transporting.LocalConnectionState _connectionState; + private LocalConnectionState _connectionState; protected bool PeerToPeer; - protected global::FishNet.Transporting.Transport Transport; + protected Transport Transport; - protected global::System.IntPtr[] MessagePointers; + protected IntPtr[] MessagePointers; protected byte[] InboundBuffer; protected const int MAX_MESSAGES = 256; - internal global::FishNet.Transporting.LocalConnectionState GetLocalConnectionState() + internal LocalConnectionState GetLocalConnectionState() { - return default(global::FishNet.Transporting.LocalConnectionState); + return default(LocalConnectionState); } - protected virtual void SetLocalConnectionState(global::FishNet.Transporting.LocalConnectionState connectionState, bool server) + protected virtual void SetLocalConnectionState(LocalConnectionState connectionState, bool server) { } - internal virtual void Initialize(global::FishNet.Transporting.Transport t) + internal virtual void Initialize(Transport t) { } @@ -32,22 +38,22 @@ protected byte[] GetIPBytes(string address) return null; } - protected global::Steamworks.EResult Send(global::Steamworks.HSteamNetConnection steamConnection, global::System.ArraySegment segment, byte channelId) + protected EResult Send(HSteamNetConnection steamConnection, ArraySegment segment, byte channelId) { - return default(global::Steamworks.EResult); + return default(EResult); } - internal void ClearQueue(global::System.Collections.Concurrent.ConcurrentQueue queue) + internal void ClearQueue(ConcurrentQueue queue) { } - internal void ClearQueue(global::System.Collections.Generic.Queue queue) + internal void ClearQueue(Queue queue) { } - protected void GetMessage(global::System.IntPtr ptr, byte[] buffer, out global::System.ArraySegment segment, out byte channel) + protected void GetMessage(IntPtr ptr, byte[] buffer, out ArraySegment segment, out byte channel) { - segment = default(global::System.ArraySegment); + segment = default(ArraySegment); channel = default(byte); } } diff --git a/Assets/Scripts/FishySteamworks/CommonSocket.cs.meta b/Assets/Scripts/FishySteamworks/CommonSocket.cs.meta index ff3b4e00..1be371dc 100644 --- a/Assets/Scripts/FishySteamworks/CommonSocket.cs.meta +++ b/Assets/Scripts/FishySteamworks/CommonSocket.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9e7aebf250b33f53ac2cb6e8f2d5ab9f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/FishySteamworks.cs b/Assets/Scripts/FishySteamworks/FishySteamworks.cs index 0a7a81d8..a9bc92a2 100644 --- a/Assets/Scripts/FishySteamworks/FishySteamworks.cs +++ b/Assets/Scripts/FishySteamworks/FishySteamworks.cs @@ -1,98 +1,106 @@ +using System; +using System.Runtime.CompilerServices; +using FishNet.Managing; +using FishNet.Transporting; +using FishySteamworks.Client; +using FishySteamworks.Server; +using UnityEngine; + namespace FishySteamworks { - public class FishySteamworks : global::FishNet.Transporting.Transport + public class FishySteamworks : Transport { - [global::System.NonSerialized] + [NonSerialized] public ulong LocalUserSteamID; - [global::UnityEngine.Tooltip("Address server should bind to.")] - [global::UnityEngine.SerializeField] + [Tooltip("Address server should bind to.")] + [SerializeField] private string _serverBindAddress; - [global::UnityEngine.Tooltip("Port to use.")] - [global::UnityEngine.SerializeField] + [Tooltip("Port to use.")] + [SerializeField] private ushort _port; - [global::UnityEngine.Tooltip("Maximum number of players which may be connected at once.")] - [global::UnityEngine.Range(1f, 65535f)] - [global::UnityEngine.SerializeField] + [Tooltip("Maximum number of players which may be connected at once.")] + [Range(1f, 65535f)] + [SerializeField] private ushort _maximumClients; - [global::UnityEngine.Tooltip("True if using peer to peer socket.")] - [global::UnityEngine.SerializeField] + [Tooltip("True if using peer to peer socket.")] + [SerializeField] private bool _peerToPeer; - [global::UnityEngine.Tooltip("Address client should connect to.")] - [global::UnityEngine.SerializeField] + [Tooltip("Address client should connect to.")] + [SerializeField] private string _clientAddress; private int[] _mtus; - private global::FishySteamworks.Client.ClientSocket _client; + private ClientSocket _client; - private global::FishySteamworks.Client.ClientHostSocket _clientHost; + private ClientHostSocket _clientHost; - private global::FishySteamworks.Server.ServerSocket _server; + private ServerSocket _server; private bool _shutdownCalled; internal const int CLIENT_HOST_ID = 32767; - public override event global::System.Action OnClientConnectionState + public override event Action OnClientConnectionState { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public override event global::System.Action OnServerConnectionState + public override event Action OnServerConnectionState { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public override event global::System.Action OnRemoteConnectionState + public override event Action OnRemoteConnectionState { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public override event global::System.Action OnClientReceivedData + public override event Action OnClientReceivedData { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } } - public override event global::System.Action OnServerReceivedData + public override event Action OnServerReceivedData { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } @@ -102,7 +110,7 @@ public class FishySteamworks : global::FishNet.Transporting.Transport { } - public override void Initialize(global::FishNet.Managing.NetworkManager networkManager, int transportIndex) + public override void Initialize(NetworkManager networkManager, int transportIndex) { } @@ -133,25 +141,25 @@ public override string GetConnectionAddress(int connectionId) return null; } - public override global::FishNet.Transporting.LocalConnectionState GetConnectionState(bool server) + public override LocalConnectionState GetConnectionState(bool server) { - return default(global::FishNet.Transporting.LocalConnectionState); + return default(LocalConnectionState); } - public override global::FishNet.Transporting.RemoteConnectionState GetConnectionState(int connectionId) + public override RemoteConnectionState GetConnectionState(int connectionId) { - return default(global::FishNet.Transporting.RemoteConnectionState); + return default(RemoteConnectionState); } - public override void HandleClientConnectionState(global::FishNet.Transporting.ClientConnectionStateArgs connectionStateArgs) + public override void HandleClientConnectionState(ClientConnectionStateArgs connectionStateArgs) { } - public override void HandleServerConnectionState(global::FishNet.Transporting.ServerConnectionStateArgs connectionStateArgs) + public override void HandleServerConnectionState(ServerConnectionStateArgs connectionStateArgs) { } - public override void HandleRemoteConnectionState(global::FishNet.Transporting.RemoteConnectionStateArgs connectionStateArgs) + public override void HandleRemoteConnectionState(RemoteConnectionStateArgs connectionStateArgs) { } @@ -163,19 +171,19 @@ public override void IterateOutgoing(bool server) { } - public override void HandleClientReceivedDataArgs(global::FishNet.Transporting.ClientReceivedDataArgs receivedDataArgs) + public override void HandleClientReceivedDataArgs(ClientReceivedDataArgs receivedDataArgs) { } - public override void HandleServerReceivedDataArgs(global::FishNet.Transporting.ServerReceivedDataArgs receivedDataArgs) + public override void HandleServerReceivedDataArgs(ServerReceivedDataArgs receivedDataArgs) { } - public override void SendToServer(byte channelId, global::System.ArraySegment segment) + public override void SendToServer(byte channelId, ArraySegment segment) { } - public override void SendToClient(byte channelId, global::System.ArraySegment segment, int connectionId) + public override void SendToClient(byte channelId, ArraySegment segment, int connectionId) { } @@ -192,7 +200,7 @@ public override void SetClientAddress(string address) { } - public override void SetServerBindAddress(string address, global::FishNet.Transporting.IPAddressType addressType) + public override void SetServerBindAddress(string address, IPAddressType addressType) { } diff --git a/Assets/Scripts/FishySteamworks/FishySteamworks.cs.meta b/Assets/Scripts/FishySteamworks/FishySteamworks.cs.meta index 9eecd792..836c631e 100644 --- a/Assets/Scripts/FishySteamworks/FishySteamworks.cs.meta +++ b/Assets/Scripts/FishySteamworks/FishySteamworks.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8769090d0266782ccc36aef7ab7448e6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/LocalPacket.cs b/Assets/Scripts/FishySteamworks/LocalPacket.cs index 8ebd6e5e..3038f6f6 100644 --- a/Assets/Scripts/FishySteamworks/LocalPacket.cs +++ b/Assets/Scripts/FishySteamworks/LocalPacket.cs @@ -1,3 +1,6 @@ +using System; +using FishNet.Utility.Performance; + namespace FishySteamworks { internal struct LocalPacket @@ -8,11 +11,12 @@ internal struct LocalPacket public byte Channel; - public LocalPacket(global::System.ArraySegment data, byte channel) + public LocalPacket(ArraySegment data, byte channel) { - Data = null; - Length = 0; - Channel = 0; + Data = ByteArrayPool.Retrieve(data.Count); + Length = data.Count; + Buffer.BlockCopy(data.Array, data.Offset, Data, 0, Length); + Channel = channel; } } } diff --git a/Assets/Scripts/FishySteamworks/LocalPacket.cs.meta b/Assets/Scripts/FishySteamworks/LocalPacket.cs.meta index 38ebfa40..92dace0f 100644 --- a/Assets/Scripts/FishySteamworks/LocalPacket.cs.meta +++ b/Assets/Scripts/FishySteamworks/LocalPacket.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7945128a16dc24282465892b9cf9af3e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FishySteamworks/Server.meta b/Assets/Scripts/FishySteamworks/Server.meta index 093ee975..7c803a20 100644 --- a/Assets/Scripts/FishySteamworks/Server.meta +++ b/Assets/Scripts/FishySteamworks/Server.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4dd8f45c4f6ce4844a1c2ea2b13a755a +guid: ea02034b262c9b74d9497b9f6f152730 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs b/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs index f0a87aae..a39801a8 100644 --- a/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs +++ b/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs @@ -1,59 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using FishNet.Transporting; +using FishySteamworks.Client; +using Steamworks; + namespace FishySteamworks.Server { - public class ServerSocket : global::FishySteamworks.CommonSocket + public class ServerSocket : CommonSocket { public struct ConnectionChange { public int ConnectionId; - public global::Steamworks.HSteamNetConnection SteamConnection; + public HSteamNetConnection SteamConnection; - public global::Steamworks.CSteamID SteamId; + public CSteamID SteamId; public bool IsConnect => false; public ConnectionChange(int id) { - ConnectionId = 0; - SteamConnection = default(global::Steamworks.HSteamNetConnection); - SteamId = default(global::Steamworks.CSteamID); + ConnectionId = id; + SteamId = CSteamID.Nil; + SteamConnection = default(HSteamNetConnection); } - public ConnectionChange(int id, global::Steamworks.HSteamNetConnection steamConnection, global::Steamworks.CSteamID steamId) + public ConnectionChange(int id, HSteamNetConnection steamConnection, CSteamID steamId) { - ConnectionId = 0; - SteamConnection = default(global::Steamworks.HSteamNetConnection); - SteamId = default(global::Steamworks.CSteamID); + ConnectionId = id; + SteamConnection = steamConnection; + SteamId = steamId; } } - private global::FishySteamworks.BidirectionalDictionary _steamConnections; + private BidirectionalDictionary _steamConnections; - private global::FishySteamworks.BidirectionalDictionary _steamIds; + private BidirectionalDictionary _steamIds; private int _maximumClients; private int _nextConnectionId; - private global::Steamworks.HSteamListenSocket _socket; + private HSteamListenSocket _socket; - private global::System.Collections.Generic.Queue _clientHostIncoming; + private Queue _clientHostIncoming; private bool _clientHostStarted; - private global::Steamworks.Callback _onRemoteConnectionStateCallback; + private Callback _onRemoteConnectionStateCallback; - private global::System.Collections.Generic.Queue _cachedConnectionIds; + private Queue _cachedConnectionIds; - private global::FishySteamworks.Client.ClientHostSocket _clientHost; + private ClientHostSocket _clientHost; private bool _iteratingConnections; - private global::System.Collections.Generic.List _pendingConnectionChanges; + private List _pendingConnectionChanges; - internal global::FishNet.Transporting.RemoteConnectionState GetConnectionState(int connectionId) + internal RemoteConnectionState GetConnectionState(int connectionId) { - return default(global::FishNet.Transporting.RemoteConnectionState); + return default(RemoteConnectionState); } internal void ResetInvalidSocket() @@ -75,17 +82,17 @@ internal bool StopConnection(int connectionId) return false; } - private bool StopConnection(int connectionId, global::Steamworks.HSteamNetConnection socket) + private bool StopConnection(int connectionId, HSteamNetConnection socket) { return false; } - [global::System.Runtime.CompilerServices.MethodImpl(global::System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] - private void OnRemoteConnectionState(global::Steamworks.SteamNetConnectionStatusChangedCallback_t args) + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private void OnRemoteConnectionState(SteamNetConnectionStatusChangedCallback_t args) { } - private void AddConnection(int connectionId, global::Steamworks.HSteamNetConnection steamConnection, global::Steamworks.CSteamID steamId) + private void AddConnection(int connectionId, HSteamNetConnection steamConnection, CSteamID steamId) { } @@ -105,7 +112,7 @@ private void ProcessPendingConnectionChanges() { } - internal void SendToClient(byte channelId, global::System.ArraySegment segment, int connectionId) + internal void SendToClient(byte channelId, ArraySegment segment, int connectionId) { } @@ -123,7 +130,7 @@ internal int GetMaximumClients() return 0; } - internal void SetClientHostSocket(global::FishySteamworks.Client.ClientHostSocket socket) + internal void SetClientHostSocket(ClientHostSocket socket) { } @@ -131,7 +138,7 @@ internal void OnClientHostState(bool started) { } - internal void ReceivedFromClientHost(global::FishySteamworks.LocalPacket packet) + internal void ReceivedFromClientHost(LocalPacket packet) { } } diff --git a/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs.meta b/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs.meta index 37c049d3..0a385b13 100644 --- a/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs.meta +++ b/Assets/Scripts/FishySteamworks/Server/ServerSocket.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 75cef9c0414e83c0738574a3f6e69ed4 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FlockChild.cs b/Assets/Scripts/FlockChild.cs index 27e25c8c..acd3462a 100644 --- a/Assets/Scripts/FlockChild.cs +++ b/Assets/Scripts/FlockChild.cs @@ -1,42 +1,44 @@ -public class FlockChild : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class FlockChild : MonoBehaviour { - [global::UnityEngine.HideInInspector] + [HideInInspector] public FlockController _spawner; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.Vector3 _wayPoint; + [HideInInspector] + public Vector3 _wayPoint; public float _speed; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool _dived; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float _stuckCounter; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float _damping; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool _soar; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool _landing; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float _targetSpeed; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool _move; - public global::UnityEngine.GameObject _model; + public GameObject _model; - public global::UnityEngine.Transform _modelT; + public Transform _modelT; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float _avoidValue; - [global::UnityEngine.HideInInspector] + [HideInInspector] public float _avoidDistance; private float _soarTimer; @@ -47,12 +49,12 @@ public class FlockChild : global::UnityEngine.MonoBehaviour private int _updateSeed; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool _avoid; - public global::UnityEngine.Transform _thisT; + public Transform _thisT; - public global::UnityEngine.Vector3 _landingPosOffset; + public Vector3 _landingPosOffset; public void Start() { @@ -119,9 +121,9 @@ public void Flap() { } - public global::UnityEngine.Vector3 findWaypoint() + public Vector3 findWaypoint() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public void Soar() diff --git a/Assets/Scripts/FlockChild.cs.meta b/Assets/Scripts/FlockChild.cs.meta index 58908a31..83412fd5 100644 --- a/Assets/Scripts/FlockChild.cs.meta +++ b/Assets/Scripts/FlockChild.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a200cee26e075a0a69c960439e9f318c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FlockChildSound.cs b/Assets/Scripts/FlockChildSound.cs index b09788a7..65d82ab6 100644 --- a/Assets/Scripts/FlockChildSound.cs +++ b/Assets/Scripts/FlockChildSound.cs @@ -1,17 +1,20 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.AudioSource))] -public class FlockChildSound : global::UnityEngine.MonoBehaviour +using ScheduleOne.Audio; +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] +public class FlockChildSound : MonoBehaviour { - public global::ScheduleOne.Audio.AudioSourceController controller; + public AudioSourceController controller; - public global::UnityEngine.AudioClip[] _idleSounds; + public AudioClip[] _idleSounds; public float _idleSoundRandomChance; - public global::UnityEngine.AudioClip[] _flightSounds; + public AudioClip[] _flightSounds; public float _flightSoundRandomChance; - public global::UnityEngine.AudioClip[] _scareSounds; + public AudioClip[] _scareSounds; public float _pitchMin; @@ -23,7 +26,7 @@ public class FlockChildSound : global::UnityEngine.MonoBehaviour private FlockChild _flockChild; - private global::UnityEngine.AudioSource _audio; + private AudioSource _audio; private bool _hasLanded; diff --git a/Assets/Scripts/FlockChildSound.cs.meta b/Assets/Scripts/FlockChildSound.cs.meta index f2da360e..92f26a4d 100644 --- a/Assets/Scripts/FlockChildSound.cs.meta +++ b/Assets/Scripts/FlockChildSound.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5ae9f7f51e9b2c4da89871da84360531 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FlockController.cs b/Assets/Scripts/FlockController.cs index 4a56d585..1c4a176f 100644 --- a/Assets/Scripts/FlockController.cs +++ b/Assets/Scripts/FlockController.cs @@ -1,4 +1,7 @@ -public class FlockController : global::UnityEngine.MonoBehaviour +using System.Collections.Generic; +using UnityEngine; + +public class FlockController : MonoBehaviour { public FlockChild _childPrefab; @@ -76,11 +79,11 @@ public class FlockController : global::UnityEngine.MonoBehaviour public float _soarMaxTime; - public global::UnityEngine.LayerMask _avoidanceMask; + public LayerMask _avoidanceMask; - public global::System.Collections.Generic.List _roamers; + public List _roamers; - public global::UnityEngine.Vector3 _posBuffer; + public Vector3 _posBuffer; public int _updateDivisor; @@ -92,15 +95,15 @@ public class FlockController : global::UnityEngine.MonoBehaviour public bool _groupChildToNewTransform; - public global::UnityEngine.Transform _groupTransform; + public Transform _groupTransform; public string _groupName; public bool _groupChildToFlock; - public global::UnityEngine.Vector3 _startPosOffset; + public Vector3 _startPosOffset; - public global::UnityEngine.Transform _thisT; + public Transform _thisT; public void Start() { @@ -110,7 +113,7 @@ public void AddChild(int amount) { } - public void AddChildToParent(global::UnityEngine.Transform obj) + public void AddChildToParent(Transform obj) { } diff --git a/Assets/Scripts/FlockController.cs.meta b/Assets/Scripts/FlockController.cs.meta index 3e0e2fd0..eb4b971c 100644 --- a/Assets/Scripts/FlockController.cs.meta +++ b/Assets/Scripts/FlockController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6a4e5b25d9cd2581494fa7695b5c6ab8 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FlockScare.cs b/Assets/Scripts/FlockScare.cs index ffd59fb7..2b36628f 100644 --- a/Assets/Scripts/FlockScare.cs +++ b/Assets/Scripts/FlockScare.cs @@ -1,4 +1,6 @@ -public class FlockScare : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class FlockScare : MonoBehaviour { public LandingSpotController[] landingSpotControllers; diff --git a/Assets/Scripts/FlockScare.cs.meta b/Assets/Scripts/FlockScare.cs.meta index 01a48cf4..9a269f62 100644 --- a/Assets/Scripts/FlockScare.cs.meta +++ b/Assets/Scripts/FlockScare.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2406d166216e874c5e748fa5d592a613 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FlockWaypointTrigger.cs b/Assets/Scripts/FlockWaypointTrigger.cs index 952f701d..cf9675cc 100644 --- a/Assets/Scripts/FlockWaypointTrigger.cs +++ b/Assets/Scripts/FlockWaypointTrigger.cs @@ -1,4 +1,6 @@ -public class FlockWaypointTrigger : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class FlockWaypointTrigger : MonoBehaviour { public float _timer; diff --git a/Assets/Scripts/FlockWaypointTrigger.cs.meta b/Assets/Scripts/FlockWaypointTrigger.cs.meta index bfeb6066..7fc99b99 100644 --- a/Assets/Scripts/FlockWaypointTrigger.cs.meta +++ b/Assets/Scripts/FlockWaypointTrigger.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9508f7bb6d399ff7ff9e5dcbf8f861a3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/FrameTimingsHUDDisplay.cs b/Assets/Scripts/FrameTimingsHUDDisplay.cs index fbfa995a..0ac66bae 100644 --- a/Assets/Scripts/FrameTimingsHUDDisplay.cs +++ b/Assets/Scripts/FrameTimingsHUDDisplay.cs @@ -1,4 +1,7 @@ -public class FrameTimingsHUDDisplay : global::UnityEngine.MonoBehaviour +using System.Collections.Generic; +using UnityEngine; + +public class FrameTimingsHUDDisplay : MonoBehaviour { public struct FrameTimingPoint { @@ -11,13 +14,13 @@ public struct FrameTimingPoint public double gpuFrameTime; } - private global::UnityEngine.GUIStyle m_Style; + private GUIStyle m_Style; - private readonly global::UnityEngine.FrameTiming[] m_FrameTimings; + private readonly FrameTiming[] m_FrameTimings; public const int SAMPLE_SIZE = 200; - public global::System.Collections.Generic.List frameTimingsHistory; + public List frameTimingsHistory; private void Awake() { diff --git a/Assets/Scripts/FrameTimingsHUDDisplay.cs.meta b/Assets/Scripts/FrameTimingsHUDDisplay.cs.meta index b474d098..5ef0e025 100644 --- a/Assets/Scripts/FrameTimingsHUDDisplay.cs.meta +++ b/Assets/Scripts/FrameTimingsHUDDisplay.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 33e3a5db391389a102a6259ed257842e -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly.meta b/Assets/Scripts/Funly.meta index 30c9bd55..4bf10dfd 100644 --- a/Assets/Scripts/Funly.meta +++ b/Assets/Scripts/Funly.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aaf4820553667784589f734d6a5a6ef0 +guid: 2096bacbdfa87ee40b127c0dcd0e1d5d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Funly/SkyStudio.meta b/Assets/Scripts/Funly/SkyStudio.meta index f53f45bf..c0bd6ad9 100644 --- a/Assets/Scripts/Funly/SkyStudio.meta +++ b/Assets/Scripts/Funly/SkyStudio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: abee6d7d23ad20c439fd0935425da98f +guid: ef11355202934f844af9c3b980e08463 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs b/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs index 0372c1f8..d390bc6c 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class BaseArtItem : global::UnityEngine.ScriptableObject + public class BaseArtItem : ScriptableObject { } } diff --git a/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs.meta index ac2e565b..3f16d6cd 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseArtItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1d9451967fbfc9afea8f69e1380d77f0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs b/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs index a8412862..3e73fb36 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public abstract class BaseArtSet : global::UnityEngine.ScriptableObject + public abstract class BaseArtSet : ScriptableObject { } } diff --git a/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs.meta index e2df1f15..f9715d0b 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseArtSet.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1345e9f1d5456f13f1d7ff0e357966ad -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs index 255328b2..f794ec54 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs @@ -1,19 +1,22 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class BaseKeyframe : global::System.IComparable, global::Funly.SkyStudio.IBaseKeyframe + [Serializable] + public class BaseKeyframe : IComparable, IBaseKeyframe { - [global::UnityEngine.SerializeField] + [SerializeField] public string m_Id; - [global::UnityEngine.SerializeField] + [SerializeField] private float m_Time; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.InterpolationCurve m_InterpolationCurve; + [SerializeField] + private InterpolationCurve m_InterpolationCurve; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.InterpolationDirection m_InterpolationDirection; + [SerializeField] + private InterpolationDirection m_InterpolationDirection; public string id { @@ -37,22 +40,22 @@ public float time } } - public global::Funly.SkyStudio.InterpolationCurve interpolationCurve + public InterpolationCurve interpolationCurve { get { - return default(global::Funly.SkyStudio.InterpolationCurve); + return default(InterpolationCurve); } set { } } - public global::Funly.SkyStudio.InterpolationDirection interpolationDirection + public InterpolationDirection interpolationDirection { get { - return default(global::Funly.SkyStudio.InterpolationDirection); + return default(InterpolationDirection); } set { diff --git a/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs.meta index 02abe15f..1fb51f38 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a985d88f89b2dc80b84714b83dd66e10 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs b/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs index 4ca05b7a..b1fe55f4 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs @@ -1,28 +1,32 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public abstract class BaseShaderDefinition : global::Funly.SkyStudio.IProfileDefinition + [Serializable] + public abstract class BaseShaderDefinition : IProfileDefinition { - private global::Funly.SkyStudio.ProfileGroupSection[] m_ProfileDefinitions; + private ProfileGroupSection[] m_ProfileDefinitions; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.ProfileFeatureSection[] m_ProfileFeatures; + [SerializeField] + private ProfileFeatureSection[] m_ProfileFeatures; - private global::System.Collections.Generic.Dictionary m_KeyToFeature; + private Dictionary m_KeyToFeature; public string shaderName { get; protected set; } - public global::Funly.SkyStudio.ProfileGroupSection[] groups => null; + public ProfileGroupSection[] groups => null; - public global::Funly.SkyStudio.ProfileFeatureSection[] features => null; + public ProfileFeatureSection[] features => null; - public global::Funly.SkyStudio.ProfileFeatureDefinition GetFeatureDefinition(string featureKey) + public ProfileFeatureDefinition GetFeatureDefinition(string featureKey) { return null; } - protected abstract global::Funly.SkyStudio.ProfileFeatureSection[] ProfileFeatureSection(); + protected abstract ProfileFeatureSection[] ProfileFeatureSection(); - protected abstract global::Funly.SkyStudio.ProfileGroupSection[] ProfileDefinitionTable(); + protected abstract ProfileGroupSection[] ProfileDefinitionTable(); } } diff --git a/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs.meta index 7977b263..d434bd63 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseShaderDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 82be56afea48e85352a2eba2e18a4239 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs b/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs index b4023686..91c67f21 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs @@ -1,65 +1,68 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - public abstract class BaseSpriteInstancedRenderer : global::UnityEngine.MonoBehaviour + public abstract class BaseSpriteInstancedRenderer : MonoBehaviour { public const int kArrayMaxSprites = 1000; - [global::UnityEngine.Tooltip("Mesh used to render the instances onto. If empty, a quad will be used.")] - public global::UnityEngine.Mesh modelMesh; + [Tooltip("Mesh used to render the instances onto. If empty, a quad will be used.")] + public Mesh modelMesh; - [global::UnityEngine.Tooltip("Sky Studio sprite sheet animated shader material.")] - public global::UnityEngine.Material renderMaterial; + [Tooltip("Sky Studio sprite sheet animated shader material.")] + public Material renderMaterial; - protected global::System.Collections.Generic.Queue m_Available; + protected Queue m_Available; - protected global::System.Collections.Generic.HashSet m_Active; + protected HashSet m_Active; - private global::UnityEngine.MaterialPropertyBlock m_PropertyBlock; + private MaterialPropertyBlock m_PropertyBlock; - private global::UnityEngine.Matrix4x4[] m_ModelMatrices; + private Matrix4x4[] m_ModelMatrices; private float[] m_StartTimes; private float[] m_EndTimes; - protected global::Funly.SkyStudio.SpriteSheetData m_SpriteSheetLayout; + protected SpriteSheetData m_SpriteSheetLayout; - protected global::UnityEngine.Texture m_SpriteTexture; + protected Texture m_SpriteTexture; - protected global::UnityEngine.Color m_TintColor; + protected Color m_TintColor; - protected global::UnityEngine.Mesh m_DefaltModelMesh; + protected Mesh m_DefaltModelMesh; public int maxSprites { get; protected set; } - protected global::UnityEngine.Camera m_ViewerCamera { get; set; } + protected Camera m_ViewerCamera { get; set; } private void Start() { } - protected abstract global::UnityEngine.Bounds CalculateMeshBounds(); + protected abstract Bounds CalculateMeshBounds(); - protected abstract global::Funly.SkyStudio.BaseSpriteItemData CreateSpriteItemData(); + protected abstract BaseSpriteItemData CreateSpriteItemData(); protected abstract bool IsRenderingEnabled(); protected abstract int GetNextSpawnCount(); - protected abstract void CalculateSpriteTRS(global::Funly.SkyStudio.BaseSpriteItemData data, out global::UnityEngine.Vector3 spritePosition, out global::UnityEngine.Quaternion spriteRotation, out global::UnityEngine.Vector3 spriteScale); + protected abstract void CalculateSpriteTRS(BaseSpriteItemData data, out Vector3 spritePosition, out Quaternion spriteRotation, out Vector3 spriteScale); - protected abstract void ConfigureSpriteItemData(global::Funly.SkyStudio.BaseSpriteItemData data); + protected abstract void ConfigureSpriteItemData(BaseSpriteItemData data); - protected abstract void PrepareDataArraysForRendering(int instanceId, global::Funly.SkyStudio.BaseSpriteItemData data); + protected abstract void PrepareDataArraysForRendering(int instanceId, BaseSpriteItemData data); - protected abstract void PopulatePropertyBlockForRendering(ref global::UnityEngine.MaterialPropertyBlock propertyBlock); + protected abstract void PopulatePropertyBlockForRendering(ref MaterialPropertyBlock propertyBlock); - private global::Funly.SkyStudio.BaseSpriteItemData DequeueNextSpriteItemData() + private BaseSpriteItemData DequeueNextSpriteItemData() { return null; } - private void ReturnSpriteItemData(global::Funly.SkyStudio.BaseSpriteItemData splash) + private void ReturnSpriteItemData(BaseSpriteItemData splash) { } @@ -79,12 +82,12 @@ private void RenderAllSprites() { } - protected global::UnityEngine.Mesh GetMesh() + protected Mesh GetMesh() { return null; } - protected virtual global::UnityEngine.Mesh GenerateMesh() + protected virtual Mesh GenerateMesh() { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs.meta index 675eda79..ac58fa87 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseSpriteInstancedRenderer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2431ae3a29622a6c511497dee85432cb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs b/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs index 502c1bd8..0b1848cf 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs +++ b/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs @@ -1,3 +1,5 @@ +using UnityEngine; + namespace Funly.SkyStudio { public class BaseSpriteItemData @@ -10,21 +12,21 @@ public enum SpriteState Complete = 3 } - public global::Funly.SkyStudio.SpriteSheetData spriteSheetData; + public SpriteSheetData spriteSheetData; public float delay; - public global::UnityEngine.Matrix4x4 modelMatrix { get; protected set; } + public Matrix4x4 modelMatrix { get; protected set; } - public global::Funly.SkyStudio.BaseSpriteItemData.SpriteState state { get; protected set; } + public SpriteState state { get; protected set; } - public global::UnityEngine.Vector3 spritePosition { get; set; } + public Vector3 spritePosition { get; set; } public float startTime { get; protected set; } public float endTime { get; protected set; } - public void SetTRSMatrix(global::UnityEngine.Vector3 worldPosition, global::UnityEngine.Quaternion rotation, global::UnityEngine.Vector3 scale) + public void SetTRSMatrix(Vector3 worldPosition, Quaternion rotation, Vector3 scale) { } diff --git a/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs.meta b/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs.meta index a5a76a64..8df5695b 100644 --- a/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BaseSpriteItemData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 63eced879e869434c66d8a8ca79a1065 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs b/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs index 9f4a4967..ef61bb86 100644 --- a/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs +++ b/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs @@ -1,64 +1,67 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - public class BlendSkyProfiles : global::UnityEngine.MonoBehaviour + public class BlendSkyProfiles : MonoBehaviour { - [global::UnityEngine.Tooltip("Called when blending finishes.")] - public global::System.Action onBlendComplete; + [Tooltip("Called when blending finishes.")] + public Action onBlendComplete; - [global::UnityEngine.HideInInspector] + [HideInInspector] private float m_StartTime; - [global::UnityEngine.HideInInspector] + [HideInInspector] private float m_EndTime; - [global::UnityEngine.Tooltip("Blender used for basic sky background properties.")] - public global::Funly.SkyStudio.FeatureBlender skyBlender; + [Tooltip("Blender used for basic sky background properties.")] + public FeatureBlender skyBlender; - [global::UnityEngine.Tooltip("Blender used for the sun properties.")] - public global::Funly.SkyStudio.FeatureBlender sunBlender; + [Tooltip("Blender used for the sun properties.")] + public FeatureBlender sunBlender; - [global::UnityEngine.Tooltip("Blender used moon properties.")] - public global::Funly.SkyStudio.FeatureBlender moonBlender; + [Tooltip("Blender used moon properties.")] + public FeatureBlender moonBlender; - [global::UnityEngine.Tooltip("Blender used cloud properties.")] - public global::Funly.SkyStudio.FeatureBlender cloudBlender; + [Tooltip("Blender used cloud properties.")] + public FeatureBlender cloudBlender; - [global::UnityEngine.Tooltip("Blender used star layer 1 properties.")] - public global::Funly.SkyStudio.FeatureBlender starLayer1Blender; + [Tooltip("Blender used star layer 1 properties.")] + public FeatureBlender starLayer1Blender; - [global::UnityEngine.Tooltip("Blender used star layer 2 properties.")] - public global::Funly.SkyStudio.FeatureBlender starLayer2Blender; + [Tooltip("Blender used star layer 2 properties.")] + public FeatureBlender starLayer2Blender; - [global::UnityEngine.Tooltip("Blender used star layer 3 properties.")] - public global::Funly.SkyStudio.FeatureBlender starLayer3Blender; + [Tooltip("Blender used star layer 3 properties.")] + public FeatureBlender starLayer3Blender; - [global::UnityEngine.Tooltip("Blender used by the rain downfall feature.")] - public global::Funly.SkyStudio.FeatureBlender rainBlender; + [Tooltip("Blender used by the rain downfall feature.")] + public FeatureBlender rainBlender; - [global::UnityEngine.Tooltip("Blender used by the rain splash feature.")] - public global::Funly.SkyStudio.FeatureBlender rainSplashBlender; + [Tooltip("Blender used by the rain splash feature.")] + public FeatureBlender rainSplashBlender; - [global::UnityEngine.Tooltip("Blender used for lightning feature properties.")] - public global::Funly.SkyStudio.FeatureBlender lightningBlender; + [Tooltip("Blender used for lightning feature properties.")] + public FeatureBlender lightningBlender; - [global::UnityEngine.Tooltip("Blender used for fog properties.")] - public global::Funly.SkyStudio.FeatureBlender fogBlender; + [Tooltip("Blender used for fog properties.")] + public FeatureBlender fogBlender; private bool m_IsBlendingFirstHalf; - private global::Funly.SkyStudio.ProfileBlendingState m_State; + private ProfileBlendingState m_State; - private global::Funly.SkyStudio.TimeOfDayController m_TimeOfDayController; + private TimeOfDayController m_TimeOfDayController; - private global::Funly.SkyStudio.BlendingHelper blendingHelper; + private BlendingHelper blendingHelper; - public global::Funly.SkyStudio.SkyProfile fromProfile { get; private set; } + public SkyProfile fromProfile { get; private set; } - public global::Funly.SkyStudio.SkyProfile toProfile { get; private set; } + public SkyProfile toProfile { get; private set; } - public global::Funly.SkyStudio.SkyProfile blendedProfile { get; private set; } + public SkyProfile blendedProfile { get; private set; } - public global::Funly.SkyStudio.SkyProfile StartBlending(global::Funly.SkyStudio.TimeOfDayController controller, global::Funly.SkyStudio.SkyProfile fromProfile, global::Funly.SkyStudio.SkyProfile toProfile, float duration) + public SkyProfile StartBlending(TimeOfDayController controller, SkyProfile fromProfile, SkyProfile toProfile, float duration) { return null; } @@ -79,7 +82,7 @@ private void UpdateBlendedProfile() { } - private float PercentForMode(global::Funly.SkyStudio.ProfileFeatureBlendingMode mode, float percent) + private float PercentForMode(ProfileFeatureBlendingMode mode, float percent) { return 0f; } diff --git a/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs.meta b/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs.meta index d94ef32c..85da6196 100644 --- a/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BlendSkyProfiles.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 41838d2c6f26989efa68c7b903719b1d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs b/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs index 5a71f186..1f390c36 100644 --- a/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs +++ b/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs @@ -1,28 +1,30 @@ +using UnityEngine; + namespace Funly.SkyStudio { public class BlendingHelper { - private global::Funly.SkyStudio.ProfileBlendingState m_State; + private ProfileBlendingState m_State; - public BlendingHelper(global::Funly.SkyStudio.ProfileBlendingState state) + public BlendingHelper(ProfileBlendingState state) { } - public void UpdateState(global::Funly.SkyStudio.ProfileBlendingState state) + public void UpdateState(ProfileBlendingState state) { } - public global::UnityEngine.Color ProfileColorForKey(global::Funly.SkyStudio.SkyProfile profile, string key) + public Color ProfileColorForKey(SkyProfile profile, string key) { - return default(global::UnityEngine.Color); + return default(Color); } - public float ProfileNumberForKey(global::Funly.SkyStudio.SkyProfile profile, string key) + public float ProfileNumberForKey(SkyProfile profile, string key) { return 0f; } - public global::Funly.SkyStudio.SpherePoint ProfileSpherePointForKey(global::Funly.SkyStudio.SkyProfile profile, string key) + public SpherePoint ProfileSpherePointForKey(SkyProfile profile, string key) { return null; } @@ -39,7 +41,7 @@ public void BlendColorIn(string key) { } - public void BlendColor(string key, global::UnityEngine.Color from, global::UnityEngine.Color to, float progress) + public void BlendColor(string key, Color from, Color to, float progress) { } @@ -63,13 +65,13 @@ public void BlendSpherePoint(string key) { } - public void BlendSpherePoint(string key, global::Funly.SkyStudio.SpherePoint from, global::Funly.SkyStudio.SpherePoint to, float progress) + public void BlendSpherePoint(string key, SpherePoint from, SpherePoint to, float progress) { } - public global::Funly.SkyStudio.ProfileFeatureBlendingMode GetFeatureAnimationMode(string featureKey) + public ProfileFeatureBlendingMode GetFeatureAnimationMode(string featureKey) { - return default(global::Funly.SkyStudio.ProfileFeatureBlendingMode); + return default(ProfileFeatureBlendingMode); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs.meta b/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs.meta index da3224ac..b1ee1578 100644 --- a/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BlendingHelper.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b06bbbd1fd3faf762996de648f4f71ce -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs b/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs index 7bf406aa..0409c5d6 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class BoolDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class BoolDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs.meta index 43b6dcfb..47011e2a 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BoolDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b135b89c85260b9d1aa6916c1bdcb0cc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs index bb64a912..a981de73 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class BoolGroupDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class BoolGroupDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs.meta index 53605528..74b6230c 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BoolGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3c38cf7d3bd810622bff42d187526a24 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs index 776cbd40..e8c551b2 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class BoolKeyframe : global::Funly.SkyStudio.BaseKeyframe + [Serializable] + public class BoolKeyframe : BaseKeyframe { public bool value; @@ -10,7 +12,7 @@ public BoolKeyframe(float time, bool value) { } - public BoolKeyframe(global::Funly.SkyStudio.BoolKeyframe keyframe) + public BoolKeyframe(BoolKeyframe keyframe) : base(0f) { } diff --git a/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs.meta index 5c6b8eba..644a1e09 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BoolKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8389bee1b88196e42bf7ec624d7e340b -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs index 5595565b..f10fe336 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs @@ -1,14 +1,16 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class BoolKeyframeGroup : global::Funly.SkyStudio.KeyframeGroup + [Serializable] + public class BoolKeyframeGroup : KeyframeGroup { public BoolKeyframeGroup(string name) : base((string)null) { } - public BoolKeyframeGroup(string name, global::Funly.SkyStudio.BoolKeyframe keyframe) + public BoolKeyframeGroup(string name, BoolKeyframe keyframe) : base((string)null) { } diff --git a/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs.meta index 8e0b8803..84ac9808 100644 --- a/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/BoolKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 672ec9a9c85843ffc3f8ca586a4a401b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs b/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs index 58c0cac3..2135b87e 100644 --- a/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class CloudBlender : global::Funly.SkyStudio.FeatureBlender + public class CloudBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs.meta index 533ffe4f..772cd533 100644 --- a/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/CloudBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b7fa3f03620a32d09c56ebe57cd5eafc -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs b/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs index 6b9db2bc..8bcbec04 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs +++ b/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs @@ -1,10 +1,12 @@ +using UnityEngine; + namespace Funly.SkyStudio { public static class ColorBlendingExtensions { - public static global::UnityEngine.Color Clear(this global::UnityEngine.Color color) + public static Color Clear(this Color color) { - return default(global::UnityEngine.Color); + return default(Color); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs.meta b/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs.meta index 9cbe04ca..18468fce 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ColorBlendingExtensions.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3f2101201a9c3940839e34b5deb736d0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs index 6ae736c9..e016cedc 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class ColorGroupDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class ColorGroupDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs.meta index 998b448c..fc4f68b5 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ColorGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 11fb10b7abff08b4afc3007859298162 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs b/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs index 3a86b94d..38af820b 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs +++ b/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs @@ -1,15 +1,17 @@ +using UnityEngine; + namespace Funly.SkyStudio { public abstract class ColorHelper { - public static global::UnityEngine.Color ColorWithHex(uint hex) + public static Color ColorWithHex(uint hex) { - return default(global::UnityEngine.Color); + return default(Color); } - public static global::UnityEngine.Color ColorWithHexAlpha(uint hex) + public static Color ColorWithHexAlpha(uint hex) { - return default(global::UnityEngine.Color); + return default(Color); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs.meta b/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs.meta index 0a11f2ed..f00efbc1 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ColorHelper.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 21b12f6a4d2cc6252620f805cf7cab4b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs index f8854698..759c1b4d 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs @@ -1,16 +1,19 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class ColorKeyframe : global::Funly.SkyStudio.BaseKeyframe + [Serializable] + public class ColorKeyframe : BaseKeyframe { - public global::UnityEngine.Color color; + public Color color; - public ColorKeyframe(global::UnityEngine.Color c, float time) + public ColorKeyframe(Color c, float time) : base(0f) { } - public ColorKeyframe(global::Funly.SkyStudio.ColorKeyframe keyframe) + public ColorKeyframe(ColorKeyframe keyframe) : base(0f) { } diff --git a/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs.meta index fd702e14..c832a285 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ColorKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b35da3daf314e2ba732cc95975a0b7ce -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs index 7654a1d6..2c0848d6 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs @@ -1,21 +1,24 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class ColorKeyframeGroup : global::Funly.SkyStudio.KeyframeGroup + [Serializable] + public class ColorKeyframeGroup : KeyframeGroup { public ColorKeyframeGroup(string name) : base((string)null) { } - public ColorKeyframeGroup(string name, global::Funly.SkyStudio.ColorKeyframe frame) + public ColorKeyframeGroup(string name, ColorKeyframe frame) : base((string)null) { } - public global::UnityEngine.Color ColorForTime(float time) + public Color ColorForTime(float time) { - return default(global::UnityEngine.Color); + return default(Color); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs.meta index 28f2e0fe..5c85410e 100644 --- a/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ColorKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ce6b795a1f1af6ef43272365c1345113 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs b/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs index aaabdb21..ffc6896c 100644 --- a/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs @@ -1,21 +1,23 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public abstract class FeatureBlender : global::UnityEngine.MonoBehaviour, global::Funly.SkyStudio.IFeatureBlender + public abstract class FeatureBlender : MonoBehaviour, IFeatureBlender { protected abstract string featureKey { get; } - protected abstract void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper); + protected abstract void BlendBoth(ProfileBlendingState state, BlendingHelper helper); - protected abstract void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper); + protected abstract void BlendIn(ProfileBlendingState state, BlendingHelper helper); - protected abstract void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper); + protected abstract void BlendOut(ProfileBlendingState state, BlendingHelper helper); - protected virtual global::Funly.SkyStudio.ProfileFeatureBlendingMode BlendingMode(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected virtual ProfileFeatureBlendingMode BlendingMode(ProfileBlendingState state, BlendingHelper helper) { - return default(global::Funly.SkyStudio.ProfileFeatureBlendingMode); + return default(ProfileFeatureBlendingMode); } - public virtual void Blend(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + public virtual void Blend(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs.meta index b02c670d..9f8a3200 100644 --- a/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/FeatureBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 048f5ddedeec2000ad481dbf7694e8ca -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/FogBlender.cs b/Assets/Scripts/Funly/SkyStudio/FogBlender.cs index 0261cb35..4f72e3be 100644 --- a/Assets/Scripts/Funly/SkyStudio/FogBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/FogBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class FogBlender : global::Funly.SkyStudio.FeatureBlender + public class FogBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/FogBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/FogBlender.cs.meta index d916024f..80ca701a 100644 --- a/Assets/Scripts/Funly/SkyStudio/FogBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/FogBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3933deb1dc46617909ab69aba0616267 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs b/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs index 69c35a3c..b599216d 100644 --- a/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs +++ b/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs @@ -1,11 +1,13 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.ExecuteInEditMode] - public class FollowCamera : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class FollowCamera : MonoBehaviour { - public global::UnityEngine.Camera followCamera; + public Camera followCamera; - public global::UnityEngine.Vector3 offset; + public Vector3 offset; private void Update() { diff --git a/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs.meta b/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs.meta index bcca4b35..d711269e 100644 --- a/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/FollowCamera.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: faee634d43b1ad77e17a796f112012bd -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs b/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs index 7aa3293b..d11f18ca 100644 --- a/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs +++ b/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs @@ -1,12 +1,14 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class HelpBoxAttribute : global::UnityEngine.PropertyAttribute + public class HelpBoxAttribute : PropertyAttribute { public string text; - public global::Funly.SkyStudio.HelpBoxMessageType messageType; + public HelpBoxMessageType messageType; - public HelpBoxAttribute(string text, global::Funly.SkyStudio.HelpBoxMessageType messageType = global::Funly.SkyStudio.HelpBoxMessageType.None) + public HelpBoxAttribute(string text, HelpBoxMessageType messageType = HelpBoxMessageType.None) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs.meta b/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs.meta index 66912ebf..32a5943a 100644 --- a/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/HelpBoxAttribute.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 15a17cd1d01998b36e8ad14326a233fe -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/HelpBoxMessageType.cs.meta b/Assets/Scripts/Funly/SkyStudio/HelpBoxMessageType.cs.meta index a8c24e7e..4c97d945 100644 --- a/Assets/Scripts/Funly/SkyStudio/HelpBoxMessageType.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/HelpBoxMessageType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc69008f0ce445f439d6c01b86e28f9d +guid: 117e3ab626aa5f44b9781c8c1be8d2e5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs b/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs index f52f23c2..a2011dcd 100644 --- a/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs +++ b/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class HelpInformation : global::UnityEngine.MonoBehaviour + public class HelpInformation : MonoBehaviour { } } diff --git a/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs.meta b/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs.meta index 2a1e2e78..2b1a1e3d 100644 --- a/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/HelpInformation.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d1401f74ce929327cfd410042425c9ac -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs index 7e21ab72..a12dd025 100644 --- a/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs @@ -6,8 +6,8 @@ public interface IBaseKeyframe float time { get; set; } - global::Funly.SkyStudio.InterpolationCurve interpolationCurve { get; set; } + InterpolationCurve interpolationCurve { get; set; } - global::Funly.SkyStudio.InterpolationDirection interpolationDirection { get; set; } + InterpolationDirection interpolationDirection { get; set; } } } diff --git a/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs.meta index 2afa49a3..a85b41cb 100644 --- a/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/IBaseKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2a008d0e24fa2e10158bdacf0464b84f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs b/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs index a80be81b..176cd539 100644 --- a/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs @@ -2,6 +2,6 @@ namespace Funly.SkyStudio { public interface IFeatureBlender { - void Blend(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper); + void Blend(ProfileBlendingState state, BlendingHelper helper); } } diff --git a/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs.meta index e45fcb9f..7cd1e5c7 100644 --- a/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/IFeatureBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: abe027c6f31cab0217df276cd9424f3e -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs index a30b6438..fa1f40d2 100644 --- a/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs @@ -10,7 +10,7 @@ public interface IKeyframeGroup void TrimToSingleKeyframe(); - void RemoveKeyFrame(global::Funly.SkyStudio.IBaseKeyframe keyframe); + void RemoveKeyFrame(IBaseKeyframe keyframe); int GetKeyFrameCount(); } diff --git a/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs.meta index b48f3d28..ce3449ec 100644 --- a/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/IKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b2f2dc268edc233e40533f25681cdfe2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs b/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs index 2a3e6a75..59e3ea1a 100644 --- a/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs +++ b/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs @@ -4,10 +4,10 @@ public interface IProfileDefinition { string shaderName { get; } - global::Funly.SkyStudio.ProfileFeatureSection[] features { get; } + ProfileFeatureSection[] features { get; } - global::Funly.SkyStudio.ProfileGroupSection[] groups { get; } + ProfileGroupSection[] groups { get; } - global::Funly.SkyStudio.ProfileFeatureDefinition GetFeatureDefinition(string featureKey); + ProfileFeatureDefinition GetFeatureDefinition(string featureKey); } } diff --git a/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs.meta b/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs.meta index 7b1be0b9..472ba234 100644 --- a/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/IProfileDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 459f5ce59936e8fe52aad0890a8a4c03 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs b/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs index 8b0cc7c2..be953527 100644 --- a/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs +++ b/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs @@ -2,6 +2,6 @@ namespace Funly.SkyStudio { public interface ISkyModule { - void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay); + void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay); } } diff --git a/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs.meta b/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs.meta index fe6e54c6..770031b6 100644 --- a/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ISkyModule.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e02731496ed780958f7b8a3f7ea90886 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/InterpolationCurve.cs.meta b/Assets/Scripts/Funly/SkyStudio/InterpolationCurve.cs.meta index f5dbacbe..3c572434 100644 --- a/Assets/Scripts/Funly/SkyStudio/InterpolationCurve.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/InterpolationCurve.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc1996d0aa4a45c40900ad5d7634abff +guid: 067dbaf86c2c0d64f963493797d0a9f5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/InterpolationDirection.cs.meta b/Assets/Scripts/Funly/SkyStudio/InterpolationDirection.cs.meta index 1b6c1d27..a4e6415d 100644 --- a/Assets/Scripts/Funly/SkyStudio/InterpolationDirection.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/InterpolationDirection.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c978eeecb1037124dab8f520d06d9e01 +guid: 16dae5c51cb8d7546a4dd0d742207dd5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs index 512c9836..ebccd84d 100644 --- a/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs @@ -1,14 +1,18 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class KeyframeGroup : global::Funly.SkyStudio.IKeyframeGroup where T : global::Funly.SkyStudio.IBaseKeyframe + [Serializable] + public class KeyframeGroup : IKeyframeGroup where T : IBaseKeyframe { - public global::System.Collections.Generic.List keyframes; + public List keyframes; - [global::UnityEngine.SerializeField] + [SerializeField] private string m_Name; - [global::UnityEngine.SerializeField] + [SerializeField] private string m_Id; public string name @@ -45,7 +49,7 @@ public void RemoveKeyFrame(T keyFrame) { } - public void RemoveKeyFrame(global::Funly.SkyStudio.IBaseKeyframe keyframe) + public void RemoveKeyFrame(IBaseKeyframe keyframe) { } @@ -63,7 +67,7 @@ public void SortKeyframes() { } - public float CurveAdjustedBlendingTime(global::Funly.SkyStudio.InterpolationCurve curve, float t) + public float CurveAdjustedBlendingTime(InterpolationCurve curve, float t) { return 0f; } @@ -87,7 +91,7 @@ public bool GetSurroundingKeyFrames(float time, out int beforeIndex, out int aft return false; } - public static float ProgressBetweenSurroundingKeyframes(float time, global::Funly.SkyStudio.BaseKeyframe beforeKey, global::Funly.SkyStudio.BaseKeyframe afterKey) + public static float ProgressBetweenSurroundingKeyframes(float time, BaseKeyframe beforeKey, BaseKeyframe afterKey) { return 0f; } @@ -106,9 +110,9 @@ public void TrimToSingleKeyframe() { } - public global::Funly.SkyStudio.InterpolationDirection GetShortestInterpolationDirection(float previousKeyValue, float nextKeyValue, float minValue, float maxValue) + public InterpolationDirection GetShortestInterpolationDirection(float previousKeyValue, float nextKeyValue, float minValue, float maxValue) { - return default(global::Funly.SkyStudio.InterpolationDirection); + return default(InterpolationDirection); } public void CalculateCircularDistances(float previousKeyValue, float nextKeyValue, float minValue, float maxValue, out float forwardDistance, out float reverseDistance) @@ -117,7 +121,7 @@ public void CalculateCircularDistances(float previousKeyValue, float nextKeyValu reverseDistance = default(float); } - public float InterpolateFloat(global::Funly.SkyStudio.InterpolationCurve curve, global::Funly.SkyStudio.InterpolationDirection direction, float time, float beforeTime, float nextTime, float previousKeyValue, float nextKeyValue, float minValue, float maxValue) + public float InterpolateFloat(InterpolationCurve curve, InterpolationDirection direction, float time, float beforeTime, float nextTime, float previousKeyValue, float nextKeyValue, float minValue, float maxValue) { return 0f; } diff --git a/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs.meta index dbe78866..1fa088e4 100644 --- a/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/KeyframeGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be2a26d3c885d9945985e36a3767018d +guid: acb6826a1e7e5b245b928444e9116af5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs index fe002d70..bbce10b2 100644 --- a/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs @@ -1,27 +1,32 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class KeyframeGroupDictionary : global::UnityEngine.ISerializationCallbackReceiver, global::System.Collections.Generic.IEnumerable, global::System.Collections.IEnumerable + [Serializable] + public class KeyframeGroupDictionary : ISerializationCallbackReceiver, IEnumerable, IEnumerable { - [global::System.NonSerialized] - private global::System.Collections.Generic.Dictionary m_Groups; + [NonSerialized] + private Dictionary m_Groups; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.ColorGroupDictionary m_ColorGroup; + [SerializeField] + private ColorGroupDictionary m_ColorGroup; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.NumberGroupDictionary m_NumberGroup; + [SerializeField] + private NumberGroupDictionary m_NumberGroup; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.TextureGroupDictionary m_TextureGroup; + [SerializeField] + private TextureGroupDictionary m_TextureGroup; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.SpherePointGroupDictionary m_SpherePointGroup; + [SerializeField] + private SpherePointGroupDictionary m_SpherePointGroup; - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.BoolGroupDictionary m_BoolGroup; + [SerializeField] + private BoolGroupDictionary m_BoolGroup; - public global::Funly.SkyStudio.IKeyframeGroup this[string aKey] + public IKeyframeGroup this[string aKey] { get { @@ -54,12 +59,12 @@ public void OnAfterDeserialize() { } - public global::System.Collections.Generic.IEnumerator GetEnumerator() + public IEnumerator GetEnumerator() { return null; } - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() + IEnumerator IEnumerable.GetEnumerator() { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs.meta index abca5be8..3be5e26a 100644 --- a/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/KeyframeGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 01f1545d0dba6ce0e3fdda35e98b25ca -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs b/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs index 4a02d90b..72da9c26 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs @@ -1,7 +1,9 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.CreateAssetMenu(fileName = "lightningArtItem.asset", menuName = "Sky Studio/Lightning/Lightning Art Item")] - public class LightningArtItem : global::Funly.SkyStudio.SpriteArtItem + [CreateAssetMenu(fileName = "lightningArtItem.asset", menuName = "Sky Studio/Lightning/Lightning Art Item")] + public class LightningArtItem : SpriteArtItem { public enum Alignment { @@ -9,22 +11,22 @@ public enum Alignment TopAlign = 1 } - [global::UnityEngine.Tooltip("Adjust how the lightning bolt is positioned inside the spawn area container.")] - public global::Funly.SkyStudio.LightningArtItem.Alignment alignment; + [Tooltip("Adjust how the lightning bolt is positioned inside the spawn area container.")] + public Alignment alignment; - [global::UnityEngine.Tooltip("Thunder sound clip to play when this lighting bolt is rendered.")] - public global::UnityEngine.AudioClip thunderSound; + [Tooltip("Thunder sound clip to play when this lighting bolt is rendered.")] + public AudioClip thunderSound; - [global::UnityEngine.Tooltip("Probability adjustment for this specific lightning bolt. This value is multiplied against the global lightning probability.")] - [global::UnityEngine.Range(0f, 1f)] + [Tooltip("Probability adjustment for this specific lightning bolt. This value is multiplied against the global lightning probability.")] + [Range(0f, 1f)] public float strikeProbability; - [global::UnityEngine.Range(0f, 60f)] - [global::UnityEngine.Tooltip("Size of the lighting bolt.")] + [Range(0f, 60f)] + [Tooltip("Size of the lighting bolt.")] public float size; - [global::UnityEngine.Range(0f, 1f)] - [global::UnityEngine.Tooltip("The blending weight of the additive lighting bolt effect")] + [Range(0f, 1f)] + [Tooltip("The blending weight of the additive lighting bolt effect")] public float intensity; } } diff --git a/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs.meta index cb9e52ba..1cc131d1 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningArtItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a94de4e8b73e64e3c6b873e6e0e12b42 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs b/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs index caebea61..c816f00a 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs @@ -1,9 +1,12 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.CreateAssetMenu(fileName = "LightningArtSet.asset", menuName = "Sky Studio/Lightning/Lightning Art Set")] - public class LightningArtSet : global::Funly.SkyStudio.SpriteArtSet + [CreateAssetMenu(fileName = "LightningArtSet.asset", menuName = "Sky Studio/Lightning/Lightning Art Set")] + public class LightningArtSet : SpriteArtSet { - [global::UnityEngine.Tooltip("List of lighting bolt art that will be used for customization.")] - public global::System.Collections.Generic.List lightingStyleItems; + [Tooltip("List of lighting bolt art that will be used for customization.")] + public List lightingStyleItems; } } diff --git a/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs.meta index e5598982..17b703b9 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningArtSet.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b666c29f57c79e56dbee944d85fcad8b -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs b/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs index 846629ad..9cb08b5f 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class LightningBlender : global::Funly.SkyStudio.FeatureBlender + public class LightningBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs.meta index 5248c726..f7f2b703 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b20c724c320c7904536a3e38377874fe -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningController.cs b/Assets/Scripts/Funly/SkyStudio/LightningController.cs index bb89c3f9..c84a1ba6 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningController.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningController.cs @@ -1,18 +1,21 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - public class LightningController : global::UnityEngine.MonoBehaviour, global::Funly.SkyStudio.ISkyModule + public class LightningController : MonoBehaviour, ISkyModule { - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + private SkyProfile m_SkyProfile; private float m_TimeOfDay; - private global::System.Collections.Generic.List m_LightningRenderers; + private List m_LightningRenderers; private void Start() { } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay) { } diff --git a/Assets/Scripts/Funly/SkyStudio/LightningController.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningController.cs.meta index 4f6d87fd..cfe2ce2a 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: eb9b3c4f4d5a2ee898717a16886be58b -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs b/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs index 0b74bf3c..9ea7264a 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs @@ -1,21 +1,24 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.AudioSource))] - public class LightningRenderer : global::Funly.SkyStudio.BaseSpriteInstancedRenderer + [RequireComponent(typeof(AudioSource))] + public class LightningRenderer : BaseSpriteInstancedRenderer { - private static global::System.Collections.Generic.List m_SpawnAreas; + private static List m_SpawnAreas; private float m_LightningProbability; private float m_NextSpawnTime; - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + private SkyProfile m_SkyProfile; - private global::Funly.SkyStudio.LightningArtItem m_Style; + private LightningArtItem m_Style; private float m_TimeOfDay; - private global::UnityEngine.AudioSource m_AudioSource; + private AudioSource m_AudioSource; private float m_LightningIntensity; @@ -29,12 +32,12 @@ private void Start() { } - protected override global::UnityEngine.Bounds CalculateMeshBounds() + protected override Bounds CalculateMeshBounds() { - return default(global::UnityEngine.Bounds); + return default(Bounds); } - protected override global::Funly.SkyStudio.BaseSpriteItemData CreateSpriteItemData() + protected override BaseSpriteItemData CreateSpriteItemData() { return null; } @@ -44,22 +47,22 @@ protected override bool IsRenderingEnabled() return false; } - protected override void CalculateSpriteTRS(global::Funly.SkyStudio.BaseSpriteItemData data, out global::UnityEngine.Vector3 spritePosition, out global::UnityEngine.Quaternion spriteRotation, out global::UnityEngine.Vector3 spriteScale) + protected override void CalculateSpriteTRS(BaseSpriteItemData data, out Vector3 spritePosition, out Quaternion spriteRotation, out Vector3 spriteScale) { - spritePosition = default(global::UnityEngine.Vector3); - spriteRotation = default(global::UnityEngine.Quaternion); - spriteScale = default(global::UnityEngine.Vector3); + spritePosition = default(Vector3); + spriteRotation = default(Quaternion); + spriteScale = default(Vector3); } - protected override void ConfigureSpriteItemData(global::Funly.SkyStudio.BaseSpriteItemData data) + protected override void ConfigureSpriteItemData(BaseSpriteItemData data) { } - protected override void PrepareDataArraysForRendering(int instanceId, global::Funly.SkyStudio.BaseSpriteItemData data) + protected override void PrepareDataArraysForRendering(int instanceId, BaseSpriteItemData data) { } - protected override void PopulatePropertyBlockForRendering(ref global::UnityEngine.MaterialPropertyBlock propertyBlock) + protected override void PopulatePropertyBlockForRendering(ref MaterialPropertyBlock propertyBlock) { } @@ -68,7 +71,7 @@ protected override int GetNextSpawnCount() return 0; } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay, global::Funly.SkyStudio.LightningArtItem artItem) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay, LightningArtItem artItem) { } @@ -76,7 +79,7 @@ private void SyncDataFromSkyProfile() { } - private global::Funly.SkyStudio.LightningSpawnArea GetRandomLightningSpawnArea() + private LightningSpawnArea GetRandomLightningSpawnArea() { return null; } @@ -85,20 +88,20 @@ private void PlayThunderBoltSound() { } - public static void AddSpawnArea(global::Funly.SkyStudio.LightningSpawnArea area) + public static void AddSpawnArea(LightningSpawnArea area) { } - public static void RemoveSpawnArea(global::Funly.SkyStudio.LightningSpawnArea area) + public static void RemoveSpawnArea(LightningSpawnArea area) { } - private global::UnityEngine.Vector3 GetRandomWorldPositionInsideSpawnArea(global::Funly.SkyStudio.LightningSpawnArea area) + private Vector3 GetRandomWorldPositionInsideSpawnArea(LightningSpawnArea area) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - private float CalculateLightningBoltScaleForArea(global::Funly.SkyStudio.LightningSpawnArea area) + private float CalculateLightningBoltScaleForArea(LightningSpawnArea area) { return 0f; } diff --git a/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs.meta index f542ca86..604c3149 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningRenderer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b377930802386b899ed707821f9f99f1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs b/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs index 80bb552c..6d65c0a3 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs +++ b/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs @@ -1,9 +1,11 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class LightningSpawnArea : global::UnityEngine.MonoBehaviour + public class LightningSpawnArea : MonoBehaviour { - [global::UnityEngine.Tooltip("Dimensions of the lightning area where lightning bolts will be spawned inside randomly.")] - public global::UnityEngine.Vector3 lightningArea; + [Tooltip("Dimensions of the lightning area where lightning bolts will be spawned inside randomly.")] + public Vector3 lightningArea; public void OnDrawGizmosSelected() { diff --git a/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs.meta b/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs.meta index bb758129..8a1fc994 100644 --- a/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LightningSpawnArea.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a5539000a0a1eabaff948d63e91d7e19 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs b/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs index 74a60a86..4260727e 100644 --- a/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs +++ b/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs @@ -1,9 +1,12 @@ +using UnityEngine; +using UnityEngine.UI; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.UI.RawImage))] - public class LoadOverheadDepthTexture : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(RawImage))] + public class LoadOverheadDepthTexture : MonoBehaviour { - private global::Funly.SkyStudio.WeatherDepthCamera m_RainCamera; + private WeatherDepthCamera m_RainCamera; private void Start() { diff --git a/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs.meta b/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs.meta index fb6852eb..321ae3a3 100644 --- a/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/LoadOverheadDepthTexture.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c546b26ff8fe7ae673181f3496281f93 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs b/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs index 9313dbe5..28c43a09 100644 --- a/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class MoonBlender : global::Funly.SkyStudio.FeatureBlender + public class MoonBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs.meta index 0c30ae38..3e44535b 100644 --- a/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/MoonBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fb5c32b1c02078a42ba50da02d51c7e5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs b/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs index e6c4c667..b4a2fc9c 100644 --- a/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs +++ b/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs @@ -1,41 +1,48 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace Funly.SkyStudio { public class NearbyStarRenderer : BaseStarDataRenderer { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CComputeStarData_003Ed__7 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CComputeStarData_003Ed__7 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::Funly.SkyStudio.NearbyStarRenderer _003C_003E4__this; + public NearbyStarRenderer _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CComputeStarData_003Ed__7(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -44,14 +51,14 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } @@ -62,33 +69,33 @@ private bool MoveNext() private const float kStarPaddingRadiusMultipler = 2.1f; - private global::UnityEngine.RenderTexture CreateRenderTexture(string name, int renderTextureSize, global::UnityEngine.RenderTextureFormat format) + private RenderTexture CreateRenderTexture(string name, int renderTextureSize, RenderTextureFormat format) { return null; } - private global::UnityEngine.Material GetNearbyStarMaterial(global::UnityEngine.Vector4 randomSeed, int starCount) + private Material GetNearbyStarMaterial(Vector4 randomSeed, int starCount) { return null; } - private void WriteDebugTexture(global::UnityEngine.RenderTexture rt, string path) + private void WriteDebugTexture(RenderTexture rt, string path) { } - private global::UnityEngine.Texture2D GetStarListTexture(string starTexKey, out int validStarPixelCount) + private Texture2D GetStarListTexture(string starTexKey, out int validStarPixelCount) { validStarPixelCount = default(int); return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::Funly.SkyStudio.NearbyStarRenderer._003CComputeStarData_003Ed__7))] - public override global::System.Collections.IEnumerator ComputeStarData() + [IteratorStateMachine(typeof(_003CComputeStarData_003Ed__7))] + public override IEnumerator ComputeStarData() { return null; } - private global::UnityEngine.Texture2D ConvertToTexture2D(global::UnityEngine.RenderTexture rt) + private Texture2D ConvertToTexture2D(RenderTexture rt) { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs.meta b/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs.meta index a6422400..a73e25ce 100644 --- a/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/NearbyStarRenderer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 900ca5ea8e0879f3e20ea69093556e37 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs index 1f3372a8..22b3ad56 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class NumberGroupDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class NumberGroupDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs.meta index b4fdc634..d438f379 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/NumberGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a2fbd18ff28e4f5cb340fd325fc12264 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs index a1bf6abf..3b025aa5 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class NumberKeyframe : global::Funly.SkyStudio.BaseKeyframe + [Serializable] + public class NumberKeyframe : BaseKeyframe { public float value; @@ -10,7 +12,7 @@ public NumberKeyframe(float time, float value) { } - public NumberKeyframe(global::Funly.SkyStudio.NumberKeyframe keyframe) + public NumberKeyframe(NumberKeyframe keyframe) : base(0f) { } diff --git a/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs.meta index 72c1ed32..e1338765 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/NumberKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 270a12277d3f539958535dc8f487fe3e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs index bced7199..6ff17058 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class NumberKeyframeGroup : global::Funly.SkyStudio.KeyframeGroup + [Serializable] + public class NumberKeyframeGroup : KeyframeGroup { public float minValue; @@ -12,7 +14,7 @@ public NumberKeyframeGroup(string name, float min, float max) { } - public NumberKeyframeGroup(string name, float min, float max, global::Funly.SkyStudio.NumberKeyframe frame) + public NumberKeyframeGroup(string name, float min, float max, NumberKeyframe frame) : base((string)null) { } diff --git a/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs.meta index 7cbc7f73..90416fdd 100644 --- a/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/NumberKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5e52bc320713ced4e63a10703ab7866e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs b/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs index 05fae6db..bc35237f 100644 --- a/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs +++ b/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs @@ -1,23 +1,25 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.ExecuteInEditMode] - public class OrbitingBody : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class OrbitingBody : MonoBehaviour { - private global::UnityEngine.Transform m_PositionTransform; + private Transform m_PositionTransform; - private global::Funly.SkyStudio.RotateBody m_RotateBody; + private RotateBody m_RotateBody; - private global::Funly.SkyStudio.SpherePoint m_SpherePoint; + private SpherePoint m_SpherePoint; - private global::UnityEngine.Vector3 m_CachedWorldDirection; + private Vector3 m_CachedWorldDirection; - private global::UnityEngine.Light m_BodyLight; + private Light m_BodyLight; - public global::UnityEngine.Transform positionTransform => null; + public Transform positionTransform => null; - public global::Funly.SkyStudio.RotateBody rotateBody => null; + public RotateBody rotateBody => null; - public global::Funly.SkyStudio.SpherePoint Point + public SpherePoint Point { get { @@ -28,9 +30,9 @@ public class OrbitingBody : global::UnityEngine.MonoBehaviour } } - public global::UnityEngine.Vector3 BodyGlobalDirection => default(global::UnityEngine.Vector3); + public Vector3 BodyGlobalDirection => default(Vector3); - public global::UnityEngine.Light BodyLight => null; + public Light BodyLight => null; public void ResetOrbit() { diff --git a/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs.meta b/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs.meta index adb2318b..2d9d3cbc 100644 --- a/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/OrbitingBody.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 956f4a9c21a539af488c43d798d2665e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs b/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs index c3087d31..8d149ff2 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs @@ -2,11 +2,11 @@ namespace Funly.SkyStudio { public struct ProfileBlendingState { - public global::Funly.SkyStudio.SkyProfile blendedProfile; + public SkyProfile blendedProfile; - public global::Funly.SkyStudio.SkyProfile fromProfile; + public SkyProfile fromProfile; - public global::Funly.SkyStudio.SkyProfile toProfile; + public SkyProfile toProfile; public float progress; @@ -16,15 +16,15 @@ public struct ProfileBlendingState public float timeOfDay; - public ProfileBlendingState(global::Funly.SkyStudio.SkyProfile blendedProfile, global::Funly.SkyStudio.SkyProfile fromProfile, global::Funly.SkyStudio.SkyProfile toProfile, float progress, float outProgress, float inProgress, float timeOfDay) + public ProfileBlendingState(SkyProfile blendedProfile, SkyProfile fromProfile, SkyProfile toProfile, float progress, float outProgress, float inProgress, float timeOfDay) { - this.blendedProfile = null; - this.fromProfile = null; - this.toProfile = null; - this.progress = 0f; - this.outProgress = 0f; - this.inProgress = 0f; - this.timeOfDay = 0f; + this.blendedProfile = blendedProfile; + this.fromProfile = fromProfile; + this.toProfile = toProfile; + this.progress = progress; + this.inProgress = inProgress; + this.outProgress = outProgress; + this.timeOfDay = timeOfDay; } } } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs.meta index 309bcc12..7685b85c 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileBlendingState.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cfbda6ec3acf48422b533e7b182cf1b6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureBlendingMode.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureBlendingMode.cs.meta index 219492a9..f33e0a72 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureBlendingMode.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureBlendingMode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f76655f8a078aae4fb7a1bbf011ab922 +guid: 52d3a7fbc25fef840bc30bc030077939 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs index 54605e6b..5a5ae53b 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs @@ -1,6 +1,8 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] + [Serializable] public class ProfileFeatureDefinition { public enum FeatureType @@ -14,7 +16,7 @@ public enum FeatureType public string[] featureKeys; - public global::Funly.SkyStudio.ProfileFeatureDefinition.FeatureType featureType; + public FeatureType featureType; public string shaderKeyword; @@ -36,17 +38,17 @@ public enum FeatureType public bool isShaderKeywordFeature; - public static global::Funly.SkyStudio.ProfileFeatureDefinition CreateShaderFeature(string featureKey, string shaderKeyword, bool value, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) + public static ProfileFeatureDefinition CreateShaderFeature(string featureKey, string shaderKeyword, bool value, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileFeatureDefinition CreateShaderFeatureDropdown(string[] featureKeys, string[] shaderKeywords, string[] labels, int selectedIndex, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) + public static ProfileFeatureDefinition CreateShaderFeatureDropdown(string[] featureKeys, string[] shaderKeywords, string[] labels, int selectedIndex, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileFeatureDefinition CreateBooleanFeature(string featureKey, bool value, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) + public static ProfileFeatureDefinition CreateBooleanFeature(string featureKey, bool value, string name, string dependsOnFeature, bool dependsOnValue, string tooltip) { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs.meta index 0ac688de..b46a7823 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 92ecec3208c28c6008f262822b4f7f00 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureKeys.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureKeys.cs.meta index 2bda131e..4c37f768 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureKeys.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureKeys.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f8881544df3f319574ded5a693c4b22d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs index 31123426..e4c44a7d 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs @@ -1,6 +1,8 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] + [Serializable] public class ProfileFeatureSection { public string sectionTitle; @@ -9,9 +11,9 @@ public class ProfileFeatureSection public string sectionIcon; - public global::Funly.SkyStudio.ProfileFeatureDefinition[] featureDefinitions; + public ProfileFeatureDefinition[] featureDefinitions; - public ProfileFeatureSection(string sectionTitle, string sectionKey, global::Funly.SkyStudio.ProfileFeatureDefinition[] featureDefinitions) + public ProfileFeatureSection(string sectionTitle, string sectionKey, ProfileFeatureDefinition[] featureDefinitions) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs.meta index f8073e41..1ae9a13a 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileFeatureSection.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 07e7a27b5d604207413900f762938b38 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs b/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs index 76d46a9e..ceaa8fa7 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs @@ -1,3 +1,5 @@ +using UnityEngine; + namespace Funly.SkyStudio { public class ProfileGroupDefinition @@ -25,19 +27,19 @@ public enum RebuildType Stars = 1 } - public global::Funly.SkyStudio.ProfileGroupDefinition.GroupType type; + public GroupType type; - public global::Funly.SkyStudio.ProfileGroupDefinition.FormatStyle formatStyle; + public FormatStyle formatStyle; - public global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType; + public RebuildType rebuildType; public string propertyKey; public string groupName; - public global::UnityEngine.Color color; + public Color color; - public global::Funly.SkyStudio.SpherePoint spherePoint; + public SpherePoint spherePoint; public float minimumValue; @@ -47,7 +49,7 @@ public enum RebuildType public bool boolValue; - public global::UnityEngine.Texture2D texture; + public Texture2D texture; public string tooltip; @@ -55,67 +57,67 @@ public enum RebuildType public bool dependsOnValue; - public static global::Funly.SkyStudio.ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, string tooltip) + public static ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType, global::Funly.SkyStudio.ProfileGroupDefinition.FormatStyle formatStyle, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition NumberGroupDefinition(string groupName, string propKey, float minimumValue, float maximumValue, float value, RebuildType rebuildType, FormatStyle formatStyle, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, global::UnityEngine.Color color, string tooltip) + public static ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, Color color, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, global::UnityEngine.Color color, string dependsOnFeature, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, Color color, string dependsOnFeature, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, global::UnityEngine.Color color, global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition ColorGroupDefinition(string groupName, string propKey, Color color, RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition SpherePointGroupDefinition(string groupName, string propKey, float horizontalRotation, float verticalRotation, string tooltip) + public static ProfileGroupDefinition SpherePointGroupDefinition(string groupName, string propKey, float horizontalRotation, float verticalRotation, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition SpherePointGroupDefinition(string groupName, string propKey, float horizontalRotation, float verticalRotation, global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition SpherePointGroupDefinition(string groupName, string propKey, float horizontalRotation, float verticalRotation, RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, global::UnityEngine.Texture2D texture, string tooltip) + public static ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, Texture2D texture, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, global::UnityEngine.Texture2D texture, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, Texture2D texture, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, global::UnityEngine.Texture2D texture, global::Funly.SkyStudio.ProfileGroupDefinition.RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition TextureGroupDefinition(string groupName, string propKey, Texture2D texture, RebuildType rebuildType, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } - public static global::Funly.SkyStudio.ProfileGroupDefinition BoolGroupDefinition(string groupName, string propKey, bool value, string dependsOnKeyword, bool dependsOnValue, string tooltip) + public static ProfileGroupDefinition BoolGroupDefinition(string groupName, string propKey, bool value, string dependsOnKeyword, bool dependsOnValue, string tooltip) { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs.meta index 8a22ebba..40149c39 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileGroupDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: bda470ebe3da33619a019a880c220f59 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs b/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs index 5595ddc7..519a51d3 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs @@ -12,9 +12,9 @@ public class ProfileGroupSection public bool dependsOnValue; - public global::Funly.SkyStudio.ProfileGroupDefinition[] groups; + public ProfileGroupDefinition[] groups; - public ProfileGroupSection(string sectionTitle, string sectionKey, string sectionIcon, string dependsOnFeature, bool dependsOnValue, global::Funly.SkyStudio.ProfileGroupDefinition[] groups) + public ProfileGroupSection(string sectionTitle, string sectionKey, string sectionIcon, string dependsOnFeature, bool dependsOnValue, ProfileGroupDefinition[] groups) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs.meta index 986d48e2..1f2e3e0a 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileGroupSection.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 653f222f90d6989b1d0ba67d9cfca82d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs b/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs index e7074073..fb927119 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs +++ b/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; + namespace Funly.SkyStudio { public abstract class ProfilePropertyKeys @@ -298,7 +300,7 @@ public abstract class ProfilePropertyKeys public const string ThunderSoundDelayKey = "ThunderSoundDelayKey"; - public static global::System.Collections.Generic.HashSet GetPropertyKeysSet() + public static HashSet GetPropertyKeysSet() { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs.meta index e305df27..114617a7 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfilePropertyKeys.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 409f73f3d3f1941e1348f93e794a5cac -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ProfileSectionKeys.cs.meta b/Assets/Scripts/Funly/SkyStudio/ProfileSectionKeys.cs.meta index d05d0413..3a48e321 100644 --- a/Assets/Scripts/Funly/SkyStudio/ProfileSectionKeys.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ProfileSectionKeys.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1874e0f23795123a566590be37fe1585 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainBlender.cs b/Assets/Scripts/Funly/SkyStudio/RainBlender.cs index 280a444a..509bbc08 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class RainBlender : global::Funly.SkyStudio.FeatureBlender + public class RainBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainBlender.cs.meta index c3488327..1a70b397 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 73006c5a1ae0f695aa12d5cfef70168a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs b/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs index 0a656d0f..a304e460 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs @@ -1,21 +1,23 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.AudioSource))] - public class RainDownfallController : global::UnityEngine.MonoBehaviour, global::Funly.SkyStudio.ISkyModule + [RequireComponent(typeof(AudioSource))] + public class RainDownfallController : MonoBehaviour, ISkyModule { - public global::UnityEngine.MeshRenderer rainMeshRenderer; + public MeshRenderer rainMeshRenderer; - public global::UnityEngine.Material rainMaterial; + public Material rainMaterial; - private global::UnityEngine.MaterialPropertyBlock m_PropertyBlock; + private MaterialPropertyBlock m_PropertyBlock; - private global::UnityEngine.AudioSource m_RainAudioSource; + private AudioSource m_RainAudioSource; private float m_TimeOfDay; - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + private SkyProfile m_SkyProfile; - public void SetWeatherEnclosure(global::Funly.SkyStudio.WeatherEnclosure enclosure) + public void SetWeatherEnclosure(WeatherEnclosure enclosure) { } @@ -23,7 +25,7 @@ private void Update() { } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs.meta index 1aa20c39..2773d41d 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainDownfallController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 78885e89c87f21cabf0ed901b9e81225 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs index 8c50ec92..845a0970 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs @@ -1,12 +1,14 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.CreateAssetMenu(fileName = "rainSplashArtItem.asset", menuName = "Sky Studio/Rain/Rain Splash Art Item")] - public class RainSplashArtItem : global::Funly.SkyStudio.SpriteArtItem + [CreateAssetMenu(fileName = "rainSplashArtItem.asset", menuName = "Sky Studio/Rain/Rain Splash Art Item")] + public class RainSplashArtItem : SpriteArtItem { - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float intensityMultiplier; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float scaleMultiplier; } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs.meta index 2861ab4b..dce4e912 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashArtItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fe738ab1a276b3e9b12df565f4cb2191 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs index b2af9539..e94be3b7 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs @@ -1,8 +1,11 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.CreateAssetMenu(fileName = "RainSplashArtSet.asset", menuName = "Sky Studio/Rain/Rain Splash Art Set")] - public class RainSplashArtSet : global::Funly.SkyStudio.SpriteArtSet + [CreateAssetMenu(fileName = "RainSplashArtSet.asset", menuName = "Sky Studio/Rain/Rain Splash Art Set")] + public class RainSplashArtSet : SpriteArtSet { - public global::System.Collections.Generic.List rainSplashArtItems; + public List rainSplashArtItems; } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs.meta index d802f39f..cb24fe1a 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashArtSet.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a7e39cc532e5f3ab2325d3e9c333e278 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs index 34819373..95c0bcc3 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class RainSplashBlender : global::Funly.SkyStudio.FeatureBlender + public class RainSplashBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs.meta index b0d60783..cc804fae 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fcaae9a531c3e9849870c2d50a96da06 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs index 5a4245f5..f2baaed0 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs @@ -1,18 +1,21 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - public class RainSplashController : global::UnityEngine.MonoBehaviour, global::Funly.SkyStudio.ISkyModule + public class RainSplashController : MonoBehaviour, ISkyModule { - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + private SkyProfile m_SkyProfile; private float m_TimeOfDay; - private global::System.Collections.Generic.List m_SplashRenderers; + private List m_SplashRenderers; private void Start() { } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay) { } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs.meta index c1844ca2..18ff4e9c 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 966a221169a3f82a892f3d1b771256e1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs index e915769f..5e21d456 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs @@ -1,7 +1,9 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class RainSplashData : global::Funly.SkyStudio.BaseSpriteItemData + public class RainSplashData : BaseSpriteItemData { - public global::UnityEngine.Vector2 depthTextureUV; + public Vector2 depthTextureUV; } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs.meta index 64769c42..5b302045 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2f0e386064d9e82bffe26bc78a9c8aa3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs b/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs index d47e3e6b..9a1542c7 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class RainSplashRenderer : global::Funly.SkyStudio.BaseSpriteInstancedRenderer + public class RainSplashRenderer : BaseSpriteInstancedRenderer { - private global::UnityEngine.Camera m_DepthCamera; + private Camera m_DepthCamera; private float[] m_StartSplashYPositions; @@ -22,24 +24,24 @@ public class RainSplashRenderer : global::Funly.SkyStudio.BaseSpriteInstancedRen private float m_SplashSurfaceOffset; - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + private SkyProfile m_SkyProfile; private float m_TimeOfDay; - private global::Funly.SkyStudio.RainSplashArtItem m_Style; + private RainSplashArtItem m_Style; - private global::UnityEngine.Bounds m_Bounds; + private Bounds m_Bounds; private void Start() { } - protected override global::UnityEngine.Bounds CalculateMeshBounds() + protected override Bounds CalculateMeshBounds() { - return default(global::UnityEngine.Bounds); + return default(Bounds); } - protected override global::Funly.SkyStudio.BaseSpriteItemData CreateSpriteItemData() + protected override BaseSpriteItemData CreateSpriteItemData() { return null; } @@ -54,26 +56,26 @@ protected override int GetNextSpawnCount() return 0; } - protected override void CalculateSpriteTRS(global::Funly.SkyStudio.BaseSpriteItemData data, out global::UnityEngine.Vector3 spritePosition, out global::UnityEngine.Quaternion spriteRotation, out global::UnityEngine.Vector3 spriteScale) + protected override void CalculateSpriteTRS(BaseSpriteItemData data, out Vector3 spritePosition, out Quaternion spriteRotation, out Vector3 spriteScale) { - spritePosition = default(global::UnityEngine.Vector3); - spriteRotation = default(global::UnityEngine.Quaternion); - spriteScale = default(global::UnityEngine.Vector3); + spritePosition = default(Vector3); + spriteRotation = default(Quaternion); + spriteScale = default(Vector3); } - protected override void ConfigureSpriteItemData(global::Funly.SkyStudio.BaseSpriteItemData data) + protected override void ConfigureSpriteItemData(BaseSpriteItemData data) { } - protected override void PrepareDataArraysForRendering(int instanceId, global::Funly.SkyStudio.BaseSpriteItemData data) + protected override void PrepareDataArraysForRendering(int instanceId, BaseSpriteItemData data) { } - protected override void PopulatePropertyBlockForRendering(ref global::UnityEngine.MaterialPropertyBlock propertyBlock) + protected override void PopulatePropertyBlockForRendering(ref MaterialPropertyBlock propertyBlock) { } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay, global::Funly.SkyStudio.RainSplashArtItem style) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay, RainSplashArtItem style) { } @@ -81,9 +83,9 @@ private void SyncDataFromSkyProfile() { } - private global::UnityEngine.Vector3 CreateWorldSplashPoint() + private Vector3 CreateWorldSplashPoint() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs.meta b/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs.meta index e8fc5468..0f15c0fe 100644 --- a/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RainSplashRenderer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 73fc6cb0f747dcd4d1bf24412d74061f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs b/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs index 1022903f..9810a653 100644 --- a/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs +++ b/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs @@ -1,7 +1,9 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Camera))] - public class RenderCloudCubemap : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Camera))] + public class RenderCloudCubemap : MonoBehaviour { public enum CubemapTextureFormat { @@ -12,14 +14,14 @@ public enum CubemapTextureFormat public const string kDefaultFilenamePrefix = "CloudCubemap"; - [global::UnityEngine.Tooltip("Filename of the final output cubemap asset. It will be written to the same directory as the current scene.")] + [Tooltip("Filename of the final output cubemap asset. It will be written to the same directory as the current scene.")] public string filenamePrefix; - [global::UnityEngine.Tooltip("Resolution of each face of the cubemap.")] + [Tooltip("Resolution of each face of the cubemap.")] public int faceWidth; - [global::UnityEngine.Tooltip("Format for the exported cubemap. RGBColor (Additive texture), RGBAColor (Color with alpha channel), RGBANormal (Normal lighting data encoded).")] - public global::Funly.SkyStudio.RenderCloudCubemap.CubemapTextureFormat textureFormat; + [Tooltip("Format for the exported cubemap. RGBColor (Additive texture), RGBAColor (Color with alpha channel), RGBANormal (Normal lighting data encoded).")] + public CubemapTextureFormat textureFormat; public bool exportFaces; } diff --git a/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs.meta b/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs.meta index 0fd2ac46..b28fa1de 100644 --- a/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RenderCloudCubemap.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cf300d9e2eb8af1d8bb2ca47721d6b6d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/RotateBody.cs b/Assets/Scripts/Funly/SkyStudio/RotateBody.cs index 2c808db4..e85334b6 100644 --- a/Assets/Scripts/Funly/SkyStudio/RotateBody.cs +++ b/Assets/Scripts/Funly/SkyStudio/RotateBody.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class RotateBody : global::UnityEngine.MonoBehaviour + public class RotateBody : MonoBehaviour { private float m_SpinSpeed; diff --git a/Assets/Scripts/Funly/SkyStudio/RotateBody.cs.meta b/Assets/Scripts/Funly/SkyStudio/RotateBody.cs.meta index 015e5e05..48e02145 100644 --- a/Assets/Scripts/Funly/SkyStudio/RotateBody.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/RotateBody.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ed0641a5862a9f45b3510c115ebd044f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs b/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs index ac373b89..641f1801 100644 --- a/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs @@ -1,16 +1,20 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class SerializableDictionary : global::UnityEngine.ISerializationCallbackReceiver + [Serializable] + public class SerializableDictionary : ISerializationCallbackReceiver { - [global::System.NonSerialized] - public global::System.Collections.Generic.Dictionary dict; + [NonSerialized] + public Dictionary dict; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List m_Keys; + [SerializeField] + public List m_Keys; - [global::UnityEngine.SerializeField] - public global::System.Collections.Generic.List m_Values; + [SerializeField] + public List m_Values; public V this[K aKey] { diff --git a/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs.meta index 57fca3f1..f1debab9 100644 --- a/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SerializableDictionary.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 31a579303106a9042bf9f7ed38aa5ea0 +guid: 98d2e5842630d6c4981ffa86d14788a7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/ShaderKeywords.cs.meta b/Assets/Scripts/Funly/SkyStudio/ShaderKeywords.cs.meta index bc3ce30b..8627f14e 100644 --- a/Assets/Scripts/Funly/SkyStudio/ShaderKeywords.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/ShaderKeywords.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c7a12e36792f0d520ab381a6a60259f0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs b/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs index 0b8e1323..cb43d098 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs @@ -1,23 +1,23 @@ namespace Funly.SkyStudio { - public class SkyBlender : global::Funly.SkyStudio.FeatureBlender + public class SkyBlender : FeatureBlender { protected override string featureKey => null; - protected override global::Funly.SkyStudio.ProfileFeatureBlendingMode BlendingMode(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override ProfileFeatureBlendingMode BlendingMode(ProfileBlendingState state, BlendingHelper helper) { - return default(global::Funly.SkyStudio.ProfileFeatureBlendingMode); + return default(ProfileFeatureBlendingMode); } - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs.meta index e865e6ee..3f03f3ac 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SkyBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1acdea47387d4be55d1e06c3dfac05d7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs b/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs index 08838d0b..eccbcbaa 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs +++ b/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs @@ -1,390 +1,392 @@ +using UnityEngine; + namespace Funly.SkyStudio { public class SkyMaterialController { - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _skyboxMaterial; + [SerializeField] + private Material _skyboxMaterial; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _skyColor; + [SerializeField] + private Color _skyColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _skyMiddleColor; + [SerializeField] + private Color _skyMiddleColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _horizonColor; + [SerializeField] + private Color _horizonColor; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(-1f, 1f)] + [SerializeField] + [Range(-1f, 1f)] private float _gradientFadeBegin; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 2f)] + [SerializeField] + [Range(0f, 2f)] private float _gradientFadeLength; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _skyMiddlePosition; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Cubemap _backgroundCubemap; + [SerializeField] + private Cubemap _backgroundCubemap; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(-1f, 1f)] + [SerializeField] + [Range(-1f, 1f)] private float _starFadeBegin; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 2f)] + [SerializeField] + [Range(0f, 2f)] private float _starFadeLength; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _horizonDistanceScale; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _starBasicCubemap; + [SerializeField] + private Texture _starBasicCubemap; - [global::UnityEngine.SerializeField] + [SerializeField] private float _starBasicTwinkleSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private float _starBasicTwinkleAmount; - [global::UnityEngine.SerializeField] + [SerializeField] private float _starBasicOpacity; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _starBasicTintColor; + [SerializeField] + private Color _starBasicTintColor; - [global::UnityEngine.SerializeField] + [SerializeField] private float _starBasicExponent; - [global::UnityEngine.SerializeField] + [SerializeField] private float _starBasicIntensity; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _starLayer1Texture; + [SerializeField] + private Texture _starLayer1Texture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _starLayer1DataTexture; + [SerializeField] + private Texture2D _starLayer1DataTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _starLayer1Color; + [SerializeField] + private Color _starLayer1Color; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 0.1f)] + [SerializeField] + [Range(0f, 0.1f)] private float _starLayer1MaxRadius; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer1TwinkleAmount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer1TwinkleSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer1RotationSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.0001f, 0.9999f)] + [SerializeField] + [Range(0.0001f, 0.9999f)] private float _starLayer1EdgeFeathering; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 10f)] + [SerializeField] + [Range(1f, 10f)] private float _starLayer1BloomFilterBoost; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector4 _starLayer1SpriteDimensions; + [SerializeField] + private Vector4 _starLayer1SpriteDimensions; - [global::UnityEngine.SerializeField] + [SerializeField] private int _starLayer1SpriteItemCount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer1SpriteAnimationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _starLayer2Texture; + [SerializeField] + private Texture _starLayer2Texture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _starLayer2DataTexture; + [SerializeField] + private Texture2D _starLayer2DataTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _starLayer2Color; + [SerializeField] + private Color _starLayer2Color; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 0.1f)] + [SerializeField] + [Range(0f, 0.1f)] private float _starLayer2MaxRadius; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer2TwinkleAmount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer2TwinkleSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer2RotationSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.0001f, 0.9999f)] + [SerializeField] + [Range(0.0001f, 0.9999f)] private float _starLayer2EdgeFeathering; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 10f)] + [SerializeField] + [Range(1f, 10f)] private float _starLayer2BloomFilterBoost; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector4 _starLayer2SpriteDimensions; + [SerializeField] + private Vector4 _starLayer2SpriteDimensions; - [global::UnityEngine.SerializeField] + [SerializeField] private int _starLayer2SpriteItemCount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer2SpriteAnimationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _starLayer3Texture; + [SerializeField] + private Texture _starLayer3Texture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _starLayer3DataTexture; + [SerializeField] + private Texture2D _starLayer3DataTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _starLayer3Color; + [SerializeField] + private Color _starLayer3Color; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 0.1f)] + [SerializeField] + [Range(0f, 0.1f)] private float _starLayer3MaxRadius; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer3TwinkleAmount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer3TwinkleSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _starLayer3RotationSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.0001f, 0.9999f)] + [SerializeField] + [Range(0.0001f, 0.9999f)] private float _starLayer3EdgeFeathering; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 10f)] + [SerializeField] + [Range(1f, 10f)] private float _starLayer3BloomFilterBoost; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector4 _starLayer3SpriteDimensions; + [SerializeField] + private Vector4 _starLayer3SpriteDimensions; - [global::UnityEngine.SerializeField] + [SerializeField] private int _starLayer3SpriteItemCount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _starLayer3SpriteAnimationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _moonTexture; + [SerializeField] + private Texture _moonTexture; - [global::UnityEngine.SerializeField] + [SerializeField] private float _moonRotationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _moonColor; + [SerializeField] + private Color _moonColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 _moonDirection; + [SerializeField] + private Vector3 _moonDirection; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Matrix4x4 _moonWorldToLocalMatrix; + [SerializeField] + private Matrix4x4 _moonWorldToLocalMatrix; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _moonSize; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.0001f, 0.9999f)] + [SerializeField] + [Range(0.0001f, 0.9999f)] private float _moonEdgeFeathering; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 10f)] + [SerializeField] + [Range(1f, 10f)] private float _moonBloomFilterBoost; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector4 _moonSpriteDimensions; + [SerializeField] + private Vector4 _moonSpriteDimensions; - [global::UnityEngine.SerializeField] + [SerializeField] private int _moonSpriteItemCount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _moonSpriteAnimationSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _moonAlpha; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _sunTexture; + [SerializeField] + private Texture _sunTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _sunColor; + [SerializeField] + private Color _sunColor; - [global::UnityEngine.SerializeField] + [SerializeField] private float _sunRotationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 _sunDirection; + [SerializeField] + private Vector3 _sunDirection; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Matrix4x4 _sunWorldToLocalMatrix; + [SerializeField] + private Matrix4x4 _sunWorldToLocalMatrix; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _sunSize; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.0001f, 0.9999f)] + [SerializeField] + [Range(0.0001f, 0.9999f)] private float _sunEdgeFeathering; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 10f)] + [SerializeField] + [Range(1f, 10f)] private float _sunBloomFilterBoost; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector4 _sunSpriteDimensions; + [SerializeField] + private Vector4 _sunSpriteDimensions; - [global::UnityEngine.SerializeField] + [SerializeField] private int _sunSpriteItemCount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _sunSpriteAnimationSpeed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _sunAlpha; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(-1f, 1f)] + [SerializeField] + [Range(-1f, 1f)] private float _cloudBegin; private float _cloudTextureTiling; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudColor; + [SerializeField] + private Color _cloudColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _cloudTexture; + [SerializeField] + private Texture _cloudTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _artCloudCustomTexture; + [SerializeField] + private Texture _artCloudCustomTexture; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudDensity; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudDirection; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudHeight; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudColor1; + [SerializeField] + private Color _cloudColor1; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudColor2; + [SerializeField] + private Color _cloudColor2; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudFadePosition; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudFadeAmount; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudAlpha; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _cloudCubemap; + [SerializeField] + private Texture _cloudCubemap; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapRotationSpeed; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _cloudCubemapDoubleLayerCustomTexture; + [SerializeField] + private Texture _cloudCubemapDoubleLayerCustomTexture; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapDoubleLayerRotationSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapDoubleLayerHeight; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapDoubleLayerTintColor; + [SerializeField] + private Color _cloudCubemapDoubleLayerTintColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapTintColor; + [SerializeField] + private Color _cloudCubemapTintColor; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapHeight; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _cloudCubemapNormalTexture; + [SerializeField] + private Texture _cloudCubemapNormalTexture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapNormalLitColor; + [SerializeField] + private Color _cloudCubemapNormalLitColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapNormalShadowColor; + [SerializeField] + private Color _cloudCubemapNormalShadowColor; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapNormalRotationSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapNormalHeight; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapNormalAmbientItensity; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture _cloudCubemapNormalDoubleLayerCustomTexture; + [SerializeField] + private Texture _cloudCubemapNormalDoubleLayerCustomTexture; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapNormalDoubleLayerRotationSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private float _cloudCubemapNormalDoubleLayerHeight; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapNormalDoubleLayerLitColor; + [SerializeField] + private Color _cloudCubemapNormalDoubleLayerLitColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _cloudCubemapNormalDoubleLayerShadowColor; + [SerializeField] + private Color _cloudCubemapNormalDoubleLayerShadowColor; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 _cloudCubemapNormalLightDirection; + [SerializeField] + private Vector3 _cloudCubemapNormalLightDirection; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _fogColor; + [SerializeField] + private Color _fogColor; - [global::UnityEngine.SerializeField] + [SerializeField] private float _fogDensity; - [global::UnityEngine.SerializeField] + [SerializeField] private float _fogHeight; - public global::UnityEngine.Material SkyboxMaterial + public Material SkyboxMaterial { get { @@ -395,33 +397,33 @@ public class SkyMaterialController } } - public global::UnityEngine.Color SkyColor + public Color SkyColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color SkyMiddleColor + public Color SkyMiddleColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color HorizonColor + public Color HorizonColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -461,7 +463,7 @@ public float SkyMiddlePosition } } - public global::UnityEngine.Cubemap BackgroundCubemap + public Cubemap BackgroundCubemap { get { @@ -505,7 +507,7 @@ public float HorizonDistanceScale } } - public global::UnityEngine.Texture StarBasicCubemap + public Texture StarBasicCubemap { get { @@ -549,11 +551,11 @@ public float StarBasicOpacity } } - public global::UnityEngine.Color StarBasicTintColor + public Color StarBasicTintColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -582,7 +584,7 @@ public float StarBasicIntensity } } - public global::UnityEngine.Texture StarLayer1Texture + public Texture StarLayer1Texture { get { @@ -593,7 +595,7 @@ public float StarBasicIntensity } } - public global::UnityEngine.Texture2D StarLayer1DataTexture + public Texture2D StarLayer1DataTexture { get { @@ -604,11 +606,11 @@ public float StarBasicIntensity } } - public global::UnityEngine.Color StarLayer1Color + public Color StarLayer1Color { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -703,7 +705,7 @@ public float StarLayer1SpriteAnimationSpeed } } - public global::UnityEngine.Texture StarLayer2Texture + public Texture StarLayer2Texture { get { @@ -714,7 +716,7 @@ public float StarLayer1SpriteAnimationSpeed } } - public global::UnityEngine.Texture2D StarLayer2DataTexture + public Texture2D StarLayer2DataTexture { get { @@ -725,11 +727,11 @@ public float StarLayer1SpriteAnimationSpeed } } - public global::UnityEngine.Color StarLayer2Color + public Color StarLayer2Color { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -824,7 +826,7 @@ public float StarLayer2SpriteAnimationSpeed } } - public global::UnityEngine.Texture StarLayer3Texture + public Texture StarLayer3Texture { get { @@ -835,7 +837,7 @@ public float StarLayer2SpriteAnimationSpeed } } - public global::UnityEngine.Texture2D StarLayer3DataTexture + public Texture2D StarLayer3DataTexture { get { @@ -846,11 +848,11 @@ public float StarLayer2SpriteAnimationSpeed } } - public global::UnityEngine.Color StarLayer3Color + public Color StarLayer3Color { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -945,7 +947,7 @@ public float StarLayer3SpriteAnimationSpeed } } - public global::UnityEngine.Texture MoonTexture + public Texture MoonTexture { get { @@ -967,33 +969,33 @@ public float MoonRotationSpeed } } - public global::UnityEngine.Color MoonColor + public Color MoonColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Vector3 MoonDirection + public Vector3 MoonDirection { get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } set { } } - public global::UnityEngine.Matrix4x4 MoonWorldToLocalMatrix + public Matrix4x4 MoonWorldToLocalMatrix { get { - return default(global::UnityEngine.Matrix4x4); + return default(Matrix4x4); } set { @@ -1066,7 +1068,7 @@ public float MoonAlpha } } - public global::UnityEngine.Texture SunTexture + public Texture SunTexture { get { @@ -1077,11 +1079,11 @@ public float MoonAlpha } } - public global::UnityEngine.Color SunColor + public Color SunColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -1099,22 +1101,22 @@ public float SunRotationSpeed } } - public global::UnityEngine.Vector3 SunDirection + public Vector3 SunDirection { get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } set { } } - public global::UnityEngine.Matrix4x4 SunWorldToLocalMatrix + public Matrix4x4 SunWorldToLocalMatrix { get { - return default(global::UnityEngine.Matrix4x4); + return default(Matrix4x4); } set { @@ -1209,18 +1211,18 @@ public float CloudTextureTiling } } - public global::UnityEngine.Color CloudColor + public Color CloudColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Texture CloudTexture + public Texture CloudTexture { get { @@ -1231,7 +1233,7 @@ public float CloudTextureTiling } } - public global::UnityEngine.Texture ArtCloudCustomTexture + public Texture ArtCloudCustomTexture { get { @@ -1286,22 +1288,22 @@ public float CloudHeight } } - public global::UnityEngine.Color CloudColor1 + public Color CloudColor1 { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color CloudColor2 + public Color CloudColor2 { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -1341,7 +1343,7 @@ public float CloudAlpha } } - public global::UnityEngine.Texture CloudCubemap + public Texture CloudCubemap { get { @@ -1363,7 +1365,7 @@ public float CloudCubemapRotationSpeed } } - public global::UnityEngine.Texture CloudCubemapDoubleLayerCustomTexture + public Texture CloudCubemapDoubleLayerCustomTexture { get { @@ -1396,22 +1398,22 @@ public float CloudCubemapDoubleLayerHeight } } - public global::UnityEngine.Color CloudCubemapDoubleLayerTintColor + public Color CloudCubemapDoubleLayerTintColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color CloudCubemapTintColor + public Color CloudCubemapTintColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -1429,7 +1431,7 @@ public float CloudCubemapHeight } } - public global::UnityEngine.Texture CloudCubemapNormalTexture + public Texture CloudCubemapNormalTexture { get { @@ -1440,22 +1442,22 @@ public float CloudCubemapHeight } } - public global::UnityEngine.Color CloudCubemapNormalLitColor + public Color CloudCubemapNormalLitColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color CloudCubemapNormalShadowColor + public Color CloudCubemapNormalShadowColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -1495,7 +1497,7 @@ public float CloudCubemapNormalAmbientIntensity } } - public global::UnityEngine.Texture CloudCubemapNormalDoubleLayerCustomTexture + public Texture CloudCubemapNormalDoubleLayerCustomTexture { get { @@ -1528,44 +1530,44 @@ public float CloudCubemapNormalDoubleLayerHeight } } - public global::UnityEngine.Color CloudCubemapNormalDoubleLayerLitColor + public Color CloudCubemapNormalDoubleLayerLitColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Color CloudCubemapNormalDoubleLayerShadowColor + public Color CloudCubemapNormalDoubleLayerShadowColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { } } - public global::UnityEngine.Vector3 CloudCubemapNormalLightDirection + public Vector3 CloudCubemapNormalLightDirection { get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } set { } } - public global::UnityEngine.Color FogColor + public Color FogColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -1598,45 +1600,45 @@ public void SetStarLayer1SpriteDimensions(int columns, int rows) { } - public global::UnityEngine.Vector2 GetStarLayer1SpriteDimensions() + public Vector2 GetStarLayer1SpriteDimensions() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } public void SetStarLayer2SpriteDimensions(int columns, int rows) { } - public global::UnityEngine.Vector2 GetStarLayer2SpriteDimensions() + public Vector2 GetStarLayer2SpriteDimensions() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } public void SetStarLayer3SpriteDimensions(int columns, int rows) { } - public global::UnityEngine.Vector2 GetStarLayer3SpriteDimensions() + public Vector2 GetStarLayer3SpriteDimensions() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } public void SetMoonSpriteDimensions(int columns, int rows) { } - public global::UnityEngine.Vector2 GetMoonSpriteDimensions() + public Vector2 GetMoonSpriteDimensions() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } public void SetSunSpriteDimensions(int columns, int rows) { } - public global::UnityEngine.Vector2 GetSunSpriteDimensions() + public Vector2 GetSunSpriteDimensions() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } private void ApplyGradientValuesOnMaterial() diff --git a/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs.meta b/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs.meta index 7d69bec1..c4979203 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SkyMaterialController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: edd6db40387f27a917b452848972b923 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs b/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs index 2f199039..6f67ef2b 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs +++ b/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs @@ -1,42 +1,45 @@ +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.CreateAssetMenu(fileName = "skyProfile.asset", menuName = "Sky Studio/Sky Profile", order = 0)] - public class SkyProfile : global::UnityEngine.ScriptableObject + [CreateAssetMenu(fileName = "skyProfile.asset", menuName = "Sky Studio/Sky Profile", order = 0)] + public class SkyProfile : ScriptableObject { public const string DefaultShaderName = "Funly/Sky Studio/Skybox/3D Standard"; public const string DefaultLegacyShaderName = "Funly/Sky Studio/Skybox/3D Standard - Global Keywords"; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material m_SkyboxMaterial; + [SerializeField] + private Material m_SkyboxMaterial; - [global::UnityEngine.SerializeField] + [SerializeField] private string m_ShaderName; - public global::Funly.SkyStudio.IProfileDefinition profileDefinition; + public IProfileDefinition profileDefinition; - public global::System.Collections.Generic.List timelineManagedKeys; + public List timelineManagedKeys; - public global::Funly.SkyStudio.KeyframeGroupDictionary keyframeGroups; + public KeyframeGroupDictionary keyframeGroups; - public global::Funly.SkyStudio.BoolDictionary featureStatus; + public BoolDictionary featureStatus; - public global::Funly.SkyStudio.LightningArtSet lightningArtSet; + public LightningArtSet lightningArtSet; - public global::Funly.SkyStudio.RainSplashArtSet rainSplashArtSet; + public RainSplashArtSet rainSplashArtSet; - public global::UnityEngine.Texture2D starLayer1DataTexture; + public Texture2D starLayer1DataTexture; - public global::UnityEngine.Texture2D starLayer2DataTexture; + public Texture2D starLayer2DataTexture; - public global::UnityEngine.Texture2D starLayer3DataTexture; + public Texture2D starLayer3DataTexture; - [global::UnityEngine.SerializeField] + [SerializeField] private int m_ProfileVersion; - private global::System.Collections.Generic.Dictionary m_KeyToGroupInfo; + private Dictionary m_KeyToGroupInfo; - public global::UnityEngine.Material skyboxMaterial + public Material skyboxMaterial { get { @@ -49,9 +52,9 @@ public class SkyProfile : global::UnityEngine.ScriptableObject public string shaderName => null; - public global::Funly.SkyStudio.ProfileGroupSection[] groupDefinitions => null; + public ProfileGroupSection[] groupDefinitions => null; - public global::Funly.SkyStudio.ProfileFeatureSection[] featureDefinitions => null; + public ProfileFeatureSection[] featureDefinitions => null; public float GetNumberPropertyValue(string propertyKey) { @@ -63,32 +66,32 @@ public float GetNumberPropertyValue(string propertyKey, float timeOfDay) return 0f; } - public global::UnityEngine.Color GetColorPropertyValue(string propertyKey) + public Color GetColorPropertyValue(string propertyKey) { - return default(global::UnityEngine.Color); + return default(Color); } - public global::UnityEngine.Color GetColorPropertyValue(string propertyKey, float timeOfDay) + public Color GetColorPropertyValue(string propertyKey, float timeOfDay) { - return default(global::UnityEngine.Color); + return default(Color); } - public global::UnityEngine.Texture GetTexturePropertyValue(string propertyKey) + public Texture GetTexturePropertyValue(string propertyKey) { return null; } - public global::UnityEngine.Texture GetTexturePropertyValue(string propertyKey, float timeOfDay) + public Texture GetTexturePropertyValue(string propertyKey, float timeOfDay) { return null; } - public global::Funly.SkyStudio.SpherePoint GetSpherePointPropertyValue(string propertyKey) + public SpherePoint GetSpherePointPropertyValue(string propertyKey) { return null; } - public global::Funly.SkyStudio.SpherePoint GetSpherePointPropertyValue(string propertyKey, float timeOfDay) + public SpherePoint GetSpherePointPropertyValue(string propertyKey, float timeOfDay) { return null; } @@ -115,7 +118,7 @@ private void ReloadDefinitions() { } - private global::Funly.SkyStudio.IProfileDefinition GetShaderInfoForMaterial(string shaderName) + private IProfileDefinition GetShaderInfoForMaterial(string shaderName) { return null; } @@ -128,12 +131,12 @@ public void MergeGroupsWithDefinitions() { } - public global::System.Collections.Generic.Dictionary GroupDefinitionDictionary() + public Dictionary GroupDefinitionDictionary() { return null; } - public global::Funly.SkyStudio.ProfileGroupSection[] ProfileDefinitionTable() + public ProfileGroupSection[] ProfileDefinitionTable() { return null; } @@ -142,15 +145,15 @@ private void AddNumericGroup(string propKey, string groupName, float min, float { } - private void AddColorGroup(string propKey, string groupName, global::UnityEngine.Color color) + private void AddColorGroup(string propKey, string groupName, Color color) { } - private void AddTextureGroup(string propKey, string groupName, global::UnityEngine.Texture2D texture) + private void AddTextureGroup(string propKey, string groupName, Texture2D texture) { } - private void AddSpherePointGroup(string propKey, string groupName, global::Funly.SkyStudio.SpherePoint point) + private void AddSpherePointGroup(string propKey, string groupName, SpherePoint point) { } @@ -163,22 +166,22 @@ public T GetGroup(string propertyKey) where T : class return null; } - public global::Funly.SkyStudio.IKeyframeGroup GetGroup(string propertyKey) + public IKeyframeGroup GetGroup(string propertyKey) { return null; } - public global::Funly.SkyStudio.IKeyframeGroup GetGroupWithId(string groupId) + public IKeyframeGroup GetGroupWithId(string groupId) { return null; } - public global::Funly.SkyStudio.ProfileGroupSection[] GetProfileDefinitions() + public ProfileGroupSection[] GetProfileDefinitions() { return null; } - public global::Funly.SkyStudio.ProfileGroupSection GetSectionInfo(string sectionKey) + public ProfileGroupSection GetSectionInfo(string sectionKey) { return null; } @@ -192,17 +195,17 @@ public void ValidateTimelineGroupKeys() { } - public global::System.Collections.Generic.List GetGroupDefinitionsManagedByTimeline() + public List GetGroupDefinitionsManagedByTimeline() { return null; } - public global::System.Collections.Generic.List GetGroupDefinitionsNotManagedByTimeline() + public List GetGroupDefinitionsNotManagedByTimeline() { return null; } - public global::Funly.SkyStudio.ProfileGroupDefinition GetGroupDefinitionForKey(string propertyKey) + public ProfileGroupDefinition GetGroupDefinitionForKey(string propertyKey) { return null; } @@ -215,7 +218,7 @@ public void TrimGroupToSingleKeyframe(string propertyKey) { } - public bool CanGroupBeOnTimeline(global::Funly.SkyStudio.ProfileGroupDefinition definition) + public bool CanGroupBeOnTimeline(ProfileGroupDefinition definition) { return false; } diff --git a/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs.meta b/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs.meta index 99062590..e2719f9a 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SkyProfile.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 335eb9e23d573d7261db6818efbcf11f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs b/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs index 1cf21966..71628fc6 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs +++ b/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs @@ -1,11 +1,14 @@ +using UnityEngine; +using UnityEngine.Rendering; + namespace Funly.SkyStudio { - [global::UnityEngine.ExecuteInEditMode] - public class SkyStudioSetupURPPipeline : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class SkyStudioSetupURPPipeline : MonoBehaviour { - [global::Funly.SkyStudio.HelpBox("For URP projects, Sky Studio will assign this rendering pipeline into GraphicsSettings. We have to install this pipeline so that we can embed our own custom render features, which are required for certain Sky Studio features like rain splashes to work properly. If you need to add rendering features, or customize the rendering pipeline asset please update this reference, and ensure that the 'SkyStudio-WeatherDepthForwardRenderer' is assigned to render feature index 1. Feel free to add any custom render features after index 1.", global::Funly.SkyStudio.HelpBoxMessageType.Info)] - [global::UnityEngine.Tooltip("The rendering pipeline that will be assigned into the graphics settings when this scene becomes active.")] - public global::UnityEngine.Rendering.RenderPipelineAsset pipelineAsset; + [HelpBox("For URP projects, Sky Studio will assign this rendering pipeline into GraphicsSettings. We have to install this pipeline so that we can embed our own custom render features, which are required for certain Sky Studio features like rain splashes to work properly. If you need to add rendering features, or customize the rendering pipeline asset please update this reference, and ensure that the 'SkyStudio-WeatherDepthForwardRenderer' is assigned to render feature index 1. Feel free to add any custom render features after index 1.", HelpBoxMessageType.Info)] + [Tooltip("The rendering pipeline that will be assigned into the graphics settings when this scene becomes active.")] + public RenderPipelineAsset pipelineAsset; private void Update() { diff --git a/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs.meta b/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs.meta index 74f41186..fc7d0dbe 100644 --- a/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SkyStudioSetupURPPipeline.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f756192cbd0e4a8625ec876af5949696 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs b/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs index 895d058a..22cc22fa 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs @@ -1,35 +1,38 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] + [Serializable] public class SpherePoint { public float horizontalRotation; public float verticalRotation; - public const float MinHorizontalRotation = -global::System.MathF.PI; + public const float MinHorizontalRotation = -MathF.PI; - public const float MaxHorizontalRotation = global::System.MathF.PI; + public const float MaxHorizontalRotation = MathF.PI; - public const float MinVerticalRotation = -global::System.MathF.PI / 2f; + public const float MinVerticalRotation = -MathF.PI / 2f; - public const float MaxVerticalRotation = global::System.MathF.PI / 2f; + public const float MaxVerticalRotation = MathF.PI / 2f; public SpherePoint(float horizontalRotation, float verticalRotation) { } - public SpherePoint(global::UnityEngine.Vector3 worldDirection) + public SpherePoint(Vector3 worldDirection) { } - public void SetFromWorldDirection(global::UnityEngine.Vector3 worldDirection) + public void SetFromWorldDirection(Vector3 worldDirection) { } - public global::UnityEngine.Vector3 GetWorldDirection() + public Vector3 GetWorldDirection() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs.meta index b48ce7af..992b9ad0 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpherePoint.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: eb9cf5abb973321417eec5c4097fd193 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs index e0821d7d..e2ec0810 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class SpherePointGroupDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class SpherePointGroupDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs.meta index 94028836..fe781258 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 89f8ed48c74cfac27d1d7c02c3bb62c2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs index 21e2d9c2..fa06f9e0 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs @@ -1,16 +1,18 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class SpherePointKeyframe : global::Funly.SkyStudio.BaseKeyframe + [Serializable] + public class SpherePointKeyframe : BaseKeyframe { - public global::Funly.SkyStudio.SpherePoint spherePoint; + public SpherePoint spherePoint; - public SpherePointKeyframe(global::Funly.SkyStudio.SpherePoint spherePoint, float time) + public SpherePointKeyframe(SpherePoint spherePoint, float time) : base(0f) { } - public SpherePointKeyframe(global::Funly.SkyStudio.SpherePointKeyframe keyframe) + public SpherePointKeyframe(SpherePointKeyframe keyframe) : base(0f) { } diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs.meta index 3e0f74ba..bfc7961a 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 58a538bf11004e67d0e249996344c4c7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs index 575011c8..4cfb2f67 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs @@ -1,27 +1,29 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class SpherePointKeyframeGroup : global::Funly.SkyStudio.KeyframeGroup + [Serializable] + public class SpherePointKeyframeGroup : KeyframeGroup { - public const float MinHorizontalRotation = -global::System.MathF.PI; + public const float MinHorizontalRotation = -MathF.PI; - public const float MaxHorizontalRotation = global::System.MathF.PI; + public const float MaxHorizontalRotation = MathF.PI; - public const float MinVerticalRotation = -global::System.MathF.PI / 2f; + public const float MinVerticalRotation = -MathF.PI / 2f; - public const float MaxVerticalRotation = global::System.MathF.PI / 2f; + public const float MaxVerticalRotation = MathF.PI / 2f; public SpherePointKeyframeGroup(string name) : base((string)null) { } - public SpherePointKeyframeGroup(string name, global::Funly.SkyStudio.SpherePointKeyframe keyframe) + public SpherePointKeyframeGroup(string name, SpherePointKeyframe keyframe) : base((string)null) { } - public global::Funly.SkyStudio.SpherePoint SpherePointForTime(float time) + public SpherePoint SpherePointForTime(float time) { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs.meta index bd9741ef..a0c55f6b 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpherePointKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 29d6c87c613a87a8b29fc5726a8d15cc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs b/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs index 98788099..724a019f 100644 --- a/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs +++ b/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs @@ -1,17 +1,20 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { public abstract class SphereUtility { - private const float k_HalfPI = global::System.MathF.PI / 2f; + private const float k_HalfPI = MathF.PI / 2f; - public static global::UnityEngine.Vector2 DirectionToSphericalCoordinate(global::UnityEngine.Vector3 direction) + public static Vector2 DirectionToSphericalCoordinate(Vector3 direction) { - return default(global::UnityEngine.Vector2); + return default(Vector2); } - public static global::UnityEngine.Vector3 SphericalCoordinateToDirection(global::UnityEngine.Vector2 coord) + public static Vector3 SphericalCoordinateToDirection(Vector2 coord) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public static float RadiusAtHeight(float yPos) @@ -19,9 +22,9 @@ public static float RadiusAtHeight(float yPos) return 0f; } - public static global::UnityEngine.Vector3 SphericalToPoint(float yPosition, float radAngle) + public static Vector3 SphericalToPoint(float yPosition, float radAngle) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public static float RadAngleToPercent(float radAngle) @@ -44,7 +47,7 @@ public static float PercentToHeight(float hPercent) return 0f; } - public static float AngleToReachTarget(global::UnityEngine.Vector2 point, float targetAngle) + public static float AngleToReachTarget(Vector2 point, float targetAngle) { return 0f; } @@ -54,45 +57,45 @@ public static float Atan2Positive(float y, float x) return 0f; } - public static global::UnityEngine.Vector3 RotateAroundXAxis(global::UnityEngine.Vector3 point, float angle) + public static Vector3 RotateAroundXAxis(Vector3 point, float angle) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public static global::UnityEngine.Vector3 RotateAroundYAxis(global::UnityEngine.Vector3 point, float angle) + public static Vector3 RotateAroundYAxis(Vector3 point, float angle) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public static global::UnityEngine.Vector3 RotatePoint(global::UnityEngine.Vector3 point, float xAxisRotation, float yAxisRotation) + public static Vector3 RotatePoint(Vector3 point, float xAxisRotation, float yAxisRotation) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public static global::UnityEngine.Vector2 Rotate2d(global::UnityEngine.Vector2 pos, float angle) + public static Vector2 Rotate2d(Vector2 pos, float angle) { - return default(global::UnityEngine.Vector2); + return default(Vector2); } - public static global::UnityEngine.Vector2 Matrix2x2Mult(global::UnityEngine.Vector4 matrix, global::UnityEngine.Vector2 pos) + public static Vector2 Matrix2x2Mult(Vector4 matrix, Vector2 pos) { - return default(global::UnityEngine.Vector2); + return default(Vector2); } - public static void CalculateStarRotation(global::UnityEngine.Vector3 star, out float xRotationAngle, out float yRotationAngle) + public static void CalculateStarRotation(Vector3 star, out float xRotationAngle, out float yRotationAngle) { xRotationAngle = default(float); yRotationAngle = default(float); } - public static global::UnityEngine.Vector2 ConvertUVToSphericalCoordinate(global::UnityEngine.Vector2 uv) + public static Vector2 ConvertUVToSphericalCoordinate(Vector2 uv) { - return default(global::UnityEngine.Vector2); + return default(Vector2); } - public static global::UnityEngine.Vector2 ConvertSphericalCoordateToUV(global::UnityEngine.Vector2 sphereCoord) + public static Vector2 ConvertSphericalCoordateToUV(Vector2 sphereCoord) { - return default(global::UnityEngine.Vector2); + return default(Vector2); } } } diff --git a/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs.meta b/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs.meta index 3e5e832c..f0ea676c 100644 --- a/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SphereUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 24c41160f6711e0c1182587530d6c267 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs b/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs index f9d50926..15b7a2e3 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs @@ -1,10 +1,12 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class SpriteArtItem : global::UnityEngine.ScriptableObject + public class SpriteArtItem : ScriptableObject { - public global::UnityEngine.Mesh mesh; + public Mesh mesh; - public global::UnityEngine.Material material; + public Material material; public int rows; @@ -14,7 +16,7 @@ public class SpriteArtItem : global::UnityEngine.ScriptableObject public int animateSpeed; - [global::UnityEngine.Tooltip("Color that will be multiplied against the base lightning bolt text color")] - public global::UnityEngine.Color tintColor; + [Tooltip("Color that will be multiplied against the base lightning bolt text color")] + public Color tintColor; } } diff --git a/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs.meta index e84733a6..b970a4ae 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpriteArtItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d9b9dc517937ade653147edc7139aa05 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs b/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs index 4a88918c..5d1fa01b 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs +++ b/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs @@ -1,6 +1,6 @@ namespace Funly.SkyStudio { - public class SpriteArtSet : global::Funly.SkyStudio.BaseArtSet + public class SpriteArtSet : BaseArtSet { } } diff --git a/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs.meta index d58d37d5..067c63cb 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpriteArtSet.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 27df78bbdc2a3aee6b18ac8ad7b1c4fb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SpriteSheetData.cs.meta b/Assets/Scripts/Funly/SkyStudio/SpriteSheetData.cs.meta index 77f7371d..13dbc6d5 100644 --- a/Assets/Scripts/Funly/SkyStudio/SpriteSheetData.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SpriteSheetData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2899bda2c606912eee601dd73cec25ee -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs b/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs index 8310c94c..1c1d984b 100644 --- a/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs +++ b/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs @@ -1,6 +1,6 @@ namespace Funly.SkyStudio { - public class Standard3dShaderDefinition : global::Funly.SkyStudio.BaseShaderDefinition + public class Standard3dShaderDefinition : BaseShaderDefinition { public const float MaxStarSize = 0.2f; @@ -20,12 +20,12 @@ public class Standard3dShaderDefinition : global::Funly.SkyStudio.BaseShaderDefi public const float MaxHDRValue = 25f; - protected override global::Funly.SkyStudio.ProfileFeatureSection[] ProfileFeatureSection() + protected override ProfileFeatureSection[] ProfileFeatureSection() { return null; } - protected override global::Funly.SkyStudio.ProfileGroupSection[] ProfileDefinitionTable() + protected override ProfileGroupSection[] ProfileDefinitionTable() { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs.meta b/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs.meta index 8e683d51..59177f8b 100644 --- a/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/Standard3dShaderDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a76f3af3047369f3e1e2eeee8379143c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/StarBlender.cs b/Assets/Scripts/Funly/SkyStudio/StarBlender.cs index f27bfbb8..9ba79c77 100644 --- a/Assets/Scripts/Funly/SkyStudio/StarBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/StarBlender.cs @@ -1,21 +1,23 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class StarBlender : global::Funly.SkyStudio.FeatureBlender + public class StarBlender : FeatureBlender { - [global::UnityEngine.Range(1f, 3f)] + [Range(1f, 3f)] public int starLayer; protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } diff --git a/Assets/Scripts/Funly/SkyStudio/StarBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/StarBlender.cs.meta index eb38b46f..b9649fcb 100644 --- a/Assets/Scripts/Funly/SkyStudio/StarBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/StarBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5b1444927e8bb08f3563beffd0f1999d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/SunBlender.cs b/Assets/Scripts/Funly/SkyStudio/SunBlender.cs index e0b2450e..44c5553b 100644 --- a/Assets/Scripts/Funly/SkyStudio/SunBlender.cs +++ b/Assets/Scripts/Funly/SkyStudio/SunBlender.cs @@ -1,18 +1,18 @@ namespace Funly.SkyStudio { - public class SunBlender : global::Funly.SkyStudio.FeatureBlender + public class SunBlender : FeatureBlender { protected override string featureKey => null; - protected override void BlendBoth(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendBoth(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendIn(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendIn(ProfileBlendingState state, BlendingHelper helper) { } - protected override void BlendOut(global::Funly.SkyStudio.ProfileBlendingState state, global::Funly.SkyStudio.BlendingHelper helper) + protected override void BlendOut(ProfileBlendingState state, BlendingHelper helper) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/SunBlender.cs.meta b/Assets/Scripts/Funly/SkyStudio/SunBlender.cs.meta index d53234c7..7efdb9fa 100644 --- a/Assets/Scripts/Funly/SkyStudio/SunBlender.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/SunBlender.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7beb601d1412d199b0cf7a08950322ff -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs b/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs index 513c9bfe..70d7c8a3 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs +++ b/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs @@ -1,7 +1,9 @@ +using System; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class TextureGroupDictionary : global::Funly.SkyStudio.SerializableDictionary + [Serializable] + public class TextureGroupDictionary : SerializableDictionary { } } diff --git a/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs.meta b/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs.meta index dbf5c389..4e007ba7 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/TextureGroupDictionary.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5d07cf405db6455402bfa7a9ed1e7aba -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs b/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs index 8f39f3e5..a97a7297 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs +++ b/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs @@ -1,16 +1,19 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class TextureKeyframe : global::Funly.SkyStudio.BaseKeyframe + [Serializable] + public class TextureKeyframe : BaseKeyframe { - public global::UnityEngine.Texture texture; + public Texture texture; - public TextureKeyframe(global::UnityEngine.Texture texture, float time) + public TextureKeyframe(Texture texture, float time) : base(0f) { } - public TextureKeyframe(global::Funly.SkyStudio.TextureKeyframe keyframe) + public TextureKeyframe(TextureKeyframe keyframe) : base(0f) { } diff --git a/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs.meta b/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs.meta index 43125d2c..23e97113 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/TextureKeyframe.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 03a37977b906decf4293c73a1242aa30 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs b/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs index 2329edd4..7bd5ba87 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs +++ b/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs @@ -1,14 +1,17 @@ +using System; +using UnityEngine; + namespace Funly.SkyStudio { - [global::System.Serializable] - public class TextureKeyframeGroup : global::Funly.SkyStudio.KeyframeGroup + [Serializable] + public class TextureKeyframeGroup : KeyframeGroup { - public TextureKeyframeGroup(string name, global::Funly.SkyStudio.TextureKeyframe keyframe) + public TextureKeyframeGroup(string name, TextureKeyframe keyframe) : base((string)null) { } - public global::UnityEngine.Texture TextureForTime(float time) + public Texture TextureForTime(float time) { return null; } diff --git a/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs.meta b/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs.meta index d8c0d557..ef27c921 100644 --- a/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/TextureKeyframeGroup.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0b125bf9cbfdbfcbbbffcc65fc4ee383 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs b/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs index be060d07..4850e319 100644 --- a/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs +++ b/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs @@ -1,50 +1,53 @@ +using System.Runtime.CompilerServices; +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.ExecuteInEditMode] - public class TimeOfDayController : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class TimeOfDayController : MonoBehaviour { - public delegate void TimeOfDayDidChange(global::Funly.SkyStudio.TimeOfDayController tc, float timeOfDay); + public delegate void TimeOfDayDidChange(TimeOfDayController tc, float timeOfDay); - [global::UnityEngine.Tooltip("Sky profile defines the skyColors configuration for times of day. This script will animate between those skyColors values based on the time of day.")] - [global::UnityEngine.SerializeField] - private global::Funly.SkyStudio.SkyProfile m_SkyProfile; + [Tooltip("Sky profile defines the skyColors configuration for times of day. This script will animate between those skyColors values based on the time of day.")] + [SerializeField] + private SkyProfile m_SkyProfile; - [global::UnityEngine.Tooltip("Time is expressed in a fractional number of days that have completed.")] - [global::UnityEngine.SerializeField] + [Tooltip("Time is expressed in a fractional number of days that have completed.")] + [SerializeField] private float m_SkyTime; - [global::UnityEngine.Tooltip("Automatically advance time at fixed speed.")] + [Tooltip("Automatically advance time at fixed speed.")] public bool automaticTimeIncrement; - [global::UnityEngine.Tooltip("Create a copy of the sky profile at runtime, so modifications don't affect the original Sky Profile in your project.")] + [Tooltip("Create a copy of the sky profile at runtime, so modifications don't affect the original Sky Profile in your project.")] public bool copySkyProfile; - private global::Funly.SkyStudio.SkyMaterialController m_SkyMaterialController; + private SkyMaterialController m_SkyMaterialController; - [global::UnityEngine.Tooltip("Speed at which to advance time by if in automatic increment is enabled.")] - [global::UnityEngine.Range(0f, 1f)] + [Tooltip("Speed at which to advance time by if in automatic increment is enabled.")] + [Range(0f, 1f)] public float automaticIncrementSpeed; - [global::UnityEngine.Tooltip("Sun orbit.")] - public global::Funly.SkyStudio.OrbitingBody sunOrbit; + [Tooltip("Sun orbit.")] + public OrbitingBody sunOrbit; - [global::UnityEngine.Tooltip("Moon orbit.")] - public global::Funly.SkyStudio.OrbitingBody moonOrbit; + [Tooltip("Moon orbit.")] + public OrbitingBody moonOrbit; - [global::UnityEngine.Tooltip("Controller for managing weather effects")] - public global::Funly.SkyStudio.WeatherController weatherController; + [Tooltip("Controller for managing weather effects")] + public WeatherController weatherController; - [global::UnityEngine.Tooltip("If true we'll invoke DynamicGI.UpdateEnvironment() when skybox changes. This is an expensive operation.")] + [Tooltip("If true we'll invoke DynamicGI.UpdateEnvironment() when skybox changes. This is an expensive operation.")] public bool updateGlobalIllumination; - [global::UnityEngine.Tooltip("Configurable prefab that determines how to animate between 2 sky profiles. You can override individual feature animations, ex: 'skyBlender', to create a custom sky blending effect.")] - public global::Funly.SkyStudio.BlendSkyProfiles skyProfileTransitionPrefab; + [Tooltip("Configurable prefab that determines how to animate between 2 sky profiles. You can override individual feature animations, ex: 'skyBlender', to create a custom sky blending effect.")] + public BlendSkyProfiles skyProfileTransitionPrefab; private bool m_DidInitialUpdate; - public static global::Funly.SkyStudio.TimeOfDayController instance { get; private set; } + public static TimeOfDayController instance { get; private set; } - public global::Funly.SkyStudio.SkyProfile skyProfile + public SkyProfile skyProfile { get { @@ -66,19 +69,19 @@ public float skyTime } } - public global::Funly.SkyStudio.SkyMaterialController SkyMaterial => null; + public SkyMaterialController SkyMaterial => null; public float timeOfDay => 0f; public int daysElapsed => 0; - public event global::Funly.SkyStudio.TimeOfDayController.TimeOfDayDidChange timeChangedCallback + public event TimeOfDayDidChange timeChangedCallback { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } @@ -116,12 +119,12 @@ private void SynchronizedShaderKeyword(string featureKey, string shaderKeyword) { } - private global::UnityEngine.Vector3 GetPrimaryLightDirection() + private Vector3 GetPrimaryLightDirection() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public bool StartSkyProfileTransition(global::Funly.SkyStudio.SkyProfile toProfile, float duration = 1f) + public bool StartSkyProfileTransition(SkyProfile toProfile, float duration = 1f) { return false; } @@ -130,7 +133,7 @@ public void CancelSkyProfileTransition() { } - public void OnBlendComplete(global::Funly.SkyStudio.BlendSkyProfiles blender) + public void OnBlendComplete(BlendSkyProfiles blender) { } diff --git a/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs.meta b/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs.meta index d2cca836..47bc5a97 100644 --- a/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/TimeOfDayController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5ecda7c1daf86629acebacea7eea5cb4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs b/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs index b445b113..15694194 100644 --- a/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs +++ b/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs @@ -1,18 +1,20 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class TransitionBetweenProfiles : global::UnityEngine.MonoBehaviour + public class TransitionBetweenProfiles : MonoBehaviour { - public global::Funly.SkyStudio.SkyProfile daySkyProfile; + public SkyProfile daySkyProfile; - public global::Funly.SkyStudio.SkyProfile nightSkyProfile; + public SkyProfile nightSkyProfile; - [global::UnityEngine.Tooltip("How long the transition animation will last.")] - [global::UnityEngine.Range(0.1f, 30f)] + [Tooltip("How long the transition animation will last.")] + [Range(0.1f, 30f)] public float transitionDuration; - public global::Funly.SkyStudio.TimeOfDayController timeOfDayController; + public TimeOfDayController timeOfDayController; - private global::Funly.SkyStudio.SkyProfile m_CurrentSkyProfile; + private SkyProfile m_CurrentSkyProfile; private void Start() { diff --git a/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs.meta b/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs.meta index 90bde589..833b8358 100644 --- a/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/TransitionBetweenProfiles.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c5f95023b6577fa8626f77b8369ade1e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs b/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs index 6f4ef8ac..25d24a11 100644 --- a/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs +++ b/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs @@ -1,14 +1,17 @@ +using UnityEngine; +using UnityEngine.Rendering.Universal; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Camera))] - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData))] - public class URPWeatherDepth : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Camera))] + [RequireComponent(typeof(UniversalAdditionalCameraData))] + public class URPWeatherDepth : MonoBehaviour { - public global::UnityEngine.RenderTexture renderTexture; + public RenderTexture renderTexture; - private global::UnityEngine.Camera m_Camera; + private Camera m_Camera; - private global::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData m_CameraData; + private UniversalAdditionalCameraData m_CameraData; private void Start() { diff --git a/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs.meta b/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs.meta index e8ff629f..b7604764 100644 --- a/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/URPWeatherDepth.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 871b6ba6496e50c139c46e8aa6afc99a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherController.cs b/Assets/Scripts/Funly/SkyStudio/WeatherController.cs index 4daf8861..be116561 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherController.cs +++ b/Assets/Scripts/Funly/SkyStudio/WeatherController.cs @@ -1,24 +1,26 @@ +using UnityEngine; + namespace Funly.SkyStudio { - public class WeatherController : global::UnityEngine.MonoBehaviour + public class WeatherController : MonoBehaviour { - private global::Funly.SkyStudio.WeatherEnclosure m_Enclosure; + private WeatherEnclosure m_Enclosure; - private global::UnityEngine.MeshRenderer m_EnclosureMeshRenderer; + private MeshRenderer m_EnclosureMeshRenderer; - private global::Funly.SkyStudio.WeatherEnclosureDetector detector; + private WeatherEnclosureDetector detector; - private global::Funly.SkyStudio.SkyProfile m_Profile; + private SkyProfile m_Profile; private float m_TimeOfDay; - public global::Funly.SkyStudio.RainDownfallController rainDownfallController { get; protected set; } + public RainDownfallController rainDownfallController { get; protected set; } - public global::Funly.SkyStudio.RainSplashController rainSplashController { get; protected set; } + public RainSplashController rainSplashController { get; protected set; } - public global::Funly.SkyStudio.LightningController lightningController { get; protected set; } + public LightningController lightningController { get; protected set; } - public global::Funly.SkyStudio.WeatherDepthCamera weatherDepthCamera { get; protected set; } + public WeatherDepthCamera weatherDepthCamera { get; protected set; } private void Awake() { @@ -40,7 +42,7 @@ private void OnDisable() { } - public void UpdateForTimeOfDay(global::Funly.SkyStudio.SkyProfile skyProfile, float timeOfDay) + public void UpdateForTimeOfDay(SkyProfile skyProfile, float timeOfDay) { } @@ -48,7 +50,7 @@ private void LateUpdate() { } - private void OnEnclosureDidChange(global::Funly.SkyStudio.WeatherEnclosure enclosure) + private void OnEnclosureDidChange(WeatherEnclosure enclosure) { } } diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherController.cs.meta b/Assets/Scripts/Funly/SkyStudio/WeatherController.cs.meta index 919a8479..2d16d68f 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherController.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/WeatherController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dc3e5cad468fd723585177c14e17dee4 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs b/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs index 1b53fc82..7f024371 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs +++ b/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs @@ -1,22 +1,24 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Camera))] - public class WeatherDepthCamera : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Camera))] + public class WeatherDepthCamera : MonoBehaviour { - private global::UnityEngine.Camera m_DepthCamera; + private Camera m_DepthCamera; - [global::UnityEngine.Tooltip("Shader used to render out depth + normal texture. This should be the sky studio depth shader.")] - public global::UnityEngine.Shader depthShader; + [Tooltip("Shader used to render out depth + normal texture. This should be the sky studio depth shader.")] + public Shader depthShader; - [global::UnityEngine.HideInInspector] - public global::UnityEngine.RenderTexture overheadDepthTexture; + [HideInInspector] + public RenderTexture overheadDepthTexture; - [global::UnityEngine.Tooltip("You can help increase performance by only rendering periodically some number of frames.")] - [global::UnityEngine.Range(1f, 60f)] + [Tooltip("You can help increase performance by only rendering periodically some number of frames.")] + [Range(1f, 60f)] public int renderFrameInterval; - [global::UnityEngine.Tooltip("The resolution of the texture. Higher resolution uses more rendering time but makes more precise weather along edges.")] - [global::UnityEngine.Range(128f, 8192f)] + [Tooltip("The resolution of the texture. Higher resolution uses more rendering time but makes more precise weather along edges.")] + [Range(128f, 8192f)] public int textureResolution; private void Start() diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs.meta b/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs.meta index e0b85514..52f99b4f 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/WeatherDepthCamera.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2f6023b1b8a6e33366d7b53a00d57771 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs index 9441eef7..f41a88e8 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs +++ b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs @@ -1,10 +1,12 @@ +using UnityEngine; + namespace Funly.SkyStudio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.MeshRenderer))] - public class WeatherEnclosure : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(MeshRenderer))] + public class WeatherEnclosure : MonoBehaviour { - public global::UnityEngine.Vector2 nearTextureTiling; + public Vector2 nearTextureTiling; - public global::UnityEngine.Vector2 farTextureTiling; + public Vector2 farTextureTiling; } } diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs.meta b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs.meta index 588f55fd..6a58162f 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosure.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d909b887a95b33d3c1c182620d80397d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs index 2494d5df..63c92a01 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs +++ b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs @@ -1,15 +1,19 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace Funly.SkyStudio { - public class WeatherEnclosureDetector : global::UnityEngine.MonoBehaviour + public class WeatherEnclosureDetector : MonoBehaviour { - [global::UnityEngine.Tooltip("Default enclosure used when not inside the trigger of another enclosure area.")] - public global::Funly.SkyStudio.WeatherEnclosure mainEnclosure; + [Tooltip("Default enclosure used when not inside the trigger of another enclosure area.")] + public WeatherEnclosure mainEnclosure; - private global::System.Collections.Generic.List triggeredEnclosures; + private List triggeredEnclosures; - public global::Funly.SkyStudio.RainDownfallController rainController; + public RainDownfallController rainController; - public global::System.Action enclosureChangedCallback; + public Action enclosureChangedCallback; private void Start() { @@ -19,11 +23,11 @@ private void OnEnable() { } - private void OnTriggerEnter(global::UnityEngine.Collider other) + private void OnTriggerEnter(Collider other) { } - private void OnTriggerExit(global::UnityEngine.Collider other) + private void OnTriggerExit(Collider other) { } diff --git a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs.meta b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs.meta index ea44cf66..aa25dabf 100644 --- a/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs.meta +++ b/Assets/Scripts/Funly/SkyStudio/WeatherEnclosureDetector.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 12c14f08add96e3c3aad072023b38dbc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/GUIDManager.cs b/Assets/Scripts/GUIDManager.cs index b0f2a39a..8a23c726 100644 --- a/Assets/Scripts/GUIDManager.cs +++ b/Assets/Scripts/GUIDManager.cs @@ -1,33 +1,37 @@ +using System; +using System.Collections.Generic; +using ScheduleOne; + public static class GUIDManager { - private static global::System.Collections.Generic.List registeredGUIDs; + private static List registeredGUIDs; - private static global::System.Collections.Generic.Dictionary guidToObject; + private static Dictionary guidToObject; - public static void RegisterObject(global::ScheduleOne.IGUIDRegisterable obj) + public static void RegisterObject(IGUIDRegisterable obj) { } - public static void DeregisterObject(global::ScheduleOne.IGUIDRegisterable obj) + public static void DeregisterObject(IGUIDRegisterable obj) { } - public static T GetObject(global::System.Guid guid) + public static T GetObject(Guid guid) { return default(T); } - public static global::System.Type GetObjectType(global::System.Guid guid) + public static Type GetObjectType(Guid guid) { return null; } - public static global::System.Guid GenerateUniqueGUID() + public static Guid GenerateUniqueGUID() { - return default(global::System.Guid); + return default(Guid); } - public static bool IsGUIDAlreadyRegistered(global::System.Guid guid) + public static bool IsGUIDAlreadyRegistered(Guid guid) { return false; } diff --git a/Assets/Scripts/GUIDManager.cs.meta b/Assets/Scripts/GUIDManager.cs.meta index 2dec128b..cec0ab28 100644 --- a/Assets/Scripts/GUIDManager.cs.meta +++ b/Assets/Scripts/GUIDManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0a0ddc268c6ca10ac7e99f1ba6c0920b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/GarageDoorController.cs b/Assets/Scripts/GarageDoorController.cs index a289297c..d375a195 100644 --- a/Assets/Scripts/GarageDoorController.cs +++ b/Assets/Scripts/GarageDoorController.cs @@ -1,7 +1,14 @@ -public class GarageDoorController : global::UnityEngine.MonoBehaviour +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + +public class GarageDoorController : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CRotate_003Ed__4 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CRotate_003Ed__4 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -9,43 +16,43 @@ private sealed class _003CRotate_003Ed__4 : global::System.Collections.Generic.I public GarageDoorController _003C_003E4__this; - public global::UnityEngine.Vector3 axis; + public Vector3 axis; public float angle; public float duration; - private global::UnityEngine.Quaternion _003Cfrom_003E5__2; + private Quaternion _003Cfrom_003E5__2; - private global::UnityEngine.Quaternion _003Cto_003E5__3; + private Quaternion _003Cto_003E5__3; private float _003Celapsed_003E5__4; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CRotate_003Ed__4(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -54,30 +61,30 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } public GarageDoorStatus doorStatus; - public global::UnityEngine.Transform garageDoor; + public Transform garageDoor; - public global::UnityEngine.Quaternion targetRotation; + public Quaternion targetRotation; - private void OnTriggerStay(global::UnityEngine.Collider other) + private void OnTriggerStay(Collider other) { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(GarageDoorController._003CRotate_003Ed__4))] - private global::System.Collections.IEnumerator Rotate(global::UnityEngine.Vector3 axis, float angle, float duration = 1f) + [IteratorStateMachine(typeof(_003CRotate_003Ed__4))] + private IEnumerator Rotate(Vector3 axis, float angle, float duration = 1f) { return null; } diff --git a/Assets/Scripts/GarageDoorController.cs.meta b/Assets/Scripts/GarageDoorController.cs.meta index e8c7ca01..7464033e 100644 --- a/Assets/Scripts/GarageDoorController.cs.meta +++ b/Assets/Scripts/GarageDoorController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 798a0f00cc3d6de74fdd4a8435ae405e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/GarageDoorStatus.cs b/Assets/Scripts/GarageDoorStatus.cs index b4747b10..030cd3bd 100644 --- a/Assets/Scripts/GarageDoorStatus.cs +++ b/Assets/Scripts/GarageDoorStatus.cs @@ -1,4 +1,6 @@ -public class GarageDoorStatus : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class GarageDoorStatus : MonoBehaviour { public bool doorIsOpen; diff --git a/Assets/Scripts/GarageDoorStatus.cs.meta b/Assets/Scripts/GarageDoorStatus.cs.meta index 7a019237..98ed71a1 100644 --- a/Assets/Scripts/GarageDoorStatus.cs.meta +++ b/Assets/Scripts/GarageDoorStatus.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4de49b278e8b79f198119052574b4bca -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/IKControl.cs b/Assets/Scripts/IKControl.cs index f9218bb9..441f6d38 100644 --- a/Assets/Scripts/IKControl.cs +++ b/Assets/Scripts/IKControl.cs @@ -1,13 +1,15 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Animator))] -public class IKControl : global::UnityEngine.MonoBehaviour +using UnityEngine; + +[RequireComponent(typeof(Animator))] +public class IKControl : MonoBehaviour { - protected global::UnityEngine.Animator animator; + protected Animator animator; public bool ikActive; - public global::UnityEngine.Transform rightHandObj; + public Transform rightHandObj; - public global::UnityEngine.Transform lookObj; + public Transform lookObj; private void Start() { diff --git a/Assets/Scripts/IKControl.cs.meta b/Assets/Scripts/IKControl.cs.meta index 2f905811..382898b7 100644 --- a/Assets/Scripts/IKControl.cs.meta +++ b/Assets/Scripts/IKControl.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5f4738348fe6cd720fdb6e87538944bf -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Interpolate.cs b/Assets/Scripts/Interpolate.cs index 34962c71..b7786c2b 100644 --- a/Assets/Scripts/Interpolate.cs +++ b/Assets/Scripts/Interpolate.cs @@ -1,3 +1,10 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + public class Interpolate { public enum EaseType @@ -26,68 +33,68 @@ public enum EaseType EaseInOutCirc = 21 } - public delegate global::UnityEngine.Vector3 ToVector3(T v); + public delegate Vector3 ToVector3(T v); public delegate float Function(float a, float b, float c, float d); - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CNewBezier_003Ed__16 : global::System.Collections.Generic.IEnumerable, global::System.Collections.IEnumerable, global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CNewBezier_003Ed__16 : IEnumerable, IEnumerable, IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; - private global::UnityEngine.Vector3 _003C_003E2__current; + private Vector3 _003C_003E2__current; private int _003C_003El__initialThreadId; - private global::System.Collections.IList nodes; + private IList nodes; - public global::System.Collections.IList _003C_003E3__nodes; + public IList _003C_003E3__nodes; - private global::System.Collections.Generic.IEnumerable steps; + private IEnumerable steps; - public global::System.Collections.Generic.IEnumerable _003C_003E3__steps; + public IEnumerable _003C_003E3__steps; - private Interpolate.ToVector3 toVector3; + private ToVector3 toVector3; - public Interpolate.ToVector3 _003C_003E3__toVector3; + public ToVector3 _003C_003E3__toVector3; - private Interpolate.Function ease; + private Function ease; - public Interpolate.Function _003C_003E3__ease; + public Function _003C_003E3__ease; private float maxStep; public float _003C_003E3__maxStep; - private global::UnityEngine.Vector3[] _003Cpoints_003E5__2; + private Vector3[] _003Cpoints_003E5__2; - private global::System.Collections.Generic.IEnumerator _003C_003E7__wrap2; + private IEnumerator _003C_003E7__wrap2; - global::UnityEngine.Vector3 global::System.Collections.Generic.IEnumerator.Current + Vector3 IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CNewBezier_003Ed__16(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -96,7 +103,7 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); @@ -106,40 +113,40 @@ private void _003C_003Em__Finally1() { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CNewCatmullRom_003Ed__20 : global::System.Collections.Generic.IEnumerable, global::System.Collections.IEnumerable, global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CNewCatmullRom_003Ed__20 : IEnumerable, IEnumerable, IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; - private global::UnityEngine.Vector3 _003C_003E2__current; + private Vector3 _003C_003E2__current; private int _003C_003El__initialThreadId; - private global::System.Collections.IList nodes; + private IList nodes; - public global::System.Collections.IList _003C_003E3__nodes; + public IList _003C_003E3__nodes; - private Interpolate.ToVector3 toVector3; + private ToVector3 toVector3; - public Interpolate.ToVector3 _003C_003E3__toVector3; + public ToVector3 _003C_003E3__toVector3; private bool loop; @@ -165,31 +172,31 @@ private sealed class _003CNewCatmullRom_003Ed__20 : global::System.Collection private int _003Cstep_003E5__9; - global::UnityEngine.Vector3 global::System.Collections.Generic.IEnumerator.Current + Vector3 IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CNewCatmullRom_003Ed__20(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -198,32 +205,32 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CNewCounter_003Ed__6 : global::System.Collections.Generic.IEnumerable, global::System.Collections.IEnumerable, global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CNewCounter_003Ed__6 : IEnumerable, IEnumerable, IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -245,31 +252,31 @@ private sealed class _003CNewCounter_003Ed__6 : global::System.Collections.Gener private int _003Ci_003E5__2; - float global::System.Collections.Generic.IEnumerator.Current + float IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return 0f; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CNewCounter_003Ed__6(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -278,76 +285,76 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CNewEase_003Ed__9 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CNewEase_003Ed__9 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::UnityEngine.Vector3 end; + public Vector3 end; - public global::UnityEngine.Vector3 start; + public Vector3 start; - public global::System.Collections.Generic.IEnumerable driver; + public IEnumerable driver; - public Interpolate.Function ease; + public Function ease; public float total; - private global::UnityEngine.Vector3 _003Cdistance_003E5__2; + private Vector3 _003Cdistance_003E5__2; - private global::System.Collections.Generic.IEnumerator _003C_003E7__wrap2; + private IEnumerator _003C_003E7__wrap2; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CNewEase_003Ed__9(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -356,7 +363,7 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); @@ -366,14 +373,14 @@ private void _003C_003Em__Finally1() { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CNewTimer_003Ed__3 : global::System.Collections.Generic.IEnumerable, global::System.Collections.IEnumerable, global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CNewTimer_003Ed__3 : IEnumerable, IEnumerable, IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -387,31 +394,31 @@ private sealed class _003CNewTimer_003Ed__3 : global::System.Collections.Generic private float _003CelapsedTime_003E5__2; - float global::System.Collections.Generic.IEnumerator.Current + float IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return 0f; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CNewTimer_003Ed__3(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -420,128 +427,128 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } - [global::System.Diagnostics.DebuggerHidden] - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() + [DebuggerHidden] + IEnumerator IEnumerable.GetEnumerator() { return null; } } - private static global::UnityEngine.Vector3 Identity(global::UnityEngine.Vector3 v) + private static Vector3 Identity(Vector3 v) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - private static global::UnityEngine.Vector3 TransformDotPosition(global::UnityEngine.Transform t) + private static Vector3 TransformDotPosition(Transform t) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(Interpolate._003CNewTimer_003Ed__3))] - private static global::System.Collections.Generic.IEnumerable NewTimer(float duration) + [IteratorStateMachine(typeof(_003CNewTimer_003Ed__3))] + private static IEnumerable NewTimer(float duration) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(Interpolate._003CNewCounter_003Ed__6))] - private static global::System.Collections.Generic.IEnumerable NewCounter(int start, int end, int step) + [IteratorStateMachine(typeof(_003CNewCounter_003Ed__6))] + private static IEnumerable NewCounter(int start, int end, int step) { return null; } - public static global::System.Collections.IEnumerator NewEase(Interpolate.Function ease, global::UnityEngine.Vector3 start, global::UnityEngine.Vector3 end, float duration) + public static IEnumerator NewEase(Function ease, Vector3 start, Vector3 end, float duration) { return null; } - public static global::System.Collections.IEnumerator NewEase(Interpolate.Function ease, global::UnityEngine.Vector3 start, global::UnityEngine.Vector3 end, int slices) + public static IEnumerator NewEase(Function ease, Vector3 start, Vector3 end, int slices) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(Interpolate._003CNewEase_003Ed__9))] - private static global::System.Collections.IEnumerator NewEase(Interpolate.Function ease, global::UnityEngine.Vector3 start, global::UnityEngine.Vector3 end, float total, global::System.Collections.Generic.IEnumerable driver) + [IteratorStateMachine(typeof(_003CNewEase_003Ed__9))] + private static IEnumerator NewEase(Function ease, Vector3 start, Vector3 end, float total, IEnumerable driver) { return null; } - private static global::UnityEngine.Vector3 Ease(Interpolate.Function ease, global::UnityEngine.Vector3 start, global::UnityEngine.Vector3 distance, float elapsedTime, float duration) + private static Vector3 Ease(Function ease, Vector3 start, Vector3 distance, float elapsedTime, float duration) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public static Interpolate.Function Ease(Interpolate.EaseType type) + public static Function Ease(EaseType type) { return null; } - public static global::System.Collections.Generic.IEnumerable NewBezier(Interpolate.Function ease, global::UnityEngine.Transform[] nodes, float duration) + public static IEnumerable NewBezier(Function ease, Transform[] nodes, float duration) { return null; } - public static global::System.Collections.Generic.IEnumerable NewBezier(Interpolate.Function ease, global::UnityEngine.Transform[] nodes, int slices) + public static IEnumerable NewBezier(Function ease, Transform[] nodes, int slices) { return null; } - public static global::System.Collections.Generic.IEnumerable NewBezier(Interpolate.Function ease, global::UnityEngine.Vector3[] points, float duration) + public static IEnumerable NewBezier(Function ease, Vector3[] points, float duration) { return null; } - public static global::System.Collections.Generic.IEnumerable NewBezier(Interpolate.Function ease, global::UnityEngine.Vector3[] points, int slices) + public static IEnumerable NewBezier(Function ease, Vector3[] points, int slices) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(Interpolate._003CNewBezier_003Ed__16<>))] - private static global::System.Collections.Generic.IEnumerable NewBezier(Interpolate.Function ease, global::System.Collections.IList nodes, Interpolate.ToVector3 toVector3, float maxStep, global::System.Collections.Generic.IEnumerable steps) + [IteratorStateMachine(typeof(_003CNewBezier_003Ed__16<>))] + private static IEnumerable NewBezier(Function ease, IList nodes, ToVector3 toVector3, float maxStep, IEnumerable steps) { return null; } - private static global::UnityEngine.Vector3 Bezier(Interpolate.Function ease, global::UnityEngine.Vector3[] points, float elapsedTime, float duration) + private static Vector3 Bezier(Function ease, Vector3[] points, float elapsedTime, float duration) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } - public static global::System.Collections.Generic.IEnumerable NewCatmullRom(global::UnityEngine.Transform[] nodes, int slices, bool loop) + public static IEnumerable NewCatmullRom(Transform[] nodes, int slices, bool loop) { return null; } - public static global::System.Collections.Generic.IEnumerable NewCatmullRom(global::UnityEngine.Vector3[] points, int slices, bool loop) + public static IEnumerable NewCatmullRom(Vector3[] points, int slices, bool loop) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(Interpolate._003CNewCatmullRom_003Ed__20<>))] - private static global::System.Collections.Generic.IEnumerable NewCatmullRom(global::System.Collections.IList nodes, Interpolate.ToVector3 toVector3, int slices, bool loop) + [IteratorStateMachine(typeof(_003CNewCatmullRom_003Ed__20<>))] + private static IEnumerable NewCatmullRom(IList nodes, ToVector3 toVector3, int slices, bool loop) { return null; } - private static global::UnityEngine.Vector3 CatmullRom(global::UnityEngine.Vector3 previous, global::UnityEngine.Vector3 start, global::UnityEngine.Vector3 end, global::UnityEngine.Vector3 next, float elapsedTime, float duration) + private static Vector3 CatmullRom(Vector3 previous, Vector3 start, Vector3 end, Vector3 next, float elapsedTime, float duration) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } private static float Linear(float start, float distance, float elapsedTime, float duration) diff --git a/Assets/Scripts/Interpolate.cs.meta b/Assets/Scripts/Interpolate.cs.meta index 53019f26..07dc7f23 100644 --- a/Assets/Scripts/Interpolate.cs.meta +++ b/Assets/Scripts/Interpolate.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 801e4e70dab18638ad9790a611332c6c -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/InvertMouseSetter.cs b/Assets/Scripts/InvertMouseSetter.cs index 6ef286f3..9c9741e4 100644 --- a/Assets/Scripts/InvertMouseSetter.cs +++ b/Assets/Scripts/InvertMouseSetter.cs @@ -1,4 +1,6 @@ -public class InvertMouseSetter : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class InvertMouseSetter : MonoBehaviour { private void Awake() { diff --git a/Assets/Scripts/InvertMouseSetter.cs.meta b/Assets/Scripts/InvertMouseSetter.cs.meta index fa572ecb..84a47a4b 100644 --- a/Assets/Scripts/InvertMouseSetter.cs.meta +++ b/Assets/Scripts/InvertMouseSetter.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f7807a684ed41cd035f82ecdc1fe49db -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ItemIconCreator.meta b/Assets/Scripts/ItemIconCreator.meta index 68b5795c..405aee26 100644 --- a/Assets/Scripts/ItemIconCreator.meta +++ b/Assets/Scripts/ItemIconCreator.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd659bba963ba3949b085aed016a7376 +guid: 1d4c942c61fa4284c96e22cbd14ae6ab folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ItemIconCreator/IconCreator.cs b/Assets/Scripts/ItemIconCreator/IconCreator.cs index eb65eea0..d3ee0a14 100644 --- a/Assets/Scripts/ItemIconCreator/IconCreator.cs +++ b/Assets/Scripts/ItemIconCreator/IconCreator.cs @@ -1,9 +1,16 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace ItemIconCreator { - [global::UnityEngine.ExecuteInEditMode] - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Camera))] - [global::UnityEngine.DisallowMultipleComponent] - public class IconCreator : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + [RequireComponent(typeof(Camera))] + [DisallowMultipleComponent] + public class IconCreator : MonoBehaviour { public enum SaveLocation { @@ -19,44 +26,44 @@ public enum Mode Manual = 1 } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CCaptureFrame_003Ed__30 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CCaptureFrame_003Ed__30 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ItemIconCreator.IconCreator _003C_003E4__this; + public IconCreator _003C_003E4__this; public string objectName; public int i; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CCaptureFrame_003Ed__30(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -65,14 +72,14 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } @@ -85,9 +92,9 @@ private bool MoveNext() public string iconFileName; - public global::ItemIconCreator.IconCreator.SaveLocation pathLocation; + public SaveLocation pathLocation; - public global::ItemIconCreator.IconCreator.Mode mode; + public Mode mode; public string folderName; @@ -101,29 +108,29 @@ private bool MoveNext() protected string finalPath; - private global::UnityEngine.Vector3 mousePostion; + private Vector3 mousePostion; - public global::UnityEngine.KeyCode nextIconKey; + public KeyCode nextIconKey; protected bool CanMove; public bool preview; - protected global::UnityEngine.Camera whiteCam; + protected Camera whiteCam; - protected global::UnityEngine.Camera blackCam; + protected Camera blackCam; - public global::UnityEngine.Camera mainCam; + public Camera mainCam; - protected global::UnityEngine.Texture2D texBlack; + protected Texture2D texBlack; - protected global::UnityEngine.Texture2D texWhite; + protected Texture2D texWhite; - protected global::UnityEngine.Texture2D finalTexture; + protected Texture2D finalTexture; - private global::UnityEngine.CameraClearFlags originalClearFlags; + private CameraClearFlags originalClearFlags; - protected global::UnityEngine.Transform currentObject; + protected Transform currentObject; private void Awake() { @@ -141,8 +148,8 @@ public virtual void BuildIcons() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ItemIconCreator.IconCreator._003CCaptureFrame_003Ed__30))] - protected global::System.Collections.IEnumerator CaptureFrame(string objectName, int i) + [IteratorStateMachine(typeof(_003CCaptureFrame_003Ed__30))] + protected IEnumerator CaptureFrame(string objectName, int i) { return null; } @@ -151,7 +158,7 @@ protected virtual void Update() { } - private void RenderCamToTexture(global::UnityEngine.Camera cam, global::UnityEngine.Texture2D tex) + private void RenderCamToTexture(Camera cam, Texture2D tex) { } @@ -168,7 +175,7 @@ public string GetFinalFolder() return null; } - private void WriteScreenImageToTexture(global::UnityEngine.Texture2D tex) + private void WriteScreenImageToTexture(Texture2D tex) { } @@ -189,7 +196,7 @@ private void CacheAndInitialiseFields() { } - protected void UpdateFOV(global::UnityEngine.GameObject targetItem) + protected void UpdateFOV(GameObject targetItem) { } @@ -197,23 +204,23 @@ protected void UpdateFOV(float value) { } - protected void LookAtTargetCenter(global::UnityEngine.GameObject targetItem) + protected void LookAtTargetCenter(GameObject targetItem) { } - private float GetTargetFov(global::UnityEngine.GameObject a) + private float GetTargetFov(GameObject a) { return 0f; } - private global::System.Collections.Generic.List GetRenderers(global::UnityEngine.GameObject obj) + private List GetRenderers(GameObject obj) { return null; } - private global::UnityEngine.Vector3 GetMeshCenter(global::UnityEngine.GameObject a) + private Vector3 GetMeshCenter(GameObject a) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } protected void RevealInFinder() diff --git a/Assets/Scripts/ItemIconCreator/IconCreator.cs.meta b/Assets/Scripts/ItemIconCreator/IconCreator.cs.meta index dc3ef25d..1e4f2ea8 100644 --- a/Assets/Scripts/ItemIconCreator/IconCreator.cs.meta +++ b/Assets/Scripts/ItemIconCreator/IconCreator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a33b0b8c24b8bf808569fcc07f115d0a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs b/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs index 18fab671..362c17d1 100644 --- a/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs +++ b/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs @@ -1,18 +1,21 @@ +using UnityEngine; +using UnityEngine.UI; + namespace ItemIconCreator { - public class IconCreatorCanvas : global::UnityEngine.MonoBehaviour + public class IconCreatorCanvas : MonoBehaviour { - public global::UnityEngine.UI.Text textLabel; + public Text textLabel; - public global::UnityEngine.GameObject borders; + public GameObject borders; - public static global::ItemIconCreator.IconCreatorCanvas instance; + public static IconCreatorCanvas instance; private void Awake() { } - public void SetInfo(int totalItens, int currentItem, string itemName, bool isRecording, global::UnityEngine.KeyCode key) + public void SetInfo(int totalItens, int currentItem, string itemName, bool isRecording, KeyCode key) { } diff --git a/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs.meta b/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs.meta index 7af25f6c..3e21a0ce 100644 --- a/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs.meta +++ b/Assets/Scripts/ItemIconCreator/IconCreatorCanvas.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9a2fcc4b0a63cbb97aaa20471ad194d1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs b/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs index 3e5b3b66..e962b43b 100644 --- a/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs +++ b/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs @@ -1,44 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace ItemIconCreator { - [global::UnityEngine.ExecuteInEditMode] - public class MaterialIconCreator : global::ItemIconCreator.IconCreator + [ExecuteInEditMode] + public class MaterialIconCreator : IconCreator { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CBuildIconsRotine_003Ed__4 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CBuildIconsRotine_003Ed__4 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ItemIconCreator.MaterialIconCreator _003C_003E4__this; + public MaterialIconCreator _003C_003E4__this; private int _003Ci_003E5__2; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CBuildIconsRotine_003Ed__4(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -47,21 +54,21 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - public global::UnityEngine.Renderer targetRenderer; + public Renderer targetRenderer; - public global::UnityEngine.Material[] materials; + public Material[] materials; public override void BuildIcons() { @@ -72,8 +79,8 @@ public override bool CheckConditions() return false; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ItemIconCreator.MaterialIconCreator._003CBuildIconsRotine_003Ed__4))] - private global::System.Collections.IEnumerator BuildIconsRotine() + [IteratorStateMachine(typeof(_003CBuildIconsRotine_003Ed__4))] + private IEnumerator BuildIconsRotine() { return null; } diff --git a/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs.meta b/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs.meta index 68acdb82..b0a153d4 100644 --- a/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs.meta +++ b/Assets/Scripts/ItemIconCreator/MaterialIconCreator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e37ad9436c8353abcd8185f91700a02f -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs b/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs index bc443c64..14abc69a 100644 --- a/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs +++ b/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs @@ -1,44 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace ItemIconCreator { - [global::UnityEngine.ExecuteInEditMode] - public class PrefabIconCreator : global::ItemIconCreator.IconCreator + [ExecuteInEditMode] + public class PrefabIconCreator : IconCreator { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CBuildAllIcons_003Ed__7 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CBuildAllIcons_003Ed__7 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ItemIconCreator.PrefabIconCreator _003C_003E4__this; + public PrefabIconCreator _003C_003E4__this; private int _003Ci_003E5__2; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CBuildAllIcons_003Ed__7(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -47,24 +54,24 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::UnityEngine.Header("Items")] - public global::UnityEngine.GameObject[] itemsToShot; + [Header("Items")] + public GameObject[] itemsToShot; - public global::UnityEngine.Transform itemPosition; + public Transform itemPosition; - private global::UnityEngine.GameObject instantiatedItem; + private GameObject instantiatedItem; public override void BuildIcons() { @@ -83,8 +90,8 @@ private void ClearShit() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ItemIconCreator.PrefabIconCreator._003CBuildAllIcons_003Ed__7))] - public global::System.Collections.IEnumerator BuildAllIcons() + [IteratorStateMachine(typeof(_003CBuildAllIcons_003Ed__7))] + public IEnumerator BuildAllIcons() { return null; } diff --git a/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs.meta b/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs.meta index f0a0250b..a695ff34 100644 --- a/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs.meta +++ b/Assets/Scripts/ItemIconCreator/PrefabIconCreator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 66b3aee2ee49e072546db07d55aa5ab8 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LandingButtons.cs b/Assets/Scripts/LandingButtons.cs index 63be60dc..cf892499 100644 --- a/Assets/Scripts/LandingButtons.cs +++ b/Assets/Scripts/LandingButtons.cs @@ -1,4 +1,6 @@ -public class LandingButtons : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class LandingButtons : MonoBehaviour { public LandingSpotController _landingSpotController; diff --git a/Assets/Scripts/LandingButtons.cs.meta b/Assets/Scripts/LandingButtons.cs.meta index f02a0fe0..fd8d0324 100644 --- a/Assets/Scripts/LandingButtons.cs.meta +++ b/Assets/Scripts/LandingButtons.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d385f6c1e6b55d25027f21442bfcae4a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LandingSpot.cs b/Assets/Scripts/LandingSpot.cs index c5d390cb..5e768ffc 100644 --- a/Assets/Scripts/LandingSpot.cs +++ b/Assets/Scripts/LandingSpot.cs @@ -1,7 +1,14 @@ -public class LandingSpot : global::UnityEngine.MonoBehaviour +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + +public class LandingSpot : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CGetFlockChild_003Ed__12 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CGetFlockChild_003Ed__12 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -13,31 +20,31 @@ private sealed class _003CGetFlockChild_003Ed__12 : global::System.Collections.G public LandingSpot _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CGetFlockChild_003Ed__12(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -46,32 +53,32 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::UnityEngine.HideInInspector] + [HideInInspector] public FlockChild landingChild; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool landing; private int lerpCounter; - [global::UnityEngine.HideInInspector] + [HideInInspector] public LandingSpotController _controller; private bool _idle; - public global::UnityEngine.Transform _thisT; + public Transform _thisT; public bool _gotcha; @@ -95,8 +102,8 @@ public void RotateBird() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(LandingSpot._003CGetFlockChild_003Ed__12))] - public global::System.Collections.IEnumerator GetFlockChild(float minDelay, float maxDelay) + [IteratorStateMachine(typeof(_003CGetFlockChild_003Ed__12))] + public IEnumerator GetFlockChild(float minDelay, float maxDelay) { return null; } diff --git a/Assets/Scripts/LandingSpot.cs.meta b/Assets/Scripts/LandingSpot.cs.meta index 702e3cfa..9ee48b3d 100644 --- a/Assets/Scripts/LandingSpot.cs.meta +++ b/Assets/Scripts/LandingSpot.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9966e81c61d206a2e39a349432316876 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LandingSpotController.cs b/Assets/Scripts/LandingSpotController.cs index afa9d58e..a6982962 100644 --- a/Assets/Scripts/LandingSpotController.cs +++ b/Assets/Scripts/LandingSpotController.cs @@ -1,7 +1,14 @@ -public class LandingSpotController : global::UnityEngine.MonoBehaviour +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + +public class LandingSpotController : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CInstantLand_003Ed__23 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CInstantLand_003Ed__23 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -11,31 +18,31 @@ private sealed class _003CInstantLand_003Ed__23 : global::System.Collections.Gen public LandingSpotController _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CInstantLand_003Ed__23(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -44,20 +51,20 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CInstantLandOnStart_003Ed__22 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CInstantLandOnStart_003Ed__22 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; @@ -67,31 +74,31 @@ private sealed class _003CInstantLandOnStart_003Ed__22 : global::System.Collecti public LandingSpotController _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CInstantLandOnStart_003Ed__22(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -100,23 +107,23 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } public bool _randomRotate; - public global::UnityEngine.Vector2 _autoCatchDelay; + public Vector2 _autoCatchDelay; - public global::UnityEngine.Vector2 _autoDismountDelay; + public Vector2 _autoDismountDelay; public float _maxBirdDistance; @@ -136,9 +143,9 @@ private bool MoveNext() public float _landingTurnSpeedModifier; - public global::UnityEngine.Transform _featherPS; + public Transform _featherPS; - public global::UnityEngine.Transform _thisT; + public Transform _thisT; public int _activeLandingSpots; @@ -164,14 +171,14 @@ public void LandAll() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(LandingSpotController._003CInstantLandOnStart_003Ed__22))] - public global::System.Collections.IEnumerator InstantLandOnStart(float delay) + [IteratorStateMachine(typeof(_003CInstantLandOnStart_003Ed__22))] + public IEnumerator InstantLandOnStart(float delay) { return null; } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(LandingSpotController._003CInstantLand_003Ed__23))] - public global::System.Collections.IEnumerator InstantLand(float delay) + [IteratorStateMachine(typeof(_003CInstantLand_003Ed__23))] + public IEnumerator InstantLand(float delay) { return null; } diff --git a/Assets/Scripts/LandingSpotController.cs.meta b/Assets/Scripts/LandingSpotController.cs.meta index c040dbc4..e192c4fb 100644 --- a/Assets/Scripts/LandingSpotController.cs.meta +++ b/Assets/Scripts/LandingSpotController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ad672e387e9047f463a0a1ac5c524ff4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX.meta b/Assets/Scripts/LiquidVolumeFX.meta index a07aa344..3984e492 100644 --- a/Assets/Scripts/LiquidVolumeFX.meta +++ b/Assets/Scripts/LiquidVolumeFX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 54c4a37e06f973a48972a2e1c87361ef +guid: a4996511d0a283a43a7c773e112c02bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs b/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs index c2028d81..e6276d96 100644 --- a/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs +++ b/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class CameraAnimator : global::UnityEngine.MonoBehaviour + public class CameraAnimator : MonoBehaviour { public float baseHeight; @@ -12,7 +14,7 @@ public class CameraAnimator : global::UnityEngine.MonoBehaviour public float distSpeed; - public global::UnityEngine.Vector3 lookAt; + public Vector3 lookAt; private float y; diff --git a/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs.meta b/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs.meta index dce28d10..0862562d 100644 --- a/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/CameraAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6dca28eede24e9df3055f7939bbc6718 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs b/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs index b34f7fc2..75d5fd80 100644 --- a/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs +++ b/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class CubeSpawn : global::UnityEngine.MonoBehaviour + public class CubeSpawn : MonoBehaviour { public int instances; diff --git a/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs.meta b/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs.meta index cba84632..f979e7cd 100644 --- a/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/CubeSpawn.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4642e639e7fc5931eefdad3b8276e62f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs b/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs index 76aab856..dbdadd99 100644 --- a/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs +++ b/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class CylinderManager : global::UnityEngine.MonoBehaviour + public class CylinderManager : MonoBehaviour { public float startingDelay; diff --git a/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs.meta b/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs.meta index 7d5bb821..6453da07 100644 --- a/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/CylinderManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3e820b1a3c7255c16434dbfd0d7f8649 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/DETAIL.cs.meta b/Assets/Scripts/LiquidVolumeFX/DETAIL.cs.meta index d1ec308c..f53d5ded 100644 --- a/Assets/Scripts/LiquidVolumeFX/DETAIL.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/DETAIL.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65a2964e6f7ca404eb5274132df77410 +guid: 495274b7fef1dee439f310a6b75f5596 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs b/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs index f5d09bd0..1586f969 100644 --- a/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs +++ b/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs @@ -2,12 +2,12 @@ namespace LiquidVolumeFX { public static class DetailExtensions { - public static bool allowsRefraction(this global::LiquidVolumeFX.DETAIL detail) + public static bool allowsRefraction(this DETAIL detail) { return false; } - public static bool usesFlask(this global::LiquidVolumeFX.DETAIL detail) + public static bool usesFlask(this DETAIL detail) { return false; } diff --git a/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs.meta b/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs.meta index 04492d32..c1cc98dd 100644 --- a/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/DetailExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10247c6766f00e04cb9e844406dae682 +guid: d085953aa7517b246971d3541c27378d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs b/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs index c558df38..161093fe 100644 --- a/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs +++ b/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class FishAnimator : global::UnityEngine.MonoBehaviour + public class FishAnimator : MonoBehaviour { private void Update() { diff --git a/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs.meta b/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs.meta index d6ffe423..95641375 100644 --- a/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/FishAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4b625045bb1de3381bee97034a2afc8a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs b/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs index 1ddbc68f..e48a7431 100644 --- a/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs +++ b/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs @@ -1,39 +1,41 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class FlaskAnimator : global::UnityEngine.MonoBehaviour + public class FlaskAnimator : MonoBehaviour { public float speed; - public global::UnityEngine.Vector3 initialPosition; + public Vector3 initialPosition; - public global::UnityEngine.Vector3 finalPosition; + public Vector3 finalPosition; public float duration; public float delay; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float level; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float minRange; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float maxRange; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float acceleration; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float rotationSpeed; - [global::UnityEngine.Range(0f, 2f)] + [Range(0f, 2f)] public float alphaDuration; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float finalRefractionBlur; - private global::LiquidVolumeFX.LiquidVolume liquid; + private LiquidVolume liquid; private float direction; diff --git a/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs.meta b/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs.meta index ba293f64..7fe6f615 100644 --- a/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/FlaskAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d2b5893daf9d82a781c98bd77485f550 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/LEVEL_COMPENSATION.cs.meta b/Assets/Scripts/LiquidVolumeFX/LEVEL_COMPENSATION.cs.meta index 35cb4734..936b3c92 100644 --- a/Assets/Scripts/LiquidVolumeFX/LEVEL_COMPENSATION.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/LEVEL_COMPENSATION.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa4f991f208d59140bb8e9cdad5bebcd +guid: 2528a2f9f872b9f47bc6fe5a8c6bedc7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs b/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs index bddcc3ce..f04d46c2 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs +++ b/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs @@ -1,20 +1,22 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class LiquidLevelPouringSync : global::UnityEngine.MonoBehaviour + public class LiquidLevelPouringSync : MonoBehaviour { public float fillSpeed; public float sinkFactor; - private global::LiquidVolumeFX.LiquidVolume lv; + private LiquidVolume lv; - private global::UnityEngine.Rigidbody rb; + private Rigidbody rb; private void Start() { } - private void OnParticleCollision(global::UnityEngine.GameObject other) + private void OnParticleCollision(GameObject other) { } diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs.meta b/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs.meta index fbe478a7..358e508d 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/LiquidLevelPouringSync.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fd1be2e42565d7995a4c3372609893ba -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs b/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs index dbd880fc..4fd73007 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs +++ b/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs @@ -1,16 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace LiquidVolumeFX { - [global::UnityEngine.ExecuteInEditMode] - [global::UnityEngine.HelpURL("https://kronnect.com/support")] - [global::UnityEngine.AddComponentMenu("Effects/Liquid Volume")] - [global::UnityEngine.DisallowMultipleComponent] - public class LiquidVolume : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + [HelpURL("https://kronnect.com/support")] + [AddComponentMenu("Effects/Liquid Volume")] + [DisallowMultipleComponent] + public class LiquidVolume : MonoBehaviour { private struct MeshCache { - public global::UnityEngine.Vector3[] verticesSorted; + public Vector3[] verticesSorted; - public global::UnityEngine.Vector3[] verticesUnsorted; + public Vector3[] verticesUnsorted; public int[] indices; } @@ -128,287 +133,287 @@ private static class ShaderParams public static bool FORCE_GLES_COMPATIBILITY; - [global::UnityEngine.SerializeField] - private global::LiquidVolumeFX.TOPOLOGY _topology; + [SerializeField] + private TOPOLOGY _topology; - [global::UnityEngine.SerializeField] - private global::LiquidVolumeFX.DETAIL _detail; + [SerializeField] + private DETAIL _detail; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _level; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _levelMultiplier; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Tooltip("Uses directional light color")] + [SerializeField] + [Tooltip("Uses directional light color")] private bool _useLightColor; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Tooltip("Uses directional light direction for day/night cycle")] + [SerializeField] + [Tooltip("Uses directional light direction for day/night cycle")] private bool _useLightDirection; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Light _directionalLight; + [SerializeField] + private Light _directionalLight; - [global::UnityEngine.SerializeField] - [global::UnityEngine.ColorUsage(true)] - private global::UnityEngine.Color _liquidColor1; + [SerializeField] + [ColorUsage(true)] + private Color _liquidColor1; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.1f, 4.85f)] + [SerializeField] + [Range(0.1f, 4.85f)] private float _liquidScale1; - [global::UnityEngine.SerializeField] - [global::UnityEngine.ColorUsage(true)] - private global::UnityEngine.Color _liquidColor2; + [SerializeField] + [ColorUsage(true)] + private Color _liquidColor2; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(2f, 4.85f)] + [SerializeField] + [Range(2f, 4.85f)] private float _liquidScale2; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _alpha; - [global::UnityEngine.SerializeField] - [global::UnityEngine.ColorUsage(true)] - private global::UnityEngine.Color _emissionColor; + [SerializeField] + [ColorUsage(true)] + private Color _emissionColor; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _ditherShadows; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _murkiness; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _turbulence1; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _turbulence2; - [global::UnityEngine.SerializeField] + [SerializeField] private float _frecuency; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 2f)] + [SerializeField] + [Range(0f, 2f)] private float _speed; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 5f)] + [SerializeField] + [Range(0f, 5f)] private float _sparklingIntensity; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _sparklingAmount; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _deepObscurance; - [global::UnityEngine.SerializeField] - [global::UnityEngine.ColorUsage(true)] - private global::UnityEngine.Color _foamColor; + [SerializeField] + [ColorUsage(true)] + private Color _foamColor; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.01f, 1f)] + [SerializeField] + [Range(0.01f, 1f)] private float _foamScale; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 0.1f)] + [SerializeField] + [Range(0f, 0.1f)] private float _foamThickness; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(-1f, 1f)] + [SerializeField] + [Range(-1f, 1f)] private float _foamDensity; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(4f, 100f)] + [SerializeField] + [Range(4f, 100f)] private float _foamWeight; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _foamTurbulence; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _foamVisibleFromBottom; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _smokeEnabled; - [global::UnityEngine.ColorUsage(true)] - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color _smokeColor; + [ColorUsage(true)] + [SerializeField] + private Color _smokeColor; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.01f, 1f)] + [SerializeField] + [Range(0.01f, 1f)] private float _smokeScale; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _smokeBaseObscurance; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _smokeHeightAtten; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 20f)] + [SerializeField] + [Range(0f, 20f)] private float _smokeSpeed; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _fixMesh; - public global::UnityEngine.Mesh originalMesh; + public Mesh originalMesh; - public global::UnityEngine.Vector3 originalPivotOffset; + public Vector3 originalPivotOffset; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 _pivotOffset; + [SerializeField] + private Vector3 _pivotOffset; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _limitVerticalRange; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1.5f)] + [SerializeField] + [Range(0f, 1.5f)] private float _upperLimit; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(-1.5f, 1.5f)] + [SerializeField] + [Range(-1.5f, 1.5f)] private float _lowerLimit; - [global::UnityEngine.SerializeField] + [SerializeField] private int _subMeshIndex; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _flaskMaterial; + [SerializeField] + private Material _flaskMaterial; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _flaskThickness; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _glossinessInternal; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _scatteringEnabled; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 16f)] + [SerializeField] + [Range(1f, 16f)] private int _scatteringPower; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _scatteringAmount; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _refractionBlur; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _blurIntensity; - [global::UnityEngine.SerializeField] + [SerializeField] private int _liquidRaySteps; - [global::UnityEngine.SerializeField] + [SerializeField] private int _foamRaySteps; - [global::UnityEngine.SerializeField] + [SerializeField] private int _smokeRaySteps; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _bumpMap; + [SerializeField] + private Texture2D _bumpMap; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] private float _bumpStrength; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _bumpDistortionScale; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector2 _bumpDistortionOffset; + [SerializeField] + private Vector2 _bumpDistortionOffset; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _distortionMap; + [SerializeField] + private Texture2D _distortionMap; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D _texture; + [SerializeField] + private Texture2D _texture; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector2 _textureScale; + [SerializeField] + private Vector2 _textureScale; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector2 _textureOffset; + [SerializeField] + private Vector2 _textureOffset; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float _distortionAmount; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _depthAware; - [global::UnityEngine.SerializeField] + [SerializeField] private float _depthAwareOffset; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _irregularDepthDebug; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _depthAwareCustomPass; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _depthAwareCustomPassDebug; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 5f)] + [SerializeField] + [Range(0f, 5f)] private float _doubleSidedBias; - [global::UnityEngine.SerializeField] + [SerializeField] private float _backDepthBias; - [global::UnityEngine.SerializeField] - private global::LiquidVolumeFX.LEVEL_COMPENSATION _rotationLevelCompensation; + [SerializeField] + private LEVEL_COMPENSATION _rotationLevelCompensation; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _ignoreGravity; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _reactToForces; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 _extentsScale; + [SerializeField] + private Vector3 _extentsScale; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(1f, 3f)] + [SerializeField] + [Range(1f, 3f)] private int _noiseVariation; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _allowViewFromInside; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _debugSpillPoint; - [global::UnityEngine.SerializeField] + [SerializeField] private int _renderQueue; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Cubemap _reflectionTexture; + [SerializeField] + private Cubemap _reflectionTexture; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0.1f, 5f)] + [SerializeField] + [Range(0.1f, 5f)] private float _physicsMass; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 0.2f)] + [SerializeField] + [Range(0f, 0.2f)] private float _physicsAngularDamp; private const int SHADER_KEYWORD_DEPTH_AWARE_INDEX = 0; @@ -445,25 +450,25 @@ private static class ShaderParams private const string SPILL_POINT_GIZMO = "SpillPointGizmo"; - [global::System.NonSerialized] - public global::UnityEngine.Material liqMat; + [NonSerialized] + public Material liqMat; - private global::UnityEngine.Material liqMatSimple; + private Material liqMatSimple; - private global::UnityEngine.Material liqMatDefaultNoFlask; + private Material liqMatDefaultNoFlask; - private global::UnityEngine.Mesh mesh; + private Mesh mesh; - [global::System.NonSerialized] - public global::UnityEngine.Renderer mr; + [NonSerialized] + public Renderer mr; - private static readonly global::System.Collections.Generic.List mrSharedMaterials; + private static readonly List mrSharedMaterials; - private global::UnityEngine.Vector3 lastPosition; + private Vector3 lastPosition; - private global::UnityEngine.Vector3 lastScale; + private Vector3 lastScale; - private global::UnityEngine.Quaternion lastRotation; + private Quaternion lastRotation; private string[] shaderKeywords; @@ -471,11 +476,11 @@ private static class ShaderParams private float lastDistanceToCam; - private global::LiquidVolumeFX.DETAIL currentDetail; + private DETAIL currentDetail; - private global::UnityEngine.Vector4 turb; + private Vector4 turb; - private global::UnityEngine.Vector4 shaderTurb; + private Vector4 shaderTurb; private float turbulenceSpeed; @@ -489,17 +494,17 @@ private static class ShaderParams private float levelMultipled; - private global::UnityEngine.Texture2D noise3DUnwrapped; + private Texture2D noise3DUnwrapped; - private global::UnityEngine.Texture3D[] noise3DTex; + private Texture3D[] noise3DTex; - private global::UnityEngine.Color[][] colors3D; + private Color[][] colors3D; - private global::UnityEngine.Vector3[] verticesUnsorted; + private Vector3[] verticesUnsorted; - private global::UnityEngine.Vector3[] verticesSorted; + private Vector3[] verticesSorted; - private static global::UnityEngine.Vector3[] rotatedVertices; + private static Vector3[] rotatedVertices; private int[] verticesIndices; @@ -507,9 +512,9 @@ private static class ShaderParams private float lastLevelVolumeRef; - private global::UnityEngine.Vector3 inertia; + private Vector3 inertia; - private global::UnityEngine.Vector3 lastAvgVelocity; + private Vector3 lastAvgVelocity; private float angularVelocity; @@ -517,47 +522,47 @@ private static class ShaderParams private float turbulenceDueForces; - private global::UnityEngine.Quaternion liquidRot; + private Quaternion liquidRot; private float prevThickness; - private global::UnityEngine.GameObject spillPointGizmo; + private GameObject spillPointGizmo; private static string[] defaultContainerNames; - private global::UnityEngine.Color[] pointLightColorBuffer; + private Color[] pointLightColorBuffer; - private global::UnityEngine.Vector4[] pointLightPositionBuffer; + private Vector4[] pointLightPositionBuffer; private int lastPointLightCount; - private static readonly global::System.Collections.Generic.Dictionary meshCache; + private static readonly Dictionary meshCache; - private readonly global::System.Collections.Generic.List verts; + private readonly List verts; - private readonly global::System.Collections.Generic.List cutPoints; + private readonly List cutPoints; - private global::UnityEngine.Vector3 cutPlaneCenter; + private Vector3 cutPlaneCenter; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Mesh fixedMesh; + [SerializeField] + private Mesh fixedMesh; - public global::LiquidVolumeFX.TOPOLOGY topology + public TOPOLOGY topology { get { - return default(global::LiquidVolumeFX.TOPOLOGY); + return default(TOPOLOGY); } set { } } - public global::LiquidVolumeFX.DETAIL detail + public DETAIL detail { get { - return default(global::LiquidVolumeFX.DETAIL); + return default(DETAIL); } set { @@ -608,7 +613,7 @@ public bool useLightDirection } } - public global::UnityEngine.Light directionalLight + public Light directionalLight { get { @@ -619,11 +624,11 @@ public bool useLightDirection } } - public global::UnityEngine.Color liquidColor1 + public Color liquidColor1 { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -641,11 +646,11 @@ public float liquidScale1 } } - public global::UnityEngine.Color liquidColor2 + public Color liquidColor2 { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -674,11 +679,11 @@ public float alpha } } - public global::UnityEngine.Color emissionColor + public Color emissionColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -784,11 +789,11 @@ public float deepObscurance } } - public global::UnityEngine.Color foamColor + public Color foamColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -872,11 +877,11 @@ public bool smokeEnabled } } - public global::UnityEngine.Color smokeColor + public Color smokeColor { get { - return default(global::UnityEngine.Color); + return default(Color); } set { @@ -938,11 +943,11 @@ public bool fixMesh } } - public global::UnityEngine.Vector3 pivotOffset + public Vector3 pivotOffset { get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } set { @@ -993,7 +998,7 @@ public int subMeshIndex } } - public global::UnityEngine.Material flaskMaterial + public Material flaskMaterial { get { @@ -1114,7 +1119,7 @@ public int smokeRaySteps } } - public global::UnityEngine.Texture2D bumpMap + public Texture2D bumpMap { get { @@ -1147,18 +1152,18 @@ public float bumpDistortionScale } } - public global::UnityEngine.Vector2 bumpDistortionOffset + public Vector2 bumpDistortionOffset { get { - return default(global::UnityEngine.Vector2); + return default(Vector2); } set { } } - public global::UnityEngine.Texture2D distortionMap + public Texture2D distortionMap { get { @@ -1169,7 +1174,7 @@ public float bumpDistortionScale } } - public global::UnityEngine.Texture2D texture + public Texture2D texture { get { @@ -1180,22 +1185,22 @@ public float bumpDistortionScale } } - public global::UnityEngine.Vector2 textureScale + public Vector2 textureScale { get { - return default(global::UnityEngine.Vector2); + return default(Vector2); } set { } } - public global::UnityEngine.Vector2 textureOffset + public Vector2 textureOffset { get { - return default(global::UnityEngine.Vector2); + return default(Vector2); } set { @@ -1290,11 +1295,11 @@ public float backDepthBias } } - public global::LiquidVolumeFX.LEVEL_COMPENSATION rotationLevelCompensation + public LEVEL_COMPENSATION rotationLevelCompensation { get { - return default(global::LiquidVolumeFX.LEVEL_COMPENSATION); + return default(LEVEL_COMPENSATION); } set { @@ -1323,11 +1328,11 @@ public bool reactToForces } } - public global::UnityEngine.Vector3 extentsScale + public Vector3 extentsScale { get { - return default(global::UnityEngine.Vector3); + return default(Vector3); } set { @@ -1378,7 +1383,7 @@ public int renderQueue } } - public global::UnityEngine.Cubemap reflectionTexture + public Cubemap reflectionTexture { get { @@ -1415,13 +1420,13 @@ public float physicsAngularDamp public float liquidSurfaceYPosition => 0f; - public event global::LiquidVolumeFX.PropertiesChangedEvent onPropertiesChanged + public event PropertiesChangedEvent onPropertiesChanged { - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] add { } - [global::System.Runtime.CompilerServices.CompilerGenerated] + [CompilerGenerated] remove { } @@ -1463,7 +1468,7 @@ private void ReadVertices() { } - private int vertexComparer(global::UnityEngine.Vector3 v0, global::UnityEngine.Vector3 v1) + private int vertexComparer(Vector3 v0, Vector3 v1) { return 0; } @@ -1480,9 +1485,9 @@ private void UpdateMaterialPropertiesNow() { } - private global::UnityEngine.Color ApplyGlobalAlpha(global::UnityEngine.Color originalColor) + private Color ApplyGlobalAlpha(Color originalColor) { - return default(global::UnityEngine.Color); + return default(Color); } private void GetRenderer() @@ -1497,7 +1502,7 @@ private void RotateVertices() { } - private float SignedVolumeOfTriangle(global::UnityEngine.Vector3 p1, global::UnityEngine.Vector3 p2, global::UnityEngine.Vector3 p3, global::UnityEngine.Vector3 zeroPoint) + private float SignedVolumeOfTriangle(Vector3 p1, Vector3 p2, Vector3 p3, Vector3 zeroPoint) { return 0f; } @@ -1517,9 +1522,9 @@ public float GetMeshVolumeUnderLevelWSFast(float level) return 0f; } - private global::UnityEngine.Vector3 ClampVertexToSlicePlane(global::UnityEngine.Vector3 p, global::UnityEngine.Vector3 q, float level) + private Vector3 ClampVertexToSlicePlane(Vector3 p, Vector3 q, float level) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public float GetMeshVolumeUnderLevel(float level01, float yExtent) @@ -1537,7 +1542,7 @@ public float GetMeshVolumeUnderLevelWS(float level) return 0f; } - private int PolygonSortOnPlane(global::UnityEngine.Vector3 p1, global::UnityEngine.Vector3 p2) + private int PolygonSortOnPlane(Vector3 p1, Vector3 p2) { return 0; } @@ -1550,12 +1555,12 @@ private void CheckInsideOut() { } - private bool PointInAABB(global::UnityEngine.Vector3 point) + private bool PointInAABB(Vector3 point) { return false; } - private bool PointInCylinder(global::UnityEngine.Vector3 point) + private bool PointInCylinder(Vector3 point) { return false; } @@ -1564,15 +1569,15 @@ private void UpdateInsideOut() { } - public bool GetSpillPoint(out global::UnityEngine.Vector3 spillPosition, float apertureStart = 1f) + public bool GetSpillPoint(out Vector3 spillPosition, float apertureStart = 1f) { - spillPosition = default(global::UnityEngine.Vector3); + spillPosition = default(Vector3); return false; } - public bool GetSpillPoint(out global::UnityEngine.Vector3 spillPosition, out float spillAmount, float apertureStart = 1f, global::LiquidVolumeFX.LEVEL_COMPENSATION rotationCompensation = global::LiquidVolumeFX.LEVEL_COMPENSATION.None) + public bool GetSpillPoint(out Vector3 spillPosition, out float spillAmount, float apertureStart = 1f, LEVEL_COMPENSATION rotationCompensation = LEVEL_COMPENSATION.None) { - spillPosition = default(global::UnityEngine.Vector3); + spillPosition = default(Vector3); spillAmount = default(float); return false; } @@ -1589,7 +1594,7 @@ public void CenterPivot() { } - public void CenterPivot(global::UnityEngine.Vector3 offset) + public void CenterPivot(Vector3 offset) { } @@ -1609,7 +1614,7 @@ private void RestoreOriginalMesh() { } - public void CopyFrom(global::LiquidVolumeFX.LiquidVolume lv) + public void CopyFrom(LiquidVolume lv) { } } diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs.meta b/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs.meta index f5a8ff91..6fe422ce 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/LiquidVolume.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e788494a8d485287b788305d7b52b9e3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs b/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs index 6c4a2cfb..e11438bc 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs +++ b/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs @@ -1,6 +1,11 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + namespace LiquidVolumeFX { - public class LiquidVolumeDepthPrePassRenderFeature : global::UnityEngine.Rendering.Universal.ScriptableRendererFeature + public class LiquidVolumeDepthPrePassRenderFeature : ScriptableRendererFeature { private static class ShaderParams { @@ -25,67 +30,67 @@ private enum Pass FrontBuffer = 1 } - private class DepthPass : global::UnityEngine.Rendering.Universal.ScriptableRenderPass + private class DepthPass : ScriptableRenderPass { private class PassData { - public global::UnityEngine.Camera cam; + public Camera cam; - public global::UnityEngine.Rendering.CommandBuffer cmd; + public CommandBuffer cmd; - public global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.DepthPass depthPass; + public DepthPass depthPass; - public global::UnityEngine.Material mat; + public Material mat; - public global::UnityEngine.Rendering.RTHandle source; + public RTHandle source; - public global::UnityEngine.Rendering.RTHandle depth; + public RTHandle depth; - public global::UnityEngine.RenderTextureDescriptor cameraTargetDescriptor; + public RenderTextureDescriptor cameraTargetDescriptor; } private const string profilerTag = "LiquidVolumeDepthPrePass"; - private global::UnityEngine.Material mat; + private Material mat; private int targetNameId; - private global::UnityEngine.Rendering.RTHandle targetRT; + private RTHandle targetRT; private int passId; - private global::System.Collections.Generic.List lvRenderers; + private List lvRenderers; - public global::UnityEngine.Rendering.Universal.ScriptableRenderer renderer; + public ScriptableRenderer renderer; public bool interleavedRendering; - private static global::UnityEngine.Vector3 currentCameraPosition; + private static Vector3 currentCameraPosition; - private readonly global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.DepthPass.PassData passData; + private readonly PassData passData; - public DepthPass(global::UnityEngine.Material mat, global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.Pass pass, global::UnityEngine.Rendering.Universal.RenderPassEvent renderPassEvent) + public DepthPass(Material mat, Pass pass, RenderPassEvent renderPassEvent) { } - public void Setup(global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature feature, global::UnityEngine.Rendering.Universal.ScriptableRenderer renderer) + public void Setup(LiquidVolumeDepthPrePassRenderFeature feature, ScriptableRenderer renderer) { } - private int SortByDistanceToCamera(global::LiquidVolumeFX.LiquidVolume lv1, global::LiquidVolumeFX.LiquidVolume lv2) + private int SortByDistanceToCamera(LiquidVolume lv1, LiquidVolume lv2) { return 0; } - public override void Configure(global::UnityEngine.Rendering.CommandBuffer cmd, global::UnityEngine.RenderTextureDescriptor cameraTextureDescriptor) + public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) { } - public override void Execute(global::UnityEngine.Rendering.ScriptableRenderContext context, ref global::UnityEngine.Rendering.Universal.RenderingData renderingData) + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { } - private static void ExecutePass(global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.DepthPass.PassData passData) + private static void ExecutePass(PassData passData) { } @@ -94,40 +99,40 @@ public void CleanUp() } } - public static readonly global::System.Collections.Generic.List lvBackRenderers; + public static readonly List lvBackRenderers; - public static readonly global::System.Collections.Generic.List lvFrontRenderers; + public static readonly List lvFrontRenderers; - [global::UnityEngine.SerializeField] - [global::UnityEngine.HideInInspector] - private global::UnityEngine.Shader shader; + [SerializeField] + [HideInInspector] + private Shader shader; public static bool installed; - private global::UnityEngine.Material mat; + private Material mat; - private global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.DepthPass backPass; + private DepthPass backPass; - private global::LiquidVolumeFX.LiquidVolumeDepthPrePassRenderFeature.DepthPass frontPass; + private DepthPass frontPass; - [global::UnityEngine.Tooltip("Renders each irregular liquid volume completely before rendering the next one.")] + [Tooltip("Renders each irregular liquid volume completely before rendering the next one.")] public bool interleavedRendering; - public global::UnityEngine.Rendering.Universal.RenderPassEvent renderPassEvent; + public RenderPassEvent renderPassEvent; - public static void AddLiquidToBackRenderers(global::LiquidVolumeFX.LiquidVolume lv) + public static void AddLiquidToBackRenderers(LiquidVolume lv) { } - public static void RemoveLiquidFromBackRenderers(global::LiquidVolumeFX.LiquidVolume lv) + public static void RemoveLiquidFromBackRenderers(LiquidVolume lv) { } - public static void AddLiquidToFrontRenderers(global::LiquidVolumeFX.LiquidVolume lv) + public static void AddLiquidToFrontRenderers(LiquidVolume lv) { } - public static void RemoveLiquidFromFrontRenderers(global::LiquidVolumeFX.LiquidVolume lv) + public static void RemoveLiquidFromFrontRenderers(LiquidVolume lv) { } @@ -139,7 +144,7 @@ public override void Create() { } - public override void AddRenderPasses(global::UnityEngine.Rendering.Universal.ScriptableRenderer renderer, ref global::UnityEngine.Rendering.Universal.RenderingData renderingData) + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { } } diff --git a/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs.meta b/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs.meta index 17378604..21945dc6 100644 --- a/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/LiquidVolumeDepthPrePassRenderFeature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0c192bd973f80b081151da3c168854fa -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs b/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs index b3e93b84..accfe5dd 100644 --- a/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs +++ b/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class PortalAnimator : global::UnityEngine.MonoBehaviour + public class PortalAnimator : MonoBehaviour { public float delay; @@ -8,7 +10,7 @@ public class PortalAnimator : global::UnityEngine.MonoBehaviour public float delayFadeOut; - private global::UnityEngine.Vector3 scale; + private Vector3 scale; private void Start() { diff --git a/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs.meta b/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs.meta index cdd6e080..62b56ea6 100644 --- a/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/PortalAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 25426a9c53b59b308a212f4714beffd2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs b/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs index 273827a3..dcb2b7ad 100644 --- a/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs +++ b/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs @@ -1,4 +1,4 @@ namespace LiquidVolumeFX { - public delegate void PropertiesChangedEvent(global::LiquidVolumeFX.LiquidVolume lv); + public delegate void PropertiesChangedEvent(LiquidVolume lv); } diff --git a/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs.meta b/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs.meta index 3e2b94ff..0bb1f6c8 100644 --- a/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/PropertiesChangedEvent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26673e989da920444a398934e55d0af9 +guid: e8e84a8c02516ac42b97a5ce8db19aa9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/RandomMove.cs b/Assets/Scripts/LiquidVolumeFX/RandomMove.cs index f6fdb0cb..298525eb 100644 --- a/Assets/Scripts/LiquidVolumeFX/RandomMove.cs +++ b/Assets/Scripts/LiquidVolumeFX/RandomMove.cs @@ -1,31 +1,33 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class RandomMove : global::UnityEngine.MonoBehaviour + public class RandomMove : MonoBehaviour { - [global::UnityEngine.Range(-10f, 10f)] + [Range(-10f, 10f)] public float right; - [global::UnityEngine.Range(-10f, 10f)] + [Range(-10f, 10f)] public float left; - [global::UnityEngine.Range(-10f, 10f)] + [Range(-10f, 10f)] public float back; - [global::UnityEngine.Range(-10f, 10f)] + [Range(-10f, 10f)] public float front; - [global::UnityEngine.Range(0f, 0.2f)] + [Range(0f, 0.2f)] public float speed; - [global::UnityEngine.Range(0f, 2f)] + [Range(0f, 2f)] public float rotationSpeed; - [global::UnityEngine.Range(0.1f, 2f)] + [Range(0.1f, 2f)] public float randomSpeed; public bool automatic; - private global::UnityEngine.Vector3 velocity; + private Vector3 velocity; private int flaskType; diff --git a/Assets/Scripts/LiquidVolumeFX/RandomMove.cs.meta b/Assets/Scripts/LiquidVolumeFX/RandomMove.cs.meta index 0079d69f..2f74a3c4 100644 --- a/Assets/Scripts/LiquidVolumeFX/RandomMove.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/RandomMove.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 68d25df6ec1da95204a371f228fd6e54 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs b/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs index 76f80ca9..61752ceb 100644 --- a/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs +++ b/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs @@ -1,16 +1,18 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class RandomRotation : global::UnityEngine.MonoBehaviour + public class RandomRotation : MonoBehaviour { - [global::UnityEngine.Range(1f, 50f)] + [Range(1f, 50f)] public float speed; - [global::UnityEngine.Range(1f, 30f)] + [Range(1f, 30f)] public float randomChangeInterval; private float lastTime; - private global::UnityEngine.Vector3 v; + private Vector3 v; private float randomization; diff --git a/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs.meta b/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs.meta index a20bea78..83bbca45 100644 --- a/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/RandomRotation.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d8016d99f00135baabf92d2457963a96 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/SpillController.cs b/Assets/Scripts/LiquidVolumeFX/SpillController.cs index 97493495..693ed385 100644 --- a/Assets/Scripts/LiquidVolumeFX/SpillController.cs +++ b/Assets/Scripts/LiquidVolumeFX/SpillController.cs @@ -1,41 +1,48 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace LiquidVolumeFX { - public class SpillController : global::UnityEngine.MonoBehaviour + public class SpillController : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CDestroySpill_003Ed__7 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CDestroySpill_003Ed__7 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::UnityEngine.GameObject spill; + public GameObject spill; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CDestroySpill_003Ed__7(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -44,23 +51,23 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - public global::UnityEngine.GameObject spill; + public GameObject spill; - private global::LiquidVolumeFX.LiquidVolume lv; + private LiquidVolume lv; - private global::UnityEngine.GameObject[] dropTemplates; + private GameObject[] dropTemplates; private const int DROP_TEMPLATES_COUNT = 10; @@ -76,8 +83,8 @@ private void FixedUpdate() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::LiquidVolumeFX.SpillController._003CDestroySpill_003Ed__7))] - private global::System.Collections.IEnumerator DestroySpill(global::UnityEngine.GameObject spill) + [IteratorStateMachine(typeof(_003CDestroySpill_003Ed__7))] + private IEnumerator DestroySpill(GameObject spill) { return null; } diff --git a/Assets/Scripts/LiquidVolumeFX/SpillController.cs.meta b/Assets/Scripts/LiquidVolumeFX/SpillController.cs.meta index 6520b635..56b2d1bb 100644 --- a/Assets/Scripts/LiquidVolumeFX/SpillController.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/SpillController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f07ee33bbc7ad1246a50bfc4403c2a7a -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs b/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs index 6377be1e..05575ecf 100644 --- a/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs +++ b/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class SpotlightAnimator : global::UnityEngine.MonoBehaviour + public class SpotlightAnimator : MonoBehaviour { public float lightOnDelay; @@ -14,15 +16,15 @@ public class SpotlightAnimator : global::UnityEngine.MonoBehaviour public float colorChangeDuration; - private global::UnityEngine.Light spotLight; + private Light spotLight; private float lastColorChange; private float colorChangeStarted; - private global::UnityEngine.Color currentColor; + private Color currentColor; - private global::UnityEngine.Color nextColor; + private Color nextColor; private bool changingColor; diff --git a/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs.meta b/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs.meta index ca1305f6..c60c66bd 100644 --- a/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/SpotlightAnimator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 870ac622b567716640967a78604dd0ce -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/TOPOLOGY.cs.meta b/Assets/Scripts/LiquidVolumeFX/TOPOLOGY.cs.meta index a9687bd1..b07517b1 100644 --- a/Assets/Scripts/LiquidVolumeFX/TOPOLOGY.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/TOPOLOGY.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c2e9d0dc86bc324999e5d20d67c6000 +guid: db5bc579c2081014ebeb8d491096f713 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs b/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs index 3db67475..80e25a6c 100644 --- a/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs +++ b/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace LiquidVolumeFX { - public class VerticalBounce : global::UnityEngine.MonoBehaviour + public class VerticalBounce : MonoBehaviour { - [global::UnityEngine.Range(0f, 0.1f)] + [Range(0f, 0.1f)] public float acceleration; private float direction; diff --git a/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs.meta b/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs.meta index 8990506b..3d950ead 100644 --- a/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs.meta +++ b/Assets/Scripts/LiquidVolumeFX/VerticalBounce.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c6a6911bac0f25bca85b51e8a1f64f3c -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LookAtCamera.cs b/Assets/Scripts/LookAtCamera.cs index 17fb7618..bb20145b 100644 --- a/Assets/Scripts/LookAtCamera.cs +++ b/Assets/Scripts/LookAtCamera.cs @@ -1,6 +1,8 @@ -public class LookAtCamera : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class LookAtCamera : MonoBehaviour { - public global::UnityEngine.Camera lookAtCamera; + public Camera lookAtCamera; public bool lookOnlyOnAwake; diff --git a/Assets/Scripts/LookAtCamera.cs.meta b/Assets/Scripts/LookAtCamera.cs.meta index 83383afb..03ec3c39 100644 --- a/Assets/Scripts/LookAtCamera.cs.meta +++ b/Assets/Scripts/LookAtCamera.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dfa24c7714fc1d78cd53934c1bde6d59 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/LookAtTarget.cs b/Assets/Scripts/LookAtTarget.cs index 0f954188..33f20305 100644 --- a/Assets/Scripts/LookAtTarget.cs +++ b/Assets/Scripts/LookAtTarget.cs @@ -1,12 +1,14 @@ -public class LookAtTarget : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class LookAtTarget : MonoBehaviour { - [global::UnityEngine.SerializeField] - private global::UnityEngine.Transform _target; + [SerializeField] + private Transform _target; - [global::UnityEngine.SerializeField] + [SerializeField] private float _speed; - private global::UnityEngine.Vector3 _lookAtTarget; + private Vector3 _lookAtTarget; private void Update() { diff --git a/Assets/Scripts/LookAtTarget.cs.meta b/Assets/Scripts/LookAtTarget.cs.meta index 5337787f..1b52ac42 100644 --- a/Assets/Scripts/LookAtTarget.cs.meta +++ b/Assets/Scripts/LookAtTarget.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c90f87d70765c910dfedce1343d83529 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/MaterialChanger.cs b/Assets/Scripts/MaterialChanger.cs index 36917b0f..2a7bdfdb 100644 --- a/Assets/Scripts/MaterialChanger.cs +++ b/Assets/Scripts/MaterialChanger.cs @@ -1,16 +1,18 @@ -[global::UnityEngine.ExecuteAlways] -public class MaterialChanger : global::UnityEngine.MonoBehaviour +using UnityEngine; + +[ExecuteAlways] +public class MaterialChanger : MonoBehaviour { - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 5f)] + [SerializeField] + [Range(0f, 5f)] private float _value; - [global::UnityEngine.SerializeField] + [SerializeField] private string _changeMaterialSetting; - private global::UnityEngine.Renderer[] _renderers; + private Renderer[] _renderers; - private global::UnityEngine.MaterialPropertyBlock _propBlock; + private MaterialPropertyBlock _propBlock; private void OnEnable() { diff --git a/Assets/Scripts/MaterialChanger.cs.meta b/Assets/Scripts/MaterialChanger.cs.meta index 0b558646..13c3d450 100644 --- a/Assets/Scripts/MaterialChanger.cs.meta +++ b/Assets/Scripts/MaterialChanger.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dd075c39850d966b2da7dd10cacc39ce -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/MeleeWeaponTrail.cs b/Assets/Scripts/MeleeWeaponTrail.cs index bfd26034..6d57ceb5 100644 --- a/Assets/Scripts/MeleeWeaponTrail.cs +++ b/Assets/Scripts/MeleeWeaponTrail.cs @@ -1,69 +1,73 @@ -public class MeleeWeaponTrail : global::UnityEngine.MonoBehaviour +using System; +using System.Collections.Generic; +using UnityEngine; + +public class MeleeWeaponTrail : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class Point { public float timeCreated; - public global::UnityEngine.Vector3 basePosition; + public Vector3 basePosition; - public global::UnityEngine.Vector3 tipPosition; + public Vector3 tipPosition; } - [global::UnityEngine.SerializeField] + [SerializeField] private bool _emit; private bool _use; - [global::UnityEngine.SerializeField] + [SerializeField] private float _emitTime; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _material; + [SerializeField] + private Material _material; - [global::UnityEngine.SerializeField] + [SerializeField] private float _lifeTime; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color[] _colors; + [SerializeField] + private Color[] _colors; - [global::UnityEngine.SerializeField] + [SerializeField] private float[] _sizes; - [global::UnityEngine.SerializeField] + [SerializeField] private float _minVertexDistance; - [global::UnityEngine.SerializeField] + [SerializeField] private float _maxVertexDistance; private float _minVertexDistanceSqr; private float _maxVertexDistanceSqr; - [global::UnityEngine.SerializeField] + [SerializeField] private float _maxAngle; - [global::UnityEngine.SerializeField] + [SerializeField] private bool _autoDestruct; - [global::UnityEngine.SerializeField] + [SerializeField] private int subdivisions; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Transform _base; + [SerializeField] + private Transform _base; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Transform _tip; + [SerializeField] + private Transform _tip; - private global::System.Collections.Generic.List _points; + private List _points; - private global::System.Collections.Generic.List _smoothedPoints; + private List _smoothedPoints; - private global::UnityEngine.GameObject _trailObject; + private GameObject _trailObject; - private global::UnityEngine.Mesh _trailMesh; + private Mesh _trailMesh; - private global::UnityEngine.Vector3 _lastPosition; + private Vector3 _lastPosition; public bool Emit { @@ -91,7 +95,7 @@ private void Update() { } - private void RemoveOldPoints(global::System.Collections.Generic.List pointList) + private void RemoveOldPoints(List pointList) { } } diff --git a/Assets/Scripts/MeleeWeaponTrail.cs.meta b/Assets/Scripts/MeleeWeaponTrail.cs.meta index c1e9e61c..c7610d99 100644 --- a/Assets/Scripts/MeleeWeaponTrail.cs.meta +++ b/Assets/Scripts/MeleeWeaponTrail.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2d63c41c154e922098af06e1307707c5 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/MeshCombiner.cs b/Assets/Scripts/MeshCombiner.cs index df7189d6..cd1c459f 100644 --- a/Assets/Scripts/MeshCombiner.cs +++ b/Assets/Scripts/MeshCombiner.cs @@ -1,33 +1,35 @@ -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.MeshFilter))] -[global::UnityEngine.RequireComponent(typeof(global::UnityEngine.MeshRenderer))] -public class MeshCombiner : global::UnityEngine.MonoBehaviour +using UnityEngine; + +[RequireComponent(typeof(MeshFilter))] +[RequireComponent(typeof(MeshRenderer))] +public class MeshCombiner : MonoBehaviour { private const int Mesh16BitBufferVertexLimit = 65535; - [global::UnityEngine.SerializeField] + [SerializeField] private bool createMultiMaterialMesh; - [global::UnityEngine.SerializeField] + [SerializeField] private bool combineInactiveChildren; - [global::UnityEngine.SerializeField] + [SerializeField] private bool deactivateCombinedChildren; - [global::UnityEngine.SerializeField] + [SerializeField] private bool deactivateCombinedChildrenMeshRenderers; - [global::UnityEngine.SerializeField] + [SerializeField] private bool generateUVMap; - [global::UnityEngine.SerializeField] + [SerializeField] private bool destroyCombinedChildren; - [global::UnityEngine.SerializeField] + [SerializeField] private string folderPath; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Tooltip("MeshFilters with Meshes which we don't want to combine into one Mesh.")] - private global::UnityEngine.MeshFilter[] meshFiltersToSkip; + [SerializeField] + [Tooltip("MeshFilters with Meshes which we don't want to combine into one Mesh.")] + private MeshFilter[] meshFiltersToSkip; public bool CreateMultiMaterialMesh { @@ -118,7 +120,7 @@ public void CombineMeshes(bool showCreatedMeshInfo) { } - private global::UnityEngine.MeshFilter[] GetMeshFiltersToCombine() + private MeshFilter[] GetMeshFiltersToCombine() { return null; } @@ -131,11 +133,11 @@ private void CombineMeshesWithMutliMaterial(bool showCreatedMeshInfo) { } - private void DeactivateCombinedGameObjects(global::UnityEngine.MeshFilter[] meshFilters) + private void DeactivateCombinedGameObjects(MeshFilter[] meshFilters) { } - private void GenerateUV(global::UnityEngine.Mesh combinedMesh) + private void GenerateUV(Mesh combinedMesh) { } } diff --git a/Assets/Scripts/MeshCombiner.cs.meta b/Assets/Scripts/MeshCombiner.cs.meta index 03afcfc4..d52ad712 100644 --- a/Assets/Scripts/MeshCombiner.cs.meta +++ b/Assets/Scripts/MeshCombiner.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5dd3c8b8bec3fd918d75f585d33ed9ca -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/MeshMerger.cs b/Assets/Scripts/MeshMerger.cs index 1438a4fd..16358c19 100644 --- a/Assets/Scripts/MeshMerger.cs +++ b/Assets/Scripts/MeshMerger.cs @@ -1,4 +1,6 @@ -public class MeshMerger : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class MeshMerger : MonoBehaviour { private void Start() { diff --git a/Assets/Scripts/MeshMerger.cs.meta b/Assets/Scripts/MeshMerger.cs.meta index 2878be0b..a352857f 100644 --- a/Assets/Scripts/MeshMerger.cs.meta +++ b/Assets/Scripts/MeshMerger.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7ebefcaac2b3ad00443574f3c1e069ed -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ModifySkyAtRuntime.cs b/Assets/Scripts/ModifySkyAtRuntime.cs index 0c5c1fab..62f26e9c 100644 --- a/Assets/Scripts/ModifySkyAtRuntime.cs +++ b/Assets/Scripts/ModifySkyAtRuntime.cs @@ -1,6 +1,8 @@ -public class ModifySkyAtRuntime : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class ModifySkyAtRuntime : MonoBehaviour { - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float speed; private void Update() diff --git a/Assets/Scripts/ModifySkyAtRuntime.cs.meta b/Assets/Scripts/ModifySkyAtRuntime.cs.meta index ac57c662..5ba84f7d 100644 --- a/Assets/Scripts/ModifySkyAtRuntime.cs.meta +++ b/Assets/Scripts/ModifySkyAtRuntime.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 81673b8ba1619f6866bd64295f270a16 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/MouseMove.cs b/Assets/Scripts/MouseMove.cs index e63efff3..2cfaf352 100644 --- a/Assets/Scripts/MouseMove.cs +++ b/Assets/Scripts/MouseMove.cs @@ -1,9 +1,11 @@ -public class MouseMove : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class MouseMove : MonoBehaviour { - [global::UnityEngine.SerializeField] + [SerializeField] private float _sensitivity; - private global::UnityEngine.Vector3 _originalPos; + private Vector3 _originalPos; private void Start() { diff --git a/Assets/Scripts/MouseMove.cs.meta b/Assets/Scripts/MouseMove.cs.meta index c5791e1f..58411dc3 100644 --- a/Assets/Scripts/MouseMove.cs.meta +++ b/Assets/Scripts/MouseMove.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f1e79ff4fa18d1e25882353620145e9f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/NPCWalkTo.cs b/Assets/Scripts/NPCWalkTo.cs index 973887a5..2f0f6b1d 100644 --- a/Assets/Scripts/NPCWalkTo.cs +++ b/Assets/Scripts/NPCWalkTo.cs @@ -1,10 +1,14 @@ -public class NPCWalkTo : global::UnityEngine.MonoBehaviour +using EasyButtons; +using ScheduleOne.NPCs; +using UnityEngine; + +public class NPCWalkTo : MonoBehaviour { - public global::UnityEngine.Transform StartPoint; + public Transform StartPoint; - public global::UnityEngine.Transform End; + public Transform End; - public global::ScheduleOne.NPCs.NPC NPC; + public NPC NPC; private void Start() { @@ -14,7 +18,7 @@ public void Update() { } - [global::EasyButtons.Button] + [Button] public void Walk() { } diff --git a/Assets/Scripts/NPCWalkTo.cs.meta b/Assets/Scripts/NPCWalkTo.cs.meta index bd9d02b9..e9e4c45f 100644 --- a/Assets/Scripts/NPCWalkTo.cs.meta +++ b/Assets/Scripts/NPCWalkTo.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 56ff01bcf57f3adc6d289ab8454add60 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/NavMeshCleaner.cs b/Assets/Scripts/NavMeshCleaner.cs index 970e790a..cff27a2d 100644 --- a/Assets/Scripts/NavMeshCleaner.cs +++ b/Assets/Scripts/NavMeshCleaner.cs @@ -1,6 +1,9 @@ -public class NavMeshCleaner : global::UnityEngine.MonoBehaviour +using System.Collections.Generic; +using UnityEngine; + +public class NavMeshCleaner : MonoBehaviour { - public global::System.Collections.Generic.List m_WalkablePoint; + public List m_WalkablePoint; public float m_Height; diff --git a/Assets/Scripts/NavMeshCleaner.cs.meta b/Assets/Scripts/NavMeshCleaner.cs.meta index f28ad017..3d554cce 100644 --- a/Assets/Scripts/NavMeshCleaner.cs.meta +++ b/Assets/Scripts/NavMeshCleaner.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e4e01c271173bc63a259e8c5ad2acf4c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/OscillateLightBrightness.cs b/Assets/Scripts/OscillateLightBrightness.cs index 21ed45a2..bba402c6 100644 --- a/Assets/Scripts/OscillateLightBrightness.cs +++ b/Assets/Scripts/OscillateLightBrightness.cs @@ -1,13 +1,15 @@ -public class OscillateLightBrightness : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class OscillateLightBrightness : MonoBehaviour { - private global::UnityEngine.Light lightComponent; + private Light lightComponent; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float lower; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] private float upper; private void Start() diff --git a/Assets/Scripts/OscillateLightBrightness.cs.meta b/Assets/Scripts/OscillateLightBrightness.cs.meta index 6852433e..c29eb55e 100644 --- a/Assets/Scripts/OscillateLightBrightness.cs.meta +++ b/Assets/Scripts/OscillateLightBrightness.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cbb64b83a6f89018312d7771a45d770e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ProductLoader.cs b/Assets/Scripts/ProductLoader.cs index dd8449ec..a747226a 100644 --- a/Assets/Scripts/ProductLoader.cs +++ b/Assets/Scripts/ProductLoader.cs @@ -1,4 +1,6 @@ -public class ProductLoader : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class ProductLoader : MonoBehaviour { private void Start() { diff --git a/Assets/Scripts/ProductLoader.cs.meta b/Assets/Scripts/ProductLoader.cs.meta index 551e8724..50045898 100644 --- a/Assets/Scripts/ProductLoader.cs.meta +++ b/Assets/Scripts/ProductLoader.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 820a67ba6a6509dda070391abb1b7dbb -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Properties.meta b/Assets/Scripts/Properties.meta index ba9be00f..2a78f031 100644 --- a/Assets/Scripts/Properties.meta +++ b/Assets/Scripts/Properties.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: badc2e320e994714883a29ccb37a6842 +guid: c39b483f23e1d4343bb80d2b44ca6586 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Properties/AssemblyInfo.cs b/Assets/Scripts/Properties/AssemblyInfo.cs index 294179a2..75151bcc 100644 --- a/Assets/Scripts/Properties/AssemblyInfo.cs +++ b/Assets/Scripts/Properties/AssemblyInfo.cs @@ -1 +1,3 @@ -[assembly: global::System.Reflection.AssemblyVersion("0.0.0.0")] +using System.Reflection; + +[assembly: AssemblyVersion("0.0.0.0")] diff --git a/Assets/Scripts/Properties/AssemblyInfo.cs.meta b/Assets/Scripts/Properties/AssemblyInfo.cs.meta index 046afa20..4cbbff30 100644 --- a/Assets/Scripts/Properties/AssemblyInfo.cs.meta +++ b/Assets/Scripts/Properties/AssemblyInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc85c1768ca7f5f4499354d50285e5ac +guid: 7fe91ee7309dc5a45bf52621a23787c9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/RadiantGI.meta b/Assets/Scripts/RadiantGI.meta index bbcb386e..ced89a1c 100644 --- a/Assets/Scripts/RadiantGI.meta +++ b/Assets/Scripts/RadiantGI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49bcfe7f96868764eb32635148205f20 +guid: f70a1fdc822fb5d42aad73cfab97af11 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/RadiantGI/Demos.meta b/Assets/Scripts/RadiantGI/Demos.meta index 8acca287..188b2826 100644 --- a/Assets/Scripts/RadiantGI/Demos.meta +++ b/Assets/Scripts/RadiantGI/Demos.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c8a6fa31ebf61d74da1c103894877351 +guid: 4a0ed5939043dc3409875656eca113c0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs b/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs index 6c3509e2..1d19267f 100644 --- a/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs +++ b/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs @@ -1,12 +1,14 @@ +using UnityEngine; + namespace RadiantGI.Demos { - public class ShootGlowingBalls : global::UnityEngine.MonoBehaviour + public class ShootGlowingBalls : MonoBehaviour { public int count; - public global::UnityEngine.Transform center; + public Transform center; - public global::UnityEngine.GameObject glowingBall; + public GameObject glowingBall; private void Start() { diff --git a/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs.meta b/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs.meta index 5d7982f7..c3d7e1bb 100644 --- a/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs.meta +++ b/Assets/Scripts/RadiantGI/Demos/ShootGlowingBalls.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ae399bbebd0a56737552e892c8c0af7d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/RadiantGI/Universal.meta b/Assets/Scripts/RadiantGI/Universal.meta index 3b02b211..c6a92668 100644 --- a/Assets/Scripts/RadiantGI/Universal.meta +++ b/Assets/Scripts/RadiantGI/Universal.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6d294bd7ff39a641a9b5ed1db7c46c0 +guid: 0f0478c2d3d597d41a1b7732074f460b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs b/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs index 53ff8ad1..fba191a8 100644 --- a/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs +++ b/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs @@ -1,10 +1,13 @@ +using UnityEngine; +using UnityEngine.Rendering; + namespace RadiantGI.Universal { - public class ToggleEffect : global::UnityEngine.MonoBehaviour + public class ToggleEffect : MonoBehaviour { - public global::UnityEngine.Rendering.VolumeProfile profile; + public VolumeProfile profile; - private global::RadiantGI.Universal.RadiantGlobalIllumination radiant; + private RadiantGlobalIllumination radiant; private void Start() { diff --git a/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs.meta b/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs.meta index fd9902ea..db4ef6b0 100644 --- a/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs.meta +++ b/Assets/Scripts/RadiantGI/Universal/ToggleEffect.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67c824fe4a0462fa0a3c79542715221b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/RandomMaterial.cs b/Assets/Scripts/RandomMaterial.cs index 49b55e56..e74ba058 100644 --- a/Assets/Scripts/RandomMaterial.cs +++ b/Assets/Scripts/RandomMaterial.cs @@ -1,8 +1,10 @@ -public class RandomMaterial : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class RandomMaterial : MonoBehaviour { - public global::UnityEngine.Renderer targetRenderer; + public Renderer targetRenderer; - public global::UnityEngine.Material[] materials; + public Material[] materials; public void Start() { diff --git a/Assets/Scripts/RandomMaterial.cs.meta b/Assets/Scripts/RandomMaterial.cs.meta index d026b4be..f291ff67 100644 --- a/Assets/Scripts/RandomMaterial.cs.meta +++ b/Assets/Scripts/RandomMaterial.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 37caae1fc26e3a995688cb6dbfbef102 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/RenderPipelineLighting.cs b/Assets/Scripts/RenderPipelineLighting.cs index 2c14f920..54743c57 100644 --- a/Assets/Scripts/RenderPipelineLighting.cs +++ b/Assets/Scripts/RenderPipelineLighting.cs @@ -1,32 +1,34 @@ -[global::UnityEngine.ExecuteInEditMode] -public class RenderPipelineLighting : global::UnityEngine.MonoBehaviour +using UnityEngine; + +[ExecuteInEditMode] +public class RenderPipelineLighting : MonoBehaviour { - [global::UnityEngine.SerializeField] - private global::UnityEngine.GameObject _standardLighting; + [SerializeField] + private GameObject _standardLighting; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _standardSky; + [SerializeField] + private Material _standardSky; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _standardTerrain; + [SerializeField] + private Material _standardTerrain; - [global::UnityEngine.SerializeField] - private global::UnityEngine.GameObject _universalLighting; + [SerializeField] + private GameObject _universalLighting; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _universalSky; + [SerializeField] + private Material _universalSky; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _universalTerrain; + [SerializeField] + private Material _universalTerrain; - [global::UnityEngine.SerializeField] - private global::UnityEngine.GameObject _highDefinitionLighting; + [SerializeField] + private GameObject _highDefinitionLighting; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _highDefinitionSky; + [SerializeField] + private Material _highDefinitionSky; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Material _highDefinitionTerrain; + [SerializeField] + private Material _highDefinitionTerrain; private void OnValidate() { diff --git a/Assets/Scripts/RenderPipelineLighting.cs.meta b/Assets/Scripts/RenderPipelineLighting.cs.meta index 24652a7a..b0d2cdc0 100644 --- a/Assets/Scripts/RenderPipelineLighting.cs.meta +++ b/Assets/Scripts/RenderPipelineLighting.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 917c438dfc1faf8c167d64c4643dad98 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ResetPosition.cs b/Assets/Scripts/ResetPosition.cs index ea3ecf7d..f441742c 100644 --- a/Assets/Scripts/ResetPosition.cs +++ b/Assets/Scripts/ResetPosition.cs @@ -1,8 +1,10 @@ -public class ResetPosition : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class ResetPosition : MonoBehaviour { public float distanceToReset; - private global::UnityEngine.Vector3 startPosition; + private Vector3 startPosition; private void Start() { diff --git a/Assets/Scripts/ResetPosition.cs.meta b/Assets/Scripts/ResetPosition.cs.meta index f24865e4..5d870933 100644 --- a/Assets/Scripts/ResetPosition.cs.meta +++ b/Assets/Scripts/ResetPosition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e75ed76ca499fee8b929dc67d194dbc9 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Rotate.cs b/Assets/Scripts/Rotate.cs index caad9ff3..26a52923 100644 --- a/Assets/Scripts/Rotate.cs +++ b/Assets/Scripts/Rotate.cs @@ -1,8 +1,10 @@ -public class Rotate : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class Rotate : MonoBehaviour { public float Speed; - public global::UnityEngine.Vector3 Axis; + public Vector3 Axis; private void Update() { diff --git a/Assets/Scripts/Rotate.cs.meta b/Assets/Scripts/Rotate.cs.meta index d0ab5a43..be089c4e 100644 --- a/Assets/Scripts/Rotate.cs.meta +++ b/Assets/Scripts/Rotate.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c5809eabcc804b3ebf9eef0e9a96b1e8 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/RotateAround.cs b/Assets/Scripts/RotateAround.cs index 450ec27a..491d5eab 100644 --- a/Assets/Scripts/RotateAround.cs +++ b/Assets/Scripts/RotateAround.cs @@ -1,6 +1,8 @@ -public class RotateAround : global::UnityEngine.MonoBehaviour +using UnityEngine; + +public class RotateAround : MonoBehaviour { - public global::UnityEngine.Transform rot_center; + public Transform rot_center; private void Start() { diff --git a/Assets/Scripts/RotateAround.cs.meta b/Assets/Scripts/RotateAround.cs.meta index 1403ffee..f9f239a5 100644 --- a/Assets/Scripts/RotateAround.cs.meta +++ b/Assets/Scripts/RotateAround.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 120b3ed811f69ec8f40c7f4139516abe -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/RotateMoveCamera.cs b/Assets/Scripts/RotateMoveCamera.cs new file mode 100644 index 00000000..873971ea --- /dev/null +++ b/Assets/Scripts/RotateMoveCamera.cs @@ -0,0 +1,30 @@ +using UnityEngine; + +public class RotateMoveCamera : MonoBehaviour +{ + public GameObject Camera; + + public float minX; + + public float maxX; + + public float minY; + + public float maxY; + + public float sensX; + + public float sensY; + + private float rotationY; + + private float rotationX; + + private float MouseX; + + private float MouseY; + + private void Update() + { + } +} diff --git a/Assets/Scripts/RotateMoveCamera.cs.meta b/Assets/Scripts/RotateMoveCamera.cs.meta new file mode 100644 index 00000000..5f627ad9 --- /dev/null +++ b/Assets/Scripts/RotateMoveCamera.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 5c97cc946741908e7c9ea6cc58edc772 +timeCreated: 1744220834 +licenseType: Free +MonoImporter: + serializedVersion: 2 + externalObjects: {} + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SColorPicker.cs b/Assets/Scripts/SColorPicker.cs index 8d67fa46..b2f728f7 100644 --- a/Assets/Scripts/SColorPicker.cs +++ b/Assets/Scripts/SColorPicker.cs @@ -1,14 +1,17 @@ -public class SColorPicker : global::HSVPicker.ColorPicker +using UnityEngine; +using UnityEngine.Events; + +public class SColorPicker : HSVPicker.ColorPicker { public int PropertyIndex; - public global::UnityEngine.Events.UnityEvent onValueChangeWithIndex; + public UnityEvent onValueChangeWithIndex; private void Start() { } - private void ValueChanged(global::UnityEngine.Color col) + private void ValueChanged(Color col) { } } diff --git a/Assets/Scripts/SColorPicker.cs.meta b/Assets/Scripts/SColorPicker.cs.meta index 48add353..10f70d99 100644 --- a/Assets/Scripts/SColorPicker.cs.meta +++ b/Assets/Scripts/SColorPicker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b5aacb70a71ed467f4ee0606e6dea94c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne.meta b/Assets/Scripts/ScheduleOne.meta index 26dd6d8d..97ed9f70 100644 --- a/Assets/Scripts/ScheduleOne.meta +++ b/Assets/Scripts/ScheduleOne.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 01444a3d36235244ba86b9b5c5bfc340 +guid: caa99aa63eb399e47aa278c70c6eb4b6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AchievementManager.cs b/Assets/Scripts/ScheduleOne/AchievementManager.cs index 69ac0b1a..7bd1a8a6 100644 --- a/Assets/Scripts/ScheduleOne/AchievementManager.cs +++ b/Assets/Scripts/ScheduleOne/AchievementManager.cs @@ -1,6 +1,9 @@ +using System.Collections.Generic; +using ScheduleOne.DevUtilities; + namespace ScheduleOne { - public class AchievementManager : global::ScheduleOne.DevUtilities.PersistentSingleton + public class AchievementManager : PersistentSingleton { public enum EAchievement { @@ -17,9 +20,9 @@ public enum EAchievement INDIAN_DEALER = 10 } - private global::ScheduleOne.AchievementManager.EAchievement[] achievements; + private EAchievement[] achievements; - private global::System.Collections.Generic.Dictionary achievementUnlocked; + private Dictionary achievementUnlocked; protected override void Awake() { @@ -33,7 +36,7 @@ private void PullAchievements() { } - public void UnlockAchievement(global::ScheduleOne.AchievementManager.EAchievement achievement) + public void UnlockAchievement(EAchievement achievement) { } } diff --git a/Assets/Scripts/ScheduleOne/AchievementManager.cs.meta b/Assets/Scripts/ScheduleOne/AchievementManager.cs.meta index 07480ff4..046bc5ff 100644 --- a/Assets/Scripts/ScheduleOne/AchievementManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/AchievementManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1fddba7ec3602481177cd4d87c05e94d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio.meta b/Assets/Scripts/ScheduleOne/Audio.meta index b16e8b23..4c3a38ad 100644 --- a/Assets/Scripts/ScheduleOne/Audio.meta +++ b/Assets/Scripts/ScheduleOne/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 677d3ce8f32f5ac4e82625f56db51b86 +guid: 4587322e66a47bc4c828627154e542ab folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs b/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs index 8cc1bd90..b0c1a6b7 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs @@ -1,17 +1,19 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.Audio.AudioSourceController))] - public class AmbientLoop : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(AudioSourceController))] + public class AmbientLoop : MonoBehaviour { public const float MUSIC_FADE_MULTIPLIER = 0.3f; public const float MUSIC_FADE_TIME = 4f; - public global::UnityEngine.AnimationCurve VolumeCurve; + public AnimationCurve VolumeCurve; public bool FadeDuringMusic; - private global::ScheduleOne.Audio.AudioSourceController audioSourceController; + private AudioSourceController audioSourceController; private float musicScale; diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs.meta index 97556a67..6a34d989 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientLoop.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c37a568e8afe688dc8eab0523d9553c4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs b/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs index 46a12b40..461df932 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs @@ -1,13 +1,16 @@ +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.Audio.AudioSourceController))] - public class AmbientLoopJukebox : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(AudioSourceController))] + public class AmbientLoopJukebox : MonoBehaviour { - public global::UnityEngine.AnimationCurve VolumeCurve; + public AnimationCurve VolumeCurve; - public global::System.Collections.Generic.List Clips; + public List Clips; - private global::ScheduleOne.Audio.AudioSourceController audioSourceController; + private AudioSourceController audioSourceController; private int currentClipIndex; diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs.meta index 08cd0e0c..de69df63 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientLoopJukebox.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f4338379b8426733f1eae2a1d8a3f241 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs b/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs index eb924eae..b2d841c1 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - public class AmbientOneShot : global::UnityEngine.MonoBehaviour + public class AmbientOneShot : MonoBehaviour { public enum EPlayTime { @@ -9,18 +11,18 @@ public enum EPlayTime Night = 2 } - public global::ScheduleOne.Audio.AudioSourceController Audio; + public AudioSourceController Audio; - [global::UnityEngine.Header("Settings")] - [global::UnityEngine.Range(0f, 1f)] + [Header("Settings")] + [Range(0f, 1f)] public float Volume; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float ChancePerHour; public int CooldownTime; - public global::ScheduleOne.Audio.AmbientOneShot.EPlayTime PlayTime; + public EPlayTime PlayTime; public float MinDistance; diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs.meta index 9d91920f..7addd47f 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientOneShot.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2b83ce60037bf3ee19f8a9d645de1491 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs b/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs index c00c9606..63e0d692 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs @@ -1,14 +1,18 @@ +using System.Collections.Generic; +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.Audio { - public class AmbientTrack : global::UnityEngine.MonoBehaviour + public class AmbientTrack : MonoBehaviour { public const float MIN_TIME_BETWEEN_AMBIENT_TRACKS = 540f; - public static global::ScheduleOne.Audio.AmbientTrack LastPlayedTrack; + public static AmbientTrack LastPlayedTrack; public static bool TrackQueued; - public global::System.Collections.Generic.List Tracks; + public List Tracks; public int MinTime; @@ -26,7 +30,7 @@ private void Awake() { } - [global::EasyButtons.Button] + [Button] public void ForcePlay() { } diff --git a/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs.meta index 303718de..567fe62f 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AmbientTrack.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b6759d5776e35494a400467110821464 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs b/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs index 5e6db8f9..73400b6f 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs @@ -1,48 +1,53 @@ +using ScheduleOne.DevUtilities; +using UnityEngine; +using UnityEngine.Audio; +using UnityEngine.Events; + namespace ScheduleOne.Audio { - public class AudioManager : global::ScheduleOne.DevUtilities.PersistentSingleton + public class AudioManager : PersistentSingleton { - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float masterVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float ambientVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float footstepsVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float fxVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float uiVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float musicVolume; - [global::UnityEngine.Range(0f, 2f)] - [global::UnityEngine.SerializeField] + [Range(0f, 2f)] + [SerializeField] protected float voiceVolume; - public global::UnityEngine.Events.UnityEvent onSettingsChanged; + public UnityEvent onSettingsChanged; - [global::UnityEngine.Header("Generic Door Sounds")] - public global::ScheduleOne.Audio.AudioSourceController DoorOpen; + [Header("Generic Door Sounds")] + public AudioSourceController DoorOpen; - public global::ScheduleOne.Audio.AudioSourceController DoorClose; + public AudioSourceController DoorClose; - [global::UnityEngine.Header("Mixers")] - public global::UnityEngine.Audio.AudioMixerGroup MainGameMixer; + [Header("Mixers")] + public AudioMixerGroup MainGameMixer; - public global::UnityEngine.Audio.AudioMixerGroup MenuMixer; + public AudioMixerGroup MenuMixer; - public global::UnityEngine.Audio.AudioMixerGroup MusicMixer; + public AudioMixerGroup MusicMixer; private float currentGameVolume; @@ -52,9 +57,9 @@ public class AudioManager : global::ScheduleOne.DevUtilities.PersistentSingleton private float gameVolumeMultiplier; - public global::UnityEngine.Audio.AudioMixerSnapshot DefaultSnapshot; + public AudioMixerSnapshot DefaultSnapshot; - public global::UnityEngine.Audio.AudioMixerSnapshot DistortedSnapshot; + public AudioMixerSnapshot DistortedSnapshot; public float MasterVolume => 0f; @@ -106,7 +111,7 @@ private void SetGameVolume(float value) { } - public float GetVolume(global::ScheduleOne.Audio.EAudioType audioType, bool scaled = true) + public float GetVolume(EAudioType audioType, bool scaled = true) { return 0f; } @@ -115,7 +120,7 @@ public void SetMasterVolume(float volume) { } - public void SetVolume(global::ScheduleOne.Audio.EAudioType type, float volume) + public void SetVolume(EAudioType type, float volume) { } } diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs.meta index b6371a5f..2919dc3f 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AudioManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 112972211443ff9f72308d837fe33204 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs b/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs index a24012ca..e580922e 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs @@ -1,16 +1,18 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.AudioSource))] - public class AudioSourceController : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(AudioSource))] + public class AudioSourceController : MonoBehaviour { public bool DEBUG; - public global::UnityEngine.AudioSource AudioSource; + public AudioSource AudioSource; - [global::UnityEngine.Header("Settings")] - public global::ScheduleOne.Audio.EAudioType AudioType; + [Header("Settings")] + public EAudioType AudioType; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float DefaultVolume; public bool RandomizePitch; @@ -19,10 +21,10 @@ public class AudioSourceController : global::UnityEngine.MonoBehaviour public float MaxPitch; - [global::UnityEngine.Range(0f, 2f)] + [Range(0f, 2f)] public float VolumeMultiplier; - [global::UnityEngine.Range(0f, 2f)] + [Range(0f, 2f)] public float PitchMultiplier; private bool paused; diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs.meta index 286ce2a8..67580dac 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AudioSourceController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 032d0b58230633efb8de577d6e5187b9 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs b/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs index 1411470f..feb332c2 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs @@ -1,13 +1,17 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.Audio { - public class AudioZone : global::ScheduleOne.Audio.Zone + public class AudioZone : Zone { - [global::System.Serializable] + [Serializable] public class Track { - public global::ScheduleOne.Audio.AudioSourceController Source; + public AudioSourceController Source; - [global::UnityEngine.Range(0.01f, 2f)] + [Range(0.01f, 2f)] public float Volume; public int StartTime; @@ -51,13 +55,13 @@ public void UpdateTimeMultiplier(int time) public const float ROLLOFF_SCALE = 0.5f; - [global::UnityEngine.Header("Settings")] - [global::UnityEngine.Range(1f, 200f)] + [Header("Settings")] + [Range(1f, 200f)] public float MaxDistance; - public global::System.Collections.Generic.List Tracks; + public List Tracks; - public global::System.Collections.Generic.Dictionary Modifiers; + public Dictionary Modifiers; protected float CurrentVolumeMultiplier; @@ -80,11 +84,11 @@ private void MinPass() { } - public void AddModifier(global::ScheduleOne.Audio.AudioZoneModifierVolume modifier, float value) + public void AddModifier(AudioZoneModifierVolume modifier, float value) { } - public void RemoveModifier(global::ScheduleOne.Audio.AudioZoneModifierVolume modifier) + public void RemoveModifier(AudioZoneModifierVolume modifier) { } diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs.meta index 99eb9ed3..29579a0a 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AudioZone.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 87e0209dd1e993617c1e84bed44483df -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs b/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs index af6cf19f..c5ea1766 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs +++ b/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs @@ -1,12 +1,15 @@ +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.Audio { - public class AudioZoneModifierVolume : global::UnityEngine.MonoBehaviour + public class AudioZoneModifierVolume : MonoBehaviour { - public global::System.Collections.Generic.List Zones; + public List Zones; public float VolumeMultiplier; - private global::UnityEngine.BoxCollider[] colliders; + private BoxCollider[] colliders; private void Start() { diff --git a/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs.meta b/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs.meta index 63c6f705..412da770 100644 --- a/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/AudioZoneModifierVolume.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 25dd75989131668f5fdeedaa712e7e54 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs b/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs index 69ce7584..7bf299b8 100644 --- a/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs +++ b/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs @@ -1,24 +1,29 @@ +using System; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.UI.Button))] - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.EventSystems.EventTrigger))] - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.Audio.AudioSourceController))] - public class ButtonSound : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Button))] + [RequireComponent(typeof(EventTrigger))] + [RequireComponent(typeof(AudioSourceController))] + public class ButtonSound : MonoBehaviour { - public global::ScheduleOne.Audio.AudioSourceController AudioSource; + public AudioSourceController AudioSource; - public global::UnityEngine.EventSystems.EventTrigger EventTrigger; + public EventTrigger EventTrigger; - [global::UnityEngine.Header("Clips")] - public global::UnityEngine.AudioClip HoverClip; + [Header("Clips")] + public AudioClip HoverClip; public float HoverSoundVolume; - public global::UnityEngine.AudioClip ClickClip; + public AudioClip ClickClip; public float ClickSoundVolume; - private global::UnityEngine.UI.Button Button; + private Button Button; public void Awake() { @@ -28,7 +33,7 @@ private void OnValidate() { } - public void AddEventTrigger(global::UnityEngine.EventSystems.EventTrigger eventTrigger, global::UnityEngine.EventSystems.EventTriggerType eventTriggerType, global::System.Action action) + public void AddEventTrigger(EventTrigger eventTrigger, EventTriggerType eventTriggerType, Action action) { } diff --git a/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs.meta b/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs.meta index 402a8d9e..1824f059 100644 --- a/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/ButtonSound.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3d51791efaccaf2a5319cb0c0d226971 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/EAudioType.cs.meta b/Assets/Scripts/ScheduleOne/Audio/EAudioType.cs.meta index b4c336c8..f11430c0 100644 --- a/Assets/Scripts/ScheduleOne/Audio/EAudioType.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/EAudioType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3de62828138b2842adffc717bff6d53 +guid: ceb147695f8d5a0419f8dcfd6435e40b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs b/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs index d21039b5..0851830d 100644 --- a/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs +++ b/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs @@ -1,21 +1,26 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.Materials; +using UnityEngine; + namespace ScheduleOne.Audio { - public class FootstepSounds : global::UnityEngine.MonoBehaviour + public class FootstepSounds : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class FootstepSoundGroup { - [global::System.Serializable] + [Serializable] public class MaterialType { - public global::ScheduleOne.Materials.EMaterialType type; + public EMaterialType type; } public string name; - public global::System.Collections.Generic.List clips; + public List clips; - public global::System.Collections.Generic.List appliesTo; + public List appliesTo; public float PitchMin; @@ -26,11 +31,11 @@ public class MaterialType public const float COOLDOWN_TIME = 0.15f; - public global::System.Collections.Generic.List sources; + public List sources; - public global::System.Collections.Generic.List soundGroups; + public List soundGroups; - private global::System.Collections.Generic.Dictionary materialFootstepSounds; + private Dictionary materialFootstepSounds; private float lastStepTime; @@ -42,11 +47,11 @@ private void Update() { } - public void Step(global::ScheduleOne.Materials.EMaterialType materialType, float hardness) + public void Step(EMaterialType materialType, float hardness) { } - public global::ScheduleOne.Audio.AudioSourceController GetFreeSource() + public AudioSourceController GetFreeSource() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs.meta b/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs.meta index f30301fe..29ebad56 100644 --- a/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/FootstepSounds.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 02a4d643a083d9eb434f66f409070595 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs b/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs index c9d33a7e..47927ea1 100644 --- a/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs +++ b/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - public class GameVolumeSetter : global::UnityEngine.MonoBehaviour + public class GameVolumeSetter : MonoBehaviour { - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float VolumeMultiplier; private void Update() diff --git a/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs.meta b/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs.meta index ab5d400f..c14317b3 100644 --- a/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/GameVolumeSetter.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 197c25d852168acd5f86fc16e20adba5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs b/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs index f64af1af..ee6e117c 100644 --- a/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs +++ b/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs @@ -1,12 +1,15 @@ +using ScheduleOne.Tools; +using UnityEngine; + namespace ScheduleOne.Audio { - public class HeartbeatSoundController : global::UnityEngine.MonoBehaviour + public class HeartbeatSoundController : MonoBehaviour { - public global::ScheduleOne.Audio.AudioSourceController sound; + public AudioSourceController sound; - public global::ScheduleOne.Tools.FloatSmoother VolumeController; + public FloatSmoother VolumeController; - public global::ScheduleOne.Tools.FloatSmoother PitchController; + public FloatSmoother PitchController; private void Awake() { diff --git a/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs.meta b/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs.meta index e0b98da4..952b7944 100644 --- a/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/HeartbeatSoundController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dea77b427f8613737f4a688b8cd29700 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs b/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs index 53ff270a..2b8bea22 100644 --- a/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs +++ b/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs @@ -1,7 +1,10 @@ +using ScheduleOne.Combat; +using UnityEngine; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Rigidbody))] - public class ImpactSoundEntity : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Rigidbody))] + public class ImpactSoundEntity : MonoBehaviour { public enum EMaterial { @@ -21,21 +24,21 @@ public enum EMaterial public const float COOLDOWN = 0.25f; - public global::ScheduleOne.Audio.ImpactSoundEntity.EMaterial Material; + public EMaterial Material; private float lastImpactTime; - private global::UnityEngine.Rigidbody rb; + private Rigidbody rb; public void Awake() { } - private void OnImpacted(global::ScheduleOne.Combat.Impact impact) + private void OnImpacted(Impact impact) { } - private void OnCollisionEnter(global::UnityEngine.Collision collision) + private void OnCollisionEnter(Collision collision) { } } diff --git a/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs.meta b/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs.meta index 089c4dc8..3a8d79d7 100644 --- a/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/ImpactSoundEntity.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ed417be3727f25bff6bb3dfa5a32f464 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs b/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs index 084f8136..7453718a 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs +++ b/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs @@ -1,18 +1,22 @@ +using System.Collections.Generic; +using ScheduleOne.DevUtilities; +using UnityEngine.Audio; + namespace ScheduleOne.Audio { - public class MusicPlayer : global::ScheduleOne.DevUtilities.PersistentSingleton + public class MusicPlayer : PersistentSingleton { public static float TimeSinceLastAmbientTrack; - public global::System.Collections.Generic.List Tracks; + public List Tracks; - public global::UnityEngine.Audio.AudioMixerGroup MusicMixer; + public AudioMixerGroup MusicMixer; - public global::UnityEngine.Audio.AudioMixerSnapshot DefaultSnapshot; + public AudioMixerSnapshot DefaultSnapshot; - public global::UnityEngine.Audio.AudioMixerSnapshot DistortedSnapshot; + public AudioMixerSnapshot DistortedSnapshot; - private global::ScheduleOne.Audio.MusicTrack _currentTrack; + private MusicTrack _currentTrack; public bool IsPlaying => false; diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs.meta b/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs.meta index 2c93a8cc..eb7de1ee 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/MusicPlayer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 12fb5b178d0a3317d35a82e42ca18204 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs b/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs index 8e6b7ea7..6ffc20a6 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs +++ b/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - public class MusicPlayerUtility : global::UnityEngine.MonoBehaviour + public class MusicPlayerUtility : MonoBehaviour { public void PlayTrack(string trackName) { diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs.meta b/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs.meta index 948b8550..b30e4bb3 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/MusicPlayerUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 49765525152f1328862b6fb03081c1a3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs b/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs index 2db56229..51a7b8ba 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs +++ b/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs @@ -1,7 +1,9 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.Audio.AudioSourceController))] - public class MusicTrack : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(AudioSourceController))] + public class MusicTrack : MonoBehaviour { public bool Enabled; @@ -13,7 +15,7 @@ public class MusicTrack : global::UnityEngine.MonoBehaviour public float FadeOutTime; - public global::ScheduleOne.Audio.AudioSourceController Controller; + public AudioSourceController Controller; public float VolumeMultiplier; diff --git a/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs.meta b/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs.meta index 31917267..a08034bf 100644 --- a/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/MusicTrack.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 55bfb424cf6ff671669f2fc4c5629386 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs b/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs index e1838421..8fe98c42 100644 --- a/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs +++ b/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.Audio { - public class RandomizedAudioSourceController : global::ScheduleOne.Audio.AudioSourceController + public class RandomizedAudioSourceController : AudioSourceController { - public global::UnityEngine.AudioClip[] Clips; + public AudioClip[] Clips; public override void Play() { diff --git a/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs.meta b/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs.meta index 30743476..ca82b5d1 100644 --- a/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/RandomizedAudioSourceController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8a8eacac1df12fcb85205d23589a8db8 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs b/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs index 73bfa675..aaa1de05 100644 --- a/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs +++ b/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs @@ -1,11 +1,16 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.Audio { - public class SFXManager : global::ScheduleOne.DevUtilities.Singleton + public class SFXManager : Singleton { - [global::System.Serializable] + [Serializable] public class ImpactType { - public global::ScheduleOne.Audio.ImpactSoundEntity.EMaterial Material; + public ImpactSoundEntity.EMaterial Material; public float MinVolume; @@ -15,21 +20,21 @@ public class ImpactType public float MaxPitch; - public global::UnityEngine.AudioClip[] Clips; + public AudioClip[] Clips; } public const float MAX_PLAYER_DISTANCE = 40f; public const float SQR_MAX_PLAYER_DISTANCE = 1600f; - public global::System.Collections.Generic.List ImpactTypes; + public List ImpactTypes; - [global::UnityEngine.SerializeField] - private global::System.Collections.Generic.List soundPool; + [SerializeField] + private List soundPool; - private global::System.Collections.Generic.List soundsInUse; + private List soundsInUse; - public void PlayImpactSound(global::ScheduleOne.Audio.ImpactSoundEntity.EMaterial material, global::UnityEngine.Vector3 position, float momentum) + public void PlayImpactSound(ImpactSoundEntity.EMaterial material, Vector3 position, float momentum) { } @@ -37,7 +42,7 @@ private void FixedUpdate() { } - private global::ScheduleOne.Audio.AudioSourceController GetSource() + private AudioSourceController GetSource() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs.meta b/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs.meta index e8123fca..6cc1cf4e 100644 --- a/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/SFXManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3adf62ce857b8b2841a3f9c5338034cb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs b/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs index 6f1de6e1..ad11f136 100644 --- a/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs +++ b/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs @@ -1,8 +1,8 @@ namespace ScheduleOne.Audio { - public class StartLoopMusicTrack : global::ScheduleOne.Audio.MusicTrack + public class StartLoopMusicTrack : MusicTrack { - public global::ScheduleOne.Audio.AudioSourceController LoopSound; + public AudioSourceController LoopSound; protected override void Awake() { diff --git a/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs.meta b/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs.meta index 1d7b140d..08ed9698 100644 --- a/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/StartLoopMusicTrack.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 491566e209a581ee7035e1686df6545a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs b/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs index 36b48e55..c3aea733 100644 --- a/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs +++ b/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs @@ -1,12 +1,15 @@ +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.Audio { - public class StartLoopStopAudio : global::UnityEngine.MonoBehaviour + public class StartLoopStopAudio : MonoBehaviour { - public global::ScheduleOne.Audio.AudioSourceController StartSound; + public AudioSourceController StartSound; - public global::ScheduleOne.Audio.AudioSourceController LoopSound; + public AudioSourceController LoopSound; - public global::ScheduleOne.Audio.AudioSourceController StopSound; + public AudioSourceController StopSound; public bool FadeLoopIn; @@ -22,12 +25,12 @@ private void Update() { } - [global::EasyButtons.Button] + [Button] public void StartAudio() { } - [global::EasyButtons.Button] + [Button] public void StopAudio() { } diff --git a/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs.meta b/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs.meta index 05151d59..77976f52 100644 --- a/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/StartLoopStopAudio.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 28a682cea7a7324c704c2028f6ed2b78 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Audio/Zone.cs b/Assets/Scripts/ScheduleOne/Audio/Zone.cs index 62974ed8..47958778 100644 --- a/Assets/Scripts/ScheduleOne/Audio/Zone.cs +++ b/Assets/Scripts/ScheduleOne/Audio/Zone.cs @@ -1,19 +1,22 @@ +using System; +using UnityEngine; + namespace ScheduleOne.Audio { - public class Zone : global::UnityEngine.MonoBehaviour + public class Zone : MonoBehaviour { public const float UPDATE_INTERVAL = 0.25f; - public global::UnityEngine.Transform PointContainer; + public Transform PointContainer; public bool IsClosed; public float VerticalSize; - [global::UnityEngine.Header("Debug")] - public global::UnityEngine.Color ZoneColor; + [Header("Debug")] + public Color ZoneColor; - private global::UnityEngine.Vector3[] points; + private Vector3[] points; public float LocalPlayerDistance { get; protected set; } @@ -29,34 +32,34 @@ private void OnDrawGizmos() { } - private global::UnityEngine.Vector3[] GetPoints() + private Vector3[] GetPoints() { return null; } - private bool DoBoundsContainPoint(global::UnityEngine.Vector3 point) + private bool DoBoundsContainPoint(Vector3 point) { return false; } - private global::System.Tuple GetBoundingPoints() + private Tuple GetBoundingPoints() { return null; } - private bool IsPointInsidePolygon(global::UnityEngine.Vector3[] polyPoints, global::UnityEngine.Vector3 point) + private bool IsPointInsidePolygon(Vector3[] polyPoints, Vector3 point) { return false; } - private int CalculateWindingNumber(global::UnityEngine.Vector2[] polygon, global::UnityEngine.Vector2 point) + private int CalculateWindingNumber(Vector2[] polygon, Vector2 point) { return 0; } - private global::UnityEngine.Vector3 GetClosestPointOnPolygon(global::UnityEngine.Vector3[] polyPoints, global::UnityEngine.Vector3 point) + private Vector3 GetClosestPointOnPolygon(Vector3[] polyPoints, Vector3 point) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } } diff --git a/Assets/Scripts/ScheduleOne/Audio/Zone.cs.meta b/Assets/Scripts/ScheduleOne/Audio/Zone.cs.meta index b8769434..80f9cc96 100644 --- a/Assets/Scripts/ScheduleOne/Audio/Zone.cs.meta +++ b/Assets/Scripts/ScheduleOne/Audio/Zone.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9b3a4759303211850f79341760abf323 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework.meta b/Assets/Scripts/ScheduleOne/AvatarFramework.meta index c489aeb1..34cc4b17 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5543e6b3af3aebf4d916abf8a3a9063c +guid: 7b27bc09f27c417439bff4363a68a5e8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs index f5885595..ab4b70d3 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs @@ -1,35 +1,37 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class Accessory : global::UnityEngine.MonoBehaviour + public class Accessory : MonoBehaviour { - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public string Name; public string AssetPath; public bool ReduceFootSize; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float FootSizeReduction; public bool ShouldBlockHair; public bool ColorAllMeshes; - [global::UnityEngine.Header("References")] - public global::UnityEngine.MeshRenderer[] meshesToColor; + [Header("References")] + public MeshRenderer[] meshesToColor; - public global::UnityEngine.SkinnedMeshRenderer[] skinnedMeshesToColor; + public SkinnedMeshRenderer[] skinnedMeshesToColor; - public global::UnityEngine.SkinnedMeshRenderer[] skinnedMeshesToBind; + public SkinnedMeshRenderer[] skinnedMeshesToBind; - public global::UnityEngine.SkinnedMeshRenderer[] shapeKeyMeshRends; + public SkinnedMeshRenderer[] shapeKeyMeshRends; private void Awake() { } - public void ApplyColor(global::UnityEngine.Color col) + public void ApplyColor(Color col) { } @@ -37,7 +39,7 @@ public void ApplyShapeKeys(float gender, float weight) { } - public void BindBones(global::UnityEngine.Transform[] bones) + public void BindBones(Transform[] bones) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs.meta index a3c67769..e85a8298 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Accessory.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 615035da7d8b087a0500079b86fe8518 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation.meta index 675c1668..8ecaf986 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64c6ad189735de048bd6864b8b398f32 +guid: 24b6603d3a68e944e847e0146743ae71 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs index a32227e3..be827fe7 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs @@ -1,6 +1,11 @@ +using System.Collections.Generic; +using ScheduleOne.Skating; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarAnimation : global::UnityEngine.MonoBehaviour + public class AvatarAnimation : MonoBehaviour { public enum EFlinchType { @@ -26,7 +31,7 @@ public enum EFlinchDirection public const float MaxBoneOffsetSqr = 0.0001f; - public static global::UnityEngine.Vector3 SITTING_OFFSET; + public static Vector3 SITTING_OFFSET; public const float SEAT_TIME = 0.5f; @@ -34,27 +39,27 @@ public enum EFlinchDirection private int framesActive; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Animator animator; + [Header("References")] + public Animator animator; - public global::UnityEngine.Transform HipBone; + public Transform HipBone; - public global::UnityEngine.Transform[] Bones; + public Transform[] Bones; - protected global::ScheduleOne.AvatarFramework.Avatar avatar; + protected Avatar avatar; - public global::UnityEngine.Transform LeftHandContainer; + public Transform LeftHandContainer; - public global::UnityEngine.Transform RightHandContainer; + public Transform RightHandContainer; - public global::UnityEngine.Transform RightHandAlignmentPoint; + public Transform RightHandAlignmentPoint; - public global::UnityEngine.Transform LeftHandAlignmentPoint; + public Transform LeftHandAlignmentPoint; - public global::ScheduleOne.AvatarFramework.Animation.AvatarIKController IKController; + public AvatarIKController IKController; - [global::UnityEngine.Header("Settings")] - public global::UnityEngine.LayerMask GroundingMask; + [Header("Settings")] + public LayerMask GroundingMask; public string StandUpFromBackClipName; @@ -64,29 +69,29 @@ public enum EFlinchDirection public bool AllowCulling; - public global::UnityEngine.Events.UnityEvent onStandupStart; + public UnityEvent onStandupStart; - public global::UnityEngine.Events.UnityEvent onStandupDone; + public UnityEvent onStandupDone; - public global::UnityEngine.Events.UnityEvent onHeavyFlinch; + public UnityEvent onHeavyFlinch; - private global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] standingBoneTransforms; + private BoneTransform[] standingBoneTransforms; - private global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] standUpFromBackBoneTransforms; + private BoneTransform[] standUpFromBackBoneTransforms; - private global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] standUpFromFrontBoneTransforms; + private BoneTransform[] standUpFromFrontBoneTransforms; - private global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] ragdollBoneTransforms; + private BoneTransform[] ragdollBoneTransforms; - private global::UnityEngine.Coroutine standUpRoutine; + private Coroutine standUpRoutine; - private global::UnityEngine.Coroutine seatRoutine; + private Coroutine seatRoutine; - private global::ScheduleOne.Skating.Skateboard activeSkateboard; + private Skateboard activeSkateboard; private bool animationEnabled; - private global::UnityEngine.AnimatorCullingMode initialCullingMode; + private AnimatorCullingMode initialCullingMode; public bool IsCrouched { get; protected set; } @@ -94,7 +99,7 @@ public enum EFlinchDirection public float TimeSinceSitEnd { get; protected set; } - public global::ScheduleOne.AvatarFramework.Animation.AvatarSeat CurrentSeat { get; protected set; } + public AvatarSeat CurrentSeat { get; protected set; } public bool StandUpAnimationPlaying { get; protected set; } @@ -160,7 +165,7 @@ public void SetAnimationEnabled(bool enabled) { } - public void Flinch(global::UnityEngine.Vector3 forceDirection, global::ScheduleOne.AvatarFramework.Animation.AvatarAnimation.EFlinchType flinchType) + public void Flinch(Vector3 forceDirection, EFlinchType flinchType) { } @@ -181,16 +186,16 @@ private bool ShouldGetUpFromBack() return false; } - private void PopulateBoneTransforms(global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] boneTransforms) + private void PopulateBoneTransforms(BoneTransform[] boneTransforms) { } - private global::System.Collections.Generic.List GetBoneTransforms() + private List GetBoneTransforms() { return null; } - private void PopulateAnimationStartBoneTransforms(string clipName, global::ScheduleOne.AvatarFramework.Animation.BoneTransform[] boneTransforms) + private void PopulateAnimationStartBoneTransforms(string clipName, BoneTransform[] boneTransforms) { } @@ -206,11 +211,11 @@ public void SetBool(string id, bool value) { } - public void SetSeat(global::ScheduleOne.AvatarFramework.Animation.AvatarSeat seat) + public void SetSeat(AvatarSeat seat) { } - public void SkateboardMounted(global::ScheduleOne.Skating.Skateboard board) + public void SkateboardMounted(Skateboard board) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs.meta index 80c22761..3046aab8 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarAnimation.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5260fcceefd2a2dff0bc3f4ef846dcaa -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs index 896838e6..98c4817f 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs @@ -1,28 +1,32 @@ +using ScheduleOne.Materials; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarFootstepDetector : global::UnityEngine.MonoBehaviour + public class AvatarFootstepDetector : MonoBehaviour { public const float MAX_DETECTION_RANGE = 20f; public const float GROUND_DETECTION_RANGE = 0.25f; - public global::ScheduleOne.AvatarFramework.Avatar Avatar; + public Avatar Avatar; - public global::UnityEngine.Transform ReferencePoint; + public Transform ReferencePoint; - public global::UnityEngine.Transform LeftBone; + public Transform LeftBone; - public global::UnityEngine.Transform RightBone; + public Transform RightBone; public float StepThreshold; - public global::UnityEngine.LayerMask GroundDetectionMask; + public LayerMask GroundDetectionMask; private bool leftDown; private bool rightDown; - public global::UnityEngine.Events.UnityEvent onStep; + public UnityEvent onStep; private void LateUpdate() { @@ -32,9 +36,9 @@ public void TriggerStep() { } - public bool IsGrounded(out global::ScheduleOne.Materials.EMaterialType surfaceType) + public bool IsGrounded(out EMaterialType surfaceType) { - surfaceType = default(global::ScheduleOne.Materials.EMaterialType); + surfaceType = default(EMaterialType); return false; } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs.meta index 37826b1d..9430f469 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarFootstepDetector.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0dd49b0ad97e01d3b5cf1cbab5ebd69c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs index 5b27edde..56792190 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs @@ -1,13 +1,16 @@ +using RootMotion.FinalIK; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarIKController : global::UnityEngine.MonoBehaviour + public class AvatarIKController : MonoBehaviour { - [global::UnityEngine.Header("References")] - public global::RootMotion.FinalIK.BipedIK BodyIK; + [Header("References")] + public BipedIK BodyIK; - private global::UnityEngine.Transform defaultLeftLegBendTarget; + private Transform defaultLeftLegBendTarget; - private global::UnityEngine.Transform defaultRightLegBendTarget; + private Transform defaultRightLegBendTarget; private void Awake() { @@ -21,7 +24,7 @@ public void SetIKActive(bool active) { } - public void OverrideLegBendTargets(global::UnityEngine.Transform leftLegTarget, global::UnityEngine.Transform rightLegTarget) + public void OverrideLegBendTargets(Transform leftLegTarget, Transform rightLegTarget) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs.meta index 247dd14d..b0577e19 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarIKController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 59abf162a0e2f75aa2e66e7364ed42d1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs index a64c800a..c24a6daa 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs @@ -1,6 +1,11 @@ +using RootMotion.FinalIK; +using ScheduleOne.NPCs; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarLookController : global::UnityEngine.MonoBehaviour + public class AvatarLookController : MonoBehaviour { public const float LookAtPlayerRange = 4f; @@ -10,21 +15,21 @@ public class AvatarLookController : global::UnityEngine.MonoBehaviour public bool DEBUG; - [global::UnityEngine.Header("References")] - public global::RootMotion.FinalIK.AimIK Aim; + [Header("References")] + public AimIK Aim; - public global::UnityEngine.Transform HeadBone; + public Transform HeadBone; - public global::UnityEngine.Transform LookForwardTarget; + public Transform LookForwardTarget; - public global::UnityEngine.Transform LookOrigin; + public Transform LookOrigin; - public global::ScheduleOne.AvatarFramework.EyeController Eyes; + public EyeController Eyes; - [global::UnityEngine.Header("Optional NPC reference")] - public global::ScheduleOne.NPCs.NPC NPC; + [Header("Optional NPC reference")] + public NPC NPC; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public bool AutoLookAtPlayer; public float LookLerpSpeed; @@ -33,33 +38,33 @@ public class AvatarLookController : global::UnityEngine.MonoBehaviour public float BodyRotationSpeed; - private global::ScheduleOne.AvatarFramework.Avatar avatar; + private Avatar avatar; - private global::UnityEngine.Vector3 lookAtPos; + private Vector3 lookAtPos; - private global::UnityEngine.Transform lookAtTarget; + private Transform lookAtTarget; - private global::UnityEngine.Vector3 lastFrameOffset; + private Vector3 lastFrameOffset; private bool overrideLookAt; - private global::UnityEngine.Vector3 overriddenLookTarget; + private Vector3 overriddenLookTarget; private int overrideLookPriority; private bool overrideRotateBody; - private global::UnityEngine.Vector3 lastFrameLookOriginPos; + private Vector3 lastFrameLookOriginPos; - private global::UnityEngine.Vector3 lastFrameLookOriginForward; + private Vector3 lastFrameLookOriginForward; - public global::UnityEngine.Transform ForceLookTarget; + public Transform ForceLookTarget; public bool ForceLookRotateBody; private float defaultIKWeight; - private global::ScheduleOne.PlayerScripts.Player nearestPlayer; + private Player nearestPlayer; private float nearestPlayerDist; @@ -83,7 +88,7 @@ private void LateUpdate() { } - public void OverrideLookTarget(global::UnityEngine.Vector3 targetPosition, int priority, bool rotateBody = false) + public void OverrideLookTarget(Vector3 targetPosition, int priority, bool rotateBody = false) { } @@ -95,12 +100,12 @@ private void LerpTargetTransform() { } - private global::ScheduleOne.PlayerScripts.Player GetNearestPlayer() + private Player GetNearestPlayer() { return null; } - private bool CanLookAt(global::UnityEngine.Vector3 position) + private bool CanLookAt(Vector3 position) { return false; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs.meta index c77ee33b..a73e2f72 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarLookController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 60af7f6f008e62bd1f1f0c014fca36ad -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs index be1877ba..b3608fb1 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs @@ -1,20 +1,23 @@ +using ScheduleOne.NPCs; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarSeat : global::UnityEngine.MonoBehaviour + public class AvatarSeat : MonoBehaviour { - public global::UnityEngine.Transform SittingPoint; + public Transform SittingPoint; - public global::UnityEngine.Transform AccessPoint; + public Transform AccessPoint; public bool IsOccupied => false; - public global::ScheduleOne.NPCs.NPC Occupant { get; protected set; } + public NPC Occupant { get; protected set; } private void Awake() { } - public void SetOccupant(global::ScheduleOne.NPCs.NPC npc) + public void SetOccupant(NPC npc) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs.meta index 473b2268..41c6b944 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeat.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: db26b5b0eb0d32fb324512e128390b96 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs index 873c547d..1f3d8681 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs @@ -1,15 +1,17 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Animation { - public class AvatarSeatSet : global::UnityEngine.MonoBehaviour + public class AvatarSeatSet : MonoBehaviour { - public global::ScheduleOne.AvatarFramework.Animation.AvatarSeat[] Seats; + public AvatarSeat[] Seats; - public global::ScheduleOne.AvatarFramework.Animation.AvatarSeat GetFirstFreeSeat() + public AvatarSeat GetFirstFreeSeat() { return null; } - public global::ScheduleOne.AvatarFramework.Animation.AvatarSeat GetRandomFreeSeat() + public AvatarSeat GetRandomFreeSeat() { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs.meta index 53f692c7..9c1714bd 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/AvatarSeatSet.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7ea3c5ee4640f1152e5cfe4dcc004f2d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs index 60a9ac80..44ccd9d6 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs @@ -1,9 +1,11 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Animation { public class BoneTransform { - public global::UnityEngine.Vector3 Position { get; set; } + public Vector3 Position { get; set; } - public global::UnityEngine.Quaternion Rotation { get; set; } + public Quaternion Rotation { get; set; } } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs.meta index accf50db..2ac0fc9f 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Animation/BoneTransform.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 656aca8a443d8e544994e69109960979 +guid: 8b8846d6401655d41bac8a06589254a2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs index ab5b4eee..733c94d1 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs @@ -1,6 +1,15 @@ +using System; +using EasyButtons; +using ScheduleOne.AvatarFramework.Animation; +using ScheduleOne.AvatarFramework.Emotions; +using ScheduleOne.AvatarFramework.Equipping; +using ScheduleOne.AvatarFramework.Impostors; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework { - public class Avatar : global::UnityEngine.MonoBehaviour + public class Avatar : MonoBehaviour { public const int MAX_ACCESSORIES = 9; @@ -12,89 +21,89 @@ public class Avatar : global::UnityEngine.MonoBehaviour private static float femaleShoulderScale; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.AvatarFramework.Animation.AvatarAnimation Anim; + [Header("References")] + public AvatarAnimation Anim; - public global::ScheduleOne.AvatarFramework.Animation.AvatarLookController LookController; + public AvatarLookController LookController; - public global::UnityEngine.SkinnedMeshRenderer[] BodyMeshes; + public SkinnedMeshRenderer[] BodyMeshes; - public global::UnityEngine.SkinnedMeshRenderer[] ShapeKeyMeshes; + public SkinnedMeshRenderer[] ShapeKeyMeshes; - public global::UnityEngine.SkinnedMeshRenderer FaceMesh; + public SkinnedMeshRenderer FaceMesh; - public global::ScheduleOne.AvatarFramework.EyeController Eyes; + public EyeController Eyes; - public global::ScheduleOne.AvatarFramework.EyebrowController EyeBrows; + public EyebrowController EyeBrows; - public global::UnityEngine.Transform BodyContainer; + public Transform BodyContainer; - public global::UnityEngine.Transform Armature; + public Transform Armature; - public global::UnityEngine.Transform LeftShoulder; + public Transform LeftShoulder; - public global::UnityEngine.Transform RightShoulder; + public Transform RightShoulder; - public global::UnityEngine.Transform HeadBone; + public Transform HeadBone; - public global::UnityEngine.Transform HipBone; + public Transform HipBone; - public global::UnityEngine.Rigidbody[] RagdollRBs; + public Rigidbody[] RagdollRBs; - public global::UnityEngine.Collider[] RagdollColliders; + public Collider[] RagdollColliders; - public global::UnityEngine.Rigidbody MiddleSpineRB; + public Rigidbody MiddleSpineRB; - public global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionManager EmotionManager; + public AvatarEmotionManager EmotionManager; - public global::ScheduleOne.AvatarFramework.AvatarEffects Effects; + public AvatarEffects Effects; - public global::UnityEngine.Transform MiddleSpine; + public Transform MiddleSpine; - public global::UnityEngine.Transform LowerSpine; + public Transform LowerSpine; - public global::UnityEngine.Transform LowestSpine; + public Transform LowestSpine; - public global::ScheduleOne.AvatarFramework.Impostors.AvatarImpostor Impostor; + public AvatarImpostor Impostor; - [global::UnityEngine.Header("Settings")] - public global::ScheduleOne.AvatarFramework.AvatarSettings InitialAvatarSettings; + [Header("Settings")] + public AvatarSettings InitialAvatarSettings; - public global::UnityEngine.Material DefaultAvatarMaterial; + public Material DefaultAvatarMaterial; public bool UseImpostor; - public global::UnityEngine.Events.UnityEvent onRagdollChange; + public UnityEvent onRagdollChange; - [global::UnityEngine.Header("Data - readonly")] - [global::UnityEngine.SerializeField] + [Header("Data - readonly")] + [SerializeField] protected float appliedGender; - [global::UnityEngine.SerializeField] + [SerializeField] protected float appliedWeight; - [global::UnityEngine.SerializeField] - protected global::ScheduleOne.AvatarFramework.Hair appliedHair; + [SerializeField] + protected Hair appliedHair; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Color appliedHairColor; + [SerializeField] + protected Color appliedHairColor; - [global::UnityEngine.SerializeField] - protected global::ScheduleOne.AvatarFramework.Accessory[] appliedAccessories; + [SerializeField] + protected Accessory[] appliedAccessories; - [global::UnityEngine.SerializeField] + [SerializeField] protected bool wearingHairBlockingAccessory; private float additionalWeight; private float additionalGender; - [global::UnityEngine.Header("Runtime loading")] - public global::ScheduleOne.AvatarFramework.AvatarSettings SettingsToLoad; + [Header("Runtime loading")] + public AvatarSettings SettingsToLoad; - public global::UnityEngine.Events.UnityEvent onSettingsLoaded; + public UnityEvent onSettingsLoaded; - private global::UnityEngine.Vector3 originalHipPos; + private Vector3 originalHipPos; private bool usingCombinedLayer; @@ -102,18 +111,18 @@ public class Avatar : global::UnityEngine.MonoBehaviour public bool Ragdolled { get; protected set; } - public global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable CurrentEquippable { get; protected set; } + public AvatarEquippable CurrentEquippable { get; protected set; } - public global::ScheduleOne.AvatarFramework.AvatarSettings CurrentSettings { get; protected set; } + public AvatarSettings CurrentSettings { get; protected set; } - public global::UnityEngine.Vector3 CenterPoint => default(global::UnityEngine.Vector3); + public Vector3 CenterPoint => default(Vector3); - [global::EasyButtons.Button] + [Button] public void Load() { } - [global::EasyButtons.Button] + [Button] public void LoadNaked() { } @@ -134,11 +143,11 @@ public void SetVisible(bool vis) { } - public void GetMugshot(global::System.Action callback) + public void GetMugshot(Action callback) { } - public void SetEmission(global::UnityEngine.Color color) + public void SetEmission(Color color) { } @@ -152,6 +161,21 @@ public bool IsWhite() return false; } + public string GetFormalAddress(bool capitalized = true) + { + return null; + } + + public string GetThirdPersonAddress(bool capitalized = true) + { + return null; + } + + public string GetThirdPersonPronoun(bool capitalized = true) + { + return null; + } + private void ApplyShapeKeys(float gender, float weight, bool bodyOnly = false) { } @@ -164,15 +188,15 @@ private void SetWearingHairBlockingAccessory(bool blocked) { } - public void LoadAvatarSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void LoadAvatarSettings(AvatarSettings settings) { } - public void LoadNakedSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings, int maxLayerOrder = 19) + public void LoadNakedSettings(AvatarSettings settings, int maxLayerOrder = 19) { } - public void ApplyBodySettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyBodySettings(AvatarSettings settings) { } @@ -184,11 +208,11 @@ public void SetAdditionalGender(float gender) { } - public void SetSkinColor(global::UnityEngine.Color color) + public void SetSkinColor(Color color) { } - public void ApplyHairSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyHairSettings(AvatarSettings settings) { } @@ -196,11 +220,11 @@ public void SetHairVisible(bool visible) { } - public void ApplyHairColorSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyHairColorSettings(AvatarSettings settings) { } - public void OverrideHairColor(global::UnityEngine.Color color) + public void OverrideHairColor(Color color) { } @@ -208,19 +232,19 @@ public void ResetHairColor() { } - public void ApplyEyeBallSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyEyeBallSettings(AvatarSettings settings) { } - public void ApplyEyeLidSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyEyeLidSettings(AvatarSettings settings) { } - public void ApplyEyeLidColorSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyEyeLidColorSettings(AvatarSettings settings) { } - public void ApplyEyebrowSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyEyebrowSettings(AvatarSettings settings) { } @@ -228,27 +252,27 @@ public void SetBlockEyeFaceLayers(bool block) { } - public void ApplyFaceLayerSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyFaceLayerSettings(AvatarSettings settings) { } - private void SetFaceLayer(int index, string assetPath, global::UnityEngine.Color color) + private void SetFaceLayer(int index, string assetPath, Color color) { } - public void SetFaceTexture(global::UnityEngine.Texture2D tex, global::UnityEngine.Color color) + public void SetFaceTexture(Texture2D tex, Color color) { } - public void ApplyBodyLayerSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings, int maxOrder = -1) + public void ApplyBodyLayerSettings(AvatarSettings settings, int maxOrder = -1) { } - private void SetBodyLayer(int index, string assetPath, global::UnityEngine.Color color) + private void SetBodyLayer(int index, string assetPath, Color color) { } - public void ApplyAccessorySettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplyAccessorySettings(AvatarSettings settings) { } @@ -260,7 +284,7 @@ public virtual void SetRagdollPhysicsEnabled(bool ragdollEnabled, bool playStand { } - public virtual global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable SetEquippable(string assetPath) + public virtual AvatarEquippable SetEquippable(string assetPath) { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs.meta index b65a70e0..7de13445 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Avatar.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 28c9afa1c6628ebe2553f8fbfa917bf2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs index 646edf2d..dd75fbba 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs @@ -1,77 +1,83 @@ +using ScheduleOne.Audio; +using ScheduleOne.DevUtilities; +using ScheduleOne.FX; +using ScheduleOne.Tools; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class AvatarEffects : global::UnityEngine.MonoBehaviour + public class AvatarEffects : MonoBehaviour { - [global::UnityEngine.Header("References")] - public global::ScheduleOne.AvatarFramework.Avatar Avatar; + [Header("References")] + public Avatar Avatar; - public global::UnityEngine.ParticleSystem[] StinkParticles; + public ParticleSystem[] StinkParticles; - public global::UnityEngine.ParticleSystem VomitParticles; + public ParticleSystem VomitParticles; - public global::UnityEngine.ParticleSystem HeadPoofParticles; + public ParticleSystem HeadPoofParticles; - public global::UnityEngine.ParticleSystem FartParticles; + public ParticleSystem FartParticles; - public global::UnityEngine.ParticleSystem AntiGravParticles; + public ParticleSystem AntiGravParticles; - public global::UnityEngine.ParticleSystem FireParticles; + public ParticleSystem FireParticles; - public global::ScheduleOne.DevUtilities.OptimizedLight FireLight; + public OptimizedLight FireLight; - public global::UnityEngine.ParticleSystem FoggyEffects; + public ParticleSystem FoggyEffects; - public global::UnityEngine.Transform HeadBone; + public Transform HeadBone; - public global::UnityEngine.Transform NeckBone; + public Transform NeckBone; - public global::ScheduleOne.AvatarFramework.AvatarEffects[] MirrorEffectsTo; + public AvatarEffects[] MirrorEffectsTo; - public global::UnityEngine.ParticleSystem ZapParticles; + public ParticleSystem ZapParticles; - public global::ScheduleOne.FX.CountdownExplosion CountdownExplosion; + public CountdownExplosion CountdownExplosion; - public global::UnityEngine.GameObject[] ObjectsToCull; + public GameObject[] ObjectsToCull; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public bool DisableHead; - [global::UnityEngine.Header("Sounds")] - public global::ScheduleOne.Audio.AudioSourceController GurgleSound; + [Header("Sounds")] + public AudioSourceController GurgleSound; - public global::ScheduleOne.Audio.AudioSourceController VomitSound; + public AudioSourceController VomitSound; - public global::ScheduleOne.Audio.AudioSourceController PoofSound; + public AudioSourceController PoofSound; - public global::ScheduleOne.Audio.AudioSourceController FartSound; + public AudioSourceController FartSound; - public global::ScheduleOne.Audio.AudioSourceController FireSound; + public AudioSourceController FireSound; - public global::ScheduleOne.Audio.AudioSourceController ZapSound; + public AudioSourceController ZapSound; - public global::ScheduleOne.Audio.AudioSourceController ZapLoopSound; + public AudioSourceController ZapLoopSound; - [global::UnityEngine.Header("Smoothers")] - [global::UnityEngine.SerializeField] - private global::ScheduleOne.Tools.FloatSmoother AdditionalWeightController; + [Header("Smoothers")] + [SerializeField] + private FloatSmoother AdditionalWeightController; - [global::UnityEngine.SerializeField] - private global::ScheduleOne.Tools.FloatSmoother AdditionalGenderController; + [SerializeField] + private FloatSmoother AdditionalGenderController; - [global::UnityEngine.SerializeField] - private global::ScheduleOne.Tools.FloatSmoother HeadSizeBoost; + [SerializeField] + private FloatSmoother HeadSizeBoost; - [global::UnityEngine.SerializeField] - private global::ScheduleOne.Tools.FloatSmoother NeckSizeBoost; + [SerializeField] + private FloatSmoother NeckSizeBoost; - [global::UnityEngine.SerializeField] - private global::ScheduleOne.Tools.ColorSmoother SkinColorSmoother; + [SerializeField] + private ColorSmoother SkinColorSmoother; private bool laxativeEnabled; - private global::UnityEngine.Color currentEmission; + private Color currentEmission; - private global::UnityEngine.Color targetEmission; + private Color targetEmission; private bool isCulled; @@ -115,7 +121,7 @@ public void ReturnHair(bool mirror = true) { } - public void OverrideHairColor(global::UnityEngine.Color color, bool mirror = true) + public void OverrideHairColor(Color color, bool mirror = true) { } @@ -123,7 +129,7 @@ public void ResetHairColor(bool mirror = true) { } - public void OverrideEyeColor(global::UnityEngine.Color color, float emission = 0.115f, bool mirror = true) + public void OverrideEyeColor(Color color, float emission = 0.115f, bool mirror = true) { } @@ -131,7 +137,7 @@ public void ResetEyeColor(bool mirror = true) { } - public void SetEyeLightEmission(float intensity, global::UnityEngine.Color color, bool mirror = true) + public void SetEyeLightEmission(float intensity, Color color, bool mirror = true) { } @@ -179,7 +185,7 @@ public void RemoveAdditionalWeightOverride(string label, bool mirror = true) { } - public void SetGlowingOn(global::UnityEngine.Color color, bool mirror = true) + public void SetGlowingOn(Color color, bool mirror = true) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs.meta index d4d70c6c..33ed6cb4 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarEffects.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ffb0e62a579344d3e6f8c503df892df7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs index d811f379..ba6935ec 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs @@ -1,21 +1,24 @@ +using System; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - [global::System.Serializable] - [global::UnityEngine.CreateAssetMenu(fileName = "Avatar Layer", menuName = "ScriptableObjects/Avatar Layer", order = 1)] - public class AvatarLayer : global::UnityEngine.ScriptableObject + [Serializable] + [CreateAssetMenu(fileName = "Avatar Layer", menuName = "ScriptableObjects/Avatar Layer", order = 1)] + public class AvatarLayer : ScriptableObject { public string Name; public string AssetPath; - public global::UnityEngine.Texture2D Texture; + public Texture2D Texture; - public global::UnityEngine.Texture2D Normal; + public Texture2D Normal; - public global::UnityEngine.Texture2D Normal_DefaultFormat; + public Texture2D Normal_DefaultFormat; public int Order; - public global::UnityEngine.Material CombinedMaterial; + public Material CombinedMaterial; } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs.meta index bb97a381..a1bba907 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarLayer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 45828ac7a8390d8b865f10a32d6b3ea9 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs index 0f7019a5..c816614a 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs @@ -1,26 +1,31 @@ +using System; +using System.Collections.Generic; +using FishNet.Serializing.Helping; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - [global::System.Serializable] - [global::UnityEngine.CreateAssetMenu(fileName = "Avatar Settings", menuName = "ScriptableObjects/Avatar Settings", order = 1)] - public class AvatarSettings : global::UnityEngine.ScriptableObject + [Serializable] + [CreateAssetMenu(fileName = "Avatar Settings", menuName = "ScriptableObjects/Avatar Settings", order = 1)] + public class AvatarSettings : ScriptableObject { - [global::System.Serializable] + [Serializable] public struct LayerSetting { public string layerPath; - public global::UnityEngine.Color layerTint; + public Color layerTint; } - [global::System.Serializable] + [Serializable] public class AccessorySetting { public string path; - public global::UnityEngine.Color color; + public Color color; } - public global::UnityEngine.Color SkinColor; + public Color SkinColor; public float Height; @@ -30,7 +35,7 @@ public class AccessorySetting public string HairPath; - public global::UnityEngine.Color HairColor; + public Color HairColor; public float EyebrowScale; @@ -40,32 +45,32 @@ public class AccessorySetting public float EyebrowRestingAngle; - public global::UnityEngine.Color LeftEyeLidColor; + public Color LeftEyeLidColor; - public global::UnityEngine.Color RightEyeLidColor; + public Color RightEyeLidColor; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration LeftEyeRestingState; + public Eye.EyeLidConfiguration LeftEyeRestingState; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration RightEyeRestingState; + public Eye.EyeLidConfiguration RightEyeRestingState; public string EyeballMaterialIdentifier; - public global::UnityEngine.Color EyeBallTint; + public Color EyeBallTint; public float PupilDilation; - public global::System.Collections.Generic.List FaceLayerSettings; + public List FaceLayerSettings; - public global::System.Collections.Generic.List BodyLayerSettings; + public List BodyLayerSettings; - public global::System.Collections.Generic.List AccessorySettings; + public List AccessorySettings; public bool UseCombinedLayer; public string CombinedLayerPath; - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::UnityEngine.Texture2D ImpostorTexture; + [CodegenExclude] + public Texture2D ImpostorTexture; public float UpperEyelidRestingPosition => 0f; @@ -73,87 +78,87 @@ public class AccessorySetting public string FaceLayer1Path => null; - public global::UnityEngine.Color FaceLayer1Color => default(global::UnityEngine.Color); + public Color FaceLayer1Color => default(Color); public string FaceLayer2Path => null; - public global::UnityEngine.Color FaceLayer2Color => default(global::UnityEngine.Color); + public Color FaceLayer2Color => default(Color); public string FaceLayer3Path => null; - public global::UnityEngine.Color FaceLayer3Color => default(global::UnityEngine.Color); + public Color FaceLayer3Color => default(Color); public string FaceLayer4Path => null; - public global::UnityEngine.Color FaceLayer4Color => default(global::UnityEngine.Color); + public Color FaceLayer4Color => default(Color); public string FaceLayer5Path => null; - public global::UnityEngine.Color FaceLayer5Color => default(global::UnityEngine.Color); + public Color FaceLayer5Color => default(Color); public string FaceLayer6Path => null; - public global::UnityEngine.Color FaceLayer6Color => default(global::UnityEngine.Color); + public Color FaceLayer6Color => default(Color); public string BodyLayer1Path => null; - public global::UnityEngine.Color BodyLayer1Color => default(global::UnityEngine.Color); + public Color BodyLayer1Color => default(Color); public string BodyLayer2Path => null; - public global::UnityEngine.Color BodyLayer2Color => default(global::UnityEngine.Color); + public Color BodyLayer2Color => default(Color); public string BodyLayer3Path => null; - public global::UnityEngine.Color BodyLayer3Color => default(global::UnityEngine.Color); + public Color BodyLayer3Color => default(Color); public string BodyLayer4Path => null; - public global::UnityEngine.Color BodyLayer4Color => default(global::UnityEngine.Color); + public Color BodyLayer4Color => default(Color); public string BodyLayer5Path => null; - public global::UnityEngine.Color BodyLayer5Color => default(global::UnityEngine.Color); + public Color BodyLayer5Color => default(Color); public string BodyLayer6Path => null; - public global::UnityEngine.Color BodyLayer6Color => default(global::UnityEngine.Color); + public Color BodyLayer6Color => default(Color); public string Accessory1Path => null; - public global::UnityEngine.Color Accessory1Color => default(global::UnityEngine.Color); + public Color Accessory1Color => default(Color); public string Accessory2Path => null; - public global::UnityEngine.Color Accessory2Color => default(global::UnityEngine.Color); + public Color Accessory2Color => default(Color); public string Accessory3Path => null; - public global::UnityEngine.Color Accessory3Color => default(global::UnityEngine.Color); + public Color Accessory3Color => default(Color); public string Accessory4Path => null; - public global::UnityEngine.Color Accessory4Color => default(global::UnityEngine.Color); + public Color Accessory4Color => default(Color); public string Accessory5Path => null; - public global::UnityEngine.Color Accessory5Color => default(global::UnityEngine.Color); + public Color Accessory5Color => default(Color); public string Accessory6Path => null; - public global::UnityEngine.Color Accessory6Color => default(global::UnityEngine.Color); + public Color Accessory6Color => default(Color); public string Accessory7Path => null; - public global::UnityEngine.Color Accessory7Color => default(global::UnityEngine.Color); + public Color Accessory7Color => default(Color); public string Accessory8Path => null; - public global::UnityEngine.Color Accessory8Color => default(global::UnityEngine.Color); + public Color Accessory8Color => default(Color); public string Accessory9Path => null; - public global::UnityEngine.Color Accessory9Color => default(global::UnityEngine.Color); + public Color Accessory9Color => default(Color); public object this[string propertyName] => null; diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs.meta index a6f937b5..39da8870 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/AvatarSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: bb9b71b75d28cae613e8a9ed2305204e -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization.meta index c2f0910f..2567ad7b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0078ebf967d4424c96193e73b9e2fa4 +guid: f90a6713f8dc7444bb8c67d00b961f71 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs index 4216125e..b6949de5 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACAccessoryReplicator : global::ScheduleOne.AvatarFramework.Customization.ACAssetPathReplicator + public class ACAccessoryReplicator : ACAssetPathReplicator { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs.meta index 7ff58a5f..01a906a9 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessoryReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 714ce4385453dd91521584ce1e5c6878 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs index 4f6e1d24..52687e7d 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACAccessorySelection : global::ScheduleOne.AvatarFramework.Customization.ACSelection + public class ACAccessorySelection : ACSelection { public override string GetOptionLabel(int index) { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs.meta index 6706b31c..90eb3289 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAccessorySelection.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e3e0d52466f60ce66e570ac3f6ed342d -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs index 3164427f..bad61595 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs @@ -1,14 +1,16 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - public class ACAssetPathReplicator : global::ScheduleOne.AvatarFramework.Customization.ACReplicator where T : global::UnityEngine.Object + public class ACAssetPathReplicator : ACReplicator where T : Object { - private global::ScheduleOne.AvatarFramework.Customization.ACSelection selection; + private ACSelection selection; protected virtual void Awake() { } - protected override void AvatarSettingsChanged(global::ScheduleOne.AvatarFramework.AvatarSettings newSettings) + protected override void AvatarSettingsChanged(AvatarSettings newSettings) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs.meta index 2b6e47b6..b47305d1 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAssetPathReplicator.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 545d0bffc6feebd4491bd22b94a7deba +guid: 2495d8d0675077e4f9c8f176b3ff9816 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs index de751b81..1156897b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACAvatarLayerReplicator : global::ScheduleOne.AvatarFramework.Customization.ACAssetPathReplicator + public class ACAvatarLayerReplicator : ACAssetPathReplicator { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs.meta index a7afae0a..793b5992 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3d90f311ab1d36f2f4e56801efc20bcf -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs index 90c8c853..08711e35 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACAvatarLayerSelection : global::ScheduleOne.AvatarFramework.Customization.ACSelection + public class ACAvatarLayerSelection : ACSelection { public override string GetOptionLabel(int index) { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs.meta index d13efeb4..567e9733 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACAvatarLayerSelection.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: def1aabf65e7989b338922d18054f0e6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs index acf422de..f2c49a04 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs @@ -1,10 +1,10 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACColorPickerReplicator : global::ScheduleOne.AvatarFramework.Customization.ACReplicator + public class ACColorPickerReplicator : ACReplicator { - public global::HSVPicker.ColorPicker picker; + public HSVPicker.ColorPicker picker; - protected override void AvatarSettingsChanged(global::ScheduleOne.AvatarFramework.AvatarSettings newSettings) + protected override void AvatarSettingsChanged(AvatarSettings newSettings) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs.meta index 041a595b..3fc058e9 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACColorPickerReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c06d2dabfb034626b8256f423ded03a4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs index 24565374..76ee75b5 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - public class ACEntry : global::UnityEngine.MonoBehaviour + public class ACEntry : MonoBehaviour { public bool DevOnly; diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs.meta index d5c133c8..0952f00f 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACEntry.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6458a27f1acff3ea843ae4e23337fd38 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs index a1bfeded..b7372ea3 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACFaceLayerReplicator : global::ScheduleOne.AvatarFramework.Customization.ACAssetPathReplicator + public class ACFaceLayerReplicator : ACAssetPathReplicator { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs.meta index 75087855..e32d35f7 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6381dd4767a88b30fe0d390d2f66c961 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs index d4c81a34..2e1910ab 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.AvatarFramework.Customization { - public class ACFaceLayerSelection : global::ScheduleOne.AvatarFramework.Customization.ACSelection + public class ACFaceLayerSelection : ACSelection { public override string GetOptionLabel(int index) { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs.meta index 535d0669..236c2c13 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACFaceLayerSelection.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: de78dcc73cf82bf44e413244500161d6 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs index bc77ce17..615255e6 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - public class ACReplicator : global::UnityEngine.MonoBehaviour + public class ACReplicator : MonoBehaviour { public string propertyName; @@ -8,7 +10,7 @@ private void Start() { } - protected virtual void AvatarSettingsChanged(global::ScheduleOne.AvatarFramework.AvatarSettings newSettings) + protected virtual void AvatarSettingsChanged(AvatarSettings newSettings) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs.meta index 1618b35a..ff902c84 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0a20a17e49baaa4e2689e577b90c2f93 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs index 9bf2abb6..b564cd1a 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs @@ -1,26 +1,30 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework.Customization { - public abstract class ACSelection : global::UnityEngine.MonoBehaviour where T : global::UnityEngine.Object + public abstract class ACSelection : MonoBehaviour where T : Object { - [global::UnityEngine.Header("References")] - public global::UnityEngine.GameObject ButtonPrefab; + [Header("References")] + public GameObject ButtonPrefab; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public int PropertyIndex; - public global::System.Collections.Generic.List Options; + public List Options; public bool Nullable; public int DefaultOptionIndex; - protected global::System.Collections.Generic.List buttons; + protected List buttons; protected int SelectedOptionIndex; - public global::UnityEngine.Events.UnityEvent onValueChange; + public UnityEvent onValueChange; - public global::UnityEngine.Events.UnityEvent onValueChangeWithIndex; + public UnityEvent onValueChangeWithIndex; protected virtual void Awake() { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs.meta index 2c6ff165..0d0b6d5a 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSelection.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a1a7bbb094296e4b9a2782da56300b9 +guid: f01d5ee3482d90e4898b4673c9a9528d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs index 11786936..8599d704 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs @@ -1,10 +1,12 @@ +using UnityEngine.UI; + namespace ScheduleOne.AvatarFramework.Customization { - public class ACSliderReplicator : global::ScheduleOne.AvatarFramework.Customization.ACReplicator + public class ACSliderReplicator : ACReplicator { - public global::UnityEngine.UI.Slider slider; + public Slider slider; - protected override void AvatarSettingsChanged(global::ScheduleOne.AvatarFramework.AvatarSettings newSettings) + protected override void AvatarSettingsChanged(AvatarSettings newSettings) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs.meta index eddcdef3..2d8f0c46 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACSliderReplicator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 06ae4dbede3f5e5cc518b424d797c228 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs index f3fe804d..4b730629 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs @@ -1,16 +1,20 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + namespace ScheduleOne.AvatarFramework.Customization { - public class ACWindow : global::UnityEngine.MonoBehaviour + public class ACWindow : MonoBehaviour { - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public string WindowTitle; - public global::ScheduleOne.AvatarFramework.Customization.ACWindow Predecessor; + public ACWindow Predecessor; - [global::UnityEngine.Header("References")] - public global::TMPro.TextMeshProUGUI TitleText; + [Header("References")] + public TextMeshProUGUI TitleText; - public global::UnityEngine.UI.Button BackButton; + public Button BackButton; private void Start() { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs.meta index c1fa0e44..1f314679 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/ACWindow.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a1f44ca9e3b18bfa7a8db5a9f30a8727 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs index 65a1e2ed..ed021a56 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs @@ -1,8 +1,12 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - [global::System.Serializable] - [global::UnityEngine.CreateAssetMenu(fileName = "BasicAvatarSettings", menuName = "ScriptableObjects/BasicAvatarSettings", order = 1)] - public class BasicAvatarSettings : global::UnityEngine.ScriptableObject + [Serializable] + [CreateAssetMenu(fileName = "BasicAvatarSettings", menuName = "ScriptableObjects/BasicAvatarSettings", order = 1)] + public class BasicAvatarSettings : ScriptableObject { public const float GENDER_MULTIPLIER = 0.7f; @@ -14,11 +18,11 @@ public class BasicAvatarSettings : global::UnityEngine.ScriptableObject public float Weight; - public global::UnityEngine.Color SkinColor; + public Color SkinColor; public string HairStyle; - public global::UnityEngine.Color HairColor; + public Color HairColor; public string Mouth; @@ -28,7 +32,7 @@ public class BasicAvatarSettings : global::UnityEngine.ScriptableObject public float FacialDetailsIntensity; - public global::UnityEngine.Color EyeballColor; + public Color EyeballColor; public float UpperEyeLidRestingPosition; @@ -46,25 +50,25 @@ public class BasicAvatarSettings : global::UnityEngine.ScriptableObject public string Top; - public global::UnityEngine.Color TopColor; + public Color TopColor; public string Bottom; - public global::UnityEngine.Color BottomColor; + public Color BottomColor; public string Shoes; - public global::UnityEngine.Color ShoesColor; + public Color ShoesColor; public string Headwear; - public global::UnityEngine.Color HeadwearColor; + public Color HeadwearColor; public string Eyewear; - public global::UnityEngine.Color EyewearColor; + public Color EyewearColor; - public global::System.Collections.Generic.List Tattoos; + public List Tattoos; public T SetValue(string fieldName, T value) { @@ -76,7 +80,7 @@ public T GetValue(string fieldName) return default(T); } - public global::ScheduleOne.AvatarFramework.AvatarSettings GetAvatarSettings() + public AvatarSettings GetAvatarSettings() { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs.meta index ee3d3cb4..8e678c4b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/BasicAvatarSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f8ad3514dbac7cdcd841e9043623419c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs index dbef3221..bfbfd35d 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs @@ -1,6 +1,13 @@ +using System.Collections.Generic; +using ScheduleOne.Clothing; +using ScheduleOne.DevUtilities; +using ScheduleOne.UI.CharacterCreator; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework.Customization { - public class CharacterCreator : global::ScheduleOne.DevUtilities.Singleton + public class CharacterCreator : Singleton { public enum ECategory { @@ -13,39 +20,39 @@ public enum ECategory Accessories = 6 } - public global::System.Collections.Generic.List Fields; + public List Fields; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform Container; + [Header("References")] + public Transform Container; - public global::UnityEngine.Transform CameraPosition; + public Transform CameraPosition; - public global::UnityEngine.Transform RigContainer; + public Transform RigContainer; - public global::ScheduleOne.AvatarFramework.Avatar Rig; + public Avatar Rig; - public global::UnityEngine.Canvas Canvas; + public Canvas Canvas; - public global::UnityEngine.Animation CanvasAnimation; + public UnityEngine.Animation CanvasAnimation; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public bool DemoCreator; - public global::ScheduleOne.AvatarFramework.Customization.BasicAvatarSettings DefaultSettings; + public BasicAvatarSettings DefaultSettings; - public global::System.Collections.Generic.List Presets; + public List Presets; - public global::UnityEngine.Events.UnityEvent onComplete; + public UnityEvent onComplete; - public global::UnityEngine.Events.UnityEvent> onCompleteWithClothing; + public UnityEvent> onCompleteWithClothing; - private global::System.Collections.Generic.Dictionary lastSelectedClothingDefinitions; + private Dictionary lastSelectedClothingDefinitions; private float rigTargetY; public bool IsOpen { get; protected set; } - public global::ScheduleOne.AvatarFramework.Customization.BasicAvatarSettings ActiveSettings { get; protected set; } + public BasicAvatarSettings ActiveSettings { get; protected set; } protected override void Awake() { @@ -59,7 +66,7 @@ private void Update() { } - public void Open(global::ScheduleOne.AvatarFramework.Customization.BasicAvatarSettings initialSettings, bool showUI = true) + public void Open(BasicAvatarSettings initialSettings, bool showUI = true) { } @@ -83,7 +90,7 @@ public void SliderChanged(float newVal) { } - public T SetValue(string fieldName, T value, global::ScheduleOne.Clothing.ClothingDefinition definition) + public T SetValue(string fieldName, T value, ClothingDefinition definition) { return default(T); } @@ -92,7 +99,7 @@ public void SelectPreset(string presetName) { } - public void RefreshCategory(global::ScheduleOne.AvatarFramework.Customization.CharacterCreator.ECategory category) + public void RefreshCategory(ECategory category) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs.meta index 3783f365..735ba684 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CharacterCreator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d3b2cf41db9128b591a2d05141f481bb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs index d00b76d0..2f0eb4e7 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs @@ -1,21 +1,25 @@ +using ScheduleOne.DevUtilities; +using TMPro; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - public class CustomizationManager : global::ScheduleOne.DevUtilities.Singleton + public class CustomizationManager : Singleton { - public delegate void AvatarSettingsChanged(global::ScheduleOne.AvatarFramework.AvatarSettings settings); + public delegate void AvatarSettingsChanged(AvatarSettings settings); - [global::UnityEngine.SerializeField] - private global::ScheduleOne.AvatarFramework.AvatarSettings ActiveSettings; + [SerializeField] + private AvatarSettings ActiveSettings; - public global::ScheduleOne.AvatarFramework.Avatar TemplateAvatar; + public Avatar TemplateAvatar; - public global::TMPro.TMP_InputField SaveInputField; + public TMP_InputField SaveInputField; - public global::TMPro.TMP_InputField LoadInputField; + public TMP_InputField LoadInputField; - public global::ScheduleOne.AvatarFramework.Customization.CustomizationManager.AvatarSettingsChanged OnAvatarSettingsChanged; + public AvatarSettingsChanged OnAvatarSettingsChanged; - public global::ScheduleOne.AvatarFramework.AvatarSettings DefaultSettings; + public AvatarSettings DefaultSettings; private bool isEditingOriginal; @@ -31,7 +35,7 @@ public void CreateSettings() { } - public void LoadSettings(global::ScheduleOne.AvatarFramework.AvatarSettings loadedSettings) + public void LoadSettings(AvatarSettings loadedSettings) { } @@ -39,7 +43,7 @@ public void LoadSettings(string settingsName, bool editOriginal = false) { } - private void ApplyDefaultSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + private void ApplyDefaultSettings(AvatarSettings settings) { } @@ -59,19 +63,19 @@ public void HeightChanged(float height) { } - public void SkinColorChanged(global::UnityEngine.Color col) + public void SkinColorChanged(Color col) { } - public void HairChanged(global::ScheduleOne.AvatarFramework.Accessory newHair) + public void HairChanged(Accessory newHair) { } - public void HairColorChanged(global::UnityEngine.Color newCol) + public void HairColorChanged(Color newCol) { } - public void EyeBallTintChanged(global::UnityEngine.Color col) + public void EyeBallTintChanged(Color col) { } @@ -103,27 +107,27 @@ public void PupilDilationChanged(float dilation) { } - public void FaceLayerChanged(global::ScheduleOne.AvatarFramework.FaceLayer layer, int index) + public void FaceLayerChanged(FaceLayer layer, int index) { } - public void FaceLayerColorChanged(global::UnityEngine.Color col, int index) + public void FaceLayerColorChanged(Color col, int index) { } - public void BodyLayerChanged(global::ScheduleOne.AvatarFramework.AvatarLayer layer, int index) + public void BodyLayerChanged(AvatarLayer layer, int index) { } - public void BodyLayerColorChanged(global::UnityEngine.Color col, int index) + public void BodyLayerColorChanged(Color col, int index) { } - public void AccessoryChanged(global::ScheduleOne.AvatarFramework.Accessory acc, int index) + public void AccessoryChanged(Accessory acc, int index) { } - public void AccessoryColorChanged(global::UnityEngine.Color col, int index) + public void AccessoryColorChanged(Color col, int index) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs.meta index 81af3adf..e555ff4f 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/CustomizationManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 94b572566184665b0a1aab3b2f9431bc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs index f67c98cc..db4bc865 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs @@ -1,16 +1,18 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Customization { - public class PoliceBelt : global::ScheduleOne.AvatarFramework.Accessory + public class PoliceBelt : Accessory { - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject BatonObject; + [Header("References")] + [SerializeField] + protected GameObject BatonObject; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject TaserObject; + [SerializeField] + protected GameObject TaserObject; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject GunObject; + [SerializeField] + protected GameObject GunObject; public void SetBatonVisible(bool vis) { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs.meta index 340fb764..20c3c106 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Customization/PoliceBelt.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 84de415bf92cb7c00bb3ff33483619a5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions.meta index 4e31b830..0215d59b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bf8aacc78abad6c40a0b4dd941ad0557 +guid: 8bfd3f6edb22d1c488f0e91465dcd7b4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs index 74850c49..0fbda52e 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs @@ -1,34 +1,37 @@ +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Emotions { - public class AvatarEmotionManager : global::UnityEngine.MonoBehaviour + public class AvatarEmotionManager : MonoBehaviour { public const float MAX_UPDATE_DISTANCE = 30f; - [global::UnityEngine.Header("Settings")] - public global::System.Collections.Generic.List EmotionPresetList; + [Header("Settings")] + public List EmotionPresetList; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.AvatarFramework.Avatar Avatar; + [Header("References")] + public Avatar Avatar; - public global::ScheduleOne.AvatarFramework.EyeController EyeController; + public EyeController EyeController; - public global::ScheduleOne.AvatarFramework.EyebrowController EyebrowController; + public EyebrowController EyebrowController; - private global::ScheduleOne.AvatarFramework.Emotions.EmotionOverride activeEmotionOverride; + private EmotionOverride activeEmotionOverride; - private global::System.Collections.Generic.List overrideStack; + private List overrideStack; - private global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset neutralPreset; + private AvatarEmotionPreset neutralPreset; - private global::UnityEngine.Coroutine emotionLerpRoutine; + private Coroutine emotionLerpRoutine; - private global::System.Collections.Generic.Dictionary emotionRemovalRoutines; + private Dictionary emotionRemovalRoutines; private int tempIndex; public string CurrentEmotion { get; protected set; } - public global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset CurrentEmotionPreset { get; protected set; } + public AvatarEmotionPreset CurrentEmotionPreset { get; protected set; } public bool IsSwitchingEmotion => false; @@ -44,7 +47,7 @@ public void UpdateEmotion() { } - public void ConfigureNeutralFace(global::UnityEngine.Texture2D faceTex, float restingBrowHeight, float restingBrowAngle, global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration leftEyelidConfig, global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration rightEyelidConfig) + public void ConfigureNeutralFace(Texture2D faceTex, float restingBrowHeight, float restingBrowAngle, Eye.EyeLidConfiguration leftEyelidConfig, Eye.EyeLidConfiguration rightEyelidConfig) { } @@ -64,16 +67,16 @@ private void ClearRemovalRoutine(string label) { } - public global::ScheduleOne.AvatarFramework.Emotions.EmotionOverride GetHighestPriorityOverride() + public EmotionOverride GetHighestPriorityOverride() { return null; } - private void LerpEmotion(global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset preset, float animationTime = 0.2f) + private void LerpEmotion(AvatarEmotionPreset preset, float animationTime = 0.2f) { } - private void SetEmotion(global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset preset) + private void SetEmotion(AvatarEmotionPreset preset) { } @@ -82,7 +85,7 @@ public bool HasEmotion(string emotion) return false; } - public global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset GetEmotion(string emotion) + public AvatarEmotionPreset GetEmotion(string emotion) { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs.meta index b9ccf84f..291d91d0 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 81125a2917ed5966d6e0bf0a13db4b51 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs index 50b74916..368a0aa7 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs @@ -1,29 +1,32 @@ +using System; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Emotions { - [global::System.Serializable] + [Serializable] public class AvatarEmotionPreset { public string PresetName; - public global::UnityEngine.Texture2D FaceTexture; + public Texture2D FaceTexture; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration LeftEyeRestingState; + public Eye.EyeLidConfiguration LeftEyeRestingState; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration RightEyeRestingState; + public Eye.EyeLidConfiguration RightEyeRestingState; - [global::UnityEngine.Range(-30f, 30f)] + [Range(-30f, 30f)] public float BrowAngleChange_L; - [global::UnityEngine.Range(-30f, 30f)] + [Range(-30f, 30f)] public float BrowAngleChange_R; - [global::UnityEngine.Range(-1f, 1f)] + [Range(-1f, 1f)] public float BrowHeightChange_L; - [global::UnityEngine.Range(-1f, 1f)] + [Range(-1f, 1f)] public float BrowHeightChange_R; - public static global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset Lerp(global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset start, global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset end, global::ScheduleOne.AvatarFramework.Emotions.AvatarEmotionPreset neutralPreset, float lerp) + public static AvatarEmotionPreset Lerp(AvatarEmotionPreset start, AvatarEmotionPreset end, AvatarEmotionPreset neutralPreset, float lerp) { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs.meta index b42d4fbd..48c75e53 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/AvatarEmotionPreset.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67f9d1f2ea8db75643652a5625c7f6f6 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/DefaultEmotions.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/DefaultEmotions.cs.meta index 2c7aed5c..c251ea9d 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/DefaultEmotions.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/DefaultEmotions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf7e176e6482bc44f9a05c19784ca071 +guid: 02a0f38cd51050042b1f8146708c1c9e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/EmotionOverride.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/EmotionOverride.cs.meta index 6b5b2d7f..9bf33426 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/EmotionOverride.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Emotions/EmotionOverride.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2523cda75e64b104780ed927747fb1e9 +guid: 9ee18a27fd089474080945a13dccc218 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping.meta index b548f817..24ba6257 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8de06f3dccd218c4e92ee001d69fd002 +guid: 37f45ef040746b7438dde666c663417f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs index 940f4a89..5fcd5712 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs @@ -1,6 +1,9 @@ +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - public class AvatarEquippable : global::UnityEngine.MonoBehaviour + public class AvatarEquippable : MonoBehaviour { public enum ETriggerType { @@ -14,23 +17,23 @@ public enum EHand Right = 1 } - [global::UnityEngine.Header("Settings")] - public global::UnityEngine.Transform AlignmentPoint; + [Header("Settings")] + public Transform AlignmentPoint; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float Suspiciousness; - public global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable.EHand Hand; + public EHand Hand; - public global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable.ETriggerType TriggerType; + public ETriggerType TriggerType; public string AnimationTrigger; public string AssetPath; - protected global::ScheduleOne.AvatarFramework.Avatar avatar; + protected Avatar avatar; - [global::EasyButtons.Button] + [Button] public void RecalculateAssetPath() { } @@ -39,7 +42,7 @@ protected virtual void Awake() { } - public virtual void Equip(global::ScheduleOne.AvatarFramework.Avatar _avatar) + public virtual void Equip(Avatar _avatar) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs.meta index c7af3413..ceb658d3 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippable.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1a499e6aafd727695d5408ac9bc8cfa1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs index 527b6a69..e3fa5175 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs @@ -1,11 +1,13 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable))] - public class AvatarEquippableLookAt : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(AvatarEquippable))] + public class AvatarEquippableLookAt : MonoBehaviour { public int Priority; - private global::ScheduleOne.AvatarFramework.Avatar avatar; + private Avatar avatar; private void Start() { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs.meta index a374bab2..b99d99d4 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarEquippableLookAt.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2c1f1889671f55f76a222f4ae927ed26 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs index b70b0499..68843e7b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs @@ -1,8 +1,12 @@ +using System; +using ScheduleOne.Audio; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - public class AvatarMeleeWeapon : global::ScheduleOne.AvatarFramework.Equipping.AvatarWeapon + public class AvatarMeleeWeapon : AvatarWeapon { - [global::System.Serializable] + [Serializable] public class MeleeAttack { public float RangeMultiplier; @@ -15,28 +19,28 @@ public class MeleeAttack public float AttackSoundDelay; - public global::UnityEngine.AudioClip[] AttackClips; + public AudioClip[] AttackClips; - public global::UnityEngine.AudioClip[] HitClips; + public AudioClip[] HitClips; } public const float GruntChance = 0.4f; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Audio.AudioSourceController AttackSound; + [Header("References")] + public AudioSourceController AttackSound; - public global::ScheduleOne.Audio.AudioSourceController HitSound; + public AudioSourceController HitSound; - [global::UnityEngine.Header("Melee Weapon settings")] + [Header("Melee Weapon settings")] public float AttackRange; public float AttackRadius; public float Damage; - public global::ScheduleOne.AvatarFramework.Equipping.AvatarMeleeWeapon.MeleeAttack[] Attacks; + public MeleeAttack[] Attacks; - private global::UnityEngine.Coroutine attackRoutine; + private Coroutine attackRoutine; public override void Unequip() { diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs.meta index e2e9474a..f14f63cd 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarMeleeWeapon.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fc8a73fd0b6693cc5e17cb95a45611ee -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs index 3a7fc3bc..46552aba 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs @@ -1,41 +1,50 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using ScheduleOne.Audio; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - public class AvatarRangedWeapon : global::ScheduleOne.AvatarFramework.Equipping.AvatarWeapon + public class AvatarRangedWeapon : AvatarWeapon { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CReload_003Ed__30 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CReload_003Ed__30 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ScheduleOne.AvatarFramework.Equipping.AvatarRangedWeapon _003C_003E4__this; + public AvatarRangedWeapon _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CReload_003Ed__30(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -44,21 +53,21 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } public static string[] RaycastLayers; - [global::UnityEngine.Header("Weapon Settings")] + [Header("Weapon Settings")] public int MagazineSize; public float ReloadTime; @@ -73,17 +82,17 @@ private bool MoveNext() public float Damage; - [global::UnityEngine.Header("Accuracy")] + [Header("Accuracy")] public float HitChange_MinRange; public float HitChange_MaxRange; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform MuzzlePoint; + [Header("References")] + public Transform MuzzlePoint; - public global::ScheduleOne.Audio.AudioSourceController FireSound; + public AudioSourceController FireSound; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public string LoweredAnimationTrigger; public string RaisedAnimationTrigger; @@ -102,7 +111,7 @@ private bool MoveNext() public bool IsRaised { get; protected set; } - public override void Equip(global::ScheduleOne.AvatarFramework.Avatar _avatar) + public override void Equip(Avatar _avatar) { } @@ -123,17 +132,17 @@ public bool CanShoot() return false; } - public virtual void Shoot(global::UnityEngine.Vector3 endPoint) + public virtual void Shoot(Vector3 endPoint) { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ScheduleOne.AvatarFramework.Equipping.AvatarRangedWeapon._003CReload_003Ed__30))] - private global::System.Collections.IEnumerator Reload() + [IteratorStateMachine(typeof(_003CReload_003Ed__30))] + private IEnumerator Reload() { return null; } - public bool IsPlayerInLoS(global::ScheduleOne.PlayerScripts.Player target) + public bool IsPlayerInLoS(Player target) { return false; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs.meta index 4c252316..6f186da9 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarRangedWeapon.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8306382e11a08ffdae5ba03ea6a69eeb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs index 4bceb46d..4810fd25 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs @@ -1,25 +1,29 @@ +using ScheduleOne.Audio; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.AvatarFramework.Equipping { - public class AvatarWeapon : global::ScheduleOne.AvatarFramework.Equipping.AvatarEquippable + public class AvatarWeapon : AvatarEquippable { - [global::UnityEngine.Header("Range settings")] + [Header("Range settings")] public float MinUseRange; public float MaxUseRange; - [global::UnityEngine.Header("Cooldown settings")] + [Header("Cooldown settings")] public float CooldownDuration; - [global::UnityEngine.Header("Equipping")] - public global::UnityEngine.AudioClip[] EquipClips; + [Header("Equipping")] + public AudioClip[] EquipClips; - public global::ScheduleOne.Audio.AudioSourceController EquipSound; + public AudioSourceController EquipSound; - public global::UnityEngine.Events.UnityEvent onSuccessfulHit; + public UnityEvent onSuccessfulHit; public float LastUseTime { get; private set; } - public override void Equip(global::ScheduleOne.AvatarFramework.Avatar _avatar) + public override void Equip(Avatar _avatar) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs.meta index a5a831ad..cb338a8d 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/AvatarWeapon.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: aa199c8b2a731079839cc706efaaa891 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs index 7987edfd..58bdbbb0 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs @@ -1,43 +1,50 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - public class Handgun : global::ScheduleOne.AvatarFramework.Equipping.AvatarRangedWeapon + public class Handgun : AvatarRangedWeapon { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CFlash_003Ed__7 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CFlash_003Ed__7 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ScheduleOne.AvatarFramework.Equipping.Handgun _003C_003E4__this; + public Handgun _003C_003E4__this; - public global::UnityEngine.Vector3 endPoint; + public Vector3 endPoint; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CFlash_003Ed__7(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -46,38 +53,38 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } - [global::UnityEngine.Header("References")] - public global::UnityEngine.Animation Anim; + [Header("References")] + public UnityEngine.Animation Anim; - public global::UnityEngine.ParticleSystem ShellParticles; + public ParticleSystem ShellParticles; - public global::UnityEngine.ParticleSystem SmokeParticles; + public ParticleSystem SmokeParticles; - public global::UnityEngine.Transform FlashObject; + public Transform FlashObject; - [global::UnityEngine.Header("Prefabs")] - public global::UnityEngine.GameObject RayPrefab; + [Header("Prefabs")] + public GameObject RayPrefab; - private global::UnityEngine.Coroutine flashRoutine; + private Coroutine flashRoutine; - public override void Shoot(global::UnityEngine.Vector3 endPoint) + public override void Shoot(Vector3 endPoint) { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ScheduleOne.AvatarFramework.Equipping.Handgun._003CFlash_003Ed__7))] - private global::System.Collections.IEnumerator Flash(global::UnityEngine.Vector3 endPoint) + [IteratorStateMachine(typeof(_003CFlash_003Ed__7))] + private IEnumerator Flash(Vector3 endPoint) { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs.meta index 0f6f2700..ad74e1b8 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Handgun.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d9fae52a8c81357189013fe82f7c3d12 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs index a75fb108..f387e6aa 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs @@ -1,43 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using ScheduleOne.Audio; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Equipping { - public class Taser : global::ScheduleOne.AvatarFramework.Equipping.AvatarRangedWeapon + public class Taser : AvatarRangedWeapon { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CFlash_003Ed__9 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CFlash_003Ed__9 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ScheduleOne.AvatarFramework.Equipping.Taser _003C_003E4__this; + public Taser _003C_003E4__this; - public global::UnityEngine.Vector3 endPoint; + public Vector3 endPoint; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CFlash_003Ed__9(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -46,14 +54,14 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } @@ -62,21 +70,21 @@ private bool MoveNext() public const float TaseMoveSpeedMultiplier = 0.5f; - [global::UnityEngine.Header("References")] - public global::UnityEngine.GameObject FlashObject; + [Header("References")] + public GameObject FlashObject; - public global::ScheduleOne.Audio.AudioSourceController ChargeSound; + public AudioSourceController ChargeSound; - [global::UnityEngine.Header("Prefabs")] - public global::UnityEngine.GameObject RayPrefab; + [Header("Prefabs")] + public GameObject RayPrefab; - private global::UnityEngine.Coroutine flashRoutine; + private Coroutine flashRoutine; - public override void Equip(global::ScheduleOne.AvatarFramework.Avatar _avatar) + public override void Equip(Avatar _avatar) { } - public override void Shoot(global::UnityEngine.Vector3 endPoint) + public override void Shoot(Vector3 endPoint) { } @@ -84,8 +92,8 @@ public override void SetIsRaised(bool raised) { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ScheduleOne.AvatarFramework.Equipping.Taser._003CFlash_003Ed__9))] - private global::System.Collections.IEnumerator Flash(global::UnityEngine.Vector3 endPoint) + [IteratorStateMachine(typeof(_003CFlash_003Ed__9))] + private IEnumerator Flash(Vector3 endPoint) { return null; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs.meta index 53a2c750..336c5a2d 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Equipping/Taser.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e9168f6d151d51d2d195d0f910d2284b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs index 9682e80b..7c074f50 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs @@ -1,14 +1,18 @@ +using System; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class Eye : global::UnityEngine.MonoBehaviour + public class Eye : MonoBehaviour { - [global::System.Serializable] + [Serializable] public struct EyeLidConfiguration { - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float topLidOpen; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float bottomLidOpen; public override string ToString() @@ -16,52 +20,52 @@ public override string ToString() return null; } - public static global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration Lerp(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration start, global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration end, float lerp) + public static EyeLidConfiguration Lerp(EyeLidConfiguration start, EyeLidConfiguration end, float lerp) { - return default(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration); + return default(EyeLidConfiguration); } } public const float PupilLookSpeed = 10f; - private static global::UnityEngine.Vector3 defaultScale; + private static Vector3 defaultScale; - private static global::UnityEngine.Vector3 maxRotation; + private static Vector3 maxRotation; - private static global::UnityEngine.Vector3 minRotation; + private static Vector3 minRotation; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform Container; + [Header("References")] + public Transform Container; - public global::UnityEngine.Transform TopLidContainer; + public Transform TopLidContainer; - public global::UnityEngine.Transform BottomLidContainer; + public Transform BottomLidContainer; - public global::UnityEngine.Transform PupilContainer; + public Transform PupilContainer; - public global::UnityEngine.MeshRenderer TopLidRend; + public MeshRenderer TopLidRend; - public global::UnityEngine.MeshRenderer BottomLidRend; + public MeshRenderer BottomLidRend; - public global::UnityEngine.MeshRenderer EyeBallRend; + public MeshRenderer EyeBallRend; - public global::UnityEngine.Transform EyeLookOrigin; + public Transform EyeLookOrigin; - public global::ScheduleOne.DevUtilities.OptimizedLight EyeLight; + public OptimizedLight EyeLight; - public global::UnityEngine.SkinnedMeshRenderer PupilRend; + public SkinnedMeshRenderer PupilRend; - private global::UnityEngine.Coroutine blinkRoutine; + private Coroutine blinkRoutine; - private global::UnityEngine.Coroutine stateRoutine; + private Coroutine stateRoutine; - private global::ScheduleOne.AvatarFramework.Avatar avatar; + private Avatar avatar; - private global::UnityEngine.Color defaultEyeColor; + private Color defaultEyeColor; - public global::UnityEngine.Vector2 AngleOffset; + public Vector2 AngleOffset; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration CurrentConfiguration { get; protected set; } + public EyeLidConfiguration CurrentConfiguration { get; protected set; } public bool IsBlinking => false; @@ -73,15 +77,15 @@ public void SetSize(float size) { } - public void SetLidColor(global::UnityEngine.Color color) + public void SetLidColor(Color color) { } - public void SetEyeballMaterial(global::UnityEngine.Material mat, global::UnityEngine.Color col) + public void SetEyeballMaterial(Material mat, Color col) { } - public void SetEyeballColor(global::UnityEngine.Color col, float emission = 0.115f, bool writeDefault = true) + public void SetEyeballColor(Color col, float emission = 0.115f, bool writeDefault = true) { } @@ -89,7 +93,7 @@ public void ResetEyeballColor() { } - public void ConfigureEyeLight(global::UnityEngine.Color color, float intensity) + public void ConfigureEyeLight(Color color, float intensity) { } @@ -97,7 +101,7 @@ public void SetDilation(float dil) { } - public void SetEyeLidState(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration config, float time) + public void SetEyeLidState(EyeLidConfiguration config, float time) { } @@ -105,15 +109,15 @@ private void StopExistingRoutines() { } - public void SetEyeLidState(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration config, bool debug = false) + public void SetEyeLidState(EyeLidConfiguration config, bool debug = false) { } - public void LookAt(global::UnityEngine.Vector3 position, bool instant = false) + public void LookAt(Vector3 position, bool instant = false) { } - public void Blink(float blinkDuration, global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration endState, bool debug = false) + public void Blink(float blinkDuration, EyeLidConfiguration endState, bool debug = false) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs.meta index 961bfb0d..804d83a1 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Eye.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b05ccf06e11fc96f6e9d6cc373f0aeb5 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs index 1fb874ae..1ce7c7f2 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs @@ -1,42 +1,50 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - [global::UnityEngine.ExecuteInEditMode] - public class EyeController : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class EyeController : MonoBehaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CBlinkRoutine_003Ed__48 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CBlinkRoutine_003Ed__48 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ScheduleOne.AvatarFramework.EyeController _003C_003E4__this; + public EyeController _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CBlinkRoutine_003Ed__48(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -45,14 +53,14 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } @@ -61,66 +69,66 @@ private bool MoveNext() public bool DEBUG; - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - public global::ScheduleOne.AvatarFramework.Eye leftEye; + [Header("References")] + [SerializeField] + public Eye leftEye; - [global::UnityEngine.SerializeField] - public global::ScheduleOne.AvatarFramework.Eye rightEye; + [SerializeField] + public Eye rightEye; - [global::UnityEngine.Header("Location Settings")] - [global::UnityEngine.Range(0f, 45f)] - [global::UnityEngine.SerializeField] + [Header("Location Settings")] + [Range(0f, 45f)] + [SerializeField] protected float eyeSpacing; - [global::UnityEngine.Range(-1f, 1f)] - [global::UnityEngine.SerializeField] + [Range(-1f, 1f)] + [SerializeField] protected float eyeHeight; - [global::UnityEngine.Range(0.5f, 1.5f)] - [global::UnityEngine.SerializeField] + [Range(0.5f, 1.5f)] + [SerializeField] protected float eyeSize; - [global::UnityEngine.Header("Eyelid Settings")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Color leftEyeLidColor; + [Header("Eyelid Settings")] + [SerializeField] + protected Color leftEyeLidColor; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Color rightEyeLidColor; + [SerializeField] + protected Color rightEyeLidColor; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration LeftRestingEyeState; + public Eye.EyeLidConfiguration LeftRestingEyeState; - public global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration RightRestingEyeState; + public Eye.EyeLidConfiguration RightRestingEyeState; - [global::UnityEngine.Header("Eyeball Settings")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material eyeBallMaterial; + [Header("Eyeball Settings")] + [SerializeField] + protected Material eyeBallMaterial; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Color eyeBallColor; + [SerializeField] + protected Color eyeBallColor; - [global::UnityEngine.Header("Pupil State")] - [global::UnityEngine.Range(0f, 1f)] + [Header("Pupil State")] + [Range(0f, 1f)] public float PupilDilation; - [global::UnityEngine.Header("Blinking Settings")] + [Header("Blinking Settings")] public bool BlinkingEnabled; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 10f)] + [SerializeField] + [Range(0f, 10f)] protected float blinkInterval; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 2f)] + [SerializeField] + [Range(0f, 2f)] protected float blinkIntervalSpread; - [global::UnityEngine.SerializeField] - [global::UnityEngine.Range(0f, 1f)] + [SerializeField] + [Range(0f, 1f)] protected float blinkDuration; - private global::ScheduleOne.AvatarFramework.Avatar avatar; + private Avatar avatar; - private global::UnityEngine.Coroutine blinkRoutine; + private Coroutine blinkRoutine; private float timeUntilNextBlink; @@ -128,9 +136,9 @@ private bool MoveNext() private bool eyeLidOverridden; - private global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration defaultLeftEyeRestingState; + private Eye.EyeLidConfiguration defaultLeftEyeRestingState; - private global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration defaultRightEyeRestingState; + private Eye.EyeLidConfiguration defaultRightEyeRestingState; private float defaultDilation; @@ -148,16 +156,16 @@ private void OnEnable() { } - [global::EasyButtons.Button] + [Button] public void ApplySettings() { } - public void SetEyeballTint(global::UnityEngine.Color col) + public void SetEyeballTint(Color col) { } - public void OverrideEyeballTint(global::UnityEngine.Color col) + public void OverrideEyeballTint(Color col) { } @@ -165,7 +173,7 @@ public void ResetEyeballTint() { } - public void OverrideEyeLids(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration eyeLidConfiguration) + public void OverrideEyeLids(Eye.EyeLidConfiguration eyeLidConfiguration) { } @@ -201,16 +209,16 @@ public void ForceBlink() { } - public void SetLeftEyeRestingLidState(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration config) + public void SetLeftEyeRestingLidState(Eye.EyeLidConfiguration config) { } - public void SetRightEyeRestingLidState(global::ScheduleOne.AvatarFramework.Eye.EyeLidConfiguration config) + public void SetRightEyeRestingLidState(Eye.EyeLidConfiguration config) { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ScheduleOne.AvatarFramework.EyeController._003CBlinkRoutine_003Ed__48))] - private global::System.Collections.IEnumerator BlinkRoutine() + [IteratorStateMachine(typeof(_003CBlinkRoutine_003Ed__48))] + private IEnumerator BlinkRoutine() { return null; } @@ -219,7 +227,7 @@ private void ResetBlinkCounter() { } - public void LookAt(global::UnityEngine.Vector3 position, bool instant = false) + public void LookAt(Vector3 position, bool instant = false) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs.meta index 8d273497..328cd2da 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/EyeController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d6571a0ec5ab24e43f725b0f2275c0c4 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs index 33930e73..7fbf8c33 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class Eyebrow : global::UnityEngine.MonoBehaviour + public class Eyebrow : MonoBehaviour { public enum ESide { @@ -10,32 +12,32 @@ public enum ESide private const float eyebrowHeightMultiplier = 0.01f; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 EyebrowDefaultScale; + [SerializeField] + private Vector3 EyebrowDefaultScale; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Vector3 EyebrowDefaultLocalPos; + [SerializeField] + private Vector3 EyebrowDefaultLocalPos; - [global::UnityEngine.SerializeField] - protected global::ScheduleOne.AvatarFramework.Eyebrow.ESide Side; + [SerializeField] + protected ESide Side; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform Model; + [SerializeField] + protected Transform Model; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.MeshRenderer Rend; + [SerializeField] + protected MeshRenderer Rend; - [global::UnityEngine.Header("Eyebrow Data - Readonly")] - [global::UnityEngine.SerializeField] - private global::UnityEngine.Color col; + [Header("Eyebrow Data - Readonly")] + [SerializeField] + private Color col; - [global::UnityEngine.SerializeField] + [SerializeField] private float scale; - [global::UnityEngine.SerializeField] + [SerializeField] private float thickness; - [global::UnityEngine.SerializeField] + [SerializeField] private float restingAngle; public void SetScale(float _scale) @@ -54,7 +56,7 @@ public void SetRestingHeight(float normalizedHeight) { } - public void SetColor(global::UnityEngine.Color _col) + public void SetColor(Color _col) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs.meta index aa556f2a..782e8dc9 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Eyebrow.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 764076666772d49568377131bbc99177 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs index 3880043e..876f59d5 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs @@ -1,13 +1,15 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class EyebrowController : global::UnityEngine.MonoBehaviour + public class EyebrowController : MonoBehaviour { - [global::UnityEngine.Header("References")] - public global::ScheduleOne.AvatarFramework.Eyebrow leftBrow; + [Header("References")] + public Eyebrow leftBrow; - public global::ScheduleOne.AvatarFramework.Eyebrow rightBrow; + public Eyebrow rightBrow; - public void ApplySettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void ApplySettings(AvatarSettings settings) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs.meta index 49e969f0..f22b6158 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/EyebrowController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 616127f4c51fb6a343cf31b0653fae31 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs index 40a6d377..26a433da 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs @@ -1,8 +1,11 @@ +using System; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - [global::System.Serializable] - [global::UnityEngine.CreateAssetMenu(fileName = "Face Layer", menuName = "ScriptableObjects/Face Layer", order = 1)] - public class FaceLayer : global::ScheduleOne.AvatarFramework.AvatarLayer + [Serializable] + [CreateAssetMenu(fileName = "Face Layer", menuName = "ScriptableObjects/Face Layer", order = 1)] + public class FaceLayer : AvatarLayer { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs.meta index fa364d40..956e9ab7 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/FaceLayer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cc2830a92969bfbc8056943b33a26c68 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs index 6e5bcef3..a8803228 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs @@ -1,9 +1,11 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class Hair : global::ScheduleOne.AvatarFramework.Accessory + public class Hair : Accessory { - [global::UnityEngine.SerializeField] - private global::UnityEngine.GameObject[] hairToHide; + [SerializeField] + private GameObject[] hairToHide; public bool BlockedByHat { get; protected set; } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs.meta index 53b7b8d4..46a8debc 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Hair.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 143112d0688d50737d608395cbd60e31 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors.meta index 1f41ae5f..4a9c6b0c 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6929ae6d5275c0846b81e2a35fcc7d40 +guid: 24e3d5b759401b24f8d0510bdbd04523 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs index 810501e3..e395c756 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs @@ -1,16 +1,18 @@ +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Impostors { - public class AvatarImpostor : global::UnityEngine.MonoBehaviour + public class AvatarImpostor : MonoBehaviour { - public global::UnityEngine.MeshRenderer meshRenderer; + public MeshRenderer meshRenderer; - private global::UnityEngine.Transform cachedCamera; + private Transform cachedCamera; public bool HasTexture { get; private set; } - private global::UnityEngine.Transform Camera => null; + private Transform Camera => null; - public void SetAvatarSettings(global::ScheduleOne.AvatarFramework.AvatarSettings settings) + public void SetAvatarSettings(AvatarSettings settings) { } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs.meta index ce001695..15e5ec2b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/AvatarImpostor.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 302783c61630df77798661612bcd85d2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs index 36c3d462..7b7943fe 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs @@ -1,16 +1,19 @@ +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.AvatarFramework.Impostors { - public class ImpostorGenerator : global::UnityEngine.MonoBehaviour + public class ImpostorGenerator : MonoBehaviour { - [global::UnityEngine.Header("References")] - public global::UnityEngine.Camera ImpostorCamera; + [Header("References")] + public Camera ImpostorCamera; - public global::ScheduleOne.AvatarFramework.Avatar Avatar; + public Avatar Avatar; - [global::UnityEngine.Header("Settings")] - public global::System.Collections.Generic.List GenerationQueue; + [Header("Settings")] + public List GenerationQueue; - [global::UnityEngine.SerializeField] - private global::UnityEngine.Texture2D output; + [SerializeField] + private Texture2D output; } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs.meta index aab5936b..21a034d9 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/Impostors/ImpostorGenerator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 95b01502b68bff042a256dd2840d5480 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs b/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs index 8196153b..33c516b5 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs @@ -1,21 +1,26 @@ +using System; +using EasyButtons; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.AvatarFramework { - public class MugshotGenerator : global::ScheduleOne.DevUtilities.Singleton + public class MugshotGenerator : Singleton { public string OutputPath; - public global::ScheduleOne.AvatarFramework.AvatarSettings Settings; + public AvatarSettings Settings; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.AvatarFramework.Avatar MugshotRig; + [Header("References")] + public Avatar MugshotRig; - public global::ScheduleOne.DevUtilities.IconGenerator Generator; + public IconGenerator Generator; - public global::ScheduleOne.AvatarFramework.AvatarSettings DefaultSettings; + public AvatarSettings DefaultSettings; - public global::UnityEngine.Transform LookAtPosition; + public Transform LookAtPosition; - private global::UnityEngine.Texture2D finalTexture; + private Texture2D finalTexture; private bool generate; @@ -31,12 +36,12 @@ private void FinalizeMugshot() { } - [global::EasyButtons.Button] + [Button] public void GenerateMugshot() { } - public void GenerateMugshot(global::ScheduleOne.AvatarFramework.AvatarSettings settings, bool fileToFile, global::System.Action callback) + public void GenerateMugshot(AvatarSettings settings, bool fileToFile, Action callback) { } } diff --git a/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs.meta b/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs.meta index b40ae1d1..22560c4b 100644 --- a/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs.meta +++ b/Assets/Scripts/ScheduleOne/AvatarFramework/MugshotGenerator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dfdd548ae666b677bb4fe4b62f897747 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building.meta b/Assets/Scripts/ScheduleOne/Building.meta index bb281011..b3b37b75 100644 --- a/Assets/Scripts/ScheduleOne/Building.meta +++ b/Assets/Scripts/ScheduleOne/Building.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ef354a1f46aacb945bf079a3ea045e9e +guid: 39e1e83c20f7ff64cbfefce3adcd22bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs b/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs index 70eca452..17a98e1b 100644 --- a/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs +++ b/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Building { - public class ActivateDuringBuild : global::UnityEngine.MonoBehaviour + public class ActivateDuringBuild : MonoBehaviour { } } diff --git a/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs.meta b/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs.meta index 86923e47..067a13f0 100644 --- a/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/ActivateDuringBuild.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2b6efe429e9f24765f4389c31241fedc -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildManager.cs b/Assets/Scripts/ScheduleOne/Building/BuildManager.cs index ec6e137a..dda7d569 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildManager.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildManager.cs @@ -1,54 +1,66 @@ +using System; +using System.Collections.Generic; +using FishNet.Object; +using ScheduleOne.Audio; +using ScheduleOne.DevUtilities; +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; +using ScheduleOne.Storage; +using ScheduleOne.Tiles; +using UnityEngine; +using Grid = ScheduleOne.Tiles.Grid; + namespace ScheduleOne.Building { - public class BuildManager : global::ScheduleOne.DevUtilities.Singleton + public class BuildManager : Singleton { - [global::System.Serializable] + [Serializable] public class BuildSound { - public global::ScheduleOne.ItemFramework.BuildableItemDefinition.EBuildSoundType Type; + public BuildableItemDefinition.EBuildSoundType Type; - public global::ScheduleOne.Audio.AudioSourceController Sound; + public AudioSourceController Sound; } - public global::System.Collections.Generic.List PlaceSounds; + public List PlaceSounds; - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform tempContainer; + [Header("References")] + [SerializeField] + protected Transform tempContainer; - public global::FishNet.Object.NetworkObject networkObject; + public NetworkObject networkObject; - [global::UnityEngine.Header("Prefabs")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject storedItemBuildHandler; + [Header("Prefabs")] + [SerializeField] + protected GameObject storedItemBuildHandler; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject cashBuildHandler; + [SerializeField] + protected GameObject cashBuildHandler; - [global::UnityEngine.Header("Materials")] - public global::UnityEngine.Material ghostMaterial_White; + [Header("Materials")] + public Material ghostMaterial_White; - public global::UnityEngine.Material ghostMaterial_Red; + public Material ghostMaterial_Red; - public global::UnityEngine.Transform _tempContainer => null; + public Transform _tempContainer => null; public bool isBuilding { get; protected set; } - public global::UnityEngine.GameObject currentBuildHandler { get; protected set; } + public GameObject currentBuildHandler { get; protected set; } protected override void Awake() { } - public void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance item) + public void StartBuilding(ItemInstance item) { } - public void StartBuildingStoredItem(global::ScheduleOne.ItemFramework.ItemInstance item) + public void StartBuildingStoredItem(ItemInstance item) { } - public void StartPlacingCash(global::ScheduleOne.ItemFramework.ItemInstance item) + public void StartPlacingCash(ItemInstance item) { } @@ -56,49 +68,54 @@ public void StopBuilding() { } - public void PlayBuildSound(global::ScheduleOne.ItemFramework.BuildableItemDefinition.EBuildSoundType type, global::UnityEngine.Vector3 point) + public void PlayBuildSound(BuildableItemDefinition.EBuildSoundType type, Vector3 point) { } - public void DisableColliders(global::UnityEngine.GameObject obj) + public void DisableColliders(GameObject obj) { } - public void DisableLights(global::UnityEngine.GameObject obj) + public void DisableLights(GameObject obj) { } - public void DisableNetworking(global::UnityEngine.GameObject obj) + public void DisableNetworking(GameObject obj) { } - public void DisableSpriteRenderers(global::UnityEngine.GameObject obj) + public void DisableSpriteRenderers(GameObject obj) { } - public void ApplyMaterial(global::UnityEngine.GameObject obj, global::UnityEngine.Material mat, bool allMaterials = true) + public void ApplyMaterial(GameObject obj, Material mat, bool allMaterials = true) { } - public void DisableNavigation(global::UnityEngine.GameObject obj) + public void DisableNavigation(GameObject obj) { } - public void DisableCanvases(global::UnityEngine.GameObject obj) + public void DisableCanvases(GameObject obj) { } - public global::ScheduleOne.EntityFramework.GridItem CreateGridItem(global::ScheduleOne.ItemFramework.ItemInstance item, global::ScheduleOne.Tiles.Grid grid, global::UnityEngine.Vector2 originCoordinate, int rotation, string guid = "") + public GridItem CreateGridItem(ItemInstance item, Grid grid, Vector2 originCoordinate, int rotation, string guid = "") + { + return null; + } + + public ProceduralGridItem CreateProceduralGridItem(ItemInstance item, int rotationAngle, List matches, string guid = "") { return null; } - public global::ScheduleOne.EntityFramework.ProceduralGridItem CreateProceduralGridItem(global::ScheduleOne.ItemFramework.ItemInstance item, int rotationAngle, global::System.Collections.Generic.List matches, string guid = "") + public SurfaceItem CreateSurfaceItem(ItemInstance item, Surface parentSurface, Vector3 relativePosition, Quaternion relativeRotation, string guid = "") { return null; } - public void CreateStoredItem(global::ScheduleOne.Storage.StorableItemInstance item, global::ScheduleOne.Storage.IStorageEntity parentStorageEntity, global::ScheduleOne.Storage.StorageGrid grid, global::UnityEngine.Vector2 originCoord, float rotation) + public void CreateStoredItem(StorableItemInstance item, IStorageEntity parentStorageEntity, StorageGrid grid, Vector2 originCoord, float rotation) { } } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildManager.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildManager.cs.meta index 157a81ea..bcb6a848 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c2bc42efde3d34cfa1ae9cdc269bfc03 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs index 5689355b..d810276f 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs @@ -1,7 +1,10 @@ +using ScheduleOne.ItemFramework; +using UnityEngine; + namespace ScheduleOne.Building { - public abstract class BuildStart_Base : global::UnityEngine.MonoBehaviour + public abstract class BuildStart_Base : MonoBehaviour { - public abstract void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance item); + public abstract void StartBuilding(ItemInstance item); } } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs.meta index a6f9b058..2a4b46b3 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f3da5860b57cc41c22e94a315aa3da8a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs index a603dfcf..d6a994a5 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs @@ -1,8 +1,10 @@ +using ScheduleOne.ItemFramework; + namespace ScheduleOne.Building { - public class BuildStart_Cash : global::ScheduleOne.Building.BuildStart_StoredItem + public class BuildStart_Cash : BuildStart_StoredItem { - public override void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance itemInstance) + public override void StartBuilding(ItemInstance itemInstance) { } } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs.meta index ce0afda1..de38fcca 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Cash.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 46119d6171cb9575e0b5644b9456eb57 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs index 3f5ee480..314d1b2e 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs @@ -1,12 +1,15 @@ +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; + namespace ScheduleOne.Building { - public class BuildStart_Grid : global::ScheduleOne.Building.BuildStart_Base + public class BuildStart_Grid : BuildStart_Base { - public override void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance itemInstance) + public override void StartBuilding(ItemInstance itemInstance) { } - protected virtual global::ScheduleOne.EntityFramework.GridItem CreateGhostModel(global::ScheduleOne.ItemFramework.BuildableItemDefinition itemDefinition) + protected virtual GridItem CreateGhostModel(BuildableItemDefinition itemDefinition) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs.meta index f4bfea3a..cda67d61 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Grid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 18fef1fb2518ec3842e90ab7334af39e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs index 0e63d370..e11c111d 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs @@ -1,12 +1,15 @@ +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; + namespace ScheduleOne.Building { - public class BuildStart_ProceduralGrid : global::ScheduleOne.Building.BuildStart_Base + public class BuildStart_ProceduralGrid : BuildStart_Base { - public override void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance itemInstance) + public override void StartBuilding(ItemInstance itemInstance) { } - protected virtual global::ScheduleOne.EntityFramework.ProceduralGridItem CreateGhostModel(global::ScheduleOne.ItemFramework.BuildableItemDefinition itemDefinition) + protected virtual ProceduralGridItem CreateGhostModel(BuildableItemDefinition itemDefinition) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs.meta index 849358c9..9106edae 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_ProceduralGrid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ce93858e8da12ea1d5dd5975d4c1a6a9 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs index c25084a4..01ba7e2b 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs @@ -1,12 +1,16 @@ +using ScheduleOne.ItemFramework; +using ScheduleOne.Storage; +using UnityEngine; + namespace ScheduleOne.Building { - public class BuildStart_StoredItem : global::ScheduleOne.Building.BuildStart_Base + public class BuildStart_StoredItem : BuildStart_Base { - public override void StartBuilding(global::ScheduleOne.ItemFramework.ItemInstance itemInstance) + public override void StartBuilding(ItemInstance itemInstance) { } - protected virtual global::UnityEngine.GameObject CreateGhostModel(global::ScheduleOne.Storage.StorableItemInstance item) + protected virtual GameObject CreateGhostModel(StorableItemInstance item) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs.meta index 4fba651e..c0c60ce7 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_StoredItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 85489a12799441b1fab481dd6f83e893 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs b/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs new file mode 100644 index 00000000..2db70da5 --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs @@ -0,0 +1,17 @@ +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; + +namespace ScheduleOne.Building +{ + public class BuildStart_Surface : BuildStart_Base + { + public override void StartBuilding(ItemInstance itemInstance) + { + } + + protected virtual SurfaceItem CreateGhostModel(BuildableItemDefinition itemDefinition) + { + return null; + } + } +} diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs.meta new file mode 100644 index 00000000..18138151 --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/BuildStart_Surface.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: b1dfcf56366b2ac4950b8eed88f41265 +timeCreated: 1744220834 +licenseType: Free +MonoImporter: + serializedVersion: 2 + externalObjects: {} + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs b/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs index de9633ee..367b868e 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Building { - public class BuildStop_Base : global::UnityEngine.MonoBehaviour + public class BuildStop_Base : MonoBehaviour { public virtual void Stop_Building() { diff --git a/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs.meta index 7d815d04..0727dd32 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildStop_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 94af72141917a66738e6c8ceddc19746 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs index 0b4a984b..b2102e7c 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Building { - public abstract class BuildUpdate_Base : global::UnityEngine.MonoBehaviour + public abstract class BuildUpdate_Base : MonoBehaviour { public virtual void Stop() { diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs.meta index c68a9b84..57a55f3b 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 670abe8db881af86c95df02b492980de -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs index 6d19814d..698c957b 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs @@ -1,12 +1,16 @@ +using System.Collections.Generic; +using ScheduleOne.Interaction; +using UnityEngine; + namespace ScheduleOne.Building { - public class BuildUpdate_Cash : global::ScheduleOne.Building.BuildUpdate_StoredItem + public class BuildUpdate_Cash : BuildUpdate_StoredItem { public int amountIndex; - protected global::System.Collections.Generic.List bills; + protected List bills; - private global::ScheduleOne.Interaction.WorldSpaceLabel amountLabel; + private WorldSpaceLabel amountLabel; private float placeAmount => 0f; diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs.meta index 4966e736..4b8fe77e 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Cash.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 00b4a8ca1f17cbd14bf9ddd71e72c914 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs index 2a46479b..69a4b417 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs @@ -1,19 +1,26 @@ +using System.Collections.Generic; +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; +using ScheduleOne.Tiles; +using UnityEngine; +using Grid = ScheduleOne.Tiles.Grid; + namespace ScheduleOne.Building { - public class BuildUpdate_Grid : global::ScheduleOne.Building.BuildUpdate_Base + public class BuildUpdate_Grid : BuildUpdate_Base { - public global::UnityEngine.GameObject GhostModel; + public GameObject GhostModel; - public global::ScheduleOne.EntityFramework.GridItem BuildableItemClass; + public GridItem BuildableItemClass; - public global::ScheduleOne.ItemFramework.ItemInstance ItemInstance; + public ItemInstance ItemInstance; public float CurrentRotation; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public float detectionRange; - public global::UnityEngine.LayerMask detectionMask; + public LayerMask detectionMask; public float rotation_Smoothing; @@ -21,9 +28,9 @@ public class BuildUpdate_Grid : global::ScheduleOne.Building.BuildUpdate_Base protected bool validPosition; - protected global::UnityEngine.Material currentGhostMaterial; + protected Material currentGhostMaterial; - protected global::ScheduleOne.Building.TileIntersection closestIntersection; + protected TileIntersection closestIntersection; private float verticalOffset; @@ -51,7 +58,7 @@ protected void ApplyRotation() { } - private global::System.Collections.Generic.List GetRelevantIntersections(global::ScheduleOne.Tiles.FootprintTile tile) + private List GetRelevantIntersections(FootprintTile tile) { return null; } @@ -68,12 +75,12 @@ protected virtual void Place() { } - private global::UnityEngine.Vector2 GetOriginCoordinate() + private Vector2 GetOriginCoordinate() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } - private global::ScheduleOne.Tiles.Grid GetHoveredGrid() + private Grid GetHoveredGrid() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs.meta index 80a486a9..57e6ee1b 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Grid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 49f6c6f2e4fffa05596f48ab63b6d2f7 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs index cc2c09cf..458d4974 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs @@ -1,24 +1,29 @@ +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; +using ScheduleOne.Tiles; +using UnityEngine; + namespace ScheduleOne.Building { - public class BuildUpdate_ProceduralGrid : global::ScheduleOne.Building.BuildUpdate_Base + public class BuildUpdate_ProceduralGrid : BuildUpdate_Base { public class Intersection { - public global::ScheduleOne.Tiles.FootprintTile footprintTile; + public FootprintTile footprintTile; - public global::ScheduleOne.Tiles.ProceduralTile procTile; + public ProceduralTile procTile; } - public global::UnityEngine.GameObject GhostModel; + public GameObject GhostModel; - public global::ScheduleOne.EntityFramework.ProceduralGridItem ItemClass; + public ProceduralGridItem ItemClass; - public global::ScheduleOne.ItemFramework.ItemInstance ItemInstance; + public ItemInstance ItemInstance; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public float detectionRange; - public global::UnityEngine.LayerMask detectionMask; + public LayerMask detectionMask; public float rotation_Smoothing; @@ -26,9 +31,9 @@ public class Intersection protected bool validPosition; - protected global::UnityEngine.Material currentGhostMaterial; + protected Material currentGhostMaterial; - protected global::ScheduleOne.Building.BuildUpdate_ProceduralGrid.Intersection bestIntersection; + protected Intersection bestIntersection; protected virtual void Update() { @@ -54,7 +59,7 @@ protected void UpdateMaterials() { } - private bool IsMatchValid(global::ScheduleOne.Tiles.FootprintTile footprintTile, global::ScheduleOne.Tiles.ProceduralTile matchedTile) + private bool IsMatchValid(FootprintTile footprintTile, ProceduralTile matchedTile) { return false; } @@ -63,7 +68,7 @@ protected void Place() { } - private global::ScheduleOne.Tiles.ProceduralTile GetNearbyProcTile() + private ProceduralTile GetNearbyProcTile() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs.meta index 5978a96b..34251a15 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_ProceduralGrid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3c297c9005cc6222824fa567eb78e514 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs index c054cffc..a428f176 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs @@ -1,26 +1,30 @@ +using ScheduleOne.Storage; +using ScheduleOne.Tiles; +using UnityEngine; + namespace ScheduleOne.Building { - public class BuildUpdate_StoredItem : global::ScheduleOne.Building.BuildUpdate_Base + public class BuildUpdate_StoredItem : BuildUpdate_Base { public class StorageTileIntersection { - public global::ScheduleOne.Tiles.FootprintTile footprintTile; + public FootprintTile footprintTile; - public global::ScheduleOne.Storage.StorageTile storageTile; + public StorageTile storageTile; } - public global::ScheduleOne.Storage.StorableItemInstance itemInstance; + public StorableItemInstance itemInstance; - public global::UnityEngine.GameObject ghostModel; + public GameObject ghostModel; - public global::ScheduleOne.Storage.StoredItem storedItemClass; + public StoredItem storedItemClass; - protected global::ScheduleOne.Building.BuildUpdate_StoredItem.StorageTileIntersection bestIntersection; + protected StorageTileIntersection bestIntersection; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public float detectionRange; - public global::UnityEngine.LayerMask detectionMask; + public LayerMask detectionMask; public float storedItemHoldDistance; @@ -28,13 +32,13 @@ public class StorageTileIntersection protected bool validPosition; - protected global::UnityEngine.Material currentGhostMaterial; + protected Material currentGhostMaterial; protected bool mouseUpSinceStart; protected bool mouseUpSincePlace; - private global::UnityEngine.Vector3 positionDuringLastValidPosition; + private Vector3 positionDuringLastValidPosition; protected virtual void Update() { @@ -68,9 +72,9 @@ protected virtual void PostPlace() { } - protected global::UnityEngine.Vector2 GetOriginCoordinate() + protected Vector2 GetOriginCoordinate() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } } } diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs.meta index 15d598aa..8870e014 100644 --- a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_StoredItem.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f7849e20da183a3c15557824a38314df -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs new file mode 100644 index 00000000..66be5a03 --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs @@ -0,0 +1,61 @@ +using ScheduleOne.EntityFramework; +using ScheduleOne.ItemFramework; +using UnityEngine; + +namespace ScheduleOne.Building +{ + public class BuildUpdate_Surface : BuildUpdate_Base + { + public GameObject GhostModel; + + public SurfaceItem BuildableItemClass; + + public ItemInstance ItemInstance; + + public float CurrentRotation; + + [Header("Settings")] + public LayerMask DetectionMask; + + protected bool validPosition; + + protected Material currentGhostMaterial; + + protected Surface hoveredValidSurface; + + private float detectionRange => 0f; + + protected virtual void Start() + { + } + + protected virtual void Update() + { + } + + protected virtual void LateUpdate() + { + } + + protected void PositionObjectInFrontOfPlayer(float dist, bool sanitizeForward) + { + } + + private bool IsSurfaceValidForItem(Surface surface, Collider hitCollider, Vector3 hitPoint) + { + return false; + } + + protected void CheckRotation() + { + } + + protected void UpdateMaterials() + { + } + + protected virtual void Place() + { + } + } +} diff --git a/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs.meta b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs.meta new file mode 100644 index 00000000..8a334fff --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/BuildUpdate_Surface.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: fe2c5d3fe12cd591b180e9195ba57a04 +timeCreated: 1744220834 +licenseType: Free +MonoImporter: + serializedVersion: 2 + externalObjects: {} + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs b/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs index 1481773c..fe5efdcf 100644 --- a/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs +++ b/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs @@ -1,14 +1,18 @@ +using System.Collections.Generic; +using ScheduleOne.Tiles; +using UnityEngine; + namespace ScheduleOne.Building { - public class CornerObstacle : global::UnityEngine.MonoBehaviour + public class CornerObstacle : MonoBehaviour { public bool obstacleEnabled; - public global::ScheduleOne.Tiles.FootprintTile parentFootprint; + public FootprintTile parentFootprint; - public global::UnityEngine.Vector2 coordinates; + public Vector2 coordinates; - public global::System.Collections.Generic.List GetNeighbourTiles(global::ScheduleOne.Tiles.Tile pairedTile) + public List GetNeighbourTiles(Tile pairedTile) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs.meta b/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs.meta index d91af49f..d497ef8f 100644 --- a/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/CornerObstacle.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 92d8e5909341836f6adf29dbb53d0628 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/Doors.meta b/Assets/Scripts/ScheduleOne/Building/Doors.meta index acd2978c..c9c2e2f1 100644 --- a/Assets/Scripts/ScheduleOne/Building/Doors.meta +++ b/Assets/Scripts/ScheduleOne/Building/Doors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 88fc7651101f3dc4ba225fd768f3a19d +guid: 264c073582d93a943896f27b9f156b16 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs b/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs index 0ddf6ed3..d7255159 100644 --- a/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs +++ b/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs @@ -1,13 +1,15 @@ +using UnityEngine; + namespace ScheduleOne.Building.Doors { - public class DoorKnocker : global::UnityEngine.MonoBehaviour + public class DoorKnocker : MonoBehaviour { - [global::UnityEngine.Header("References")] - public global::UnityEngine.Animation Anim; + [Header("References")] + public Animation Anim; public string KnockingSoundClipName; - public global::UnityEngine.AudioSource KnockingSound; + public AudioSource KnockingSound; public void Knock() { diff --git a/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs.meta b/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs.meta index 99c9dd8d..017d1e77 100644 --- a/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/Doors/DoorKnocker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 506926e0423e6b8ab4591bc9003cd812 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs b/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs index 8b7babdb..da5e2043 100644 --- a/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs +++ b/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs @@ -1,10 +1,13 @@ +using ScheduleOne.Doors; +using ScheduleOne.PlayerScripts; + namespace ScheduleOne.Building.Doors { - public class PropertyDoorController : global::ScheduleOne.Doors.DoorController + public class PropertyDoorController : DoorController { public const float WANTED_PLAYER_CLOSE_DISTANCE = 20f; - public global::ScheduleOne.Property.Property Property; + public ScheduleOne.Property.Property Property; private bool IsUnlocked; @@ -24,13 +27,13 @@ private void CheckClose() { } - protected override bool CanPlayerAccess(global::ScheduleOne.Doors.EDoorSide side, out string reason) + protected override bool CanPlayerAccess(EDoorSide side, out string reason) { reason = null; return false; } - private global::ScheduleOne.PlayerScripts.Player GetNearestWantedPlayer() + private Player GetNearestWantedPlayer() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs.meta b/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs.meta index e608dff0..1790ce68 100644 --- a/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/Doors/PropertyDoorController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5e4773b5ea8427bf9ba1b8275b9724b0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs b/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs index 6fa23cac..0dd7dae3 100644 --- a/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs +++ b/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Building { - public class OverrideGhostMaterial : global::UnityEngine.MonoBehaviour + public class OverrideGhostMaterial : MonoBehaviour { } } diff --git a/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs.meta b/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs.meta index cec25b0f..3dc9027c 100644 --- a/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/OverrideGhostMaterial.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3c4a13c7737826b308c5629ab699a602 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Building/Surface.cs b/Assets/Scripts/ScheduleOne/Building/Surface.cs new file mode 100644 index 00000000..745d926c --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/Surface.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using EasyButtons; +using UnityEngine; + +namespace ScheduleOne.Building +{ + public class Surface : MonoBehaviour, IGUIDRegisterable + { + public enum ESurfaceType + { + Wall = 0, + Roof = 1 + } + + public enum EFace + { + Front = 0, + Back = 1, + Top = 2, + Bottom = 3, + Left = 4, + Right = 5 + } + + [Header("Settings")] + public ESurfaceType SurfaceType; + + public List ValidFaces; + + public ScheduleOne.Property.Property ParentProperty; + + [SerializeField] + protected string BakedGUID; + + public Guid GUID { get; protected set; } + + public Transform Container => null; + + [Button] + public void RegenerateGUID() + { + } + + private void OnValidate() + { + } + + protected virtual void Awake() + { + } + + public void SetGUID(Guid guid) + { + } + + public Vector3 GetRelativePosition(Vector3 worldPosition) + { + return default(Vector3); + } + + public Quaternion GetRelativeRotation(Quaternion worldRotation) + { + return default(Quaternion); + } + + public bool IsFrontFace(Vector3 point, Collider collider) + { + return false; + } + + public bool IsPointValid(Vector3 point, Collider hitCollider) + { + return false; + } + } +} diff --git a/Assets/Scripts/ScheduleOne/Building/Surface.cs.meta b/Assets/Scripts/ScheduleOne/Building/Surface.cs.meta new file mode 100644 index 00000000..a8f64682 --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Building/Surface.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 05201a8364257a77fe5aab4a5b9106da +timeCreated: 1744220834 +licenseType: Free +MonoImporter: + serializedVersion: 2 + externalObjects: {} + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs b/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs index a5978918..d31834c4 100644 --- a/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs +++ b/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs @@ -1,9 +1,11 @@ +using ScheduleOne.Tiles; + namespace ScheduleOne.Building { public class TileIntersection { - public global::ScheduleOne.Tiles.FootprintTile footprint; + public FootprintTile footprint; - public global::ScheduleOne.Tiles.Tile tile; + public Tile tile; } } diff --git a/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs.meta b/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs.meta index cac9d439..ad4845f8 100644 --- a/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs.meta +++ b/Assets/Scripts/ScheduleOne/Building/TileIntersection.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d3215e3c55e64ce4caee44481335c63e +guid: e05644c9078dcba4482caa5b64d1d891 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Calling.meta b/Assets/Scripts/ScheduleOne/Calling.meta index 55e01f07..0b04f67f 100644 --- a/Assets/Scripts/ScheduleOne/Calling.meta +++ b/Assets/Scripts/ScheduleOne/Calling.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e42835ccaab867c42b826a5fb4f3b3bc +guid: 50c0b9885ad3faa42be83716ba0d357c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Calling/CallManager.cs b/Assets/Scripts/ScheduleOne/Calling/CallManager.cs index 4ded8580..d0e87b2c 100644 --- a/Assets/Scripts/ScheduleOne/Calling/CallManager.cs +++ b/Assets/Scripts/ScheduleOne/Calling/CallManager.cs @@ -1,14 +1,21 @@ +using ScheduleOne.DevUtilities; +using ScheduleOne.ScriptableObjects; + namespace ScheduleOne.Calling { - public class CallManager : global::ScheduleOne.DevUtilities.Singleton + public class CallManager : Singleton { - public global::ScheduleOne.ScriptableObjects.PhoneCallData QueuedCallData { get; private set; } + public PhoneCallData QueuedCallData { get; private set; } protected override void Start() { } - public void QueueCall(global::ScheduleOne.ScriptableObjects.PhoneCallData data) + protected override void OnDestroy() + { + } + + public void QueueCall(PhoneCallData data) { } @@ -16,7 +23,7 @@ public void ClearQueuedCall() { } - private void CallCompleted(global::ScheduleOne.ScriptableObjects.PhoneCallData call) + private void CallCompleted(PhoneCallData call) { } } diff --git a/Assets/Scripts/ScheduleOne/Calling/CallManager.cs.meta b/Assets/Scripts/ScheduleOne/Calling/CallManager.cs.meta index 373e5c17..052f128f 100644 --- a/Assets/Scripts/ScheduleOne/Calling/CallManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Calling/CallManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ad540272636e8eb25de3fdae3e77ce36 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs b/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs index 0776de4b..a1f06815 100644 --- a/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs +++ b/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs @@ -1,26 +1,34 @@ +using ScheduleOne.Audio; +using ScheduleOne.Interaction; +using ScheduleOne.Lighting; +using ScheduleOne.ScriptableObjects; +using UnityEngine; + namespace ScheduleOne.Calling { - public class PayPhone : global::UnityEngine.MonoBehaviour + public class PayPhone : MonoBehaviour { public const float RING_INTERVAL = 4f; public const float RING_RANGE = 9f; - public global::ScheduleOne.Lighting.BlinkingLight Light; + public BlinkingLight Light; - public global::ScheduleOne.Audio.AudioSourceController RingSound; + public AudioSourceController RingSound; - public global::ScheduleOne.Audio.AudioSourceController AnswerSound; + public AudioSourceController AnswerSound; - public global::ScheduleOne.Interaction.InteractableObject IntObj; + public InteractableObject IntObj; - public global::UnityEngine.Transform CameraPosition; + public Transform CameraPosition; private float timeSinceLastRing; - public global::ScheduleOne.ScriptableObjects.PhoneCallData QueuedCall => null; + private const float ringRangeSquared = 81f; + + public PhoneCallData QueuedCall => null; - public global::ScheduleOne.ScriptableObjects.PhoneCallData ActiveCall => null; + public PhoneCallData ActiveCall => null; public void FixedUpdate() { diff --git a/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs.meta b/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs.meta index 59b1f3bb..d894014a 100644 --- a/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs.meta +++ b/Assets/Scripts/ScheduleOne/Calling/PayPhone.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f6f7a3d46ebc1741ae781b48e15a5df9 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino.meta b/Assets/Scripts/ScheduleOne/Casino.meta index 9681e6d7..123e9275 100644 --- a/Assets/Scripts/ScheduleOne/Casino.meta +++ b/Assets/Scripts/ScheduleOne/Casino.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3572528b990789c47bcffa8ddc8322fb +guid: f61f157d7381e4f4c94503ba9d6bf87b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs b/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs index 3e57d330..c04a4127 100644 --- a/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs +++ b/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs @@ -1,6 +1,16 @@ +using System; +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.DevUtilities; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Casino { - public class BlackjackGameController : global::ScheduleOne.Casino.CasinoGameController + public class BlackjackGameController : CasinoGameController { public enum EStage { @@ -27,70 +37,70 @@ public enum EPayoutType public const float BLACKJACK_PAYOUT_RATIO = 1.5f; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Casino.PlayingCard[] Cards; + [Header("References")] + public PlayingCard[] Cards; - public global::UnityEngine.Transform[] DefaultCardPositions; + public Transform[] DefaultCardPositions; - public global::UnityEngine.Transform[] FocusedCameraTransforms; + public Transform[] FocusedCameraTransforms; - public global::UnityEngine.Transform[] FinalCameraTransforms; + public Transform[] FinalCameraTransforms; - public global::UnityEngine.Transform[] Player1CardPositions; + public Transform[] Player1CardPositions; - public global::UnityEngine.Transform[] Player2CardPositions; + public Transform[] Player2CardPositions; - public global::UnityEngine.Transform[] Player3CardPositions; + public Transform[] Player3CardPositions; - public global::UnityEngine.Transform[] Player4CardPositions; + public Transform[] Player4CardPositions; - public global::UnityEngine.Transform[] DealerCardPositions; + public Transform[] DealerCardPositions; - private global::System.Collections.Generic.List playersInCurrentRound; + private List playersInCurrentRound; - private global::System.Collections.Generic.List playStack; + private List playStack; - private global::System.Collections.Generic.List player1Hand; + private List player1Hand; - private global::System.Collections.Generic.List player2Hand; + private List player2Hand; - private global::System.Collections.Generic.List player3Hand; + private List player3Hand; - private global::System.Collections.Generic.List player4Hand; + private List player4Hand; - private global::System.Collections.Generic.List dealerHand; + private List dealerHand; - private global::System.Collections.Generic.List cardValuesInDeck; + private List cardValuesInDeck; - private global::System.Collections.Generic.List drawnCardsValues; + private List drawnCardsValues; - protected global::UnityEngine.Transform localFocusCameraTransform; + protected Transform localFocusCameraTransform; - protected global::UnityEngine.Transform localFinalCameraTransform; + protected Transform localFinalCameraTransform; - public global::System.Action onLocalPlayerBetChange; + public Action onLocalPlayerBetChange; - public global::System.Action onLocalPlayerExitRound; + public Action onLocalPlayerExitRound; - public global::System.Action onInitialCardsDealt; + public Action onInitialCardsDealt; - public global::System.Action onLocalPlayerReadyForInput; + public Action onLocalPlayerReadyForInput; - public global::System.Action onLocalPlayerBust; + public Action onLocalPlayerBust; - public global::System.Action onLocalPlayerRoundCompleted; + public Action onLocalPlayerRoundCompleted; private bool roundEnded; - private global::UnityEngine.Coroutine gameRoutine; + private Coroutine gameRoutine; private bool NetworkInitialize___EarlyScheduleOne_002ECasino_002EBlackjackGameControllerAssembly_002DCSharp_002Edll_Excuted; private bool NetworkInitialize__LateScheduleOne_002ECasino_002EBlackjackGameControllerAssembly_002DCSharp_002Edll_Excuted; - public global::ScheduleOne.Casino.BlackjackGameController.EStage CurrentStage { get; private set; } + public EStage CurrentStage { get; private set; } - public global::ScheduleOne.PlayerScripts.Player PlayerTurn { get; private set; } + public Player PlayerTurn { get; private set; } public float LocalPlayerBet { get; private set; } @@ -116,7 +126,7 @@ protected override void Close() { } - protected override void Exit(global::ScheduleOne.DevUtilities.ExitAction action) + protected override void Exit(ExitAction action) { } @@ -124,61 +134,61 @@ protected override void FixedUpdate() { } - private global::System.Collections.Generic.List GetClockwisePlayers() + private List GetClockwisePlayers() { return null; } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void StartGame() { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void NotifyPlayerScore(global::FishNet.Object.NetworkObject player, int score, bool blackjack) + [ObserversRpc(RunLocally = true)] + private void NotifyPlayerScore(NetworkObject player, int score, bool blackjack) { } - private global::UnityEngine.Transform[] GetPlayerCardPositions(int playerIndex) + private Transform[] GetPlayerCardPositions(int playerIndex) { return null; } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void SetRoundEnded(bool ended) { } - private void AddCardToPlayerHand(int playerIndex, global::ScheduleOne.Casino.PlayingCard card) + private void AddCardToPlayerHand(int playerIndex, PlayingCard card) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void AddCardToPlayerHand(int playerindex, string cardID) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void AddCardToDealerHand(string cardID) { } - private global::System.Collections.Generic.List GetPlayerCards(int playerIndex) + private List GetPlayerCards(int playerIndex) { return null; } - private int GetHandScore(global::System.Collections.Generic.List cards, bool countFaceDown = true) + private int GetHandScore(List cards, bool countFaceDown = true) { return 0; } - private int GetCardValue(global::ScheduleOne.Casino.PlayingCard card, bool aceAsEleven = true) + private int GetCardValue(PlayingCard card, bool aceAsEleven = true) { return 0; } - private global::ScheduleOne.Casino.PlayingCard DrawCard() + private PlayingCard DrawCard() { return null; } @@ -187,16 +197,16 @@ private void ResetCards() { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void EndGame() { } - public void RemoveLocalPlayerFromGame(global::ScheduleOne.Casino.BlackjackGameController.EPayoutType payout, float cameraDelay = 0f) + public void RemoveLocalPlayerFromGame(EPayoutType payout, float cameraDelay = 0f) { } - public float GetPayout(float bet, global::ScheduleOne.Casino.BlackjackGameController.EPayoutType payout) + public float GetPayout(float bet, EPayoutType payout) { return 0f; } @@ -206,18 +216,18 @@ private bool IsCurrentRoundEmpty() return false; } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void AddPlayerToCurrentRound(global::FishNet.Object.NetworkObject player) + [ObserversRpc(RunLocally = true)] + private void AddPlayerToCurrentRound(NetworkObject player) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - private void RequestRemovePlayerFromCurrentRound(global::FishNet.Object.NetworkObject player) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + private void RequestRemovePlayerFromCurrentRound(NetworkObject player) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void RemovePlayerFromCurrentRound(global::FishNet.Object.NetworkObject player) + [ObserversRpc(RunLocally = true)] + private void RemovePlayerFromCurrentRound(NetworkObject player) { } @@ -259,19 +269,19 @@ private void RpcLogic___StartGame_2166136261() { } - private void RpcReader___Observers_StartGame_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_StartGame_2166136261(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Observers_NotifyPlayerScore_2864061566(global::FishNet.Object.NetworkObject player, int score, bool blackjack) + private void RpcWriter___Observers_NotifyPlayerScore_2864061566(NetworkObject player, int score, bool blackjack) { } - private void RpcLogic___NotifyPlayerScore_2864061566(global::FishNet.Object.NetworkObject player, int score, bool blackjack) + private void RpcLogic___NotifyPlayerScore_2864061566(NetworkObject player, int score, bool blackjack) { } - private void RpcReader___Observers_NotifyPlayerScore_2864061566(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_NotifyPlayerScore_2864061566(PooledReader PooledReader0, Channel channel) { } @@ -283,7 +293,7 @@ private void RpcLogic___SetRoundEnded_1140765316(bool ended) { } - private void RpcReader___Observers_SetRoundEnded_1140765316(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetRoundEnded_1140765316(PooledReader PooledReader0, Channel channel) { } @@ -295,7 +305,7 @@ private void RpcLogic___AddCardToPlayerHand_2801973956(int playerindex, string c { } - private void RpcReader___Observers_AddCardToPlayerHand_2801973956(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_AddCardToPlayerHand_2801973956(PooledReader PooledReader0, Channel channel) { } @@ -307,7 +317,7 @@ private void RpcLogic___AddCardToDealerHand_3615296227(string cardID) { } - private void RpcReader___Observers_AddCardToDealerHand_3615296227(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_AddCardToDealerHand_3615296227(PooledReader PooledReader0, Channel channel) { } @@ -319,43 +329,43 @@ private void RpcLogic___EndGame_2166136261() { } - private void RpcReader___Observers_EndGame_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_EndGame_2166136261(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Observers_AddPlayerToCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Observers_AddPlayerToCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___AddPlayerToCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___AddPlayerToCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Observers_AddPlayerToCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_AddPlayerToCurrentRound_3323014238(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Server_RequestRemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___RequestRemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Server_RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_RequestRemovePlayerFromCurrentRound_3323014238(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_RemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Observers_RemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___RemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___RemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Observers_RemovePlayerFromCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_RemovePlayerFromCurrentRound_3323014238(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs.meta b/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs.meta index bd5e3c21..9b215733 100644 --- a/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/BlackjackGameController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 123e51c48382393875573f24de66e124 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/CardController.cs b/Assets/Scripts/ScheduleOne/Casino/CardController.cs index a6d687a9..06f5a015 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CardController.cs +++ b/Assets/Scripts/ScheduleOne/Casino/CardController.cs @@ -1,10 +1,17 @@ +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using UnityEngine; + namespace ScheduleOne.Casino { - public class CardController : global::FishNet.Object.NetworkBehaviour + public class CardController : NetworkBehaviour { - private global::System.Collections.Generic.List cards; + private List cards; - private global::System.Collections.Generic.Dictionary cardDictionary; + private Dictionary cardDictionary; private bool NetworkInitialize___EarlyScheduleOne_002ECasino_002ECardControllerAssembly_002DCSharp_002Edll_Excuted; @@ -14,37 +21,37 @@ public virtual void Awake() { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - public void SendCardValue(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + public void SendCardValue(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void SetCardValue(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + [ObserversRpc(RunLocally = true)] + private void SetCardValue(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] + [ServerRpc(RequireOwnership = false, RunLocally = true)] public void SendCardFaceUp(string cardId, bool faceUp) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void SetCardFaceUp(string cardId, bool faceUp) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - public void SendCardGlide(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + public void SendCardGlide(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void SetCardGlide(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + [ObserversRpc(RunLocally = true)] + private void SetCardGlide(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - private global::ScheduleOne.Casino.PlayingCard GetCard(string cardId) + private PlayingCard GetCard(string cardId) { return null; } @@ -61,27 +68,27 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Server_SendCardValue_3709737967(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + private void RpcWriter___Server_SendCardValue_3709737967(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - public void RpcLogic___SendCardValue_3709737967(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + public void RpcLogic___SendCardValue_3709737967(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - private void RpcReader___Server_SendCardValue_3709737967(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendCardValue_3709737967(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_SetCardValue_3709737967(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + private void RpcWriter___Observers_SetCardValue_3709737967(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - private void RpcLogic___SetCardValue_3709737967(string cardId, global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + private void RpcLogic___SetCardValue_3709737967(string cardId, PlayingCard.ECardSuit suit, PlayingCard.ECardValue value) { } - private void RpcReader___Observers_SetCardValue_3709737967(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetCardValue_3709737967(PooledReader PooledReader0, Channel channel) { } @@ -93,7 +100,7 @@ public void RpcLogic___SendCardFaceUp_310431262(string cardId, bool faceUp) { } - private void RpcReader___Server_SendCardFaceUp_310431262(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendCardFaceUp_310431262(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } @@ -105,31 +112,31 @@ private void RpcLogic___SetCardFaceUp_310431262(string cardId, bool faceUp) { } - private void RpcReader___Observers_SetCardFaceUp_310431262(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetCardFaceUp_310431262(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_SendCardGlide_2833372058(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + private void RpcWriter___Server_SendCardGlide_2833372058(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - public void RpcLogic___SendCardGlide_2833372058(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + public void RpcLogic___SendCardGlide_2833372058(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - private void RpcReader___Server_SendCardGlide_2833372058(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendCardGlide_2833372058(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_SetCardGlide_2833372058(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + private void RpcWriter___Observers_SetCardGlide_2833372058(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - private void RpcLogic___SetCardGlide_2833372058(string cardId, global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float glideTime) + private void RpcLogic___SetCardGlide_2833372058(string cardId, Vector3 position, Quaternion rotation, float glideTime) { } - private void RpcReader___Observers_SetCardGlide_2833372058(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetCardGlide_2833372058(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/CardController.cs.meta b/Assets/Scripts/ScheduleOne/Casino/CardController.cs.meta index ce17c020..e5a78c53 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CardController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/CardController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: bfb21ec3cb2d93ad94abb6a180c92755 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs b/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs index 71d5e196..daa5e0fe 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs @@ -1,19 +1,24 @@ +using FishNet.Object; +using ScheduleOne.DevUtilities; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Casino { - public class CasinoGameController : global::FishNet.Object.NetworkBehaviour + public class CasinoGameController : NetworkBehaviour { public const float FOV = 65f; public const float CAMERA_LERP_TIME = 0.2f; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Casino.CasinoGamePlayers Players; + [Header("References")] + public CasinoGamePlayers Players; - public global::ScheduleOne.Casino.CasinoGameInteraction Interaction; + public CasinoGameInteraction Interaction; - public global::UnityEngine.Transform[] DefaultCameraTransforms; + public Transform[] DefaultCameraTransforms; - protected global::UnityEngine.Transform localDefaultCameraTransform; + protected Transform localDefaultCameraTransform; private bool NetworkInitialize___EarlyScheduleOne_002ECasino_002ECasinoGameControllerAssembly_002DCSharp_002Edll_Excuted; @@ -21,17 +26,17 @@ public class CasinoGameController : global::FishNet.Object.NetworkBehaviour public bool IsOpen { get; private set; } - public global::ScheduleOne.Casino.CasinoGamePlayerData LocalPlayerData => null; + public CasinoGamePlayerData LocalPlayerData => null; public virtual void Awake() { } - protected virtual void OnLocalPlayerRequestJoin(global::ScheduleOne.PlayerScripts.Player player) + protected virtual void OnLocalPlayerRequestJoin(Player player) { } - protected virtual void Exit(global::ScheduleOne.DevUtilities.ExitAction action) + protected virtual void Exit(ExitAction action) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs.meta b/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs.meta index 73bbd92f..f9affe24 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGameController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b212d98e0adfe2cf8f12ea39d096fbe2 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs b/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs index 19832036..39685513 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs @@ -1,15 +1,20 @@ +using System; +using ScheduleOne.Interaction; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Casino { - public class CasinoGameInteraction : global::UnityEngine.MonoBehaviour + public class CasinoGameInteraction : MonoBehaviour { public string GameName; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Casino.CasinoGamePlayers Players; + [Header("References")] + public CasinoGamePlayers Players; - public global::ScheduleOne.Interaction.InteractableObject IntObj; + public InteractableObject IntObj; - public global::System.Action onLocalPlayerRequestJoin; + public Action onLocalPlayerRequestJoin; private void Awake() { diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs.meta b/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs.meta index 00632b9f..499d4e49 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGameInteraction.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: dfc6216ad38dd460c8810d23ca6214e2 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs index dc328d25..ff2c14e0 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs @@ -1,16 +1,19 @@ +using System.Collections.Generic; +using ScheduleOne.PlayerScripts; + namespace ScheduleOne.Casino { public class CasinoGamePlayerData { - protected global::System.Collections.Generic.Dictionary bools; + protected Dictionary bools; - protected global::System.Collections.Generic.Dictionary floats; + protected Dictionary floats; - public global::ScheduleOne.Casino.CasinoGamePlayers Parent { get; private set; } + public CasinoGamePlayers Parent { get; private set; } - public global::ScheduleOne.PlayerScripts.Player Player { get; private set; } + public Player Player { get; private set; } - public CasinoGamePlayerData(global::ScheduleOne.Casino.CasinoGamePlayers parent, global::ScheduleOne.PlayerScripts.Player player) + public CasinoGamePlayerData(CasinoGamePlayers parent, Player player) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs.meta b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs.meta index 46e3df0e..c8ac76d1 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayerData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ce9e0205c3c0fd8589018e5c31a54258 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs index 2be6bad7..b00b3799 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs @@ -1,18 +1,26 @@ +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.PlayerScripts; +using UnityEngine.Events; + namespace ScheduleOne.Casino { - public class CasinoGamePlayers : global::FishNet.Object.NetworkBehaviour + public class CasinoGamePlayers : NetworkBehaviour { public int PlayerLimit; - private global::ScheduleOne.PlayerScripts.Player[] Players; + private Player[] Players; - public global::UnityEngine.Events.UnityEvent onPlayerListChanged; + public UnityEvent onPlayerListChanged; - public global::UnityEngine.Events.UnityEvent onPlayerScoresChanged; + public UnityEvent onPlayerScoresChanged; - private global::System.Collections.Generic.Dictionary playerScores; + private Dictionary playerScores; - private global::System.Collections.Generic.Dictionary playerDatas; + private Dictionary playerDatas; private bool NetworkInitialize___EarlyScheduleOne_002ECasino_002ECasinoGamePlayersAssembly_002DCSharp_002Edll_Excuted; @@ -24,110 +32,110 @@ public virtual void Awake() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } - public void AddPlayer(global::ScheduleOne.PlayerScripts.Player player) + public void AddPlayer(Player player) { } - public void RemovePlayer(global::ScheduleOne.PlayerScripts.Player player) + public void RemovePlayer(Player player) { } - public void SetPlayerScore(global::ScheduleOne.PlayerScripts.Player player, int score) + public void SetPlayerScore(Player player, int score) { } - public int GetPlayerScore(global::ScheduleOne.PlayerScripts.Player player) + public int GetPlayerScore(Player player) { return 0; } - public global::ScheduleOne.PlayerScripts.Player GetPlayer(int index) + public Player GetPlayer(int index) { return null; } - public int GetPlayerIndex(global::ScheduleOne.PlayerScripts.Player player) + public int GetPlayerIndex(Player player) { return 0; } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - private void RequestAddPlayer(global::FishNet.Object.NetworkObject playerObject) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + private void RequestAddPlayer(NetworkObject playerObject) { } - private void AddPlayerToArray(global::ScheduleOne.PlayerScripts.Player player) + private void AddPlayerToArray(Player player) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false)] - private void RequestRemovePlayer(global::FishNet.Object.NetworkObject playerObject) + [ServerRpc(RequireOwnership = false)] + private void RequestRemovePlayer(NetworkObject playerObject) { } - private void RemovePlayerFromArray(global::ScheduleOne.PlayerScripts.Player player) + private void RemovePlayerFromArray(Player player) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false)] - private void RequestSetScore(global::FishNet.Object.NetworkObject playerObject, int score) + [ServerRpc(RequireOwnership = false)] + private void RequestSetScore(NetworkObject playerObject, int score) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - [global::FishNet.Object.TargetRpc] - private void SetPlayerScore(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, int score) + [ObserversRpc(RunLocally = true)] + [TargetRpc] + private void SetPlayerScore(NetworkConnection conn, NetworkObject playerObject, int score) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - [global::FishNet.Object.TargetRpc] - private void SetPlayerList(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject[] playerObjects) + [ObserversRpc(RunLocally = true)] + [TargetRpc] + private void SetPlayerList(NetworkConnection conn, NetworkObject[] playerObjects) { } - public global::ScheduleOne.Casino.CasinoGamePlayerData GetPlayerData() + public CasinoGamePlayerData GetPlayerData() { return null; } - public global::ScheduleOne.Casino.CasinoGamePlayerData GetPlayerData(global::ScheduleOne.PlayerScripts.Player player) + public CasinoGamePlayerData GetPlayerData(Player player) { return null; } - public global::ScheduleOne.Casino.CasinoGamePlayerData GetPlayerData(int index) + public CasinoGamePlayerData GetPlayerData(int index) { return null; } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - public void SendPlayerBool(global::FishNet.Object.NetworkObject playerObject, string key, bool value) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + public void SendPlayerBool(NetworkObject playerObject, string key, bool value) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - [global::FishNet.Object.TargetRpc] - private void ReceivePlayerBool(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, bool value) + [ObserversRpc(RunLocally = true)] + [TargetRpc] + private void ReceivePlayerBool(NetworkConnection conn, NetworkObject playerObject, string key, bool value) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - public void SendPlayerFloat(global::FishNet.Object.NetworkObject playerObject, string key, float value) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + public void SendPlayerFloat(NetworkObject playerObject, string key, float value) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - [global::FishNet.Object.TargetRpc] - private void ReceivePlayerFloat(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, float value) + [ObserversRpc(RunLocally = true)] + [TargetRpc] + private void ReceivePlayerFloat(NetworkConnection conn, NetworkObject playerObject, string key, float value) { } - private global::FishNet.Object.NetworkObject[] GetPlayerObjects() + private NetworkObject[] GetPlayerObjects() { return null; } @@ -144,143 +152,143 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Server_RequestAddPlayer_3323014238(global::FishNet.Object.NetworkObject playerObject) + private void RpcWriter___Server_RequestAddPlayer_3323014238(NetworkObject playerObject) { } - private void RpcLogic___RequestAddPlayer_3323014238(global::FishNet.Object.NetworkObject playerObject) + private void RpcLogic___RequestAddPlayer_3323014238(NetworkObject playerObject) { } - private void RpcReader___Server_RequestAddPlayer_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_RequestAddPlayer_3323014238(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Server_RequestRemovePlayer_3323014238(global::FishNet.Object.NetworkObject playerObject) + private void RpcWriter___Server_RequestRemovePlayer_3323014238(NetworkObject playerObject) { } - private void RpcLogic___RequestRemovePlayer_3323014238(global::FishNet.Object.NetworkObject playerObject) + private void RpcLogic___RequestRemovePlayer_3323014238(NetworkObject playerObject) { } - private void RpcReader___Server_RequestRemovePlayer_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_RequestRemovePlayer_3323014238(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Server_RequestSetScore_4172557123(global::FishNet.Object.NetworkObject playerObject, int score) + private void RpcWriter___Server_RequestSetScore_4172557123(NetworkObject playerObject, int score) { } - private void RpcLogic___RequestSetScore_4172557123(global::FishNet.Object.NetworkObject playerObject, int score) + private void RpcLogic___RequestSetScore_4172557123(NetworkObject playerObject, int score) { } - private void RpcReader___Server_RequestSetScore_4172557123(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_RequestSetScore_4172557123(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_SetPlayerScore_1865307316(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, int score) + private void RpcWriter___Observers_SetPlayerScore_1865307316(NetworkConnection conn, NetworkObject playerObject, int score) { } - private void RpcLogic___SetPlayerScore_1865307316(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, int score) + private void RpcLogic___SetPlayerScore_1865307316(NetworkConnection conn, NetworkObject playerObject, int score) { } - private void RpcReader___Observers_SetPlayerScore_1865307316(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetPlayerScore_1865307316(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_SetPlayerScore_1865307316(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, int score) + private void RpcWriter___Target_SetPlayerScore_1865307316(NetworkConnection conn, NetworkObject playerObject, int score) { } - private void RpcReader___Target_SetPlayerScore_1865307316(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_SetPlayerScore_1865307316(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Observers_SetPlayerList_204172449(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject[] playerObjects) + private void RpcWriter___Observers_SetPlayerList_204172449(NetworkConnection conn, NetworkObject[] playerObjects) { } - private void RpcLogic___SetPlayerList_204172449(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject[] playerObjects) + private void RpcLogic___SetPlayerList_204172449(NetworkConnection conn, NetworkObject[] playerObjects) { } - private void RpcReader___Observers_SetPlayerList_204172449(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetPlayerList_204172449(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_SetPlayerList_204172449(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject[] playerObjects) + private void RpcWriter___Target_SetPlayerList_204172449(NetworkConnection conn, NetworkObject[] playerObjects) { } - private void RpcReader___Target_SetPlayerList_204172449(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_SetPlayerList_204172449(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_SendPlayerBool_77262511(global::FishNet.Object.NetworkObject playerObject, string key, bool value) + private void RpcWriter___Server_SendPlayerBool_77262511(NetworkObject playerObject, string key, bool value) { } - public void RpcLogic___SendPlayerBool_77262511(global::FishNet.Object.NetworkObject playerObject, string key, bool value) + public void RpcLogic___SendPlayerBool_77262511(NetworkObject playerObject, string key, bool value) { } - private void RpcReader___Server_SendPlayerBool_77262511(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendPlayerBool_77262511(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_ReceivePlayerBool_1748594478(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, bool value) + private void RpcWriter___Observers_ReceivePlayerBool_1748594478(NetworkConnection conn, NetworkObject playerObject, string key, bool value) { } - private void RpcLogic___ReceivePlayerBool_1748594478(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, bool value) + private void RpcLogic___ReceivePlayerBool_1748594478(NetworkConnection conn, NetworkObject playerObject, string key, bool value) { } - private void RpcReader___Observers_ReceivePlayerBool_1748594478(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_ReceivePlayerBool_1748594478(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_ReceivePlayerBool_1748594478(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, bool value) + private void RpcWriter___Target_ReceivePlayerBool_1748594478(NetworkConnection conn, NetworkObject playerObject, string key, bool value) { } - private void RpcReader___Target_ReceivePlayerBool_1748594478(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_ReceivePlayerBool_1748594478(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_SendPlayerFloat_2931762093(global::FishNet.Object.NetworkObject playerObject, string key, float value) + private void RpcWriter___Server_SendPlayerFloat_2931762093(NetworkObject playerObject, string key, float value) { } - public void RpcLogic___SendPlayerFloat_2931762093(global::FishNet.Object.NetworkObject playerObject, string key, float value) + public void RpcLogic___SendPlayerFloat_2931762093(NetworkObject playerObject, string key, float value) { } - private void RpcReader___Server_SendPlayerFloat_2931762093(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendPlayerFloat_2931762093(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_ReceivePlayerFloat_2317689966(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, float value) + private void RpcWriter___Observers_ReceivePlayerFloat_2317689966(NetworkConnection conn, NetworkObject playerObject, string key, float value) { } - private void RpcLogic___ReceivePlayerFloat_2317689966(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, float value) + private void RpcLogic___ReceivePlayerFloat_2317689966(NetworkConnection conn, NetworkObject playerObject, string key, float value) { } - private void RpcReader___Observers_ReceivePlayerFloat_2317689966(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_ReceivePlayerFloat_2317689966(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_ReceivePlayerFloat_2317689966(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject playerObject, string key, float value) + private void RpcWriter___Target_ReceivePlayerFloat_2317689966(NetworkConnection conn, NetworkObject playerObject, string key, float value) { } - private void RpcReader___Target_ReceivePlayerFloat_2317689966(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_ReceivePlayerFloat_2317689966(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs.meta b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs.meta index 5700570a..f1321f73 100644 --- a/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/CasinoGamePlayers.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d4a955caa26c3051bec7c8ed029e7ff3 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs b/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs index da8fb77a..2ea05e17 100644 --- a/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs +++ b/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs @@ -1,27 +1,32 @@ +using System; +using EasyButtons; +using ScheduleOne.Audio; +using UnityEngine; + namespace ScheduleOne.Casino { - public class PlayingCard : global::UnityEngine.MonoBehaviour + public class PlayingCard : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class CardSprite { - public global::ScheduleOne.Casino.PlayingCard.ECardSuit Suit; + public ECardSuit Suit; - public global::ScheduleOne.Casino.PlayingCard.ECardValue Value; + public ECardValue Value; - public global::UnityEngine.Sprite Sprite; + public Sprite Sprite; } public struct CardData { - public global::ScheduleOne.Casino.PlayingCard.ECardSuit Suit; + public ECardSuit Suit; - public global::ScheduleOne.Casino.PlayingCard.ECardValue Value; + public ECardValue Value; - public CardData(global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value) + public CardData(ECardSuit suit, ECardValue value) { - Suit = default(global::ScheduleOne.Casino.PlayingCard.ECardSuit); - Value = default(global::ScheduleOne.Casino.PlayingCard.ECardValue); + this.Suit = suit; + this.Value = value; } } @@ -53,43 +58,43 @@ public enum ECardValue public string CardID; - [global::UnityEngine.Header("References")] - public global::UnityEngine.SpriteRenderer CardSpriteRenderer; + [Header("References")] + public SpriteRenderer CardSpriteRenderer; - public global::ScheduleOne.Casino.PlayingCard.CardSprite[] CardSprites; + public CardSprite[] CardSprites; - public global::UnityEngine.Animation FlipAnimation; + public Animation FlipAnimation; - public global::UnityEngine.AnimationClip FlipFaceUpClip; + public AnimationClip FlipFaceUpClip; - public global::UnityEngine.AnimationClip FlipFaceDownClip; + public AnimationClip FlipFaceDownClip; - [global::UnityEngine.Header("Sound")] - public global::ScheduleOne.Audio.AudioSourceController FlipSound; + [Header("Sound")] + public AudioSourceController FlipSound; - public global::ScheduleOne.Audio.AudioSourceController LandSound; + public AudioSourceController LandSound; - private global::UnityEngine.Coroutine moveRoutine; + private Coroutine moveRoutine; - private global::System.Tuple lastGlideTarget; + private Tuple lastGlideTarget; public bool IsFaceUp { get; private set; } - public global::ScheduleOne.Casino.PlayingCard.ECardSuit Suit { get; private set; } + public ECardSuit Suit { get; private set; } - public global::ScheduleOne.Casino.PlayingCard.ECardValue Value { get; private set; } + public ECardValue Value { get; private set; } - public global::ScheduleOne.Casino.CardController CardController { get; private set; } + public CardController CardController { get; private set; } private void OnValidate() { } - public void SetCardController(global::ScheduleOne.Casino.CardController cardController) + public void SetCardController(CardController cardController) { } - public void SetCard(global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue value, bool network = true) + public void SetCard(ECardSuit suit, ECardValue value, bool network = true) { } @@ -101,16 +106,16 @@ public void SetFaceUp(bool faceUp, bool network = true) { } - public void GlideTo(global::UnityEngine.Vector3 position, global::UnityEngine.Quaternion rotation, float duration = 0.5f, bool network = true) + public void GlideTo(Vector3 position, Quaternion rotation, float duration = 0.5f, bool network = true) { } - private global::ScheduleOne.Casino.PlayingCard.CardSprite GetCardSprite(global::ScheduleOne.Casino.PlayingCard.ECardSuit suit, global::ScheduleOne.Casino.PlayingCard.ECardValue val) + private CardSprite GetCardSprite(ECardSuit suit, ECardValue val) { return null; } - [global::EasyButtons.Button] + [Button] public void VerifyCardSprites() { } diff --git a/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs.meta b/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs.meta index c4aad035..cd51dca0 100644 --- a/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/PlayingCard.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 42248ac2bb243f8f4a5594952f4bd8ea -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs b/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs index 9b2224fd..89792743 100644 --- a/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs +++ b/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs @@ -1,6 +1,16 @@ +using System; +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.DevUtilities; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Casino { - public class RTBGameController : global::ScheduleOne.Casino.CasinoGameController + public class RTBGameController : CasinoGameController { public enum EStage { @@ -17,44 +27,44 @@ public enum EStage public const float ANSWER_MAX_TIME = 6f; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform PlayCameraTransform; + [Header("References")] + public Transform PlayCameraTransform; - public global::UnityEngine.Transform FocusedCameraTransform; + public Transform FocusedCameraTransform; - public global::ScheduleOne.Casino.PlayingCard[] Cards; + public PlayingCard[] Cards; - public global::UnityEngine.Transform[] CardDefaultPositions; + public Transform[] CardDefaultPositions; - public global::UnityEngine.Transform ActiveCardPosition; + public Transform ActiveCardPosition; - public global::UnityEngine.Transform[] DockedCardPositions; + public Transform[] DockedCardPositions; - public global::System.Action onStageChange; + public Action onStageChange; - public global::System.Action onQuestionReady; + public Action onQuestionReady; - public global::System.Action onQuestionDone; + public Action onQuestionDone; - public global::System.Action onLocalPlayerCorrect; + public Action onLocalPlayerCorrect; - public global::System.Action onLocalPlayerIncorrect; + public Action onLocalPlayerIncorrect; - public global::System.Action onLocalPlayerBetChange; + public Action onLocalPlayerBetChange; - public global::System.Action onLocalPlayerExitRound; + public Action onLocalPlayerExitRound; - private global::System.Collections.Generic.List playersInCurrentRound; + private List playersInCurrentRound; - private global::System.Collections.Generic.List cardsInDeck; + private List cardsInDeck; - private global::System.Collections.Generic.List drawnCards; + private List drawnCards; private bool NetworkInitialize___EarlyScheduleOne_002ECasino_002ERTBGameControllerAssembly_002DCSharp_002Edll_Excuted; private bool NetworkInitialize__LateScheduleOne_002ECasino_002ERTBGameControllerAssembly_002DCSharp_002Edll_Excuted; - public global::ScheduleOne.Casino.RTBGameController.EStage CurrentStage { get; private set; } + public EStage CurrentStage { get; private set; } public bool IsQuestionActive { get; private set; } @@ -80,7 +90,7 @@ protected override void Close() { } - protected override void Exit(global::ScheduleOne.DevUtilities.ExitAction action) + protected override void Exit(ExitAction action) { } @@ -88,21 +98,21 @@ protected override void FixedUpdate() { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void SetStage(global::ScheduleOne.Casino.RTBGameController.EStage stage) + [ObserversRpc(RunLocally = true)] + private void SetStage(EStage stage) { } - private void RunRound(global::ScheduleOne.Casino.RTBGameController.EStage stage) + private void RunRound(EStage stage) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void SetBetMultiplier(float multiplier) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void EndGame() { } @@ -116,22 +126,22 @@ private bool IsCurrentRoundEmpty() return false; } - private float GetAnswerIndex(global::ScheduleOne.Casino.RTBGameController.EStage stage, global::ScheduleOne.Casino.PlayingCard.CardData card) + private float GetAnswerIndex(EStage stage, PlayingCard.CardData card) { return 0f; } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void NotifyAnswer(float answerIndex) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] private void QuestionDone() { } - private void GetQuestionsAndAnswers(global::ScheduleOne.Casino.RTBGameController.EStage stage, out string question, out string[] answers) + private void GetQuestionsAndAnswers(EStage stage, out string question, out string[] answers) { question = null; answers = null; @@ -141,24 +151,24 @@ private void ResetCards() { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void AddPlayerToCurrentRound(global::FishNet.Object.NetworkObject player) + [ObserversRpc(RunLocally = true)] + private void AddPlayerToCurrentRound(NetworkObject player) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - private void RequestRemovePlayerFromCurrentRound(global::FishNet.Object.NetworkObject player) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + private void RequestRemovePlayerFromCurrentRound(NetworkObject player) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void RemovePlayerFromCurrentRound(global::FishNet.Object.NetworkObject player) + [ObserversRpc(RunLocally = true)] + private void RemovePlayerFromCurrentRound(NetworkObject player) { } - private global::ScheduleOne.Casino.PlayingCard.CardData PullCardFromDeck() + private PlayingCard.CardData PullCardFromDeck() { - return default(global::ScheduleOne.Casino.PlayingCard.CardData); + return default(PlayingCard.CardData); } public void SetLocalPlayerBet(float bet) @@ -188,12 +198,12 @@ public void ToggleLocalPlayerReady() { } - private int GetCardNumberValue(global::ScheduleOne.Casino.PlayingCard.CardData card) + private int GetCardNumberValue(PlayingCard.CardData card) { return 0; } - public static float GetNetBetMultiplier(global::ScheduleOne.Casino.RTBGameController.EStage stage) + public static float GetNetBetMultiplier(EStage stage) { return 0f; } @@ -210,15 +220,15 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Observers_SetStage_2502303021(global::ScheduleOne.Casino.RTBGameController.EStage stage) + private void RpcWriter___Observers_SetStage_2502303021(EStage stage) { } - private void RpcLogic___SetStage_2502303021(global::ScheduleOne.Casino.RTBGameController.EStage stage) + private void RpcLogic___SetStage_2502303021(EStage stage) { } - private void RpcReader___Observers_SetStage_2502303021(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetStage_2502303021(PooledReader PooledReader0, Channel channel) { } @@ -230,7 +240,7 @@ private void RpcLogic___SetBetMultiplier_431000436(float multiplier) { } - private void RpcReader___Observers_SetBetMultiplier_431000436(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetBetMultiplier_431000436(PooledReader PooledReader0, Channel channel) { } @@ -242,7 +252,7 @@ private void RpcLogic___EndGame_2166136261() { } - private void RpcReader___Observers_EndGame_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_EndGame_2166136261(PooledReader PooledReader0, Channel channel) { } @@ -254,7 +264,7 @@ private void RpcLogic___NotifyAnswer_431000436(float answerIndex) { } - private void RpcReader___Observers_NotifyAnswer_431000436(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_NotifyAnswer_431000436(PooledReader PooledReader0, Channel channel) { } @@ -266,43 +276,43 @@ private void RpcLogic___QuestionDone_2166136261() { } - private void RpcReader___Observers_QuestionDone_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_QuestionDone_2166136261(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Observers_AddPlayerToCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Observers_AddPlayerToCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___AddPlayerToCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___AddPlayerToCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Observers_AddPlayerToCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_AddPlayerToCurrentRound_3323014238(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Server_RequestRemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___RequestRemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Server_RequestRemovePlayerFromCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_RequestRemovePlayerFromCurrentRound_3323014238(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_RemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcWriter___Observers_RemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcLogic___RemovePlayerFromCurrentRound_3323014238(global::FishNet.Object.NetworkObject player) + private void RpcLogic___RemovePlayerFromCurrentRound_3323014238(NetworkObject player) { } - private void RpcReader___Observers_RemovePlayerFromCurrentRound_3323014238(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_RemovePlayerFromCurrentRound_3323014238(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs.meta b/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs.meta index 32431605..baaf85c3 100644 --- a/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/RTBGameController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a955b9b1e10f2f24ce1f618a597ff6e8 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs b/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs index 26e6b802..db5fb90c 100644 --- a/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs +++ b/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs @@ -1,6 +1,17 @@ +using EasyButtons; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.Audio; +using ScheduleOne.Interaction; +using TMPro; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.Casino { - public class SlotMachine : global::FishNet.Object.NetworkBehaviour + public class SlotMachine : NetworkBehaviour { public enum ESymbol { @@ -23,47 +34,47 @@ public enum EOutcome public static int[] BetAmounts; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Interaction.InteractableObject DownButton; + [Header("References")] + public InteractableObject DownButton; - public global::ScheduleOne.Interaction.InteractableObject UpButton; + public InteractableObject UpButton; - public global::ScheduleOne.Interaction.InteractableObject HandleIntObj; + public InteractableObject HandleIntObj; - public global::TMPro.TextMeshPro BetAmountLabel; + public TextMeshPro BetAmountLabel; - public global::ScheduleOne.Casino.SlotReel[] Reels; + public SlotReel[] Reels; - public global::ScheduleOne.Audio.AudioSourceController SpinLoop; + public AudioSourceController SpinLoop; - public global::UnityEngine.Animation ScreenAnimation; + public Animation ScreenAnimation; - public global::UnityEngine.ParticleSystem[] JackpotParticles; + public ParticleSystem[] JackpotParticles; - [global::UnityEngine.Header("Win Animations")] - public global::TMPro.TextMeshProUGUI[] WinAmountLabels; + [Header("Win Animations")] + public TextMeshProUGUI[] WinAmountLabels; - public global::UnityEngine.AnimationClip MiniWinAnimation; + public AnimationClip MiniWinAnimation; - public global::UnityEngine.AnimationClip SmallWinAnimation; + public AnimationClip SmallWinAnimation; - public global::UnityEngine.AnimationClip BigWinAnimation; + public AnimationClip BigWinAnimation; - public global::UnityEngine.AnimationClip JackpotAnimation; + public AnimationClip JackpotAnimation; - public global::ScheduleOne.Audio.AudioSourceController MiniWinSound; + public AudioSourceController MiniWinSound; - public global::ScheduleOne.Audio.AudioSourceController SmallWinSound; + public AudioSourceController SmallWinSound; - public global::ScheduleOne.Audio.AudioSourceController BigWinSound; + public AudioSourceController BigWinSound; - public global::ScheduleOne.Audio.AudioSourceController JackpotSound; + public AudioSourceController JackpotSound; - public global::UnityEngine.Events.UnityEvent onDownPressed; + public UnityEvent onDownPressed; - public global::UnityEngine.Events.UnityEvent onUpPressed; + public UnityEvent onUpPressed; - public global::UnityEngine.Events.UnityEvent onHandlePulled; + public UnityEvent onHandlePulled; private int currentBetIndex; @@ -79,7 +90,7 @@ public virtual void Awake() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } @@ -103,67 +114,67 @@ private void HandleHovered() { } - [global::EasyButtons.Button] + [Button] public void HandleInteracted() { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] + [ServerRpc(RequireOwnership = false, RunLocally = true)] private void SendBetIndex(int index) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - [global::FishNet.Object.TargetRpc] - public void SetBetIndex(global::FishNet.Connection.NetworkConnection conn, int index) + [ObserversRpc(RunLocally = true)] + [TargetRpc] + public void SetBetIndex(NetworkConnection conn, int index) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - public void SendStartSpin(global::FishNet.Connection.NetworkConnection spinner, int betAmount) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + public void SendStartSpin(NetworkConnection spinner, int betAmount) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - public void StartSpin(global::FishNet.Connection.NetworkConnection spinner, global::ScheduleOne.Casino.SlotMachine.ESymbol[] symbols, int betAmount) + [ObserversRpc(RunLocally = true)] + public void StartSpin(NetworkConnection spinner, ESymbol[] symbols, int betAmount) { } - private global::ScheduleOne.Casino.SlotMachine.EOutcome EvaluateOutcome(global::ScheduleOne.Casino.SlotMachine.ESymbol[] outcome) + private EOutcome EvaluateOutcome(ESymbol[] outcome) { - return default(global::ScheduleOne.Casino.SlotMachine.EOutcome); + return default(EOutcome); } - private int GetWinAmount(global::ScheduleOne.Casino.SlotMachine.EOutcome outcome, int betAmount) + private int GetWinAmount(EOutcome outcome, int betAmount) { return 0; } - private void DisplayOutcome(global::ScheduleOne.Casino.SlotMachine.EOutcome outcome, int winAmount) + private void DisplayOutcome(EOutcome outcome, int winAmount) { } - public static global::ScheduleOne.Casino.SlotMachine.ESymbol GetRandomSymbol() + public static ESymbol GetRandomSymbol() { - return default(global::ScheduleOne.Casino.SlotMachine.ESymbol); + return default(ESymbol); } - private bool IsFruit(global::ScheduleOne.Casino.SlotMachine.ESymbol symbol) + private bool IsFruit(ESymbol symbol) { return false; } - private bool IsAllFruit(global::ScheduleOne.Casino.SlotMachine.ESymbol[] symbols) + private bool IsAllFruit(ESymbol[] symbols) { return false; } - private bool IsUniform(global::ScheduleOne.Casino.SlotMachine.ESymbol[] symbols) + private bool IsUniform(ESymbol[] symbols) { return false; } - [global::EasyButtons.Button] + [Button] public void SimulateMany() { } @@ -188,51 +199,51 @@ private void RpcLogic___SendBetIndex_3316948804(int index) { } - private void RpcReader___Server_SendBetIndex_3316948804(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendBetIndex_3316948804(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_SetBetIndex_2681120339(global::FishNet.Connection.NetworkConnection conn, int index) + private void RpcWriter___Observers_SetBetIndex_2681120339(NetworkConnection conn, int index) { } - public void RpcLogic___SetBetIndex_2681120339(global::FishNet.Connection.NetworkConnection conn, int index) + public void RpcLogic___SetBetIndex_2681120339(NetworkConnection conn, int index) { } - private void RpcReader___Observers_SetBetIndex_2681120339(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetBetIndex_2681120339(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_SetBetIndex_2681120339(global::FishNet.Connection.NetworkConnection conn, int index) + private void RpcWriter___Target_SetBetIndex_2681120339(NetworkConnection conn, int index) { } - private void RpcReader___Target_SetBetIndex_2681120339(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_SetBetIndex_2681120339(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Server_SendStartSpin_2681120339(global::FishNet.Connection.NetworkConnection spinner, int betAmount) + private void RpcWriter___Server_SendStartSpin_2681120339(NetworkConnection spinner, int betAmount) { } - public void RpcLogic___SendStartSpin_2681120339(global::FishNet.Connection.NetworkConnection spinner, int betAmount) + public void RpcLogic___SendStartSpin_2681120339(NetworkConnection spinner, int betAmount) { } - private void RpcReader___Server_SendStartSpin_2681120339(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendStartSpin_2681120339(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_StartSpin_2659526290(global::FishNet.Connection.NetworkConnection spinner, global::ScheduleOne.Casino.SlotMachine.ESymbol[] symbols, int betAmount) + private void RpcWriter___Observers_StartSpin_2659526290(NetworkConnection spinner, ESymbol[] symbols, int betAmount) { } - public void RpcLogic___StartSpin_2659526290(global::FishNet.Connection.NetworkConnection spinner, global::ScheduleOne.Casino.SlotMachine.ESymbol[] symbols, int betAmount) + public void RpcLogic___StartSpin_2659526290(NetworkConnection spinner, ESymbol[] symbols, int betAmount) { } - private void RpcReader___Observers_StartSpin_2659526290(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_StartSpin_2659526290(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs.meta b/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs.meta index 4c9ab337..4639d869 100644 --- a/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/SlotMachine.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ca77108f4b5dd46c3fa9c428a2467698 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs b/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs index 822a9054..329f336e 100644 --- a/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs +++ b/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs @@ -1,30 +1,35 @@ +using System; +using ScheduleOne.Audio; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.Casino { - public class SlotReel : global::UnityEngine.MonoBehaviour + public class SlotReel : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class SymbolRotation { - public global::ScheduleOne.Casino.SlotMachine.ESymbol Symbol; + public SlotMachine.ESymbol Symbol; public float Rotation; } - [global::UnityEngine.Header("Settings")] - public global::ScheduleOne.Casino.SlotReel.SymbolRotation[] SymbolRotations; + [Header("Settings")] + public SymbolRotation[] SymbolRotations; public float SpinSpeed; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Audio.AudioSourceController StopSound; + [Header("References")] + public AudioSourceController StopSound; - public global::UnityEngine.Events.UnityEvent onStart; + public UnityEvent onStart; - public global::UnityEngine.Events.UnityEvent onStop; + public UnityEvent onStop; public bool IsSpinning { get; private set; } - public global::ScheduleOne.Casino.SlotMachine.ESymbol CurrentSymbol { get; private set; } + public SlotMachine.ESymbol CurrentSymbol { get; private set; } public float CurrentRotation { get; private set; } @@ -40,11 +45,11 @@ public void Spin() { } - public void Stop(global::ScheduleOne.Casino.SlotMachine.ESymbol endSymbol) + public void Stop(SlotMachine.ESymbol endSymbol) { } - public void SetSymbol(global::ScheduleOne.Casino.SlotMachine.ESymbol symbol) + public void SetSymbol(SlotMachine.ESymbol symbol) { } @@ -52,7 +57,7 @@ private void SetReelRotation(float rotation) { } - private float GetSymbolRotation(global::ScheduleOne.Casino.SlotMachine.ESymbol symbol) + private float GetSymbolRotation(SlotMachine.ESymbol symbol) { return 0f; } diff --git a/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs.meta b/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs.meta index e8db4060..a4ab0485 100644 --- a/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/SlotReel.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d227930e6b0810b36c47930c5f09c4a8 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/UI.meta b/Assets/Scripts/ScheduleOne/Casino/UI.meta index de2f1a48..4ea34e3b 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI.meta +++ b/Assets/Scripts/ScheduleOne/Casino/UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a828e0f6ad6d50346923178115297504 +guid: e9661f38e75891e478dc7ec734423b0d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs b/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs index bc4d8f30..e6ae2d04 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs +++ b/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs @@ -1,65 +1,71 @@ +using ScheduleOne.DevUtilities; +using TMPro; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.UI; + namespace ScheduleOne.Casino.UI { - public class BlackjackInterface : global::ScheduleOne.DevUtilities.Singleton + public class BlackjackInterface : Singleton { - [global::UnityEngine.Header("References")] - public global::UnityEngine.Canvas Canvas; + [Header("References")] + public Canvas Canvas; - public global::ScheduleOne.Casino.UI.CasinoGamePlayerDisplay PlayerDisplay; + public CasinoGamePlayerDisplay PlayerDisplay; - public global::UnityEngine.RectTransform BetContainer; + public RectTransform BetContainer; - public global::TMPro.TextMeshProUGUI BetTitleLabel; + public TextMeshProUGUI BetTitleLabel; - public global::UnityEngine.UI.Slider BetSlider; + public Slider BetSlider; - public global::TMPro.TextMeshProUGUI BetAmount; + public TextMeshProUGUI BetAmount; - public global::UnityEngine.UI.Button ReadyButton; + public Button ReadyButton; - public global::TMPro.TextMeshProUGUI ReadyLabel; + public TextMeshProUGUI ReadyLabel; - public global::UnityEngine.RectTransform WaitingContainer; + public RectTransform WaitingContainer; - public global::TMPro.TextMeshProUGUI WaitingLabel; + public TextMeshProUGUI WaitingLabel; - public global::TMPro.TextMeshProUGUI DealerScoreLabel; + public TextMeshProUGUI DealerScoreLabel; - public global::TMPro.TextMeshProUGUI PlayerScoreLabel; + public TextMeshProUGUI PlayerScoreLabel; - public global::UnityEngine.UI.Button HitButton; + public Button HitButton; - public global::UnityEngine.UI.Button StandButton; + public Button StandButton; - public global::UnityEngine.Animation InputContainerAnimation; + public Animation InputContainerAnimation; - public global::UnityEngine.CanvasGroup InputContainerCanvasGroup; + public CanvasGroup InputContainerCanvasGroup; - public global::UnityEngine.AnimationClip InputContainerFadeIn; + public AnimationClip InputContainerFadeIn; - public global::UnityEngine.AnimationClip InputContainerFadeOut; + public AnimationClip InputContainerFadeOut; - public global::UnityEngine.RectTransform SelectionIndicator; + public RectTransform SelectionIndicator; - public global::UnityEngine.Animation ScoresContainerAnimation; + public Animation ScoresContainerAnimation; - public global::UnityEngine.CanvasGroup ScoresContainerCanvasGroup; + public CanvasGroup ScoresContainerCanvasGroup; - public global::TMPro.TextMeshProUGUI PositiveOutcomeLabel; + public TextMeshProUGUI PositiveOutcomeLabel; - public global::TMPro.TextMeshProUGUI PayoutLabel; + public TextMeshProUGUI PayoutLabel; - public global::UnityEngine.Events.UnityEvent onBust; + public UnityEvent onBust; - public global::UnityEngine.Events.UnityEvent onBlackjack; + public UnityEvent onBlackjack; - public global::UnityEngine.Events.UnityEvent onWin; + public UnityEvent onWin; - public global::UnityEngine.Events.UnityEvent onLose; + public UnityEvent onLose; - public global::UnityEngine.Events.UnityEvent onPush; + public UnityEvent onPush; - public global::ScheduleOne.Casino.BlackjackGameController CurrentGame { get; private set; } + public BlackjackGameController CurrentGame { get; private set; } protected override void Awake() { @@ -69,7 +75,7 @@ private void FixedUpdate() { } - public void Open(global::ScheduleOne.Casino.BlackjackGameController game) + public void Open(BlackjackGameController game) { } @@ -126,7 +132,7 @@ private void OnLocalPlayerBust() { } - private void OnLocalPlayerRoundCompleted(global::ScheduleOne.Casino.BlackjackGameController.EPayoutType payout) + private void OnLocalPlayerRoundCompleted(BlackjackGameController.EPayoutType payout) { } } diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs.meta b/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs.meta index a9b6cdb9..b32b171a 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/UI/BlackjackInterface.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 539618fdd3a8fe0b0a807331fc09dc53 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs b/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs index 138a3f69..dc5e5640 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs +++ b/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs @@ -1,13 +1,16 @@ +using TMPro; +using UnityEngine; + namespace ScheduleOne.Casino.UI { - public class CasinoGamePlayerDisplay : global::UnityEngine.MonoBehaviour + public class CasinoGamePlayerDisplay : MonoBehaviour { - public global::ScheduleOne.Casino.CasinoGamePlayers BindedPlayers; + public CasinoGamePlayers BindedPlayers; - [global::UnityEngine.Header("References")] - public global::TMPro.TextMeshProUGUI TitleLabel; + [Header("References")] + public TextMeshProUGUI TitleLabel; - public global::UnityEngine.RectTransform[] PlayerEntries; + public RectTransform[] PlayerEntries; public void RefreshPlayers() { @@ -17,7 +20,7 @@ public void RefreshScores() { } - public void Bind(global::ScheduleOne.Casino.CasinoGamePlayers players) + public void Bind(CasinoGamePlayers players) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs.meta b/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs.meta index a67803a4..563d2191 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/UI/CasinoGamePlayerDisplay.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 787448c52ecb8c2cb9bef4c8a62aeacf -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs b/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs index 25177293..67e31b6f 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs +++ b/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs @@ -1,60 +1,66 @@ +using ScheduleOne.DevUtilities; +using TMPro; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.UI; + namespace ScheduleOne.Casino.UI { - public class RTBInterface : global::ScheduleOne.DevUtilities.Singleton + public class RTBInterface : Singleton { - [global::UnityEngine.Header("References")] - public global::UnityEngine.Canvas Canvas; + [Header("References")] + public Canvas Canvas; - public global::ScheduleOne.Casino.UI.CasinoGamePlayerDisplay PlayerDisplay; + public CasinoGamePlayerDisplay PlayerDisplay; - public global::TMPro.TextMeshProUGUI StatusLabel; + public TextMeshProUGUI StatusLabel; - public global::UnityEngine.RectTransform BetContainer; + public RectTransform BetContainer; - public global::TMPro.TextMeshProUGUI BetTitleLabel; + public TextMeshProUGUI BetTitleLabel; - public global::UnityEngine.UI.Slider BetSlider; + public Slider BetSlider; - public global::TMPro.TextMeshProUGUI BetAmount; + public TextMeshProUGUI BetAmount; - public global::UnityEngine.UI.Button ReadyButton; + public Button ReadyButton; - public global::TMPro.TextMeshProUGUI ReadyLabel; + public TextMeshProUGUI ReadyLabel; - public global::TMPro.TextMeshProUGUI WinningsMultiplierLabel; + public TextMeshProUGUI WinningsMultiplierLabel; - [global::UnityEngine.Header("Question and answers")] - public global::UnityEngine.RectTransform QuestionContainer; + [Header("Question and answers")] + public RectTransform QuestionContainer; - public global::TMPro.TextMeshProUGUI QuestionLabel; + public TextMeshProUGUI QuestionLabel; - public global::UnityEngine.UI.Slider TimerSlider; + public Slider TimerSlider; - public global::UnityEngine.UI.Button[] AnswerButtons; + public Button[] AnswerButtons; - public global::TMPro.TextMeshProUGUI[] AnswerLabels; + public TextMeshProUGUI[] AnswerLabels; - public global::UnityEngine.UI.Button ForfeitButton; + public Button ForfeitButton; - public global::TMPro.TextMeshProUGUI ForfeitLabel; + public TextMeshProUGUI ForfeitLabel; - public global::UnityEngine.Animation QuestionContainerAnimation; + public Animation QuestionContainerAnimation; - public global::UnityEngine.AnimationClip QuestionContainerFadeIn; + public AnimationClip QuestionContainerFadeIn; - public global::UnityEngine.AnimationClip QuestionContainerFadeOut; + public AnimationClip QuestionContainerFadeOut; - public global::UnityEngine.CanvasGroup QuestionCanvasGroup; + public CanvasGroup QuestionCanvasGroup; - public global::UnityEngine.RectTransform SelectionIndicator; + public RectTransform SelectionIndicator; - public global::UnityEngine.Events.UnityEvent onCorrect; + public UnityEvent onCorrect; - public global::UnityEngine.Events.UnityEvent onFinalCorrect; + public UnityEvent onFinalCorrect; - public global::UnityEngine.Events.UnityEvent onIncorrect; + public UnityEvent onIncorrect; - public global::ScheduleOne.Casino.RTBGameController CurrentGame { get; private set; } + public RTBGameController CurrentGame { get; private set; } protected override void Awake() { @@ -69,7 +75,7 @@ private string GetStatusText() return null; } - public void Open(global::ScheduleOne.Casino.RTBGameController game) + public void Open(RTBGameController game) { } diff --git a/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs.meta b/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs.meta index c47ba6f0..71abd4c5 100644 --- a/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs.meta +++ b/Assets/Scripts/ScheduleOne/Casino/UI/RTBInterface.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0a706e9e65ad9d1615e2e811b27f4f77 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing.meta b/Assets/Scripts/ScheduleOne/Clothing.meta index 912c10c9..991a490b 100644 --- a/Assets/Scripts/ScheduleOne/Clothing.meta +++ b/Assets/Scripts/ScheduleOne/Clothing.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2463f1d40b3a75b4c85713ad98b53d6f +guid: 96916a005c2226847b37110ad8444539 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs b/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs index 24c1ca78..684bc49d 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs @@ -1,28 +1,30 @@ +using UnityEngine; + namespace ScheduleOne.Clothing { public static class ClothingColorExtensions { - public static global::UnityEngine.Color GetActualColor(this global::ScheduleOne.Clothing.EClothingColor color) + public static Color GetActualColor(this EClothingColor color) { - return default(global::UnityEngine.Color); + return default(Color); } - public static global::UnityEngine.Color GetLabelColor(this global::ScheduleOne.Clothing.EClothingColor color) + public static Color GetLabelColor(this EClothingColor color) { - return default(global::UnityEngine.Color); + return default(Color); } - public static string GetLabel(this global::ScheduleOne.Clothing.EClothingColor color) + public static string GetLabel(this EClothingColor color) { return null; } - public static global::ScheduleOne.Clothing.EClothingColor GetClothingColor(global::UnityEngine.Color color) + public static EClothingColor GetClothingColor(Color color) { - return default(global::ScheduleOne.Clothing.EClothingColor); + return default(EClothingColor); } - public static bool ColorEquals(global::UnityEngine.Color a, global::UnityEngine.Color b, float tolerance = 0.004f) + public static bool ColorEquals(Color a, Color b, float tolerance = 0.004f) { return false; } diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs.meta index 9e674f0d..935f3e24 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingColorExtensions.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67c803d7e9fb863b5a5814888fd14385 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs b/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs index 0be5513e..b5e5a6f0 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs @@ -1,20 +1,27 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.ItemFramework; +using UnityEngine; + namespace ScheduleOne.Clothing { - [global::System.Serializable] - [global::UnityEngine.CreateAssetMenu(fileName = "ClothingDefinition", menuName = "ScriptableObjects/ClothingDefinition", order = 1)] - public class ClothingDefinition : global::ScheduleOne.ItemFramework.StorableItemDefinition + [Serializable] + [CreateAssetMenu(fileName = "ClothingDefinition", menuName = "ScriptableObjects/ClothingDefinition", order = 1)] + public class ClothingDefinition : StorableItemDefinition { - public global::ScheduleOne.Clothing.EClothingSlot Slot; + public EClothingSlot Slot; - public global::ScheduleOne.Clothing.EClothingApplicationType ApplicationType; + public EClothingApplicationType ApplicationType; public string ClothingAssetPath; public bool Colorable; - public global::System.Collections.Generic.List SlotsToBlock; + public EClothingColor DefaultColor; + + public List SlotsToBlock; - public override global::ScheduleOne.ItemFramework.ItemInstance GetDefaultInstance(int quantity = 1) + public override ItemInstance GetDefaultInstance(int quantity = 1) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs.meta index 9fe25137..1f029543 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingDefinition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b14deb9742dc29beef9fb3e516a10af4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs b/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs index 1f1437b9..9f2c0f9c 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs @@ -1,9 +1,14 @@ +using System; +using ScheduleOne.ItemFramework; +using ScheduleOne.Persistence.Datas; +using ScheduleOne.Storage; + namespace ScheduleOne.Clothing { - [global::System.Serializable] - public class ClothingInstance : global::ScheduleOne.Storage.StorableItemInstance + [Serializable] + public class ClothingInstance : StorableItemInstance { - public global::ScheduleOne.Clothing.EClothingColor Color; + public EClothingColor Color; public override string Name => null; @@ -11,16 +16,16 @@ public ClothingInstance() { } - public ClothingInstance(global::ScheduleOne.ItemFramework.ItemDefinition definition, int quantity, global::ScheduleOne.Clothing.EClothingColor color) + public ClothingInstance(ItemDefinition definition, int quantity, EClothingColor color) { } - public override global::ScheduleOne.ItemFramework.ItemInstance GetCopy(int overrideQuantity = -1) + public override ItemInstance GetCopy(int overrideQuantity = -1) { return null; } - public override global::ScheduleOne.Persistence.Datas.ItemData GetItemData() + public override ItemData GetItemData() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs.meta index ebf53ef8..484ca15d 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingInstance.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67a36b7ed8d99f181251b506d7413a61 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs b/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs index bb330a45..770626d4 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs @@ -1,30 +1,35 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.Clothing { - public class ClothingUtility : global::ScheduleOne.DevUtilities.Singleton + public class ClothingUtility : Singleton { - [global::System.Serializable] + [Serializable] public class ColorData { - public global::ScheduleOne.Clothing.EClothingColor ColorType; + public EClothingColor ColorType; - public global::UnityEngine.Color ActualColor; + public Color ActualColor; - public global::UnityEngine.Color LabelColor; + public Color LabelColor; } - [global::System.Serializable] + [Serializable] public class ClothingSlotData { - public global::ScheduleOne.Clothing.EClothingSlot Slot; + public EClothingSlot Slot; public string Name; - public global::UnityEngine.Sprite Icon; + public Sprite Icon; } - public global::System.Collections.Generic.List ColorDataList; + public List ColorDataList; - public global::System.Collections.Generic.List ClothingSlotDataList; + public List ClothingSlotDataList; protected override void Awake() { @@ -34,12 +39,12 @@ private void OnValidate() { } - public global::ScheduleOne.Clothing.ClothingUtility.ColorData GetColorData(global::ScheduleOne.Clothing.EClothingColor color) + public ColorData GetColorData(EClothingColor color) { return null; } - public global::ScheduleOne.Clothing.ClothingUtility.ClothingSlotData GetSlotData(global::ScheduleOne.Clothing.EClothingSlot slot) + public ClothingSlotData GetSlotData(EClothingSlot slot) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs.meta index 6f0ee4a1..95b7c8f0 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/ClothingUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4260646df90fce78e7789c7c7ae44899 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/EClothingApplicationType.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/EClothingApplicationType.cs.meta index 2a884903..f59012d1 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/EClothingApplicationType.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/EClothingApplicationType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55855a6545d023140a6322f7d48c91c7 +guid: 937fb4c9c6f03ef489cdb8d2a0bcde43 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/EClothingColor.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/EClothingColor.cs.meta index 0e80991c..3afbe058 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/EClothingColor.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/EClothingColor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67453dd80de2b004f92954fcaab40bab +guid: ec3d06a6798ce924bacdaacb9db4c449 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Clothing/EClothingSlot.cs.meta b/Assets/Scripts/ScheduleOne/Clothing/EClothingSlot.cs.meta index eb38838c..45887124 100644 --- a/Assets/Scripts/ScheduleOne/Clothing/EClothingSlot.cs.meta +++ b/Assets/Scripts/ScheduleOne/Clothing/EClothingSlot.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12b4808242f742949b751635550d3e5e +guid: 015d89432a5b8394cac68725eeaedc1d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat.meta b/Assets/Scripts/ScheduleOne/Combat.meta index 1db93753..46015bc4 100644 --- a/Assets/Scripts/ScheduleOne/Combat.meta +++ b/Assets/Scripts/ScheduleOne/Combat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a151b600b8957f41abddc224f5a3dce +guid: 3ff5fc00cec18b946af75f430125ea38 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs b/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs index 850a5171..d0c7b121 100644 --- a/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs +++ b/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs @@ -1,41 +1,55 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.CompilerServices; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.AvatarFramework.Equipping; +using ScheduleOne.PlayerScripts; +using ScheduleOne.Vision; +using UnityEngine; + namespace ScheduleOne.Combat { - public class CombatBehaviour : global::ScheduleOne.NPCs.Behaviour.Behaviour + public class CombatBehaviour : ScheduleOne.NPCs.Behaviour.Behaviour { - [global::System.Runtime.CompilerServices.CompilerGenerated] - private sealed class _003CSearchRoutine_003Ed__68 : global::System.Collections.Generic.IEnumerator, global::System.Collections.IEnumerator, global::System.IDisposable + [CompilerGenerated] + private sealed class _003CSearchRoutine_003Ed__68 : IEnumerator, IEnumerator, IDisposable { private int _003C_003E1__state; private object _003C_003E2__current; - public global::ScheduleOne.Combat.CombatBehaviour _003C_003E4__this; + public CombatBehaviour _003C_003E4__this; - object global::System.Collections.Generic.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - object global::System.Collections.IEnumerator.Current + object IEnumerator.Current { - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] get { return null; } } - [global::System.Diagnostics.DebuggerHidden] + [DebuggerHidden] public _003CSearchRoutine_003Ed__68(int _003C_003E1__state) { } - [global::System.Diagnostics.DebuggerHidden] - void global::System.IDisposable.Dispose() + [DebuggerHidden] + void IDisposable.Dispose() { } @@ -44,14 +58,14 @@ private bool MoveNext() return false; } - bool global::System.Collections.IEnumerator.MoveNext() + bool IEnumerator.MoveNext() { //ILSpy generated this explicit interface implementation from .override directive in MoveNext return this.MoveNext(); } - [global::System.Diagnostics.DebuggerHidden] - void global::System.Collections.IEnumerator.Reset() + [DebuggerHidden] + void IEnumerator.Reset() { } } @@ -68,7 +82,7 @@ private bool MoveNext() public const float REACHED_DESTINATION_DISTANCE = 2f; - [global::UnityEngine.Header("General Setttings")] + [Header("General Setttings")] public float GiveUpRange; public float GiveUpTime; @@ -77,16 +91,16 @@ private bool MoveNext() public bool PlayAngryVO; - [global::UnityEngine.Header("Movement settings")] - [global::UnityEngine.Range(0f, 1f)] + [Header("Movement settings")] + [Range(0f, 1f)] public float DefaultMovementSpeed; - [global::UnityEngine.Header("Weapon settings")] - public global::ScheduleOne.AvatarFramework.Equipping.AvatarWeapon DefaultWeapon; + [Header("Weapon settings")] + public AvatarWeapon DefaultWeapon; - public global::ScheduleOne.AvatarFramework.Equipping.AvatarMeleeWeapon VirtualPunchWeapon; + public AvatarMeleeWeapon VirtualPunchWeapon; - [global::UnityEngine.Header("Search settings")] + [Header("Search settings")] public float DefaultSearchTime; protected bool overrideTargetDistance; @@ -101,19 +115,19 @@ private bool MoveNext() protected float playerSightedDuration; - protected global::UnityEngine.Vector3 lastKnownTargetPosition; + protected Vector3 lastKnownTargetPosition; - protected global::ScheduleOne.AvatarFramework.Equipping.AvatarWeapon currentWeapon; + protected AvatarWeapon currentWeapon; protected int successfulHits; protected int consecutiveMissedShots; - protected global::UnityEngine.Coroutine rangedWeaponRoutine; + protected Coroutine rangedWeaponRoutine; - protected global::UnityEngine.Coroutine searchRoutine; + protected Coroutine searchRoutine; - protected global::UnityEngine.Vector3 currentSearchDestination; + protected Vector3 currentSearchDestination; protected bool hasSearchDestination; @@ -123,7 +137,7 @@ private bool MoveNext() private bool NetworkInitialize__LateScheduleOne_002ECombat_002ECombatBehaviourAssembly_002DCSharp_002Edll_Excuted; - public global::ScheduleOne.PlayerScripts.Player TargetPlayer { get; protected set; } + public Player TargetPlayer { get; protected set; } public bool IsSearching { get; protected set; } @@ -133,12 +147,12 @@ public override void Awake() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - public virtual void SetTarget(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject target) + [ObserversRpc(RunLocally = true)] + public virtual void SetTarget(NetworkConnection conn, NetworkObject target) { } @@ -190,12 +204,12 @@ protected void SetMovementSpeed(float speed) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] protected virtual void SetWeapon(string weaponPath) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] protected void ClearWeapon() { } @@ -205,7 +219,7 @@ protected virtual bool ReadyToAttack(bool checkTarget = true) return false; } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] + [ObserversRpc(RunLocally = true)] protected virtual void Attack() { } @@ -227,7 +241,7 @@ protected bool IsPlayerVisible() return false; } - private void ProcessVisionEvent(global::ScheduleOne.Vision.VisionEventReceipt visionEventReceipt) + private void ProcessVisionEvent(VisionEventReceipt visionEventReceipt) { } @@ -244,15 +258,15 @@ private void StopSearching() { } - [global::System.Runtime.CompilerServices.IteratorStateMachine(typeof(global::ScheduleOne.Combat.CombatBehaviour._003CSearchRoutine_003Ed__68))] - private global::System.Collections.IEnumerator SearchRoutine() + [IteratorStateMachine(typeof(_003CSearchRoutine_003Ed__68))] + private IEnumerator SearchRoutine() { return null; } - private global::UnityEngine.Vector3 GetNextSearchLocation() + private Vector3 GetNextSearchLocation() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } protected bool IsTargetValid() @@ -260,13 +274,13 @@ protected bool IsTargetValid() return false; } - private void RepositionToTargetRange(global::UnityEngine.Vector3 origin) + private void RepositionToTargetRange(Vector3 origin) { } - private global::UnityEngine.Vector3 GetRandomReachablePointNear(global::UnityEngine.Vector3 point, float randomRadius, float minDistance = 0f) + private Vector3 GetRandomReachablePointNear(Vector3 point, float randomRadius, float minDistance = 0f) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } protected float GetMinTargetDistance() @@ -279,7 +293,7 @@ protected float GetMaxTargetDistance() return 0f; } - protected bool IsTargetInRange(global::UnityEngine.Vector3 origin = default(global::UnityEngine.Vector3)) + protected bool IsTargetInRange(Vector3 origin = default(Vector3)) { return false; } @@ -296,15 +310,15 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Observers_SetTarget_1824087381(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject target) + private void RpcWriter___Observers_SetTarget_1824087381(NetworkConnection conn, NetworkObject target) { } - public virtual void RpcLogic___SetTarget_1824087381(global::FishNet.Connection.NetworkConnection conn, global::FishNet.Object.NetworkObject target) + public virtual void RpcLogic___SetTarget_1824087381(NetworkConnection conn, NetworkObject target) { } - private void RpcReader___Observers_SetTarget_1824087381(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetTarget_1824087381(PooledReader PooledReader0, Channel channel) { } @@ -316,7 +330,7 @@ protected virtual void RpcLogic___SetWeapon_3615296227(string weaponPath) { } - private void RpcReader___Observers_SetWeapon_3615296227(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetWeapon_3615296227(PooledReader PooledReader0, Channel channel) { } @@ -328,7 +342,7 @@ protected void RpcLogic___ClearWeapon_2166136261() { } - private void RpcReader___Observers_ClearWeapon_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_ClearWeapon_2166136261(PooledReader PooledReader0, Channel channel) { } @@ -340,7 +354,7 @@ protected virtual void RpcLogic___Attack_2166136261() { } - private void RpcReader___Observers_Attack_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_Attack_2166136261(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs.meta b/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs.meta index 971e7ad4..a5580a18 100644 --- a/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/CombatBehaviour.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3b8b81ca1bc4f5d1a42f88d15c4821d8 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs b/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs index f9b1b659..bf067914 100644 --- a/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs +++ b/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs @@ -1,37 +1,46 @@ +using System.Collections.Generic; +using EasyButtons; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.Combat { - public class CombatManager : global::ScheduleOne.DevUtilities.NetworkSingleton + public class CombatManager : NetworkSingleton { - public global::UnityEngine.LayerMask MeleeLayerMask; + public LayerMask MeleeLayerMask; - public global::UnityEngine.LayerMask ExplosionLayerMask; + public LayerMask ExplosionLayerMask; - public global::UnityEngine.LayerMask RangedWeaponLayerMask; + public LayerMask RangedWeaponLayerMask; - public global::ScheduleOne.Combat.Explosion ExplosionPrefab; + public Explosion ExplosionPrefab; - private global::System.Collections.Generic.List explosionIDs; + private List explosionIDs; private bool NetworkInitialize___EarlyScheduleOne_002ECombat_002ECombatManagerAssembly_002DCSharp_002Edll_Excuted; private bool NetworkInitialize__LateScheduleOne_002ECombat_002ECombatManagerAssembly_002DCSharp_002Edll_Excuted; - [global::EasyButtons.Button] + [Button] public void CreateTestExplosion() { } - public void CreateExplosion(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data) + public void CreateExplosion(Vector3 origin, ExplosionData data) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - private void CreateExplosion(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + private void CreateExplosion(Vector3 origin, ExplosionData data, int id) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void Explosion(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + [ObserversRpc(RunLocally = true)] + private void Explosion(Vector3 origin, ExplosionData data, int id) { } @@ -47,27 +56,27 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Server_CreateExplosion_2907189355(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + private void RpcWriter___Server_CreateExplosion_2907189355(Vector3 origin, ExplosionData data, int id) { } - private void RpcLogic___CreateExplosion_2907189355(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + private void RpcLogic___CreateExplosion_2907189355(Vector3 origin, ExplosionData data, int id) { } - private void RpcReader___Server_CreateExplosion_2907189355(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_CreateExplosion_2907189355(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_Explosion_2907189355(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + private void RpcWriter___Observers_Explosion_2907189355(Vector3 origin, ExplosionData data, int id) { } - private void RpcLogic___Explosion_2907189355(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data, int id) + private void RpcLogic___Explosion_2907189355(Vector3 origin, ExplosionData data, int id) { } - private void RpcReader___Observers_Explosion_2907189355(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_Explosion_2907189355(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs.meta b/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs.meta index 37169036..76d77355 100644 --- a/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/CombatManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f452e72181cfa34f2438758b6ee67d09 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/EImpactType.cs.meta b/Assets/Scripts/ScheduleOne/Combat/EImpactType.cs.meta index afe19092..e58fd5c6 100644 --- a/Assets/Scripts/ScheduleOne/Combat/EImpactType.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/EImpactType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 770d04cc6376a624da02afdccfd75382 +guid: c7049f382fafb1b4a8b5292f31c0617d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/Explosion.cs b/Assets/Scripts/ScheduleOne/Combat/Explosion.cs index 73ee3c12..0beda8da 100644 --- a/Assets/Scripts/ScheduleOne/Combat/Explosion.cs +++ b/Assets/Scripts/ScheduleOne/Combat/Explosion.cs @@ -1,10 +1,13 @@ +using ScheduleOne.Audio; +using UnityEngine; + namespace ScheduleOne.Combat { - public class Explosion : global::UnityEngine.MonoBehaviour + public class Explosion : MonoBehaviour { - public global::ScheduleOne.Audio.AudioSourceController Sound; + public AudioSourceController Sound; - public void Initialize(global::UnityEngine.Vector3 origin, global::ScheduleOne.Combat.ExplosionData data) + public void Initialize(Vector3 origin, ExplosionData data) { } } diff --git a/Assets/Scripts/ScheduleOne/Combat/Explosion.cs.meta b/Assets/Scripts/ScheduleOne/Combat/Explosion.cs.meta index 80e3bc94..2cb8ac3e 100644 --- a/Assets/Scripts/ScheduleOne/Combat/Explosion.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/Explosion.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5bfdfe4c747ee36e89ebd5c4602c2764 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs b/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs index 3c978623..605ce9bc 100644 --- a/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs +++ b/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs @@ -10,14 +10,14 @@ public struct ExplosionData public float MaxPushForce; - public static readonly global::ScheduleOne.Combat.ExplosionData DefaultSmall; + public static readonly ExplosionData DefaultSmall = new ExplosionData(6f, 200f, 500f); public ExplosionData(float damageRadius, float maxDamage, float maxPushForce) { - DamageRadius = 0f; - MaxDamage = 0f; - PushForceRadius = 0f; - MaxPushForce = 0f; + this.DamageRadius = damageRadius; + this.MaxDamage = maxDamage; + this.PushForceRadius = maxPushForce; + this.MaxPushForce = maxPushForce; } } } diff --git a/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs.meta b/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs.meta index 5d3759f2..e6229a4f 100644 --- a/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/ExplosionData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0a86ecc7923a0804b208c90c272a211d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs b/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs index c3fcef89..3a2b5db5 100644 --- a/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs +++ b/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs @@ -2,8 +2,8 @@ namespace ScheduleOne.Combat { public interface IDamageable { - void SendImpact(global::ScheduleOne.Combat.Impact impact); + void SendImpact(Impact impact); - void ReceiveImpact(global::ScheduleOne.Combat.Impact impact); + void ReceiveImpact(Impact impact); } } diff --git a/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs.meta b/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs.meta index e1f11b7a..44bf1ec0 100644 --- a/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/IDamageable.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 30657eb09cab1f9c2cf273c1811a4dd0 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/Impact.cs b/Assets/Scripts/ScheduleOne/Combat/Impact.cs index 3fb4446d..375ef1d7 100644 --- a/Assets/Scripts/ScheduleOne/Combat/Impact.cs +++ b/Assets/Scripts/ScheduleOne/Combat/Impact.cs @@ -1,26 +1,32 @@ +using System; +using FishNet.Object; +using FishNet.Serializing.Helping; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Combat { - [global::System.Serializable] + [Serializable] public class Impact { - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::UnityEngine.RaycastHit Hit; + [CodegenExclude] + public RaycastHit Hit; - public global::UnityEngine.Vector3 HitPoint; + public Vector3 HitPoint; - public global::UnityEngine.Vector3 ImpactForceDirection; + public Vector3 ImpactForceDirection; public float ImpactForce; public float ImpactDamage; - public global::ScheduleOne.Combat.EImpactType ImpactType; + public EImpactType ImpactType; - public global::FishNet.Object.NetworkObject ImpactSource; + public NetworkObject ImpactSource; public int ImpactID; - public Impact(global::UnityEngine.RaycastHit hit, global::UnityEngine.Vector3 hitPoint, global::UnityEngine.Vector3 impactForceDirection, float impactForce, float impactDamage, global::ScheduleOne.Combat.EImpactType impactType, global::ScheduleOne.PlayerScripts.Player impactSource, int impactID) + public Impact(RaycastHit hit, Vector3 hitPoint, Vector3 impactForceDirection, float impactForce, float impactDamage, EImpactType impactType, Player impactSource, int impactID) { } @@ -28,12 +34,12 @@ public Impact() { } - public static bool IsLethal(global::ScheduleOne.Combat.EImpactType impactType) + public static bool IsLethal(EImpactType impactType) { return false; } - public bool IsPlayerImpact(out global::ScheduleOne.PlayerScripts.Player player) + public bool IsPlayerImpact(out Player player) { player = null; return false; diff --git a/Assets/Scripts/ScheduleOne/Combat/Impact.cs.meta b/Assets/Scripts/ScheduleOne/Combat/Impact.cs.meta index a194c80c..c93a9ee8 100644 --- a/Assets/Scripts/ScheduleOne/Combat/Impact.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/Impact.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d67d441c90e7aab064517886b83f3ad9 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs b/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs index b78a7d0e..d2820a18 100644 --- a/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs +++ b/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs @@ -1,30 +1,34 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.Combat { - public class PhysicsDamageable : global::UnityEngine.MonoBehaviour, global::ScheduleOne.Combat.IDamageable + public class PhysicsDamageable : MonoBehaviour, IDamageable { public const int VELOCITY_HISTORY_LENGTH = 4; - public global::UnityEngine.Rigidbody Rb; + public Rigidbody Rb; public float ForceMultiplier; - private global::System.Collections.Generic.List impactHistory; + private List impactHistory; - public global::System.Action onImpacted; + public Action onImpacted; - private global::System.Collections.Generic.List velocityHistory; + private List velocityHistory; - public global::UnityEngine.Vector3 averageVelocity { get; private set; } + public Vector3 averageVelocity { get; private set; } public void OnValidate() { } - public virtual void SendImpact(global::ScheduleOne.Combat.Impact impact) + public virtual void SendImpact(Impact impact) { } - public virtual void ReceiveImpact(global::ScheduleOne.Combat.Impact impact) + public virtual void ReceiveImpact(Impact impact) { } } diff --git a/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs.meta b/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs.meta index b9289a4c..fcc7b9a5 100644 --- a/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/PhysicsDamageable.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 210836729aa4f2d8ac4fec0dfd9ea51a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Combat/PunchController.cs b/Assets/Scripts/ScheduleOne/Combat/PunchController.cs index a650e0c6..fed8949b 100644 --- a/Assets/Scripts/ScheduleOne/Combat/PunchController.cs +++ b/Assets/Scripts/ScheduleOne/Combat/PunchController.cs @@ -1,6 +1,10 @@ +using ScheduleOne.Audio; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne.Combat { - public class PunchController : global::UnityEngine.MonoBehaviour + public class PunchController : MonoBehaviour { public const float MAX_PUNCH_LOAD = 1f; @@ -12,8 +16,8 @@ public class PunchController : global::UnityEngine.MonoBehaviour public const float PUNCH_DEBOUNCE = 0.1f; - [global::UnityEngine.Header("Settings")] - public global::UnityEngine.Vector3 ViewmodelAvatarOffset; + [Header("Settings")] + public Vector3 ViewmodelAvatarOffset; public float MinPunchDamage; @@ -23,23 +27,23 @@ public class PunchController : global::UnityEngine.MonoBehaviour public float MaxPunchForce; - [global::UnityEngine.Header("Stamina Settings")] + [Header("Stamina Settings")] public float MinStaminaCost; public float MaxStaminaCost; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Audio.AudioSourceController PunchSound; + [Header("References")] + public AudioSourceController PunchSound; - public global::UnityEngine.RuntimeAnimatorController PunchAnimator; + public RuntimeAnimatorController PunchAnimator; private float punchLoad; private float remainingCooldown; - private global::ScheduleOne.PlayerScripts.Player player; + private Player player; - private global::UnityEngine.Coroutine punchRoutine; + private Coroutine punchRoutine; private bool itemEquippedLastFrame; diff --git a/Assets/Scripts/ScheduleOne/Combat/PunchController.cs.meta b/Assets/Scripts/ScheduleOne/Combat/PunchController.cs.meta index 093bac28..128237ae 100644 --- a/Assets/Scripts/ScheduleOne/Combat/PunchController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Combat/PunchController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: bec07b5beca1b63aba7df7e86a33642b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/CommandListScreen.cs b/Assets/Scripts/ScheduleOne/CommandListScreen.cs index 9440bc09..bbd19528 100644 --- a/Assets/Scripts/ScheduleOne/CommandListScreen.cs +++ b/Assets/Scripts/ScheduleOne/CommandListScreen.cs @@ -1,12 +1,16 @@ +using System.Collections.Generic; +using ScheduleOne.UI.MainMenu; +using UnityEngine; + namespace ScheduleOne { - public class CommandListScreen : global::ScheduleOne.UI.MainMenu.MainMenuScreen + public class CommandListScreen : MainMenuScreen { - public global::UnityEngine.RectTransform CommandEntryContainer; + public RectTransform CommandEntryContainer; - public global::UnityEngine.RectTransform CommandEntryPrefab; + public RectTransform CommandEntryPrefab; - private global::System.Collections.Generic.List commandEntries; + private List commandEntries; private void Start() { diff --git a/Assets/Scripts/ScheduleOne/CommandListScreen.cs.meta b/Assets/Scripts/ScheduleOne/CommandListScreen.cs.meta index c00d4150..a17f3d84 100644 --- a/Assets/Scripts/ScheduleOne/CommandListScreen.cs.meta +++ b/Assets/Scripts/ScheduleOne/CommandListScreen.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0dba3a0e3b299b830e6e5ba77231c272 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Console.cs b/Assets/Scripts/ScheduleOne/Console.cs index d8e85852..308f50a4 100644 --- a/Assets/Scripts/ScheduleOne/Console.cs +++ b/Assets/Scripts/ScheduleOne/Console.cs @@ -1,6 +1,12 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.DevUtilities; +using ScheduleOne.PlayerScripts; +using UnityEngine; + namespace ScheduleOne { - public class Console : global::ScheduleOne.DevUtilities.Singleton + public class Console : Singleton { public abstract class ConsoleCommand { @@ -10,10 +16,10 @@ public abstract class ConsoleCommand public abstract string ExampleUsage { get; } - public abstract void Execute(global::System.Collections.Generic.List args); + public abstract void Execute(List args); } - public class SetTimeCommand : global::ScheduleOne.Console.ConsoleCommand + public class SetTimeCommand : ConsoleCommand { public override string CommandWord => null; @@ -21,12 +27,12 @@ public class SetTimeCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SpawnVehicleCommand : global::ScheduleOne.Console.ConsoleCommand + public class SpawnVehicleCommand : ConsoleCommand { public override string CommandWord => null; @@ -34,12 +40,12 @@ public class SpawnVehicleCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class AddItemToInventoryCommand : global::ScheduleOne.Console.ConsoleCommand + public class AddItemToInventoryCommand : ConsoleCommand { public override string CommandWord => null; @@ -47,12 +53,12 @@ public class AddItemToInventoryCommand : global::ScheduleOne.Console.ConsoleComm public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ClearInventoryCommand : global::ScheduleOne.Console.ConsoleCommand + public class ClearInventoryCommand : ConsoleCommand { public override string CommandWord => null; @@ -60,12 +66,12 @@ public class ClearInventoryCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ChangeCashCommand : global::ScheduleOne.Console.ConsoleCommand + public class ChangeCashCommand : ConsoleCommand { public override string CommandWord => null; @@ -73,12 +79,12 @@ public class ChangeCashCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ChangeOnlineBalanceCommand : global::ScheduleOne.Console.ConsoleCommand + public class ChangeOnlineBalanceCommand : ConsoleCommand { public override string CommandWord => null; @@ -86,12 +92,12 @@ public class ChangeOnlineBalanceCommand : global::ScheduleOne.Console.ConsoleCom public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetMoveSpeedCommand : global::ScheduleOne.Console.ConsoleCommand + public class SetMoveSpeedCommand : ConsoleCommand { public override string CommandWord => null; @@ -99,12 +105,12 @@ public class SetMoveSpeedCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetJumpMultiplier : global::ScheduleOne.Console.ConsoleCommand + public class SetJumpMultiplier : ConsoleCommand { public override string CommandWord => null; @@ -112,12 +118,12 @@ public class SetJumpMultiplier : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetPropertyOwned : global::ScheduleOne.Console.ConsoleCommand + public class SetPropertyOwned : ConsoleCommand { public override string CommandWord => null; @@ -125,12 +131,12 @@ public class SetPropertyOwned : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Teleport : global::ScheduleOne.Console.ConsoleCommand + public class Teleport : ConsoleCommand { public override string CommandWord => null; @@ -138,12 +144,12 @@ public class Teleport : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class PackageProduct : global::ScheduleOne.Console.ConsoleCommand + public class PackageProduct : ConsoleCommand { public override string CommandWord => null; @@ -151,12 +157,12 @@ public class PackageProduct : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetStaminaReserve : global::ScheduleOne.Console.ConsoleCommand + public class SetStaminaReserve : ConsoleCommand { public override string CommandWord => null; @@ -164,12 +170,12 @@ public class SetStaminaReserve : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class RaisedWanted : global::ScheduleOne.Console.ConsoleCommand + public class RaisedWanted : ConsoleCommand { public override string CommandWord => null; @@ -177,12 +183,12 @@ public class RaisedWanted : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class LowerWanted : global::ScheduleOne.Console.ConsoleCommand + public class LowerWanted : ConsoleCommand { public override string CommandWord => null; @@ -190,12 +196,12 @@ public class LowerWanted : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ClearWanted : global::ScheduleOne.Console.ConsoleCommand + public class ClearWanted : ConsoleCommand { public override string CommandWord => null; @@ -203,12 +209,12 @@ public class ClearWanted : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetHealth : global::ScheduleOne.Console.ConsoleCommand + public class SetHealth : ConsoleCommand { public override string CommandWord => null; @@ -216,12 +222,12 @@ public class SetHealth : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetEnergy : global::ScheduleOne.Console.ConsoleCommand + public class SetEnergy : ConsoleCommand { public override string CommandWord => null; @@ -229,12 +235,12 @@ public class SetEnergy : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class FreeCamCommand : global::ScheduleOne.Console.ConsoleCommand + public class FreeCamCommand : ConsoleCommand { public override string CommandWord => null; @@ -242,12 +248,12 @@ public class FreeCamCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Save : global::ScheduleOne.Console.ConsoleCommand + public class Save : ConsoleCommand { public override string CommandWord => null; @@ -255,12 +261,12 @@ public class Save : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetTimeScale : global::ScheduleOne.Console.ConsoleCommand + public class SetTimeScale : ConsoleCommand { public override string CommandWord => null; @@ -268,12 +274,12 @@ public class SetTimeScale : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetVariableValue : global::ScheduleOne.Console.ConsoleCommand + public class SetVariableValue : ConsoleCommand { public override string CommandWord => null; @@ -281,12 +287,12 @@ public class SetVariableValue : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetQuestState : global::ScheduleOne.Console.ConsoleCommand + public class SetQuestState : ConsoleCommand { public override string CommandWord => null; @@ -294,12 +300,12 @@ public class SetQuestState : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetQuestEntryState : global::ScheduleOne.Console.ConsoleCommand + public class SetQuestEntryState : ConsoleCommand { public override string CommandWord => null; @@ -307,12 +313,12 @@ public class SetQuestEntryState : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetEmotion : global::ScheduleOne.Console.ConsoleCommand + public class SetEmotion : ConsoleCommand { public override string CommandWord => null; @@ -320,12 +326,12 @@ public class SetEmotion : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetUnlocked : global::ScheduleOne.Console.ConsoleCommand + public class SetUnlocked : ConsoleCommand { public override string CommandWord => null; @@ -333,12 +339,12 @@ public class SetUnlocked : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetRelationship : global::ScheduleOne.Console.ConsoleCommand + public class SetRelationship : ConsoleCommand { public override string CommandWord => null; @@ -346,12 +352,12 @@ public class SetRelationship : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class AddEmployeeCommand : global::ScheduleOne.Console.ConsoleCommand + public class AddEmployeeCommand : ConsoleCommand { public override string CommandWord => null; @@ -359,12 +365,12 @@ public class AddEmployeeCommand : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetDiscovered : global::ScheduleOne.Console.ConsoleCommand + public class SetDiscovered : ConsoleCommand { public override string CommandWord => null; @@ -372,12 +378,12 @@ public class SetDiscovered : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class GrowPlants : global::ScheduleOne.Console.ConsoleCommand + public class GrowPlants : ConsoleCommand { public override string CommandWord => null; @@ -385,12 +391,12 @@ public class GrowPlants : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetLawIntensity : global::ScheduleOne.Console.ConsoleCommand + public class SetLawIntensity : ConsoleCommand { public override string CommandWord => null; @@ -398,12 +404,12 @@ public class SetLawIntensity : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class SetQuality : global::ScheduleOne.Console.ConsoleCommand + public class SetQuality : ConsoleCommand { public override string CommandWord => null; @@ -411,12 +417,12 @@ public class SetQuality : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Bind : global::ScheduleOne.Console.ConsoleCommand + public class Bind : ConsoleCommand { public override string CommandWord => null; @@ -424,12 +430,12 @@ public class Bind : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Unbind : global::ScheduleOne.Console.ConsoleCommand + public class Unbind : ConsoleCommand { public override string CommandWord => null; @@ -437,12 +443,12 @@ public class Unbind : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ClearBinds : global::ScheduleOne.Console.ConsoleCommand + public class ClearBinds : ConsoleCommand { public override string CommandWord => null; @@ -450,12 +456,12 @@ public class ClearBinds : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class HideUI : global::ScheduleOne.Console.ConsoleCommand + public class HideUI : ConsoleCommand { public override string CommandWord => null; @@ -463,12 +469,12 @@ public class HideUI : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class GiveXP : global::ScheduleOne.Console.ConsoleCommand + public class GiveXP : ConsoleCommand { public override string CommandWord => null; @@ -476,12 +482,12 @@ public class GiveXP : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Disable : global::ScheduleOne.Console.ConsoleCommand + public class Disable : ConsoleCommand { public override string CommandWord => null; @@ -489,12 +495,12 @@ public class Disable : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class Enable : global::ScheduleOne.Console.ConsoleCommand + public class Enable : ConsoleCommand { public override string CommandWord => null; @@ -502,12 +508,12 @@ public class Enable : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class EndTutorial : global::ScheduleOne.Console.ConsoleCommand + public class EndTutorial : ConsoleCommand { public override string CommandWord => null; @@ -515,12 +521,12 @@ public class EndTutorial : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class DisableNPCAsset : global::ScheduleOne.Console.ConsoleCommand + public class DisableNPCAsset : ConsoleCommand { public override string CommandWord => null; @@ -528,12 +534,12 @@ public class DisableNPCAsset : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ShowFPS : global::ScheduleOne.Console.ConsoleCommand + public class ShowFPS : ConsoleCommand { public override string CommandWord => null; @@ -541,12 +547,12 @@ public class ShowFPS : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class HideFPS : global::ScheduleOne.Console.ConsoleCommand + public class HideFPS : ConsoleCommand { public override string CommandWord => null; @@ -554,12 +560,12 @@ public class HideFPS : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - public class ClearTrash : global::ScheduleOne.Console.ConsoleCommand + public class ClearTrash : ConsoleCommand { public override string CommandWord => null; @@ -567,33 +573,33 @@ public class ClearTrash : global::ScheduleOne.Console.ConsoleCommand public override string ExampleUsage => null; - public override void Execute(global::System.Collections.Generic.List args) + public override void Execute(List args) { } } - [global::System.Serializable] + [Serializable] public class LabelledGameObject { public string Label; - public global::UnityEngine.GameObject GameObject; + public GameObject GameObject; } - public global::UnityEngine.Transform TeleportPointsContainer; + public Transform TeleportPointsContainer; - public global::System.Collections.Generic.List LabelledGameObjectList; + public List LabelledGameObjectList; - [global::UnityEngine.Tooltip("Commands that run on startup (Editor only)")] - public global::System.Collections.Generic.List startupCommands; + [Tooltip("Commands that run on startup (Editor only)")] + public List startupCommands; - public static global::System.Collections.Generic.List Commands; + public static List Commands; - private static global::System.Collections.Generic.Dictionary commands; + private static Dictionary commands; - private global::System.Collections.Generic.Dictionary keyBindings; + private Dictionary keyBindings; - private static global::ScheduleOne.PlayerScripts.Player player => null; + private static Player player => null; private static void LogCommandError(string error) { @@ -611,22 +617,22 @@ private void RunStartupCommands() { } - [global::UnityEngine.HideInCallstack] - public static void Log(object message, global::UnityEngine.Object context = null) + [HideInCallstack] + public static void Log(object message, UnityEngine.Object context = null) { } - [global::UnityEngine.HideInCallstack] - public static void LogWarning(object message, global::UnityEngine.Object context = null) + [HideInCallstack] + public static void LogWarning(object message, UnityEngine.Object context = null) { } - [global::UnityEngine.HideInCallstack] - public static void LogError(object message, global::UnityEngine.Object context = null) + [HideInCallstack] + public static void LogError(object message, UnityEngine.Object context = null) { } - public static void SubmitCommand(global::System.Collections.Generic.List args) + public static void SubmitCommand(List args) { } @@ -634,11 +640,11 @@ public static void SubmitCommand(string args) { } - public void AddBinding(global::UnityEngine.KeyCode key, string command) + public void AddBinding(KeyCode key, string command) { } - public void RemoveBinding(global::UnityEngine.KeyCode key) + public void RemoveBinding(KeyCode key) { } diff --git a/Assets/Scripts/ScheduleOne/Console.cs.meta b/Assets/Scripts/ScheduleOne/Console.cs.meta index 312384ff..780fec16 100644 --- a/Assets/Scripts/ScheduleOne/Console.cs.meta +++ b/Assets/Scripts/ScheduleOne/Console.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4e5193ebb8ae13490e5c9e49d9e591e7 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts.meta b/Assets/Scripts/ScheduleOne/ConstructableScripts.meta index a2a1491e..96caebe0 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts.meta +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21061ea09d86efc4babbfadc7615a1aa +guid: bc688e73f8176c04aa9da5bf3e559a8d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs index e661ad25..899ab42f 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs @@ -1,45 +1,55 @@ +using System.Collections.Generic; +using EPOOutline; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.Construction.Features; +using ScheduleOne.EntityFramework; +using UnityEngine; + namespace ScheduleOne.ConstructableScripts { - public class Constructable : global::FishNet.Object.NetworkBehaviour + public class Constructable : NetworkBehaviour { - [global::UnityEngine.Header("Basic settings")] - [global::UnityEngine.SerializeField] + [Header("Basic settings")] + [SerializeField] protected bool isStatic; - [global::UnityEngine.SerializeField] + [SerializeField] protected string constructableName; - [global::UnityEngine.SerializeField] + [SerializeField] protected string constructableDescription; - [global::UnityEngine.SerializeField] + [SerializeField] protected string constructableAssetPath; - [global::UnityEngine.SerializeField] + [SerializeField] protected string ID; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Sprite constructableIcon; + [SerializeField] + protected Sprite constructableIcon; - [global::UnityEngine.Header("Bounds settings")] - public global::UnityEngine.BoxCollider boundingBox; + [Header("Bounds settings")] + public BoxCollider boundingBox; - [global::UnityEngine.Header("Construction Handler")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject constructionHandler_Asset; + [Header("Construction Handler")] + [SerializeField] + protected GameObject constructionHandler_Asset; - [global::UnityEngine.Header("Outline settings")] - [global::UnityEngine.SerializeField] - protected global::System.Collections.Generic.List outlineRenderers; + [Header("Outline settings")] + [SerializeField] + protected List outlineRenderers; - protected global::EPOOutline.Outlinable outlineEffect; + protected Outlinable outlineEffect; - [global::UnityEngine.Header("Features")] - public global::System.Collections.Generic.List features; + [Header("Features")] + public List features; private bool isDestroyed; - private global::System.Collections.Generic.Dictionary originalLayers; + private Dictionary originalLayers; private bool NetworkInitialize___EarlyScheduleOne_002EConstructableScripts_002EConstructableAssembly_002DCSharp_002Edll_Excuted; @@ -55,9 +65,9 @@ public class Constructable : global::FishNet.Object.NetworkBehaviour public string PrefabID => null; - public global::UnityEngine.Sprite ConstructableIcon => null; + public Sprite ConstructableIcon => null; - public global::UnityEngine.GameObject _constructionHandler_Asset => null; + public GameObject _constructionHandler_Asset => null; public bool isVisible { get; protected set; } @@ -84,12 +94,12 @@ public virtual void DestroyConstructable(bool callOnServer = true) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false)] + [ServerRpc(RequireOwnership = false)] private void Destroy_Networked() { } - [global::FishNet.Object.ObserversRpc] + [ObserversRpc] private void DestroyConstructableWrapper() { } @@ -114,7 +124,7 @@ public virtual string GetBuildableVersionAssetPath() return null; } - public void ShowOutline(global::ScheduleOne.EntityFramework.BuildableItem.EOutlineColor color) + public void ShowOutline(BuildableItem.EOutlineColor color) { } @@ -122,9 +132,9 @@ public void HideOutline() { } - public virtual global::UnityEngine.Vector3 GetCosmeticCenter() + public virtual Vector3 GetCosmeticCenter() { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public float GetBoundingBoxLongestSide() @@ -140,7 +150,7 @@ public virtual void RestoreVisibility() { } - public void SetLayerRecursively(global::UnityEngine.GameObject go, int layerNumber) + public void SetLayerRecursively(GameObject go, int layerNumber) { } @@ -164,7 +174,7 @@ private void RpcLogic___Destroy_Networked_2166136261() { } - private void RpcReader___Server_Destroy_Networked_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_Destroy_Networked_2166136261(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } @@ -176,7 +186,7 @@ private void RpcLogic___DestroyConstructableWrapper_2166136261() { } - private void RpcReader___Observers_DestroyConstructableWrapper_2166136261(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_DestroyConstructableWrapper_2166136261(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs.meta b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs.meta index dd632b66..7fb78c4d 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs.meta +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e77165c7a4f8a8ca7273ae7fae29784e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs index 6648c6f0..75b94940 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs @@ -1,56 +1,68 @@ +using System; +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Object.Synchronizing; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.Property.Utilities.Power; +using ScheduleOne.Tiles; +using UnityEngine; +using Grid = ScheduleOne.Tiles.Grid; + namespace ScheduleOne.ConstructableScripts { - public class Constructable_GridBased : global::ScheduleOne.ConstructableScripts.Constructable + public class Constructable_GridBased : Constructable { - [global::UnityEngine.Header("Grid Based Constructable References")] - public global::UnityEngine.Transform buildPoint; + [Header("Grid Based Constructable References")] + public Transform buildPoint; - public global::System.Collections.Generic.List CoordinateFootprintTilePairs; + public List CoordinateFootprintTilePairs; - public global::UnityEngine.Transform ContentContainer; + public Transform ContentContainer; - public global::ScheduleOne.Tiles.Grid[] Grids; + public Grid[] Grids; - public global::System.Collections.Generic.List roofObjectsForVisibility; + public List roofObjectsForVisibility; - [global::UnityEngine.Header("Power")] - [global::UnityEngine.SerializeField] + [Header("Power")] + [SerializeField] protected bool AlwaysPowered; - [global::UnityEngine.SerializeField] - protected global::ScheduleOne.Property.Utilities.Power.PowerNode powerNode; + [SerializeField] + protected PowerNode powerNode; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool isGhost; protected bool dataChangedThisFrame; - [global::FishNet.Object.Synchronizing.SyncVar] - public global::System.Guid OwnerGridGUID; + [SyncVar] + public Guid OwnerGridGUID; - [global::FishNet.Object.Synchronizing.SyncVar] - public global::UnityEngine.Vector2 OriginCoordinate; + [SyncVar] + public Vector2 OriginCoordinate; - [global::FishNet.Object.Synchronizing.SyncVar] + [SyncVar] public float Rotation; - public global::System.Collections.Generic.List coordinatePairs; + public List coordinatePairs; - private global::System.Collections.Generic.Dictionary originalRoofLayers; + private Dictionary originalRoofLayers; protected bool roofVisible; - public global::FishNet.Object.Synchronizing.SyncVar syncVar___OwnerGridGUID; + public SyncVar syncVar___OwnerGridGUID; - public global::FishNet.Object.Synchronizing.SyncVar syncVar___OriginCoordinate; + public SyncVar syncVar___OriginCoordinate; - public global::FishNet.Object.Synchronizing.SyncVar syncVar___Rotation; + public SyncVar syncVar___Rotation; private bool NetworkInitialize___EarlyScheduleOne_002EConstructableScripts_002EConstructable_GridBasedAssembly_002DCSharp_002Edll_Excuted; private bool NetworkInitialize__LateScheduleOne_002EConstructableScripts_002EConstructable_GridBasedAssembly_002DCSharp_002Edll_Excuted; - public global::ScheduleOne.Tiles.FootprintTile OriginFootprint => null; + public FootprintTile OriginFootprint => null; public int FootprintX => 0; @@ -58,28 +70,28 @@ public class Constructable_GridBased : global::ScheduleOne.ConstructableScripts. public bool hasWaterSupply => false; - public global::ScheduleOne.Property.Utilities.Power.PowerNode PowerNode => null; + public PowerNode PowerNode => null; public bool isPowered => false; - public global::ScheduleOne.Tiles.Grid OwnerGrid { get; protected set; } + public Grid OwnerGrid { get; protected set; } - public global::System.Guid SyncAccessor_OwnerGridGUID + public Guid SyncAccessor_OwnerGridGUID { get { - return default(global::System.Guid); + return default(Guid); } set { } } - public global::UnityEngine.Vector2 SyncAccessor_OriginCoordinate + public Vector2 SyncAccessor_OriginCoordinate { get { - return default(global::UnityEngine.Vector2); + return default(Vector2); } set { @@ -105,7 +117,7 @@ public override void OnStartServer() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } @@ -113,7 +125,7 @@ public override void OnStartNetwork() { } - public virtual void InitializeConstructable_GridBased(global::ScheduleOne.Tiles.Grid grid, global::UnityEngine.Vector2 originCoordinate, float rotation) + public virtual void InitializeConstructable_GridBased(Grid grid, Vector2 originCoordinate, float rotation) { } @@ -121,16 +133,16 @@ private void ReceiveData() { } - private void SetParent(global::UnityEngine.Transform parent) + private void SetParent(Transform parent) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] - protected virtual void SetData(global::System.Guid gridGUID, global::UnityEngine.Vector2 originCoordinate, float rotation) + [ServerRpc(RequireOwnership = false, RunLocally = true)] + protected virtual void SetData(Guid gridGUID, Vector2 originCoordinate, float rotation) { } - public virtual void RepositionConstructable(global::System.Guid gridGUID, global::UnityEngine.Vector2 originCoordinate, float rotation) + public virtual void RepositionConstructable(Guid gridGUID, Vector2 originCoordinate, float rotation) { } @@ -155,9 +167,9 @@ private string[] GetGridGUIDs() return null; } - [global::FishNet.Object.ObserversRpc] - [global::FishNet.Object.TargetRpc] - protected void SetGridGUIDs(global::FishNet.Connection.NetworkConnection target, string[] guids) + [ObserversRpc] + [TargetRpc] + protected void SetGridGUIDs(NetworkConnection target, string[] guids) { } @@ -181,12 +193,12 @@ public void SetFootprintTileVisiblity(bool visible) { } - public global::ScheduleOne.Tiles.FootprintTile GetFootprintTile(global::ScheduleOne.Tiles.Coordinate coord) + public FootprintTile GetFootprintTile(Coordinate coord) { return null; } - public global::System.Collections.Generic.List GetFootprintTiles() + public List GetFootprintTiles() { return null; } @@ -203,39 +215,39 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Server_SetData_810381718(global::System.Guid gridGUID, global::UnityEngine.Vector2 originCoordinate, float rotation) + private void RpcWriter___Server_SetData_810381718(Guid gridGUID, Vector2 originCoordinate, float rotation) { } - protected virtual void RpcLogic___SetData_810381718(global::System.Guid gridGUID, global::UnityEngine.Vector2 originCoordinate, float rotation) + protected virtual void RpcLogic___SetData_810381718(Guid gridGUID, Vector2 originCoordinate, float rotation) { } - private void RpcReader___Server_SetData_810381718(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SetData_810381718(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_SetGridGUIDs_2890081366(global::FishNet.Connection.NetworkConnection target, string[] guids) + private void RpcWriter___Observers_SetGridGUIDs_2890081366(NetworkConnection target, string[] guids) { } - protected void RpcLogic___SetGridGUIDs_2890081366(global::FishNet.Connection.NetworkConnection target, string[] guids) + protected void RpcLogic___SetGridGUIDs_2890081366(NetworkConnection target, string[] guids) { } - private void RpcReader___Observers_SetGridGUIDs_2890081366(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetGridGUIDs_2890081366(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_SetGridGUIDs_2890081366(global::FishNet.Connection.NetworkConnection target, string[] guids) + private void RpcWriter___Target_SetGridGUIDs_2890081366(NetworkConnection target, string[] guids) { } - private void RpcReader___Target_SetGridGUIDs_2890081366(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_SetGridGUIDs_2890081366(PooledReader PooledReader0, Channel channel) { } - public virtual bool ReadSyncVar___ScheduleOne_002EConstructableScripts_002EConstructable_GridBased(global::FishNet.Serializing.PooledReader PooledReader0, uint UInt321, bool Boolean2) + public virtual bool ReadSyncVar___ScheduleOne_002EConstructableScripts_002EConstructable_GridBased(PooledReader PooledReader0, uint UInt321, bool Boolean2) { return false; } diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs.meta b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs.meta index 313716ee..9e2c3616 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs.meta +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/Constructable_GridBased.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 84037d15130754ce9efc79dc6f3502ce -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs b/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs index 0c4f9953..f62b73b2 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.ConstructableScripts { - public class EmployeeTrailer : global::ScheduleOne.ConstructableScripts.Constructable_GridBased + public class EmployeeTrailer : Constructable_GridBased { private bool NetworkInitialize___EarlyScheduleOne_002EConstructableScripts_002EEmployeeTrailerAssembly_002DCSharp_002Edll_Excuted; diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs.meta b/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs.meta index 71613530..94d6bd09 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs.meta +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/EmployeeTrailer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cc952781ec34f0f9e82cb818a10b15b2 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs b/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs index 1e6cb750..f176a71c 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs @@ -1,44 +1,48 @@ +using ScheduleOne.DevUtilities; +using ScheduleOne.Vehicles; +using UnityEngine; + namespace ScheduleOne.ConstructableScripts { - public class LoadingDock : global::ScheduleOne.ConstructableScripts.Constructable_GridBased + public class LoadingDock : Constructable_GridBased { - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::ScheduleOne.DevUtilities.VehicleDetector vehicleDetector; + [Header("References")] + [SerializeField] + protected VehicleDetector vehicleDetector; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.MeshRenderer[] redLightMeshes; + [SerializeField] + protected MeshRenderer[] redLightMeshes; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.MeshRenderer[] greenLightMeshes; + [SerializeField] + protected MeshRenderer[] greenLightMeshes; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform[] sideWalls; + [SerializeField] + protected Transform[] sideWalls; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Animation gateAnim; + [SerializeField] + protected Animation gateAnim; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Collider reservationBlocker; + [SerializeField] + protected Collider reservationBlocker; - public global::UnityEngine.Transform vehiclePosition; + public Transform vehiclePosition; - [global::UnityEngine.Header("Materials")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material redLightMat_On; + [Header("Materials")] + [SerializeField] + protected Material redLightMat_On; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material redLightMat_Off; + [SerializeField] + protected Material redLightMat_Off; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material greenLightMat_On; + [SerializeField] + protected Material greenLightMat_On; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material greenLightMat_Off; + [SerializeField] + protected Material greenLightMat_Off; private bool wallsOpen; - private global::ScheduleOne.Vehicles.LandVehicle currentOccupant; + private LandVehicle currentOccupant; private bool NetworkInitialize___EarlyScheduleOne_002EConstructableScripts_002ELoadingDockAssembly_002DCSharp_002Edll_Excuted; @@ -46,7 +50,7 @@ public class LoadingDock : global::ScheduleOne.ConstructableScripts.Constructabl public bool isOccupied => false; - public global::ScheduleOne.Vehicles.LandVehicle reservant { get; protected set; } + public LandVehicle reservant { get; protected set; } private void Start() { @@ -70,7 +74,7 @@ public override void DestroyConstructable(bool callOnServer = true) { } - public void SetReservant(global::ScheduleOne.Vehicles.LandVehicle _res) + public void SetReservant(LandVehicle _res) { } diff --git a/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs.meta b/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs.meta index e43bc9e7..d60cdfd4 100644 --- a/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs.meta +++ b/Assets/Scripts/ScheduleOne/ConstructableScripts/LoadingDock.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3228db7c6bcfec19a70d0d970ae8a272 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction.meta b/Assets/Scripts/ScheduleOne/Construction.meta index 337558fb..d277878b 100644 --- a/Assets/Scripts/ScheduleOne/Construction.meta +++ b/Assets/Scripts/ScheduleOne/Construction.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d972805a624c088458c88567b3aaa323 +guid: 0439e00ff2fafd54e94ac887a5a0736f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs index dc9ddbe4..cb4ff4d1 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs @@ -1,29 +1,38 @@ +using System; +using FishNet.Object; +using ScheduleOne.ConstructableScripts; +using ScheduleOne.DevUtilities; +using ScheduleOne.Tiles; +using ScheduleOne.UI.Construction; +using UnityEngine; +using Grid = ScheduleOne.Tiles.Grid; + namespace ScheduleOne.Construction { - public class ConstructionManager : global::ScheduleOne.DevUtilities.Singleton + public class ConstructionManager : Singleton { public class WorldIntersection { - public global::ScheduleOne.Tiles.FootprintTile footprint; + public FootprintTile footprint; - public global::ScheduleOne.Tiles.Tile tile; + public Tile tile; } - public delegate void ConstructableNotification(global::ScheduleOne.ConstructableScripts.Constructable c); + public delegate void ConstructableNotification(Constructable c); - public global::FishNet.Object.NetworkObject networkObject; + public NetworkObject networkObject; - public global::System.Action onConstructionModeEnabled; + public Action onConstructionModeEnabled; - public global::System.Action onConstructionModeDisabled; + public Action onConstructionModeDisabled; - public global::UnityEngine.GameObject constructHandler; + public GameObject constructHandler; - public global::ScheduleOne.Construction.ConstructionManager.ConstructableNotification onNewConstructableBuilt; + public ConstructableNotification onNewConstructableBuilt; - public global::ScheduleOne.Construction.ConstructionManager.ConstructableNotification onConstructableMoved; + public ConstructableNotification onConstructableMoved; - public global::ScheduleOne.Property.Property currentProperty; + public ScheduleOne.Property.Property currentProperty; public bool constructionModeEnabled { get; protected set; } @@ -35,7 +44,7 @@ protected override void Start() { } - public void EnterConstructionMode(global::ScheduleOne.Property.Property prop) + public void EnterConstructionMode(ScheduleOne.Property.Property prop) { } @@ -43,7 +52,7 @@ public void ExitConstructionMode() { } - public void DeployConstructable(global::ScheduleOne.UI.Construction.ConstructionMenu.ConstructionMenuListing listing) + public void DeployConstructable(ConstructionMenu.ConstructionMenuListing listing) { } @@ -51,7 +60,7 @@ public void StopConstructableDeploy() { } - public void MoveConstructable(global::ScheduleOne.ConstructableScripts.Constructable_GridBased c) + public void MoveConstructable(Constructable_GridBased c) { } @@ -59,16 +68,16 @@ public void StopMovingConstructable() { } - private void Exit(global::ScheduleOne.DevUtilities.ExitAction exit) + private void Exit(ExitAction exit) { } - public global::ScheduleOne.ConstructableScripts.Constructable_GridBased CreateConstructable_GridBased(string ID, global::ScheduleOne.Tiles.Grid grid, global::UnityEngine.Vector2 originCoordinate, float rotation) + public Constructable_GridBased CreateConstructable_GridBased(string ID, Grid grid, Vector2 originCoordinate, float rotation) { return null; } - public global::ScheduleOne.ConstructableScripts.Constructable CreateConstructable(string prefabID) + public Constructable CreateConstructable(string prefabID) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs.meta index 16c83e05..7f76792a 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7118767e1357e1f7d387a67f0d99dbab -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods.meta index f6f26291..6fc28f1c 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a576562dd2ef99746ba7f69c2c6278e6 +guid: 8556ff08e0bb88647a95f17e3f211f5a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs index ff2be46a..1fe844db 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs @@ -1,8 +1,11 @@ +using ScheduleOne.ConstructableScripts; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public abstract class ConstructStart_Base : global::UnityEngine.MonoBehaviour + public abstract class ConstructStart_Base : MonoBehaviour { - public virtual void StartConstruction(string constructableID, global::ScheduleOne.ConstructableScripts.Constructable_GridBased movedConstructable = null) + public virtual void StartConstruction(string constructableID, Constructable_GridBased movedConstructable = null) { } } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs.meta index 63a82ae6..14881fd4 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1e690f51870a447398b665bae9052812 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs index fedfda81..17fac1bc 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs @@ -1,12 +1,15 @@ +using ScheduleOne.ConstructableScripts; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructStart_OutdoorGrid : global::ScheduleOne.Construction.ConstructionMethods.ConstructStart_Base + public class ConstructStart_OutdoorGrid : ConstructStart_Base { - private global::ScheduleOne.ConstructableScripts.Constructable_GridBased constructable; + private Constructable_GridBased constructable; - private global::UnityEngine.Transform ghostModel; + private Transform ghostModel; - public override void StartConstruction(string constructableID, global::ScheduleOne.ConstructableScripts.Constructable_GridBased movedConstructable = null) + public override void StartConstruction(string constructableID, Constructable_GridBased movedConstructable = null) { } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs.meta index 0deacdc1..df0acdc2 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_OutdoorGrid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 54dfb4518d8da6bb32346fa4c0a7f021 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs index e822f61b..894b45fb 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructStart_PowerLine : global::ScheduleOne.Construction.ConstructionMethods.ConstructStart_Base + public class ConstructStart_PowerLine : ConstructStart_Base { } } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs.meta index a01470bd..a56ab3c9 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStart_PowerLine.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 906b65929b3e74d4b18a1733cb2f18a0 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs index 854fed28..97649ad3 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructStop_Base : global::UnityEngine.MonoBehaviour + public class ConstructStop_Base : MonoBehaviour { public virtual void StopConstruction() { diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs.meta index 0d67d4cb..1a9c947e 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructStop_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3451dd66161ab314db3d7c56f0e12061 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs index e98e2d44..ad322e1d 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs @@ -1,8 +1,11 @@ +using ScheduleOne.ConstructableScripts; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructUpdate_Base : global::UnityEngine.MonoBehaviour + public class ConstructUpdate_Base : MonoBehaviour { - public global::ScheduleOne.ConstructableScripts.Constructable_GridBased MovedConstructable; + public Constructable_GridBased MovedConstructable; public bool isMoving => false; diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs.meta index 90034c97..5a3613ec 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_Base.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a3833fe2795f3da2e08dfbf42441d993 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs index 77edca41..1eaf262d 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs @@ -1,21 +1,24 @@ +using ScheduleOne.ConstructableScripts; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructUpdate_OutdoorGrid : global::ScheduleOne.Construction.ConstructionMethods.ConstructUpdate_Base + public class ConstructUpdate_OutdoorGrid : ConstructUpdate_Base { - [global::UnityEngine.Header("Settings")] - public global::UnityEngine.LayerMask detectionMask; + [Header("Settings")] + public LayerMask detectionMask; - public global::ScheduleOne.ConstructableScripts.Constructable_GridBased ConstructableClass; + public Constructable_GridBased ConstructableClass; - public global::UnityEngine.Transform GhostModel; + public Transform GhostModel; protected bool validPosition; public float currentRotation; - protected global::UnityEngine.Material currentGhostMaterial; + protected Material currentGhostMaterial; - protected global::ScheduleOne.Construction.ConstructionManager.WorldIntersection closestIntersection; + protected ConstructionManager.WorldIntersection closestIntersection; private float listingPrice; @@ -52,7 +55,7 @@ private bool AreMetaReqsMet() return false; } - protected virtual global::ScheduleOne.ConstructableScripts.Constructable_GridBased PlaceNewConstructable() + protected virtual Constructable_GridBased PlaceNewConstructable() { return null; } @@ -61,9 +64,9 @@ protected virtual void FinalizeMoveConstructable() { } - private global::UnityEngine.Vector2 GetOriginCoordinate() + private Vector2 GetOriginCoordinate() { - return default(global::UnityEngine.Vector2); + return default(Vector2); } } } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs.meta index 971ebd19..830f5b5e 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_OutdoorGrid.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 973b4d5d7c09a94d87b8bf968d42edb5 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs index 7e01a419..95ea0c50 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs @@ -1,22 +1,27 @@ +using System.Collections.Generic; +using ScheduleOne.DevUtilities; +using ScheduleOne.Property.Utilities.Power; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructUpdate_PowerLine : global::ScheduleOne.Construction.ConstructionMethods.ConstructUpdate_Base + public class ConstructUpdate_PowerLine : ConstructUpdate_Base { - [global::UnityEngine.Header("Settings")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Material ghostPowerLine_Material; + [Header("Settings")] + [SerializeField] + protected Material ghostPowerLine_Material; - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject cosmeticPowerNode; + [Header("References")] + [SerializeField] + protected GameObject cosmeticPowerNode; - protected global::UnityEngine.Transform tempPowerLineContainer; + protected Transform tempPowerLineContainer; - protected global::ScheduleOne.Property.Utilities.Power.PowerNode hoveredPowerNode; + protected PowerNode hoveredPowerNode; - protected global::System.Collections.Generic.List tempSegments; + protected List tempSegments; - protected global::ScheduleOne.Property.Utilities.Power.PowerNode startNode; + protected PowerNode startNode; protected float powerLineInitialDistance; @@ -28,7 +33,7 @@ public override void ConstructionStop() { } - public void Exit(global::ScheduleOne.DevUtilities.ExitAction exit) + public void Exit(ExitAction exit) { } @@ -40,12 +45,12 @@ protected override void LateUpdate() { } - protected global::ScheduleOne.Property.Utilities.Power.PowerNode GetHoveredPowerNode() + protected PowerNode GetHoveredPowerNode() { return null; } - private void CompletePowerLine(global::ScheduleOne.Property.Utilities.Power.PowerNode target) + private void CompletePowerLine(PowerNode target) { } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs.meta index dea5cadf..712b33c4 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerLine.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 376e8354cd2ce6919d98a41d55923814 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs index 485e604e..8f74265b 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs @@ -1,25 +1,32 @@ +using System.Collections.Generic; +using ScheduleOne.ConstructableScripts; +using ScheduleOne.DevUtilities; +using ScheduleOne.ObjectScripts; +using ScheduleOne.Property.Utilities.Power; +using UnityEngine; + namespace ScheduleOne.Construction.ConstructionMethods { - public class ConstructUpdate_PowerTower : global::ScheduleOne.Construction.ConstructionMethods.ConstructUpdate_OutdoorGrid + public class ConstructUpdate_PowerTower : ConstructUpdate_OutdoorGrid { - [global::UnityEngine.Header("Materials")] - public global::UnityEngine.Material specialMat; + [Header("Materials")] + public Material specialMat; - public global::UnityEngine.Material powerLine_GhostMat; + public Material powerLine_GhostMat; - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.GameObject cosmeticPowerNode; + [Header("References")] + [SerializeField] + protected GameObject cosmeticPowerNode; public float LengthFactor; - protected global::UnityEngine.Transform tempPowerLineContainer; + protected Transform tempPowerLineContainer; - protected global::System.Collections.Generic.List tempSegments; + protected List tempSegments; - private global::ScheduleOne.Property.Utilities.Power.PowerNode hoveredPowerNode; + private PowerNode hoveredPowerNode; - protected global::ScheduleOne.Property.Utilities.Power.PowerNode startNode; + protected PowerNode startNode; protected float powerLineInitialDistance; @@ -39,26 +46,26 @@ protected override void LateUpdate() { } - public void Exit(global::ScheduleOne.DevUtilities.ExitAction exit) + public void Exit(ExitAction exit) { } - private global::ScheduleOne.ObjectScripts.PowerTower GetHoveredPowerTower() + private PowerTower GetHoveredPowerTower() { return null; } - protected global::ScheduleOne.Property.Utilities.Power.PowerNode GetHoveredPowerNode() + protected PowerNode GetHoveredPowerNode() { return null; } - protected override global::ScheduleOne.ConstructableScripts.Constructable_GridBased PlaceNewConstructable() + protected override Constructable_GridBased PlaceNewConstructable() { return null; } - private void CompletePowerLine(global::ScheduleOne.Property.Utilities.Power.PowerNode target) + private void CompletePowerLine(PowerNode target) { } diff --git a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs.meta b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs.meta index dc10949e..42b5da9a 100644 --- a/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/ConstructionMethods/ConstructUpdate_PowerTower.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7ba9ea08050667e754864c09a9ea6c06 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features.meta b/Assets/Scripts/ScheduleOne/Construction/Features.meta index 2de7d2b5..29a82a25 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b84437c0fd46ef4cacd3a004a96fd72 +guid: 14ebcacf3e6bca9409aea1a0c2d196d2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs b/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs index 146a5ce2..7f7d7ae8 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs @@ -1,43 +1,53 @@ +using System; +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Object.Synchronizing; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.UI.Construction.Features; +using UnityEngine; + namespace ScheduleOne.Construction.Features { - public class ColorFeature : global::ScheduleOne.Construction.Features.Feature + public class ColorFeature : Feature { - [global::System.Serializable] + [Serializable] public class NamedColor { public string colorName; - public global::UnityEngine.Color color; + public Color color; public float price; } - [global::System.Serializable] + [Serializable] public class SecondaryPaintTarget { - public global::System.Collections.Generic.List colorTargets; + public List colorTargets; public float sChange; public float vChange; } - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::System.Collections.Generic.List colorTargets; + [Header("References")] + [SerializeField] + protected List colorTargets; - [global::UnityEngine.SerializeField] - protected global::System.Collections.Generic.List secondaryTargets; + [SerializeField] + protected List secondaryTargets; - [global::UnityEngine.Header("Color settings")] - public global::System.Collections.Generic.List colors; + [Header("Color settings")] + public List colors; public int defaultColorIndex; - [global::FishNet.Object.Synchronizing.SyncVar] + [SyncVar] public int ownedColorIndex; - public global::FishNet.Object.Synchronizing.SyncVar syncVar___ownedColorIndex; + public SyncVar syncVar___ownedColorIndex; private bool NetworkInitialize___EarlyScheduleOne_002EConstruction_002EFeatures_002EColorFeatureAssembly_002DCSharp_002Edll_Excuted; @@ -54,7 +64,7 @@ public int SyncAccessor_ownedColorIndex } } - public override global::ScheduleOne.UI.Construction.Features.FI_Base CreateInterface(global::UnityEngine.Transform parent) + public override FI_Base CreateInterface(Transform parent) { return null; } @@ -63,16 +73,16 @@ public override void Default() { } - private void ApplyColor(global::ScheduleOne.Construction.Features.ColorFeature.NamedColor color) + private void ApplyColor(NamedColor color) { } - public static global::UnityEngine.Color ModifyColor(global::UnityEngine.Color original, float sChange, float vChange) + public static Color ModifyColor(Color original, float sChange, float vChange) { - return default(global::UnityEngine.Color); + return default(Color); } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] + [ServerRpc(RequireOwnership = false, RunLocally = true)] protected virtual void SetData(int colorIndex) { } @@ -81,7 +91,7 @@ private void ReceiveData() { } - private void BuyColor(global::ScheduleOne.Construction.Features.ColorFeature.NamedColor color) + private void BuyColor(NamedColor color) { } @@ -105,11 +115,11 @@ protected virtual void RpcLogic___SetData_3316948804(int colorIndex) { } - private void RpcReader___Server_SetData_3316948804(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SetData_3316948804(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - public virtual bool ReadSyncVar___ScheduleOne_002EConstruction_002EFeatures_002EColorFeature(global::FishNet.Serializing.PooledReader PooledReader0, uint UInt321, bool Boolean2) + public virtual bool ReadSyncVar___ScheduleOne_002EConstruction_002EFeatures_002EColorFeature(PooledReader PooledReader0, uint UInt321, bool Boolean2) { return false; } diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs.meta index d6626441..b5bce8f2 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/ColorFeature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0cb2e4cc8c6efebb94ddcac96f68719e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs b/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs index 7a5a6fe2..90e52352 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs @@ -1,14 +1,18 @@ +using FishNet.Object; +using ScheduleOne.UI.Construction.Features; +using UnityEngine; + namespace ScheduleOne.Construction.Features { - public abstract class Feature : global::FishNet.Object.NetworkBehaviour + public abstract class Feature : NetworkBehaviour { public string featureName; - public global::UnityEngine.Sprite featureIcon; + public Sprite featureIcon; - public global::UnityEngine.Transform featureIconLocation; + public Transform featureIconLocation; - public global::UnityEngine.GameObject featureInterfacePrefab; + public GameObject featureInterfacePrefab; public bool disableRoofDisibility; @@ -24,7 +28,7 @@ public override void OnStartClient() { } - public virtual global::ScheduleOne.UI.Construction.Features.FI_Base CreateInterface(global::UnityEngine.Transform parent) + public virtual FI_Base CreateInterface(Transform parent) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs.meta index 675a0800..181c756b 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/Feature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 02a349c666ca097a0cc407f93935b2cd -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs index 5f49054f..042afb1f 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs @@ -1,22 +1,25 @@ +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.Construction.Features { - public class GenericOption : global::UnityEngine.MonoBehaviour + public class GenericOption : MonoBehaviour { - [global::UnityEngine.Header("Interface settings")] + [Header("Interface settings")] public string optionName; - public global::UnityEngine.Color optionButtonColor; + public Color optionButtonColor; public float optionPrice; - [global::UnityEngine.Header("Events")] - public global::UnityEngine.Events.UnityEvent onInstalled; + [Header("Events")] + public UnityEvent onInstalled; - public global::UnityEngine.Events.UnityEvent onUninstalled; + public UnityEvent onUninstalled; - public global::UnityEngine.Events.UnityEvent onSetVisible; + public UnityEvent onSetVisible; - public global::UnityEngine.Events.UnityEvent onSetInvisible; + public UnityEvent onSetInvisible; public virtual void Install() { diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs.meta index 43a071af..b7da3356 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOption.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4a1f906f4ca84f79921aff74026554df -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs index 28eaba6a..2a07e9c8 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs @@ -1,14 +1,18 @@ +using System.Collections.Generic; +using ScheduleOne.UI.Construction.Features; +using UnityEngine; + namespace ScheduleOne.Construction.Features { - public class GenericOptionListFeature : global::ScheduleOne.Construction.Features.OptionListFeature + public class GenericOptionListFeature : OptionListFeature { - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::System.Collections.Generic.List options; + [Header("References")] + [SerializeField] + protected List options; - private global::ScheduleOne.Construction.Features.GenericOption visibleOption; + private GenericOption visibleOption; - private global::ScheduleOne.Construction.Features.GenericOption installedOption; + private GenericOption installedOption; private bool NetworkInitialize___EarlyScheduleOne_002EConstruction_002EFeatures_002EGenericOptionListFeatureAssembly_002DCSharp_002Edll_Excuted; @@ -18,7 +22,7 @@ public override void Default() { } - protected override global::System.Collections.Generic.List GetOptions() + protected override List GetOptions() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs.meta index 731b658d..66824019 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/GenericOptionListFeature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4cc7a48f07e8f9f29045ef2c58a6b511 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs b/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs index 0004e7a3..fe6ac23e 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs @@ -1,25 +1,30 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.UI.Construction.Features; +using UnityEngine; + namespace ScheduleOne.Construction.Features { - public class MaterialFeature : global::ScheduleOne.Construction.Features.OptionListFeature + public class MaterialFeature : OptionListFeature { - [global::System.Serializable] + [Serializable] public class NamedMaterial { public string matName; - public global::UnityEngine.Color buttonColor; + public Color buttonColor; - public global::UnityEngine.Material mat; + public Material mat; public float price; } - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::System.Collections.Generic.List materialTargets; + [Header("References")] + [SerializeField] + protected List materialTargets; - [global::UnityEngine.Header("Material settings")] - public global::System.Collections.Generic.List materials; + [Header("Material settings")] + public List materials; private bool NetworkInitialize___EarlyScheduleOne_002EConstruction_002EFeatures_002EMaterialFeatureAssembly_002DCSharp_002Edll_Excuted; @@ -29,11 +34,11 @@ public override void SelectOption(int optionIndex) { } - private void ApplyMaterial(global::ScheduleOne.Construction.Features.MaterialFeature.NamedMaterial mat) + private void ApplyMaterial(NamedMaterial mat) { } - protected override global::System.Collections.Generic.List GetOptions() + protected override List GetOptions() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs.meta index ae5183e0..0b38c334 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/MaterialFeature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d648a2bc53a8959da509631f9c14ebfa -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs b/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs index 5d99bed3..8c53bb71 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs +++ b/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs @@ -1,14 +1,23 @@ +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Object.Synchronizing; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.UI.Construction.Features; +using UnityEngine; + namespace ScheduleOne.Construction.Features { - public abstract class OptionListFeature : global::ScheduleOne.Construction.Features.Feature + public abstract class OptionListFeature : Feature { - [global::UnityEngine.Header("Option list feature settings")] + [Header("Option list feature settings")] public int defaultOptionIndex; - [global::FishNet.Object.Synchronizing.SyncVar] + [SyncVar] public int ownedOptionIndex; - public global::FishNet.Object.Synchronizing.SyncVar syncVar___ownedOptionIndex; + public SyncVar syncVar___ownedOptionIndex; private bool NetworkInitialize___EarlyScheduleOne_002EConstruction_002EFeatures_002EOptionListFeatureAssembly_002DCSharp_002Edll_Excuted; @@ -29,7 +38,7 @@ public override void Awake() { } - public override global::ScheduleOne.UI.Construction.Features.FI_Base CreateInterface(global::UnityEngine.Transform parent) + public override FI_Base CreateInterface(Transform parent) { return null; } @@ -38,13 +47,13 @@ public override void Default() { } - protected abstract global::System.Collections.Generic.List GetOptions(); + protected abstract List GetOptions(); public virtual void SelectOption(int optionIndex) { } - [global::FishNet.Object.ServerRpc(RequireOwnership = false, RunLocally = true)] + [ServerRpc(RequireOwnership = false, RunLocally = true)] protected virtual void SetData(int colorIndex) { } @@ -77,11 +86,11 @@ protected virtual void RpcLogic___SetData_3316948804(int colorIndex) { } - private void RpcReader___Server_SetData_3316948804(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SetData_3316948804(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - public virtual bool ReadSyncVar___ScheduleOne_002EConstruction_002EFeatures_002EOptionListFeature(global::FishNet.Serializing.PooledReader PooledReader0, uint UInt321, bool Boolean2) + public virtual bool ReadSyncVar___ScheduleOne_002EConstruction_002EFeatures_002EOptionListFeature(PooledReader PooledReader0, uint UInt321, bool Boolean2) { return false; } diff --git a/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs.meta b/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs.meta index f15488b8..f713e0db 100644 --- a/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs.meta +++ b/Assets/Scripts/ScheduleOne/Construction/Features/OptionListFeature.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ba18d8d34bbf51c26f74a2bb5b3f934d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Cutscenes.meta b/Assets/Scripts/ScheduleOne/Cutscenes.meta index 308c963b..41a4dd9b 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes.meta +++ b/Assets/Scripts/ScheduleOne/Cutscenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de7360fcf3e2d8d4291bfd7613ab1c25 +guid: 2481e78a6558ead498228441b841a554 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs b/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs index 768ae000..146e3855 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs +++ b/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs @@ -1,9 +1,12 @@ +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.Cutscenes { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Animation))] - public class Cutscene : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Animation))] + public class Cutscene : MonoBehaviour { - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public string Name; public bool DisablePlayerControl; @@ -12,15 +15,15 @@ public class Cutscene : global::UnityEngine.MonoBehaviour public float CameraFOV; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform CameraControl; + [Header("References")] + public Transform CameraControl; - [global::UnityEngine.Header("Events")] - public global::UnityEngine.Events.UnityEvent onPlay; + [Header("Events")] + public UnityEvent onPlay; - public global::UnityEngine.Events.UnityEvent onEnd; + public UnityEvent onEnd; - private global::UnityEngine.Animation animation; + private Animation animation; public bool IsPlaying { get; private set; } diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs.meta b/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs.meta index ee1a34f6..68f2dae8 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs.meta +++ b/Assets/Scripts/ScheduleOne/Cutscenes/Cutscene.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 63adecd25e54bed032db06b35a20273c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs b/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs index 7b8599d6..9fc02c4f 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs +++ b/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs @@ -1,16 +1,21 @@ +using System.Collections.Generic; +using EasyButtons; +using ScheduleOne.DevUtilities; +using UnityEngine; + namespace ScheduleOne.Cutscenes { - public class CutsceneManager : global::ScheduleOne.DevUtilities.Singleton + public class CutsceneManager : Singleton { - public global::System.Collections.Generic.List Cutscenes; + public List Cutscenes; - [global::UnityEngine.Header("Run cutscene by name")] - [global::UnityEngine.SerializeField] + [Header("Run cutscene by name")] + [SerializeField] private string cutsceneName; - private global::ScheduleOne.Cutscenes.Cutscene playingCutscene; + private Cutscene playingCutscene; - [global::EasyButtons.Button] + [Button] private void RunCutscene() { } diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs.meta b/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs.meta index 176ed3af..ba3e42e5 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Cutscenes/CutsceneManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 83145bc237947a82bcdbf158b1ce8a47 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs b/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs index ba8c6964..3e4fd4fe 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs +++ b/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs @@ -1,14 +1,17 @@ +using ScheduleOne.AvatarFramework; +using UnityEngine.Events; + namespace ScheduleOne.Cutscenes { - public class EndCutscene : global::ScheduleOne.Cutscenes.Cutscene + public class EndCutscene : Cutscene { - public global::UnityEngine.Events.UnityEvent onStandUp; + public UnityEvent onStandUp; - public global::UnityEngine.Events.UnityEvent onRunStart; + public UnityEvent onRunStart; - public global::UnityEngine.Events.UnityEvent onEngineStart; + public UnityEvent onEngineStart; - public global::ScheduleOne.AvatarFramework.Avatar Avatar; + public Avatar Avatar; public override void Play() { diff --git a/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs.meta b/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs.meta index e535cc99..75212391 100644 --- a/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs.meta +++ b/Assets/Scripts/ScheduleOne/Cutscenes/EndCutscene.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8e9cfe5380a8a5ffe2b062d5a481d38a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Decoration.meta b/Assets/Scripts/ScheduleOne/Decoration.meta index cff15086..2165e8f3 100644 --- a/Assets/Scripts/ScheduleOne/Decoration.meta +++ b/Assets/Scripts/ScheduleOne/Decoration.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 261ad261471910044b323f827abc7fcd +guid: 88ff24767e980c8458bf278e1a7126c6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs b/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs index e492ecc1..a277d776 100644 --- a/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs +++ b/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs @@ -1,12 +1,14 @@ +using UnityEngine; + namespace ScheduleOne.Decoration { - public class RockerSwitch : global::UnityEngine.MonoBehaviour + public class RockerSwitch : MonoBehaviour { - public global::UnityEngine.MeshRenderer ButtonMesh; + public MeshRenderer ButtonMesh; - public global::UnityEngine.Transform ButtonTransform; + public Transform ButtonTransform; - public global::UnityEngine.Light Light; + public Light Light; public bool isOn; diff --git a/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs.meta b/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs.meta index 3f02973c..153f0823 100644 --- a/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs.meta +++ b/Assets/Scripts/ScheduleOne/Decoration/RockerSwitch.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6cf356d8c956d0c7a4cd93902f7fb020 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Delivery.meta b/Assets/Scripts/ScheduleOne/Delivery.meta index e6d081cb..5f1a0bef 100644 --- a/Assets/Scripts/ScheduleOne/Delivery.meta +++ b/Assets/Scripts/ScheduleOne/Delivery.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b63ce0e57506b394da3bd5115b286140 +guid: d15a894d1bcb0f346a83ae17f03b0076 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs b/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs index 095480e8..51e9222e 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs @@ -1,6 +1,11 @@ +using System; +using FishNet.Serializing.Helping; +using ScheduleOne.DevUtilities; +using UnityEngine.Events; + namespace ScheduleOne.Delivery { - [global::System.Serializable] + [Serializable] public class DeliveryInstance { public string DeliveryID; @@ -11,26 +16,26 @@ public class DeliveryInstance public int LoadingDockIndex; - public global::ScheduleOne.DevUtilities.StringIntPair[] Items; + public StringIntPair[] Items; - public global::ScheduleOne.Delivery.EDeliveryStatus Status; + public EDeliveryStatus Status; public int TimeUntilArrival; - [global::System.NonSerialized] - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::UnityEngine.Events.UnityEvent onDeliveryCompleted; + [NonSerialized] + [CodegenExclude] + public UnityEvent onDeliveryCompleted; - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::ScheduleOne.Delivery.DeliveryVehicle ActiveVehicle { get; private set; } + [CodegenExclude] + public DeliveryVehicle ActiveVehicle { get; private set; } - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::ScheduleOne.Property.Property Destination => null; + [CodegenExclude] + public ScheduleOne.Property.Property Destination => null; - [global::FishNet.Serializing.Helping.CodegenExclude] - public global::ScheduleOne.Delivery.LoadingDock LoadingDock => null; + [CodegenExclude] + public LoadingDock LoadingDock => null; - public DeliveryInstance(string deliveryID, string storeName, string destinationCode, int loadingDockIndex, global::ScheduleOne.DevUtilities.StringIntPair[] items, global::ScheduleOne.Delivery.EDeliveryStatus status, int timeUntilArrival) + public DeliveryInstance(string deliveryID, string storeName, string destinationCode, int loadingDockIndex, StringIntPair[] items, EDeliveryStatus status, int timeUntilArrival) { } @@ -43,7 +48,7 @@ public int GetTimeStatus() return 0; } - public void SetStatus(global::ScheduleOne.Delivery.EDeliveryStatus status) + public void SetStatus(EDeliveryStatus status) { } diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs.meta b/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs.meta index 883c27d7..5fe6242d 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs.meta +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryInstance.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b8518fff999d42529cb336a5d06450eb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs b/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs index 64ab8bf0..fee6eac9 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs @@ -1,21 +1,30 @@ +using System.Collections.Generic; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.DevUtilities; +using ScheduleOne.Persistence; +using ScheduleOne.Persistence.Loaders; +using ScheduleOne.UI.Phone.Delivery; +using ScheduleOne.UI.Shop; +using UnityEngine.Events; + namespace ScheduleOne.Delivery { - public class DeliveryManager : global::ScheduleOne.DevUtilities.NetworkSingleton, global::ScheduleOne.Persistence.IBaseSaveable, global::ScheduleOne.Persistence.ISaveable + public class DeliveryManager : NetworkSingleton, IBaseSaveable, ISaveable { - [global::UnityEngine.HideInInspector] - public global::System.Collections.Generic.List AllShops; - - public global::System.Collections.Generic.List Deliveries; + public List Deliveries; - public global::UnityEngine.Events.UnityEvent onDeliveryCreated; + public UnityEvent onDeliveryCreated; - public global::UnityEngine.Events.UnityEvent onDeliveryCompleted; + public UnityEvent onDeliveryCompleted; - private global::ScheduleOne.Persistence.Loaders.DeliveriesLoader loader; + private DeliveriesLoader loader; - private global::System.Collections.Generic.List writtenVehicles; + private List writtenVehicles; - private global::System.Collections.Generic.Dictionary minsSinceVehicleEmpty; + private Dictionary minsSinceVehicleEmpty; private bool NetworkInitialize___EarlyScheduleOne_002EDelivery_002EDeliveryManagerAssembly_002DCSharp_002Edll_Excuted; @@ -25,13 +34,13 @@ public class DeliveryManager : global::ScheduleOne.DevUtilities.NetworkSingleton public string SaveFileName => null; - public global::ScheduleOne.Persistence.Loaders.Loader Loader => null; + public Loader Loader => null; public bool ShouldSaveUnderFolder => false; - public global::System.Collections.Generic.List LocalExtraFiles { get; set; } + public List LocalExtraFiles { get; set; } - public global::System.Collections.Generic.List LocalExtraFolders { get; set; } + public List LocalExtraFolders { get; set; } public bool HasChanged { get; set; } @@ -47,7 +56,7 @@ public virtual void InitializeSaveable() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } @@ -55,43 +64,43 @@ private void OnMinPass() { } - public bool IsLoadingBayFree(global::ScheduleOne.Property.Property destination, int loadingDockIndex) + public bool IsLoadingBayFree(ScheduleOne.Property.Property destination, int loadingDockIndex) { return false; } - [global::FishNet.Object.ServerRpc(RequireOwnership = false)] - public void SendDelivery(global::ScheduleOne.Delivery.DeliveryInstance delivery) + [ServerRpc(RequireOwnership = false)] + public void SendDelivery(DeliveryInstance delivery) { } - [global::FishNet.Object.ObserversRpc] - [global::FishNet.Object.TargetRpc] - private void ReceiveDelivery(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Delivery.DeliveryInstance delivery) + [ObserversRpc] + [TargetRpc] + private void ReceiveDelivery(NetworkConnection conn, DeliveryInstance delivery) { } - [global::FishNet.Object.ObserversRpc(RunLocally = true)] - private void SetDeliveryState(string deliveryID, global::ScheduleOne.Delivery.EDeliveryStatus status) + [ObserversRpc(RunLocally = true)] + private void SetDeliveryState(string deliveryID, EDeliveryStatus status) { } - private global::ScheduleOne.Delivery.DeliveryInstance GetDelivery(string deliveryID) + private DeliveryInstance GetDelivery(string deliveryID) { return null; } - public global::ScheduleOne.Delivery.DeliveryInstance GetDelivery(global::ScheduleOne.Property.Property destination) + public DeliveryInstance GetDelivery(ScheduleOne.Property.Property destination) { return null; } - public global::ScheduleOne.Delivery.DeliveryInstance GetActiveShopDelivery(global::ScheduleOne.UI.Phone.Delivery.DeliveryShop shop) + public DeliveryInstance GetActiveShopDelivery(DeliveryShop shop) { return null; } - public global::ScheduleOne.UI.Shop.ShopInterface GetShopInterface(string shopName) + public ShopInterface GetShopInterface(string shopName) { return null; } @@ -101,7 +110,7 @@ public virtual string GetSaveString() return null; } - public virtual global::System.Collections.Generic.List WriteData(string parentFolderPath) + public virtual List WriteData(string parentFolderPath) { return null; } @@ -122,47 +131,47 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Server_SendDelivery_2813439055(global::ScheduleOne.Delivery.DeliveryInstance delivery) + private void RpcWriter___Server_SendDelivery_2813439055(DeliveryInstance delivery) { } - public void RpcLogic___SendDelivery_2813439055(global::ScheduleOne.Delivery.DeliveryInstance delivery) + public void RpcLogic___SendDelivery_2813439055(DeliveryInstance delivery) { } - private void RpcReader___Server_SendDelivery_2813439055(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel, global::FishNet.Connection.NetworkConnection conn) + private void RpcReader___Server_SendDelivery_2813439055(PooledReader PooledReader0, Channel channel, NetworkConnection conn) { } - private void RpcWriter___Observers_ReceiveDelivery_2795369214(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Delivery.DeliveryInstance delivery) + private void RpcWriter___Observers_ReceiveDelivery_2795369214(NetworkConnection conn, DeliveryInstance delivery) { } - private void RpcLogic___ReceiveDelivery_2795369214(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Delivery.DeliveryInstance delivery) + private void RpcLogic___ReceiveDelivery_2795369214(NetworkConnection conn, DeliveryInstance delivery) { } - private void RpcReader___Observers_ReceiveDelivery_2795369214(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_ReceiveDelivery_2795369214(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Target_ReceiveDelivery_2795369214(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Delivery.DeliveryInstance delivery) + private void RpcWriter___Target_ReceiveDelivery_2795369214(NetworkConnection conn, DeliveryInstance delivery) { } - private void RpcReader___Target_ReceiveDelivery_2795369214(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_ReceiveDelivery_2795369214(PooledReader PooledReader0, Channel channel) { } - private void RpcWriter___Observers_SetDeliveryState_316609003(string deliveryID, global::ScheduleOne.Delivery.EDeliveryStatus status) + private void RpcWriter___Observers_SetDeliveryState_316609003(string deliveryID, EDeliveryStatus status) { } - private void RpcLogic___SetDeliveryState_316609003(string deliveryID, global::ScheduleOne.Delivery.EDeliveryStatus status) + private void RpcLogic___SetDeliveryState_316609003(string deliveryID, EDeliveryStatus status) { } - private void RpcReader___Observers_SetDeliveryState_316609003(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Observers_SetDeliveryState_316609003(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs.meta b/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs.meta index a2eddd2f..33a03b11 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2869c0c1ae3585f013eb96a3f9a1a754 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs b/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs index ddbf2340..7e4f7e18 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs @@ -1,19 +1,22 @@ +using ScheduleOne.Vehicles; +using UnityEngine; + namespace ScheduleOne.Delivery { - [global::UnityEngine.RequireComponent(typeof(global::ScheduleOne.Vehicles.LandVehicle))] - public class DeliveryVehicle : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(LandVehicle))] + public class DeliveryVehicle : MonoBehaviour { public string GUID; - public global::ScheduleOne.Vehicles.LandVehicle Vehicle { get; private set; } + public LandVehicle Vehicle { get; private set; } - public global::ScheduleOne.Delivery.DeliveryInstance ActiveDelivery { get; private set; } + public DeliveryInstance ActiveDelivery { get; private set; } private void Awake() { } - public void Activate(global::ScheduleOne.Delivery.DeliveryInstance instance) + public void Activate(DeliveryInstance instance) { } diff --git a/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs.meta b/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs.meta index d1e8736b..eaa6eab9 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs.meta +++ b/Assets/Scripts/ScheduleOne/Delivery/DeliveryVehicle.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 53fbb70863a64ab0d9e431ab698de66c -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Delivery/EDeliveryStatus.cs.meta b/Assets/Scripts/ScheduleOne/Delivery/EDeliveryStatus.cs.meta index a52e1355..a2021c21 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/EDeliveryStatus.cs.meta +++ b/Assets/Scripts/ScheduleOne/Delivery/EDeliveryStatus.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd6a84260b1a3734d8d8b0ad0376bd90 +guid: 3fa83a1b1d84e47409704a5ddad75b3f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs b/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs index 2f02ed07..200222bf 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs +++ b/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs @@ -1,41 +1,52 @@ +using System; +using System.Collections.Generic; +using EPOOutline; +using EasyButtons; +using ScheduleOne.DevUtilities; +using ScheduleOne.ItemFramework; +using ScheduleOne.Management; +using ScheduleOne.Map; +using ScheduleOne.Vehicles; +using UnityEngine; + namespace ScheduleOne.Delivery { - public class LoadingDock : global::UnityEngine.MonoBehaviour, global::ScheduleOne.IGUIDRegisterable, global::ScheduleOne.Management.ITransitEntity + public class LoadingDock : MonoBehaviour, IGUIDRegisterable, ITransitEntity { - [global::UnityEngine.SerializeField] + [SerializeField] protected string BakedGUID; - public global::ScheduleOne.Property.Property ParentProperty; + public ScheduleOne.Property.Property ParentProperty; - public global::ScheduleOne.DevUtilities.VehicleDetector VehicleDetector; + public VehicleDetector VehicleDetector; - public global::ScheduleOne.Map.ParkingLot Parking; + public ParkingLot Parking; - public global::UnityEngine.Transform uiPoint; + public Transform uiPoint; - public global::UnityEngine.Transform[] accessPoints; + public Transform[] accessPoints; - public global::UnityEngine.GameObject[] OutlineRenderers; + public GameObject[] OutlineRenderers; - private global::EPOOutline.Outlinable OutlineEffect; + private Outlinable OutlineEffect; - public global::ScheduleOne.Vehicles.LandVehicle DynamicOccupant { get; private set; } + public LandVehicle DynamicOccupant { get; private set; } - public global::ScheduleOne.Vehicles.LandVehicle StaticOccupant { get; private set; } + public LandVehicle StaticOccupant { get; private set; } public bool IsInUse => false; - public global::System.Guid GUID { get; protected set; } + public Guid GUID { get; protected set; } public string Name => null; - public global::System.Collections.Generic.List InputSlots { get; set; } + public List InputSlots { get; set; } - public global::System.Collections.Generic.List OutputSlots { get; set; } + public List OutputSlots { get; set; } - public global::UnityEngine.Transform LinkOrigin => null; + public Transform LinkOrigin => null; - public global::UnityEngine.Transform[] AccessPoints => null; + public Transform[] AccessPoints => null; public bool Selectable { get; } @@ -43,7 +54,7 @@ public class LoadingDock : global::UnityEngine.MonoBehaviour, global::ScheduleOn public bool IsDestroyed { get; set; } - [global::EasyButtons.Button] + [Button] public void RegenerateGUID() { } @@ -56,7 +67,7 @@ private void Start() { } - public void SetGUID(global::System.Guid guid) + public void SetGUID(Guid guid) { } @@ -64,15 +75,15 @@ private void RefreshOccupant() { } - private void SetOccupant(global::ScheduleOne.Vehicles.LandVehicle occupant) + private void SetOccupant(LandVehicle occupant) { } - public void SetStaticOccupant(global::ScheduleOne.Vehicles.LandVehicle vehicle) + public void SetStaticOccupant(LandVehicle vehicle) { } - public virtual void ShowOutline(global::UnityEngine.Color color) + public virtual void ShowOutline(Color color) { } diff --git a/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs.meta b/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs.meta index e472596e..e4b2a531 100644 --- a/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs.meta +++ b/Assets/Scripts/ScheduleOne/Delivery/LoadingDock.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 20fce8cd5015fbf3430df912dbdc3571 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities.meta b/Assets/Scripts/ScheduleOne/DevUtilities.meta index f88b6e33..e9cc0f57 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebdf603e4f79b5746b0f6b2ca0a4ca82 +guid: 07e84724c66e00c409c1b82303ff4208 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs index 84e88cca..89cd2d18 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class AchievementUtility : global::UnityEngine.MonoBehaviour + public class AchievementUtility : MonoBehaviour { - public global::ScheduleOne.AchievementManager.EAchievement Achievement; + public AchievementManager.EAchievement Achievement; public void UnlockAchievement() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs.meta index 9f9994f3..97329d9d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AchievementUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d2816c87a800421070e306554e0da61d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs b/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs index 86d6e0ed..8c56155d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class ApplicationQuit : global::UnityEngine.MonoBehaviour + public class ApplicationQuit : MonoBehaviour { public void Quit() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs.meta index 0608cc96..60bb7e46 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ApplicationQuit.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4528c7f15e657e7346dc0588c22c08c7 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs index 1166c0d5..d1e7b3ee 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { public static class AssetPathUtility { - public static string GetResourcesPath(global::UnityEngine.Object selectedObject) + public static string GetResourcesPath(Object selectedObject) { return null; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs.meta index 1176dce6..68b6e64b 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AssetPathUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b0cb1bc2caf819f3f6bcd5d79b6c1477 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs index fdfe6343..2b40205d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs @@ -1,10 +1,12 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class AstarUtility : global::UnityEngine.MonoBehaviour + public class AstarUtility : MonoBehaviour { - public static global::UnityEngine.Vector3 GetClosestPointOnGraph(global::UnityEngine.Vector3 point, string GraphName) + public static Vector3 GetClosestPointOnGraph(Vector3 point, string GraphName) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } } } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs.meta index c0b6be2c..0d6f3dff 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AstarUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 09016c2f52d7f8d992caefb427716a6f -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs index 30dcd713..21d9f015 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class AudioSettings { public float MasterVolume; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs.meta index c894ef41..3921fe42 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AudioSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 31f8267b06965a8ac1ae9c048f3a1217 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs b/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs index 577fa37d..5ad23788 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs @@ -1,10 +1,14 @@ +using ScheduleOne.ConstructableScripts; +using UnityEngine; +using Grid = ScheduleOne.Tiles.Grid; + namespace ScheduleOne.DevUtilities { - public class Autotest : global::UnityEngine.MonoBehaviour + public class Autotest : MonoBehaviour { - public global::ScheduleOne.ConstructableScripts.Constructable_GridBased workerAccom; + public Constructable_GridBased workerAccom; - public global::ScheduleOne.Tiles.Grid crescentGrid; + public Grid crescentGrid; protected void Start() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs.meta index 55203fd0..40a014aa 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Autotest.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f5c96d6f17fbbfebc9f12f33a4ded54a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs b/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs index 4891c7ae..73c0b010 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs @@ -1,20 +1,22 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class AverageAcceleration : global::UnityEngine.MonoBehaviour + public class AverageAcceleration : MonoBehaviour { - public global::UnityEngine.Rigidbody Rb; + public Rigidbody Rb; public float TimeWindow; - private global::UnityEngine.Vector3[] accelerations; + private Vector3[] accelerations; private int currentIndex; private float timer; - private global::UnityEngine.Vector3 prevVelocity; + private Vector3 prevVelocity; - public global::UnityEngine.Vector3 Acceleration { get; private set; } + public Vector3 Acceleration { get; private set; } private void Start() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs.meta index 17a27133..1ae688de 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/AverageAcceleration.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c8735822ea57585971a4c754511a5d31 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs b/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs index df023a95..c94c18a8 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs @@ -1,20 +1,22 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class BirdsEyeView : global::ScheduleOne.DevUtilities.Singleton + public class BirdsEyeView : Singleton { - [global::UnityEngine.Header("Settings")] - public global::UnityEngine.Vector3 bounds_Min; + [Header("Settings")] + public Vector3 bounds_Min; - public global::UnityEngine.Vector3 bounds_Max; + public Vector3 bounds_Max; - [global::UnityEngine.Header("Camera settings")] + [Header("Camera settings")] public float lateralMovementSpeed; public float scrollMovementSpeed; public float targetFollowSpeed; - [global::UnityEngine.Header("Camera orbit settings")] + [Header("Camera orbit settings")] public float xSpeed; public float ySpeed; @@ -23,7 +25,7 @@ public class BirdsEyeView : global::ScheduleOne.DevUtilities.Singleton null; + private Transform playerCam => null; public bool isEnabled { get; protected set; } @@ -53,7 +55,7 @@ protected virtual void LateUpdate() { } - public void Enable(global::UnityEngine.Vector3 startPosition, global::UnityEngine.Quaternion startRotation) + public void Enable(Vector3 startPosition, Quaternion startRotation) { } @@ -86,7 +88,7 @@ private void CancelOriginSlide() { } - public void SlideCameraOrigin(global::UnityEngine.Vector3 position, float offsetDistance, float time = 0f) + public void SlideCameraOrigin(Vector3 position, float offsetDistance, float time = 0f) { } } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs.meta index 8f5c0b78..0f4d05d1 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/BirdsEyeView.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5f041260bd363e941ed492395095439a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs b/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs index ded320a8..5660fb16 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs @@ -1,17 +1,21 @@ +using ScheduleOne.AvatarFramework.Animation; +using UnityEngine; +using UnityEngine.UI; + namespace ScheduleOne.DevUtilities { - public class CameraOrbit : global::UnityEngine.MonoBehaviour + public class CameraOrbit : MonoBehaviour { - [global::UnityEngine.Header("Required")] - public global::UnityEngine.Transform target; + [Header("Required")] + public Transform target; - public global::UnityEngine.Transform cam; + public Transform cam; - public global::UnityEngine.UI.GraphicRaycaster raycaster; + public GraphicRaycaster raycaster; - public global::ScheduleOne.AvatarFramework.Animation.AvatarLookController LookAt; + public AvatarLookController LookAt; - [global::UnityEngine.Header("Config")] + [Header("Config")] public float targetdistance; public float xSpeed; @@ -30,7 +34,7 @@ public class CameraOrbit : global::UnityEngine.MonoBehaviour public float ScrollSensativity; - private global::UnityEngine.Rigidbody rb; + private Rigidbody rb; private float x; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs.meta index aeaa066f..5169b777 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CameraOrbit.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ea85201bb73efff61c4c9a04ba0ec5db -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs b/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs index 6b092964..bcfcc1a7 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class CopyPosition : global::UnityEngine.MonoBehaviour + public class CopyPosition : MonoBehaviour { - public global::UnityEngine.Transform ToCopy; + public Transform ToCopy; private void LateUpdate() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs.meta index a60f95a9..d4cc716b 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CopyPosition.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 82aef449b3d9b7b9b3d8c9a946cc70ef -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs b/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs index dd9450ee..d7852e6c 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.DevUtilities { - public class CoroutineService : global::ScheduleOne.DevUtilities.Singleton + public class CoroutineService : Singleton { } } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs.meta index bf6fdd2e..8989f822 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/CoroutineService.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ef4f697b91bcdcb0ed948e684334061b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs index 15b655ad..ddbfa9df 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs @@ -1,6 +1,10 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public struct DisplaySettings { public enum EDisplayMode @@ -12,7 +16,7 @@ public enum EDisplayMode public int ResolutionIndex; - public global::ScheduleOne.DevUtilities.DisplaySettings.EDisplayMode DisplayMode; + public EDisplayMode DisplayMode; public bool VSync; @@ -24,7 +28,7 @@ public enum EDisplayMode public int ActiveDisplayIndex; - public static global::System.Collections.Generic.List GetResolutions() + public static List GetResolutions() { return null; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs.meta index 912fdd2d..16cb8abb 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/DisplaySettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f3a932ac400e94367a9be8814e59304b -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs b/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs index 55e445c3..fb6bfb3c 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs @@ -2,7 +2,7 @@ namespace ScheduleOne.DevUtilities { public class ExitAction { - public global::ScheduleOne.DevUtilities.ExitType exitType; + public ExitType exitType; public bool used; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs.meta index e7f8846e..76ff8614 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ExitAction.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a76f6c54f9c802b40ad4c5841e559f47 +guid: 7f7b3e9d5e77a834e93988342ae75f7e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ExitType.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/ExitType.cs.meta index 2acbf822..ba79d372 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ExitType.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ExitType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1510c1053b412f44186c9aae7e1d6123 +guid: eb5d3cfa0cf614e4ab53f807fdc1dfda MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs index 330dc363..a435d530 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs @@ -1,8 +1,11 @@ +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class GUIDUtility : global::UnityEngine.MonoBehaviour + public class GUIDUtility : MonoBehaviour { - [global::EasyButtons.Button] + [Button] public void GenerateGUID() { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs.meta index 98c47eb2..924b1ad7 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GUIDUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1800e5c915a2bd8e6eb7aed00119d53a -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs b/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs index 5cb7419a..c674c125 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs @@ -1,27 +1,39 @@ +using System.Collections.Generic; +using EasyButtons; +using FishNet.Connection; +using FishNet.Object; +using FishNet.Serializing; +using FishNet.Transporting; +using ScheduleOne.Persistence; +using ScheduleOne.Persistence.Datas; +using ScheduleOne.Persistence.Loaders; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.DevUtilities { - public class GameManager : global::ScheduleOne.DevUtilities.NetworkSingleton, global::ScheduleOne.Persistence.IBaseSaveable, global::ScheduleOne.Persistence.ISaveable + public class GameManager : NetworkSingleton, IBaseSaveable, ISaveable { public const bool IS_DEMO = false; public static bool IS_BETA; - [global::UnityEngine.SerializeField] + [SerializeField] private int seed; public string OrganisationName; - public global::ScheduleOne.DevUtilities.GameSettings Settings; + public GameSettings Settings; - public global::UnityEngine.Transform SpawnPoint; + public Transform SpawnPoint; - public global::UnityEngine.Transform NoHomeRespawnPoint; + public Transform NoHomeRespawnPoint; - public global::UnityEngine.Transform Temp; + public Transform Temp; - public global::UnityEngine.Events.UnityEvent onSettingsLoaded; + public UnityEvent onSettingsLoaded; - private global::ScheduleOne.Persistence.Loaders.GameDataLoader loader; + private GameDataLoader loader; private bool NetworkInitialize___EarlyScheduleOne_002EDevUtilities_002EGameManagerAssembly_002DCSharp_002Edll_Excuted; @@ -31,7 +43,7 @@ public class GameManager : global::ScheduleOne.DevUtilities.NetworkSingleton 0; - public global::UnityEngine.Sprite OrganisationLogo { get; protected set; } + public Sprite OrganisationLogo { get; protected set; } public bool IsTutorial => false; @@ -39,13 +51,13 @@ public class GameManager : global::ScheduleOne.DevUtilities.NetworkSingleton null; - public global::ScheduleOne.Persistence.Loaders.Loader Loader => null; + public Loader Loader => null; public bool ShouldSaveUnderFolder => false; - public global::System.Collections.Generic.List LocalExtraFiles { get; set; } + public List LocalExtraFiles { get; set; } - public global::System.Collections.Generic.List LocalExtraFolders { get; set; } + public List LocalExtraFolders { get; set; } public bool HasChanged { get; set; } @@ -57,12 +69,12 @@ protected override void Start() { } - public override void OnSpawnServer(global::FishNet.Connection.NetworkConnection connection) + public override void OnSpawnServer(NetworkConnection connection) { } - [global::FishNet.Object.TargetRpc] - public void SetGameData(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Persistence.Datas.GameData data) + [TargetRpc] + public void SetGameData(NetworkConnection conn, GameData data) { } @@ -75,11 +87,11 @@ public virtual string GetSaveString() return null; } - public void Load(global::ScheduleOne.Persistence.Datas.GameData data, string path) + public void Load(GameData data, string path) { } - [global::EasyButtons.Button] + [Button] public void EndTutorial(bool natural) { } @@ -96,15 +108,15 @@ public override void NetworkInitializeIfDisabled() { } - private void RpcWriter___Target_SetGameData_3076874643(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Persistence.Datas.GameData data) + private void RpcWriter___Target_SetGameData_3076874643(NetworkConnection conn, GameData data) { } - public void RpcLogic___SetGameData_3076874643(global::FishNet.Connection.NetworkConnection conn, global::ScheduleOne.Persistence.Datas.GameData data) + public void RpcLogic___SetGameData_3076874643(NetworkConnection conn, GameData data) { } - private void RpcReader___Target_SetGameData_3076874643(global::FishNet.Serializing.PooledReader PooledReader0, global::FishNet.Transporting.Channel channel) + private void RpcReader___Target_SetGameData_3076874643(PooledReader PooledReader0, Channel channel) { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs.meta index 09a6ba1b..9d300798 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GameManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6d760530fcdabde9d1c2eed7d9aba3b4 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs index 7402e4af..dee580d4 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class GameSettings { public bool ConsoleEnabled; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs.meta index e7507f7a..740b456c 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GameSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1e6ee07c91018da32f79f500f5c7f3eb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs index 380dc7ca..4e5c90f8 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class GraphicsSettings { public enum EAntiAliasingMode @@ -18,9 +20,9 @@ public enum EGraphicsQuality Ultra = 3 } - public global::ScheduleOne.DevUtilities.GraphicsSettings.EGraphicsQuality GraphicsQuality; + public EGraphicsQuality GraphicsQuality; - public global::ScheduleOne.DevUtilities.GraphicsSettings.EAntiAliasingMode AntiAliasingMode; + public EAntiAliasingMode AntiAliasingMode; public float FOV; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs.meta index 358d22ae..9f4a1060 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/GraphicsSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 39a3199ac8414d0a16ece713bea07c67 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs b/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs index dbfeaffe..d8c3411a 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs @@ -1,13 +1,19 @@ +using System; +using System.Collections.Generic; +using EasyButtons; +using ScheduleOne.Packaging; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class IconGenerator : global::ScheduleOne.DevUtilities.Singleton + public class IconGenerator : Singleton { - [global::System.Serializable] + [Serializable] public class PackagingVisuals { public string PackagingID; - public global::ScheduleOne.Packaging.FilledPackagingVisuals Visuals; + public FilledPackagingVisuals Visuals; } public int IconSize; @@ -16,34 +22,34 @@ public class PackagingVisuals public bool ModifyLighting; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Registry Registry; + [Header("References")] + public Registry Registry; - public global::UnityEngine.Camera CameraPosition; + public Camera CameraPosition; - public global::UnityEngine.Transform MainContainer; + public Transform MainContainer; - public global::UnityEngine.Transform ItemContainer; + public Transform ItemContainer; - public global::UnityEngine.GameObject Canvas; + public GameObject Canvas; - public global::System.Collections.Generic.List Visuals; + public List Visuals; protected override void Awake() { } - [global::EasyButtons.Button] + [Button] public void GenerateIcon() { } - public global::UnityEngine.Texture2D GeneratePackagingIcon(string packagingID, string productID) + public Texture2D GeneratePackagingIcon(string packagingID, string productID) { return null; } - public global::UnityEngine.Texture2D GetTexture(global::UnityEngine.Transform model) + public Texture2D GetTexture(Transform model) { return null; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs.meta index 8f97af2f..ee32d1d1 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/IconGenerator.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c45b53b8a448f8cb2e6e357e9bc1f4b1 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs index a9a9ddf0..b2a373dd 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class InputSettings { public enum EActionMode @@ -13,7 +15,7 @@ public enum EActionMode public bool InvertMouse; - public global::ScheduleOne.DevUtilities.InputSettings.EActionMode SprintMode; + public EActionMode SprintMode; public string BindingOverrides; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs.meta index 3a60e5e7..fd2867a7 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/InputSettings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: edc38392bcbc5f783fb19a417b27e3a8 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs b/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs index 2b8188ee..f4e7338b 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs @@ -1,8 +1,10 @@ +using System; + namespace ScheduleOne.DevUtilities { public static class JsonHelper { - [global::System.Serializable] + [Serializable] private class Wrapper { public T[] Items; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs.meta index 9c2864ef..51acf870 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/JsonHelper.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67fb1cd97193e4bc0e8f0687fb8c8cfb -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs index e08dd572..62f2c216 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { public static class LayerUtility { - public static void SetLayerRecursively(global::UnityEngine.GameObject go, int layerNumber) + public static void SetLayerRecursively(GameObject go, int layerNumber) { } } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs.meta index becc376e..900e71a5 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LayerUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9f17b361c79d1cfa6801d5df7a231d7b -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs b/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs index f4421a55..d12607ee 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs @@ -1,20 +1,22 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class LightOptimizer : global::UnityEngine.MonoBehaviour + public class LightOptimizer : MonoBehaviour { public bool LightsEnabled; - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.BoxCollider[] activationZones; + [Header("References")] + [SerializeField] + protected BoxCollider[] activationZones; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform[] viewPoints; + [SerializeField] + protected Transform[] viewPoints; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public float checkRange; - protected global::ScheduleOne.DevUtilities.OptimizedLight[] lights; + protected OptimizedLight[] lights; public void Awake() { @@ -28,7 +30,7 @@ public void ApplyLights() { } - public bool PointInCameraView(global::UnityEngine.Vector3 point) + public bool PointInCameraView(Vector3 point) { return false; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs.meta index 1226cd94..385bad1d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LightOptimizer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5603be5a731c6d299b88806a4b02af30 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs b/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs index bc38c138..d8f3855a 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs @@ -1,8 +1,10 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class LookAt : global::UnityEngine.MonoBehaviour + public class LookAt : MonoBehaviour { - public global::UnityEngine.Transform Target; + public Transform Target; private void LateUpdate() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs.meta index fc012daf..a12a05b5 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/LookAt.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1185bbf42308bd574efeeb045fcc73d7 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs b/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs index c4d51a75..2522e449 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs @@ -1,3 +1,5 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { public class MapHeightSampler @@ -6,7 +8,7 @@ public class MapHeightSampler private static float SampleDistance; - public static global::UnityEngine.Vector3 ResetPosition; + public static Vector3 ResetPosition; public static bool Sample(float x, out float y, float z) { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs.meta index 310102b0..025cce15 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/MapHeightSampler.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3bd6bd6e9514a3ea880dcca7d3198950 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs b/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs index fd7be821..a113182d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs @@ -1,10 +1,16 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.Persistence; +using ScheduleOne.Persistence.Datas; +using ScheduleOne.Persistence.Loaders; + namespace ScheduleOne.DevUtilities { - public class MetadataManager : global::ScheduleOne.DevUtilities.Singleton, global::ScheduleOne.Persistence.IBaseSaveable, global::ScheduleOne.Persistence.ISaveable + public class MetadataManager : Singleton, IBaseSaveable, ISaveable { - private global::ScheduleOne.Persistence.Loaders.MetadataLoader loader; + private MetadataLoader loader; - public global::System.DateTime CreationDate { get; protected set; } + public DateTime CreationDate { get; protected set; } public string CreationVersion { get; protected set; } @@ -12,13 +18,13 @@ public class MetadataManager : global::ScheduleOne.DevUtilities.Singleton null; - public global::ScheduleOne.Persistence.Loaders.Loader Loader => null; + public Loader Loader => null; public bool ShouldSaveUnderFolder => false; - public global::System.Collections.Generic.List LocalExtraFiles { get; set; } + public List LocalExtraFiles { get; set; } - public global::System.Collections.Generic.List LocalExtraFolders { get; set; } + public List LocalExtraFolders { get; set; } public bool HasChanged { get; set; } @@ -35,7 +41,7 @@ public virtual string GetSaveString() return null; } - public void Load(global::ScheduleOne.Persistence.Datas.MetaData data) + public void Load(MetaData data) { } } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs.meta index e9c9aaf3..5f228bf2 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/MetadataManager.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e037e1c1bd2feb720eb808c48e03c649 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs b/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs index e3bde3a4..e84dd8df 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs @@ -1,28 +1,34 @@ +using System.Collections.Generic; +using ScheduleOne.Management; +using ScheduleOne.NPCs; +using UnityEngine; +using UnityEngine.AI; + namespace ScheduleOne.DevUtilities { public static class NavMeshUtility { public const float SAMPLE_MAX_DISTANCE = 2f; - public static global::System.Collections.Generic.Dictionary SampleCache; + public static Dictionary SampleCache; - public static global::System.Collections.Generic.List sampleCacheKeys; + public static List sampleCacheKeys; public const float SAMPLE_CACHE_MAX_SQR_DIST = 1f; public const float MAX_CACHE_SIZE = 10000f; - public static float GetPathLength(global::UnityEngine.AI.NavMeshPath path) + public static float GetPathLength(NavMeshPath path) { return 0f; } - public static global::UnityEngine.Transform GetAccessPoint(global::ScheduleOne.Management.ITransitEntity entity, global::ScheduleOne.NPCs.NPC npc) + public static Transform GetAccessPoint(ITransitEntity entity, NPC npc) { return null; } - public static bool IsAtTransitEntity(global::ScheduleOne.Management.ITransitEntity entity, global::ScheduleOne.NPCs.NPC npc, float distanceThreshold = 0.4f) + public static bool IsAtTransitEntity(ITransitEntity entity, NPC npc, float distanceThreshold = 0.4f) { return false; } @@ -32,15 +38,15 @@ public static int GetNavMeshAgentID(string name) return 0; } - public static bool SamplePosition(global::UnityEngine.Vector3 sourcePosition, out global::UnityEngine.AI.NavMeshHit hit, float maxDistance, int areaMask, bool useCache = true) + public static bool SamplePosition(Vector3 sourcePosition, out NavMeshHit hit, float maxDistance, int areaMask, bool useCache = true) { - hit = default(global::UnityEngine.AI.NavMeshHit); + hit = default(NavMeshHit); return false; } - private static global::UnityEngine.Vector3 Quantize(global::UnityEngine.Vector3 position, float precision = 0.1f) + private static Vector3 Quantize(Vector3 position, float precision = 0.1f) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public static void ClearCache() diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs.meta index 9f951abb..5cc72b11 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/NavMeshUtility.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: da8978f7145f32a9630a9f903570b79e -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs b/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs index 36199f01..6a83287d 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs @@ -1,6 +1,8 @@ +using FishNet.Object; + namespace ScheduleOne.DevUtilities { - public abstract class NetworkSingleton : global::FishNet.Object.NetworkBehaviour where T : global::ScheduleOne.DevUtilities.NetworkSingleton + public abstract class NetworkSingleton : NetworkBehaviour where T : NetworkSingleton { private static T instance; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs.meta index 93473528..89ea8573 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/NetworkSingleton.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b1050c6e93aa924dabfd0c8e69f35e4 +guid: 911bdd34d3d44ef429440a53b21da419 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs b/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs index 70c41118..826664ed 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs @@ -1,33 +1,39 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.ConstructableScripts; +using ScheduleOne.EntityFramework; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class ObjectSelector : global::ScheduleOne.DevUtilities.Singleton + public class ObjectSelector : Singleton { - [global::UnityEngine.Header("Settings")] - [global::UnityEngine.SerializeField] + [Header("Settings")] + [SerializeField] protected float detectionRange; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.LayerMask detectionMask; + [SerializeField] + protected LayerMask detectionMask; - private global::System.Collections.Generic.List allowedTypes; + private List allowedTypes; - private global::System.Collections.Generic.List selectedObjects; + private List selectedObjects; - private global::System.Collections.Generic.List selectedConstructables; + private List selectedConstructables; - public global::System.Action onClose; + public Action onClose; private int selectionLimit; private bool exitOnSelectionLimit; - private global::ScheduleOne.EntityFramework.BuildableItem hoveredBuildable; + private BuildableItem hoveredBuildable; - private global::ScheduleOne.ConstructableScripts.Constructable hoveredConstructable; + private Constructable hoveredConstructable; - private global::System.Collections.Generic.List outlinedObjects; + private List outlinedObjects; - private global::System.Collections.Generic.List outlinedConstructables; + private List outlinedConstructables; public bool isSelecting { get; protected set; } @@ -43,21 +49,21 @@ protected virtual void LateUpdate() { } - private global::ScheduleOne.EntityFramework.BuildableItem GetHoveredBuildable() + private BuildableItem GetHoveredBuildable() { return null; } - private global::ScheduleOne.ConstructableScripts.Constructable GetHoveredConstructable() + private Constructable GetHoveredConstructable() { return null; } - private void Exit(global::ScheduleOne.DevUtilities.ExitAction action) + private void Exit(ExitAction action) { } - public void StartSelecting(string selectionTitle, global::System.Collections.Generic.List _typeRestriction, ref global::System.Collections.Generic.List initialSelection_Objects, ref global::System.Collections.Generic.List initalSelection_Constructables, int _selectionLimit, bool _exitOnSelectionLimit) + public void StartSelecting(string selectionTitle, List _typeRestriction, ref List initialSelection_Objects, ref List initalSelection_Constructables, int _selectionLimit, bool _exitOnSelectionLimit) { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs.meta index ed211d5a..703cbdf7 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ObjectSelector.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 044b7a035afe52308c210e656538aac3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs b/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs index 805003d5..5229a72f 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs @@ -1,18 +1,20 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Light))] - [global::UnityEngine.ExecuteInEditMode] - public class OptimizedLight : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Light))] + [ExecuteInEditMode] + public class OptimizedLight : MonoBehaviour { public bool Enabled; - [global::UnityEngine.HideInInspector] + [HideInInspector] public bool DisabledForOptimization; - [global::UnityEngine.Range(10f, 500f)] + [Range(10f, 500f)] public float MaxDistance; - public global::UnityEngine.Light _Light; + public Light _Light; private bool culled; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs.meta index cbc8586a..71792676 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/OptimizedLight.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 907abdca512bc4a98b26a797b1d07569 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs b/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs index 397a91f7..f8337135 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs @@ -1,15 +1,18 @@ +using EasyButtons; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class OrbitCamera : global::UnityEngine.MonoBehaviour + public class OrbitCamera : MonoBehaviour { - [global::UnityEngine.Header("References")] - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform cameraStartPoint; + [Header("References")] + [SerializeField] + protected Transform cameraStartPoint; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.Transform centrePoint; + [SerializeField] + protected Transform centrePoint; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public float targetFollowSpeed; public float yMinLimit; @@ -20,7 +23,7 @@ public class OrbitCamera : global::UnityEngine.MonoBehaviour public static float ySpeed; - private global::UnityEngine.Vector3 rotationOriginPoint; + private Vector3 rotationOriginPoint; private float distance; @@ -30,11 +33,11 @@ public class OrbitCamera : global::UnityEngine.MonoBehaviour private float y; - private global::UnityEngine.Transform targetTransform; + private Transform targetTransform; public bool isEnabled { get; protected set; } - protected global::UnityEngine.Transform cam => null; + protected Transform cam => null; protected virtual void Awake() { @@ -52,7 +55,7 @@ protected virtual void LateUpdate() { } - [global::EasyButtons.Button] + [Button] public void Enable() { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs.meta index 8bbff2c9..db0d2486 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/OrbitCamera.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d8d263ea60cfa74596fa71c19b81de85 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs index 13198f1c..5b492b53 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class PID { public float pFactor; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs.meta index 9b947424..d33fff52 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PID.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1066a533b97877e8c006562a462555df -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs index 8e6d7702..a3d2a23e 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs @@ -1,8 +1,12 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.ItemFramework; + namespace ScheduleOne.DevUtilities { - public class PackingAlgorithm : global::ScheduleOne.DevUtilities.Singleton + public class PackingAlgorithm : Singleton { - [global::System.Serializable] + [Serializable] public class Rectangle { public string name; @@ -22,9 +26,9 @@ public Rectangle(string _name, int x, int y) } } - public class StoredItemData : global::ScheduleOne.DevUtilities.PackingAlgorithm.Rectangle + public class StoredItemData : Rectangle { - public global::ScheduleOne.ItemFramework.ItemInstance item; + public ItemInstance item; public int xPos; @@ -32,7 +36,7 @@ public class StoredItemData : global::ScheduleOne.DevUtilities.PackingAlgorithm. public float rotation => 0f; - public StoredItemData(string _name, int x, int y, global::ScheduleOne.ItemFramework.ItemInstance _item) + public StoredItemData(string _name, int x, int y, ItemInstance _item) : base(null, 0, 0) { } @@ -44,45 +48,45 @@ public class Coordinate public int y; - public global::ScheduleOne.DevUtilities.PackingAlgorithm.Rectangle occupant; + public Rectangle occupant; public Coordinate(int _x, int _y) { } } - public global::System.Collections.Generic.List rectsToPack; + public List rectsToPack; - public global::System.Collections.Generic.List PackItems(global::System.Collections.Generic.List datas, int gridX, int gridY) + public List PackItems(List datas, int gridX, int gridY) { return null; } - public global::System.Collections.Generic.List AttemptPack(global::System.Collections.Generic.List rects, int gridX, int gridY) + public List AttemptPack(List rects, int gridX, int gridY) { return null; } - private bool DoesCoordinateHaveOccupiedAdjacent(global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate[,] grid, global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate coord, int gridX, int gridY) + private bool DoesCoordinateHaveOccupiedAdjacent(Coordinate[,] grid, Coordinate coord, int gridX, int gridY) { return false; } - private bool IsCoordinateInBounds(global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate coord, int gridX, int gridY) + private bool IsCoordinateInBounds(Coordinate coord, int gridX, int gridY) { return false; } - private void PrintGrid(global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate[,] grid, int gridX, int gridY) + private void PrintGrid(Coordinate[,] grid, int gridX, int gridY) { } - private int GetRegionSize(global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate[,] grid, int gridX, int gridY) + private int GetRegionSize(Coordinate[,] grid, int gridX, int gridY) { return 0; } - private global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate TransformCoordinatePoint(global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate[,] grid, global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate baseCoordinate, global::ScheduleOne.DevUtilities.PackingAlgorithm.Coordinate offset, int gridX, int gridY) + private Coordinate TransformCoordinatePoint(Coordinate[,] grid, Coordinate baseCoordinate, Coordinate offset, int gridX, int gridY) { return null; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs.meta index 84269688..516d7edc 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PackingAlgorithm.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cc07c52632198625e3351266443c7cac -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs index 40d62e81..07859998 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs @@ -1,6 +1,6 @@ namespace ScheduleOne.DevUtilities { - public abstract class PersistentSingleton : global::ScheduleOne.DevUtilities.Singleton where T : global::ScheduleOne.DevUtilities.Singleton + public abstract class PersistentSingleton : Singleton where T : Singleton { protected override void Awake() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs.meta index f1324a04..dbbd15fc 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PersistentSingleton.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42210123440c26244a2a3d1872760c86 +guid: 0dc273ea200ab9849b094fbf9d0b11c3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs index c999de4d..402b15a2 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs @@ -1,21 +1,24 @@ +using TMPro; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - [global::UnityEngine.ExecuteInEditMode] - public class PlaceholderBuilding : global::UnityEngine.MonoBehaviour + [ExecuteInEditMode] + public class PlaceholderBuilding : MonoBehaviour { - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public string Name; - public global::UnityEngine.Vector3 Dimensions; + public Vector3 Dimensions; public bool AutoGround; - [global::UnityEngine.Header("References")] - public global::UnityEngine.Transform Model; + [Header("References")] + public Transform Model; - public global::TMPro.TextMeshPro Label; + public TextMeshPro Label; - private global::UnityEngine.Vector3 lastFramePosition; + private Vector3 lastFramePosition; private void Awake() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs.meta index b8642eb9..45072fbd 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PlaceholderBuilding.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d46286b28fa3a6ab18d0bda59db00d84 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs index 6ff76b27..d3b4b958 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public abstract class PlayerSingleton : global::UnityEngine.MonoBehaviour where T : global::ScheduleOne.DevUtilities.PlayerSingleton + public abstract class PlayerSingleton : MonoBehaviour where T : PlayerSingleton { private static T instance; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs.meta index fca995be..f6f1e883 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerSingleton.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 87acfa57ca926ef48abd46d714ef884d +guid: d25f6533d3abd0e48acdbfac1581c3ea MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerUtilities.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerUtilities.cs.meta index 59ed1388..547f6f00 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PlayerUtilities.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PlayerUtilities.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e98a9f351bc3e4c14dd335387bd47b4a -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs b/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs index ee6c880c..2b0d1336 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs @@ -1,14 +1,17 @@ +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class PositionHistoryTracker : global::UnityEngine.MonoBehaviour + public class PositionHistoryTracker : MonoBehaviour { - [global::UnityEngine.Tooltip("Frequency (in seconds) to record the position.")] + [Tooltip("Frequency (in seconds) to record the position.")] public float recordingFrequency; - [global::UnityEngine.Tooltip("Duration (in seconds) to store the position history.")] + [Tooltip("Duration (in seconds) to store the position history.")] public float historyDuration; - public global::System.Collections.Generic.List positionHistory; + public List positionHistory; private float lastRecordTime; @@ -26,9 +29,9 @@ private void RecordPosition() { } - public global::UnityEngine.Vector3 GetPositionXSecondsAgo(float secondsAgo) + public Vector3 GetPositionXSecondsAgo(float secondsAgo) { - return default(global::UnityEngine.Vector3); + return default(Vector3); } public void ClearHistory() diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs.meta index f570533c..d0441e58 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/PositionHistoryTracker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 67a0dddab00a8d702e5298bfe14e8545 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs b/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs index 9675a767..1ba77d49 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs @@ -1,62 +1,69 @@ +using System; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.InputSystem; + namespace ScheduleOne.DevUtilities { - public class RebindActionUI : global::UnityEngine.MonoBehaviour + public class RebindActionUI : MonoBehaviour { - [global::System.Serializable] - public class UpdateBindingUIEvent : global::UnityEngine.Events.UnityEvent + [Serializable] + public class UpdateBindingUIEvent : UnityEvent { } - [global::System.Serializable] - public class InteractiveRebindEvent : global::UnityEngine.Events.UnityEvent + [Serializable] + public class InteractiveRebindEvent : UnityEvent { } - public global::System.Action onRebind; + public Action onRebind; - [global::UnityEngine.Tooltip("Reference to action that is to be rebound from the UI.")] - [global::UnityEngine.SerializeField] - private global::UnityEngine.InputSystem.InputActionReference m_Action; + [Tooltip("Reference to action that is to be rebound from the UI.")] + [SerializeField] + private InputActionReference m_Action; - [global::UnityEngine.SerializeField] + [SerializeField] private string m_BindingId; - [global::UnityEngine.SerializeField] - private global::UnityEngine.InputSystem.InputBinding.DisplayStringOptions m_DisplayStringOptions; + [SerializeField] + private InputBinding.DisplayStringOptions m_DisplayStringOptions; - [global::UnityEngine.Tooltip("Text label that will receive the name of the action. Optional. Set to None to have the rebind UI not show a label for the action.")] - [global::UnityEngine.SerializeField] - private global::TMPro.TextMeshProUGUI m_ActionLabel; + [Tooltip("Text label that will receive the name of the action. Optional. Set to None to have the rebind UI not show a label for the action.")] + [SerializeField] + private TextMeshProUGUI m_ActionLabel; - [global::UnityEngine.Tooltip("Text label that will receive the current, formatted binding string.")] - [global::UnityEngine.SerializeField] - private global::TMPro.TextMeshProUGUI m_BindingText; + [Tooltip("Text label that will receive the current, formatted binding string.")] + [SerializeField] + private TextMeshProUGUI m_BindingText; - [global::UnityEngine.Tooltip("Optional UI that will be shown while a rebind is in progress.")] - [global::UnityEngine.SerializeField] - private global::UnityEngine.GameObject m_RebindOverlay; + [Tooltip("Optional UI that will be shown while a rebind is in progress.")] + [SerializeField] + private GameObject m_RebindOverlay; - [global::UnityEngine.Tooltip("Optional text label that will be updated with prompt for user input.")] - [global::UnityEngine.SerializeField] - private global::TMPro.TextMeshProUGUI m_RebindText; + [Tooltip("Optional text label that will be updated with prompt for user input.")] + [SerializeField] + private TextMeshProUGUI m_RebindText; - [global::UnityEngine.Tooltip("Event that is triggered when the way the binding is display should be updated. This allows displaying bindings in custom ways, e.g. using images instead of text.")] - [global::UnityEngine.SerializeField] - private global::ScheduleOne.DevUtilities.RebindActionUI.UpdateBindingUIEvent m_UpdateBindingUIEvent; + [Tooltip("Event that is triggered when the way the binding is display should be updated. This allows displaying bindings in custom ways, e.g. using images instead of text.")] + [SerializeField] + private UpdateBindingUIEvent m_UpdateBindingUIEvent; - [global::UnityEngine.Tooltip("Event that is triggered when an interactive rebind is being initiated. This can be used, for example, to implement custom UI behavior while a rebind is in progress. It can also be used to further customize the rebind.")] - [global::UnityEngine.SerializeField] - private global::ScheduleOne.DevUtilities.RebindActionUI.InteractiveRebindEvent m_RebindStartEvent; + [Tooltip("Event that is triggered when an interactive rebind is being initiated. This can be used, for example, to implement custom UI behavior while a rebind is in progress. It can also be used to further customize the rebind.")] + [SerializeField] + private InteractiveRebindEvent m_RebindStartEvent; - [global::UnityEngine.Tooltip("Event that is triggered when an interactive rebind is complete or has been aborted.")] - [global::UnityEngine.SerializeField] - private global::ScheduleOne.DevUtilities.RebindActionUI.InteractiveRebindEvent m_RebindStopEvent; + [Tooltip("Event that is triggered when an interactive rebind is complete or has been aborted.")] + [SerializeField] + private InteractiveRebindEvent m_RebindStopEvent; - private global::UnityEngine.InputSystem.InputActionRebindingExtensions.RebindingOperation m_RebindOperation; + private InputActionRebindingExtensions.RebindingOperation m_RebindOperation; - private static global::System.Collections.Generic.List s_RebindActionUIs; + private static List s_RebindActionUIs; - public global::UnityEngine.InputSystem.InputActionReference actionReference + public InputActionReference actionReference { get { @@ -78,18 +85,18 @@ public string bindingId } } - public global::UnityEngine.InputSystem.InputBinding.DisplayStringOptions displayStringOptions + public InputBinding.DisplayStringOptions displayStringOptions { get { - return default(global::UnityEngine.InputSystem.InputBinding.DisplayStringOptions); + return default(InputBinding.DisplayStringOptions); } set { } } - public global::TMPro.TextMeshProUGUI actionLabel + public TextMeshProUGUI actionLabel { get { @@ -100,7 +107,7 @@ public string bindingId } } - public global::TMPro.TextMeshProUGUI bindingText + public TextMeshProUGUI bindingText { get { @@ -111,7 +118,7 @@ public string bindingId } } - public global::TMPro.TextMeshProUGUI rebindPrompt + public TextMeshProUGUI rebindPrompt { get { @@ -122,7 +129,7 @@ public string bindingId } } - public global::UnityEngine.GameObject rebindOverlay + public GameObject rebindOverlay { get { @@ -133,15 +140,15 @@ public string bindingId } } - public global::ScheduleOne.DevUtilities.RebindActionUI.UpdateBindingUIEvent updateBindingUIEvent => null; + public UpdateBindingUIEvent updateBindingUIEvent => null; - public global::ScheduleOne.DevUtilities.RebindActionUI.InteractiveRebindEvent startRebindEvent => null; + public InteractiveRebindEvent startRebindEvent => null; - public global::ScheduleOne.DevUtilities.RebindActionUI.InteractiveRebindEvent stopRebindEvent => null; + public InteractiveRebindEvent stopRebindEvent => null; - public global::UnityEngine.InputSystem.InputActionRebindingExtensions.RebindingOperation ongoingRebind => null; + public InputActionRebindingExtensions.RebindingOperation ongoingRebind => null; - public bool ResolveActionAndBinding(out global::UnityEngine.InputSystem.InputAction action, out int bindingIndex) + public bool ResolveActionAndBinding(out InputAction action, out int bindingIndex) { action = null; bindingIndex = default(int); @@ -160,7 +167,7 @@ public void StartInteractiveRebind() { } - private void PerformInteractiveRebind(global::UnityEngine.InputSystem.InputAction action, int bindingIndex, bool allCompositeParts = false) + private void PerformInteractiveRebind(InputAction action, int bindingIndex, bool allCompositeParts = false) { } @@ -172,7 +179,7 @@ protected void OnDisable() { } - private static void OnActionChange(object obj, global::UnityEngine.InputSystem.InputActionChange change) + private static void OnActionChange(object obj, InputActionChange change) { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs.meta index 7bb25e95..9200f238 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/RebindActionUI.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9f7fced43c0d89b27788b907a820b885 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs b/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs index 4c6c028c..715ced5a 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs @@ -1,26 +1,28 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class SetTransform : global::UnityEngine.MonoBehaviour + public class SetTransform : MonoBehaviour { - [global::UnityEngine.Header("Frequency Settings")] + [Header("Frequency Settings")] public bool SetOnAwake; public bool SetOnUpdate; public bool SetOnLateUpdate; - [global::UnityEngine.Header("Transform Settings")] + [Header("Transform Settings")] public bool SetPosition; - public global::UnityEngine.Vector3 LocalPosition; + public Vector3 LocalPosition; public bool SetRotation; - public global::UnityEngine.Vector3 LocalRotation; + public Vector3 LocalRotation; public bool SetScale; - public global::UnityEngine.Vector3 LocalScale; + public Vector3 LocalScale; private void Awake() { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs.meta index 7d67c055..5eb2955c 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/SetTransform.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 364360548f18a9f72efb27e2a76ae79e -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs b/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs index 3366eb23..e2a9755c 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs @@ -1,6 +1,11 @@ +using System; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.Rendering.Universal; + namespace ScheduleOne.DevUtilities { - public class Settings : global::ScheduleOne.DevUtilities.PersistentSingleton + public class Settings : PersistentSingleton { public enum UnitType { @@ -10,43 +15,43 @@ public enum UnitType public const float MinYPos = -20f; - public global::ScheduleOne.DevUtilities.DisplaySettings DisplaySettings; + public DisplaySettings DisplaySettings; - public global::ScheduleOne.DevUtilities.DisplaySettings UnappliedDisplaySettings; + public DisplaySettings UnappliedDisplaySettings; - public global::ScheduleOne.DevUtilities.GraphicsSettings GraphicsSettings; + public GraphicsSettings GraphicsSettings; - public global::ScheduleOne.DevUtilities.AudioSettings AudioSettings; + public AudioSettings AudioSettings; - public global::ScheduleOne.DevUtilities.InputSettings InputSettings; + public InputSettings InputSettings; - public global::UnityEngine.InputSystem.InputActionAsset InputActions; + public InputActionAsset InputActions; - public global::ScheduleOne.GameInput GameInput; + public GameInput GameInput; - public global::UnityEngine.Rendering.Universal.ScriptableRendererFeature SSAO; + public ScriptableRendererFeature SSAO; - public global::UnityEngine.Rendering.Universal.ScriptableRendererFeature GodRays; + public ScriptableRendererFeature GodRays; - [global::UnityEngine.Header("Camera")] + [Header("Camera")] public float LookSensitivity; public bool InvertMouse; public float CameraFOV; - public global::ScheduleOne.DevUtilities.InputSettings.EActionMode SprintMode; + public InputSettings.EActionMode SprintMode; - [global::UnityEngine.Range(0f, 1f)] + [Range(0f, 1f)] public float CameraBobIntensity; - private global::UnityEngine.InputSystem.InputActionMap playerControls; + private InputActionMap playerControls; - public global::System.Action onDisplayChanged; + public Action onDisplayChanged; - public global::System.Action onInputsApplied; + public Action onInputsApplied; - public global::ScheduleOne.DevUtilities.Settings.UnitType unitType { get; protected set; } + public UnitType unitType { get; protected set; } public bool PausingFreezesTime => false; @@ -58,11 +63,11 @@ protected override void Start() { } - public void ApplyDisplaySettings(global::ScheduleOne.DevUtilities.DisplaySettings settings) + public void ApplyDisplaySettings(DisplaySettings settings) { } - private void MoveMainWindowTo(global::UnityEngine.DisplayInfo displayInfo) + private void MoveMainWindowTo(DisplayInfo displayInfo) { } @@ -70,7 +75,7 @@ public void ReloadGraphicsSettings() { } - public void ApplyGraphicsSettings(global::ScheduleOne.DevUtilities.GraphicsSettings settings) + public void ApplyGraphicsSettings(GraphicsSettings settings) { } @@ -78,7 +83,7 @@ public void ReloadAudioSettings() { } - public void ApplyAudioSettings(global::ScheduleOne.DevUtilities.AudioSettings settings) + public void ApplyAudioSettings(AudioSettings settings) { } @@ -86,42 +91,42 @@ public void ReloadInputSettings() { } - public void ApplyInputSettings(global::ScheduleOne.DevUtilities.InputSettings settings) + public void ApplyInputSettings(InputSettings settings) { } - public void WriteDisplaySettings(global::ScheduleOne.DevUtilities.DisplaySettings settings) + public void WriteDisplaySettings(DisplaySettings settings) { } - public global::ScheduleOne.DevUtilities.DisplaySettings ReadDisplaySettings() + public DisplaySettings ReadDisplaySettings() { - return default(global::ScheduleOne.DevUtilities.DisplaySettings); + return default(DisplaySettings); } - public void WriteGraphicsSettings(global::ScheduleOne.DevUtilities.GraphicsSettings settings) + public void WriteGraphicsSettings(GraphicsSettings settings) { } - public global::ScheduleOne.DevUtilities.GraphicsSettings ReadGraphicsSettings() + public GraphicsSettings ReadGraphicsSettings() { return null; } - public void WriteAudioSettings(global::ScheduleOne.DevUtilities.AudioSettings settings) + public void WriteAudioSettings(AudioSettings settings) { } - public global::ScheduleOne.DevUtilities.AudioSettings ReadAudioSettings() + public AudioSettings ReadAudioSettings() { return null; } - public void WriteInputSettings(global::ScheduleOne.DevUtilities.InputSettings settings) + public void WriteInputSettings(InputSettings settings) { } - public global::ScheduleOne.DevUtilities.InputSettings ReadInputSettings() + public InputSettings ReadInputSettings() { return null; } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs.meta index 2a1fcd04..d50e8f91 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Settings.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 23e82f9592e0585e6b610f0338595647 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs b/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs index 06223b30..e845e847 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs @@ -1,6 +1,8 @@ +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public abstract class Singleton : global::UnityEngine.MonoBehaviour where T : global::ScheduleOne.DevUtilities.Singleton + public abstract class Singleton : MonoBehaviour where T : Singleton { private static T instance; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs.meta index ab16ae04..ce1767d0 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/Singleton.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f81531036d95214498fcf9dbc6a05c28 +guid: db58ca1a47eb4fd498ac4ff99e05a3cd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs b/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs index f213452f..6375bd00 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.DevUtilities { - [global::System.Serializable] + [Serializable] public class StringIntPair { public string String; diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs.meta index c84037ac..cc6a3342 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/StringIntPair.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3fddfa01a67739d293231d83c7306017 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs b/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs index f0ac8e8a..d66b5a71 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; + namespace ScheduleOne.DevUtilities { public class ValueTracker @@ -15,7 +17,7 @@ public Value(float val, float time) private float historyDuration; - private global::System.Collections.Generic.List valueHistory; + private List valueHistory; public ValueTracker(float HistoryDuration) { diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs.meta index 9b6efb47..bf9672e7 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/ValueTracker.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0c213c34a5e51b3df2c6153f1f56fa46 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs index f68b4b98..750c0d10 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs @@ -1,17 +1,21 @@ +using System.Collections.Generic; +using ScheduleOne.Vehicles; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - [global::UnityEngine.RequireComponent(typeof(global::UnityEngine.Rigidbody))] - public class VehicleDetector : global::UnityEngine.MonoBehaviour + [RequireComponent(typeof(Rigidbody))] + public class VehicleDetector : MonoBehaviour { public const float ACTIVATION_DISTANCE_SQ = 400f; - public global::System.Collections.Generic.List vehicles; + public List vehicles; - public global::ScheduleOne.Vehicles.LandVehicle closestVehicle; + public LandVehicle closestVehicle; private bool ignoreExit; - private global::UnityEngine.Collider[] detectionColliders; + private Collider[] detectionColliders; private bool collidersEnabled; @@ -29,7 +33,7 @@ private void OnDestroy() { } - private void OnTriggerEnter(global::UnityEngine.Collider other) + private void OnTriggerEnter(Collider other) { } @@ -37,7 +41,7 @@ private void MinPass() { } - private void OnTriggerExit(global::UnityEngine.Collider other) + private void OnTriggerExit(Collider other) { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs.meta index d87e926e..4d52e827 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleDetector.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 263e9b73fd0e17093ae57aebe5410df3 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs index 0621a82a..da880dfc 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs +++ b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs @@ -1,27 +1,32 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.Vehicles; +using UnityEngine; + namespace ScheduleOne.DevUtilities { - public class VehicleSelector : global::ScheduleOne.DevUtilities.Singleton + public class VehicleSelector : Singleton { - [global::UnityEngine.Header("Settings")] - [global::UnityEngine.SerializeField] + [Header("Settings")] + [SerializeField] protected float detectionRange; - [global::UnityEngine.SerializeField] - protected global::UnityEngine.LayerMask detectionMask; + [SerializeField] + protected LayerMask detectionMask; - private global::System.Collections.Generic.List selectedVehicles; + private List selectedVehicles; - public global::System.Action onClose; + public Action onClose; private int selectionLimit; private bool exitOnSelectionLimit; - private global::ScheduleOne.Vehicles.LandVehicle hoveredVehicle; + private LandVehicle hoveredVehicle; - private global::System.Collections.Generic.List outlinedVehicles; + private List outlinedVehicles; - private global::System.Func vehicleFilter; + private Func vehicleFilter; public bool isSelecting { get; protected set; } @@ -37,16 +42,16 @@ protected virtual void LateUpdate() { } - private global::ScheduleOne.Vehicles.LandVehicle GetHoveredVehicle() + private LandVehicle GetHoveredVehicle() { return null; } - private void Exit(global::ScheduleOne.DevUtilities.ExitAction action) + private void Exit(ExitAction action) { } - public void StartSelecting(string selectionTitle, ref global::System.Collections.Generic.List initialSelection, int _selectionLimit, bool _exitOnSelectionLimit, global::System.Func filter = null) + public void StartSelecting(string selectionTitle, ref List initialSelection, int _selectionLimit, bool _exitOnSelectionLimit, Func filter = null) { } diff --git a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs.meta b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs.meta index 709369a7..87a3b7eb 100644 --- a/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs.meta +++ b/Assets/Scripts/ScheduleOne/DevUtilities/VehicleSelector.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 356be13c24b20635c6e836ec18c3e836 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue.meta b/Assets/Scripts/ScheduleOne/Dialogue.meta index 94da5902..9bb2a897 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2764fd3f3de935a4faeacbe20d4d850d +guid: 42f6f9c29a8349045a22b3797d50cf69 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs b/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs index d6de26cd..e14cc608 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs @@ -1,14 +1,17 @@ +using System; +using UnityEngine; + namespace ScheduleOne.Dialogue { - [global::System.Serializable] + [Serializable] public class BranchNodeData { public string Guid; public string BranchLabel; - public global::UnityEngine.Vector2 Position; + public Vector2 Position; - public global::ScheduleOne.Dialogue.BranchOptionData[] options; + public BranchOptionData[] options; } } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs.meta index d358a18c..979428a0 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/BranchNodeData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0467804ca91e813991418566f198f608 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs b/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs index 4687c7c5..a1888884 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.Dialogue { - [global::System.Serializable] + [Serializable] public class BranchOptionData { public string Guid; diff --git a/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs.meta index 98f6c49b..205aae9d 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/BranchOptionData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 084f3a4b62bbeb08ace30d9ccf420032 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs b/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs index caf35805..ef609092 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs @@ -1,8 +1,10 @@ +using System.Collections.Generic; + namespace ScheduleOne.Dialogue { - public class ControlledDialogueHandler : global::ScheduleOne.Dialogue.DialogueHandler + public class ControlledDialogueHandler : DialogueHandler { - private global::ScheduleOne.Dialogue.DialogueController controller; + private DialogueController controller; protected override void Awake() { @@ -18,7 +20,7 @@ protected override string ModifyChoiceText(string choiceLabel, string choiceText return null; } - protected override void ModifyChoiceList(string dialogueLabel, ref global::System.Collections.Generic.List existingChoices) + protected override void ModifyChoiceList(string dialogueLabel, ref List existingChoices) { } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs.meta index 8c1209a4..f5a6cbe1 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/ControlledDialogueHandler.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 12ac5195a582cd9d5e0f0df3b7705871 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs index a4dad82f..cafb5d46 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs @@ -1,12 +1,16 @@ +using System; +using ScheduleOne.UI.Phone.Messages; +using UnityEngine; + namespace ScheduleOne.Dialogue { - [global::System.Serializable] + [Serializable] public class DialogueChain { - [global::UnityEngine.TextArea(1, 10)] + [TextArea(1, 10)] public string[] Lines; - public global::ScheduleOne.UI.Phone.Messages.MessageChain GetMessageChain() + public MessageChain GetMessageChain() { return null; } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs.meta index b5972751..96447648 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChain.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 941e8726808394d4f9f96c822791aa33 +guid: b070d83d1e5559841b6aeb31b49b2c29 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs index 7c80748d..4b82fecb 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs @@ -1,6 +1,8 @@ +using System; + namespace ScheduleOne.Dialogue { - [global::System.Serializable] + [Serializable] public class DialogueChoiceData { public string Guid; diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs.meta index 05d7bae0..4c8ea39a 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueChoiceData.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 0c676897f9c88577b7a4ec9fc47dd149 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs index f2bf77ae..e55a8a12 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs @@ -1,39 +1,43 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + namespace ScheduleOne.Dialogue { - [global::System.Serializable] - public class DialogueContainer : global::UnityEngine.ScriptableObject + [Serializable] + public class DialogueContainer : ScriptableObject { - public global::System.Collections.Generic.List NodeLinks; + public List NodeLinks; - public global::System.Collections.Generic.List DialogueNodeData; + public List DialogueNodeData; - public global::System.Collections.Generic.List BranchNodeData; + public List BranchNodeData; public bool allowExit { get; private set; } public bool AllowExit => false; - public global::ScheduleOne.Dialogue.DialogueNodeData GetDialogueNodeByLabel(string dialogueNodeLabel) + public DialogueNodeData GetDialogueNodeByLabel(string dialogueNodeLabel) { return null; } - public global::ScheduleOne.Dialogue.BranchNodeData GetBranchNodeByLabel(string branchLabel) + public BranchNodeData GetBranchNodeByLabel(string branchLabel) { return null; } - public global::ScheduleOne.Dialogue.DialogueNodeData GetDialogueNodeByGUID(string dialogueNodeGUID) + public DialogueNodeData GetDialogueNodeByGUID(string dialogueNodeGUID) { return null; } - public global::ScheduleOne.Dialogue.BranchNodeData GetBranchNodeByGUID(string branchGUID) + public BranchNodeData GetBranchNodeByGUID(string branchGUID) { return null; } - public global::ScheduleOne.Dialogue.NodeLinkData GetLink(string baseChoiceOrOptionGUID) + public NodeLinkData GetLink(string baseChoiceOrOptionGUID) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs.meta index 41eed93d..3243565f 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueContainer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a539b9588c9b7c0468bd4db78c2d6e46 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs index 8fece32e..5b89475c 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs @@ -1,8 +1,16 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.Interaction; +using ScheduleOne.NPCs; +using ScheduleOne.VoiceOver; +using UnityEngine; +using UnityEngine.Events; + namespace ScheduleOne.Dialogue { - public class DialogueController : global::UnityEngine.MonoBehaviour + public class DialogueController : MonoBehaviour { - [global::System.Serializable] + [Serializable] public class DialogueChoice { public delegate bool ShouldShowCheck(bool enabled); @@ -13,13 +21,13 @@ public class DialogueChoice public string ChoiceText; - public global::ScheduleOne.Dialogue.DialogueContainer Conversation; + public DialogueContainer Conversation; - public global::UnityEngine.Events.UnityEvent onChoosen; + public UnityEvent onChoosen; - public global::ScheduleOne.Dialogue.DialogueController.DialogueChoice.ShouldShowCheck shouldShowCheck; + public ShouldShowCheck shouldShowCheck; - public global::ScheduleOne.Dialogue.DialogueController.DialogueChoice.IsChoiceValid isValidCheck; + public IsChoiceValid isValidCheck; public int Priority; @@ -35,7 +43,7 @@ public bool IsValid(out string invalidReason) } } - [global::System.Serializable] + [Serializable] public class GreetingOverride { public string Greeting; @@ -44,34 +52,34 @@ public class GreetingOverride public bool PlayVO; - public global::ScheduleOne.VoiceOver.EVOLineType VOType; + public EVOLineType VOType; } public static float GREETING_COOLDOWN; - [global::UnityEngine.Header("References")] - public global::ScheduleOne.Interaction.InteractableObject IntObj; + [Header("References")] + public InteractableObject IntObj; - public global::ScheduleOne.Dialogue.DialogueContainer GenericDialogue; + public DialogueContainer GenericDialogue; - [global::UnityEngine.Header("Settings")] + [Header("Settings")] public bool DialogueEnabled; public bool UseDialogueBehaviour; - public global::System.Collections.Generic.List Choices; + public List Choices; - public global::System.Collections.Generic.List GreetingOverrides; + public List GreetingOverrides; - public global::ScheduleOne.Dialogue.DialogueContainer OverrideContainer; + public DialogueContainer OverrideContainer; - protected global::ScheduleOne.NPCs.NPC npc; + protected NPC npc; - protected global::ScheduleOne.Dialogue.DialogueHandler handler; + protected DialogueHandler handler; private float lastGreetingTime; - private global::System.Collections.Generic.List shownChoices; + private List shownChoices; private bool dialogueQueued; @@ -101,32 +109,32 @@ private void Unqueue() { } - private string GetActiveGreeting(out bool playVO, out global::ScheduleOne.VoiceOver.EVOLineType voLineType) + private string GetActiveGreeting(out bool playVO, out EVOLineType voLineType) { playVO = default(bool); - voLineType = default(global::ScheduleOne.VoiceOver.EVOLineType); + voLineType = default(EVOLineType); return null; } - private global::System.Collections.Generic.List GetActiveChoices() + private List GetActiveChoices() { return null; } - protected virtual bool GetCustomGreeting(out string greeting, out bool playVO, out global::ScheduleOne.VoiceOver.EVOLineType voLineType) + protected virtual bool GetCustomGreeting(out string greeting, out bool playVO, out EVOLineType voLineType) { greeting = null; playVO = default(bool); - voLineType = default(global::ScheduleOne.VoiceOver.EVOLineType); + voLineType = default(EVOLineType); return false; } - public virtual int AddDialogueChoice(global::ScheduleOne.Dialogue.DialogueController.DialogueChoice data, int priority = 0) + public virtual int AddDialogueChoice(DialogueChoice data, int priority = 0) { return 0; } - public virtual int AddGreetingOverride(global::ScheduleOne.Dialogue.DialogueController.GreetingOverride data) + public virtual int AddGreetingOverride(GreetingOverride data) { return 0; } @@ -146,7 +154,7 @@ public virtual string ModifyChoiceText(string choiceLabel, string choiceText) return null; } - public virtual void ModifyChoiceList(string dialogueLabel, ref global::System.Collections.Generic.List existingChoices) + public virtual void ModifyChoiceList(string dialogueLabel, ref List existingChoices) { } @@ -160,7 +168,7 @@ public virtual bool CheckChoice(string choiceLabel, out string invalidReason) return false; } - public void SetOverrideContainer(global::ScheduleOne.Dialogue.DialogueContainer container) + public void SetOverrideContainer(DialogueContainer container) { } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs.meta index 64cf9acc..ef28ae16 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 27dff837f5382b46edd303eb5a262c22 -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs index 49b6f2e9..871be308 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs @@ -1,8 +1,12 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.ItemFramework; + namespace ScheduleOne.Dialogue { - public class DialogueController_ArmsDealer : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_ArmsDealer : DialogueController { - [global::System.Serializable] + [Serializable] public class WeaponOption { public string Name; @@ -13,18 +17,18 @@ public class WeaponOption public string NotAvailableReason; - public global::ScheduleOne.ItemFramework.StorableItemDefinition Item; + public StorableItemDefinition Item; } - public global::System.Collections.Generic.List MeleeWeapons; + public List MeleeWeapons; - public global::System.Collections.Generic.List RangedWeapons; + public List RangedWeapons; - public global::System.Collections.Generic.List Ammo; + public List Ammo; - private global::System.Collections.Generic.List allWeapons; + private List allWeapons; - private global::ScheduleOne.Dialogue.DialogueController_ArmsDealer.WeaponOption chosenWeapon; + private WeaponOption chosenWeapon; private void Awake() { @@ -34,11 +38,11 @@ public override void ChoiceCallback(string choiceLabel) { } - public override void ModifyChoiceList(string dialogueLabel, ref global::System.Collections.Generic.List existingChoices) + public override void ModifyChoiceList(string dialogueLabel, ref List existingChoices) { } - private global::System.Collections.Generic.List GetWeaponChoices(global::System.Collections.Generic.List options) + private List GetWeaponChoices(List options) { return null; } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs.meta index 454ce250..6d7d2d7d 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_ArmsDealer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 38d4e1edb1f941857260fbbd1932842c -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs index 88dd7e11..c08ae493 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs @@ -1,8 +1,14 @@ +using ScheduleOne.ItemFramework; + namespace ScheduleOne.Dialogue { - public class DialogueController_Dan : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_Dan : DialogueController { - public global::ScheduleOne.ItemFramework.ItemDefinition ItemToGive; + public ItemDefinition ItemToGive; + + protected override void Start() + { + } public override string ModifyDialogueText(string dialogueLabel, string dialogueText) { diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs.meta index 9396fe01..61ad64c4 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dan.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5ef4f5d27b714b955a3ef9b3d5a6f3ac -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs new file mode 100644 index 00000000..d63fe98d --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs @@ -0,0 +1,33 @@ +using ScheduleOne.Economy; + +namespace ScheduleOne.Dialogue +{ + public class DialogueController_Dealer : DialogueController + { + public Dealer Dealer { get; private set; } + + protected override void Start() + { + } + + public override string ModifyDialogueText(string dialogueLabel, string dialogueText) + { + return null; + } + + public override string ModifyChoiceText(string choiceLabel, string choiceText) + { + return null; + } + + public override bool CheckChoice(string choiceLabel, out string invalidReason) + { + invalidReason = null; + return false; + } + + public override void ChoiceCallback(string choiceLabel) + { + } + } +} diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs.meta new file mode 100644 index 00000000..ace69043 --- /dev/null +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Dealer.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 4e8e70e2de7cea257e9b716d1e327994 +timeCreated: 1744220834 +licenseType: Free +MonoImporter: + serializedVersion: 2 + externalObjects: {} + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs index f594532c..92de8e09 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs @@ -1,10 +1,13 @@ +using System.Collections.Generic; +using ScheduleOne.Employees; + namespace ScheduleOne.Dialogue { - public class DialogueController_Fixer : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_Fixer : DialogueController { - private global::ScheduleOne.Employees.EEmployeeType selectedEmployeeType; + private EEmployeeType selectedEmployeeType; - private global::ScheduleOne.Property.Property selectedProperty; + private ScheduleOne.Property.Property selectedProperty; private bool lastConfirmationWasInitial; @@ -12,7 +15,7 @@ public override void ChoiceCallback(string choiceLabel) { } - public override void ModifyChoiceList(string dialogueLabel, ref global::System.Collections.Generic.List existingChoices) + public override void ModifyChoiceList(string dialogueLabel, ref List existingChoices) { } diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs.meta index 46ff5b7a..10b5b5e0 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Fixer.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cad438df19d5813b5996ce25ba627d21 -timeCreated: 1744155518 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs index 89991fce..4842eaf3 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs @@ -1,22 +1,25 @@ +using ScheduleOne.Quests; +using UnityEngine.Events; + namespace ScheduleOne.Dialogue { - public class DialogueController_Ming : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_Ming : DialogueController { - public global::ScheduleOne.Property.Property Property; + public ScheduleOne.Property.Property Property; public float Price; - public global::ScheduleOne.Dialogue.DialogueContainer BuyDialogue; + public DialogueContainer BuyDialogue; public string BuyText; public string RemindText; - public global::ScheduleOne.Dialogue.DialogueContainer RemindLocationDialogue; + public DialogueContainer RemindLocationDialogue; - public global::ScheduleOne.Quests.QuestEntry[] PurchaseRoomQuests; + public QuestEntry[] PurchaseRoomQuests; - public global::UnityEngine.Events.UnityEvent onPurchase; + public UnityEvent onPurchase; protected override void Start() { diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs.meta index 6852df38..8e87c96c 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Ming.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 524856a5cce80ba4edac3c289de9a28d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs index 7f197db3..0e244533 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs @@ -1,8 +1,10 @@ +using ScheduleOne.Police; + namespace ScheduleOne.Dialogue { - public class DialogueController_Police : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_Police : DialogueController { - private global::ScheduleOne.Police.PoliceOfficer officer; + private PoliceOfficer officer; protected override void Start() { diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs.meta b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs.meta index ace3a1db..d33230f4 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs.meta +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_Police.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 791ab1c0630964e55fe26b89a645902d -timeCreated: 1744155517 +timeCreated: 1744220834 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_SkateboardSeller.cs b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_SkateboardSeller.cs index 17b7f7fc..ba5463d6 100644 --- a/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_SkateboardSeller.cs +++ b/Assets/Scripts/ScheduleOne/Dialogue/DialogueController_SkateboardSeller.cs @@ -1,8 +1,13 @@ +using System; +using System.Collections.Generic; +using ScheduleOne.ItemFramework; +using UnityEngine.Events; + namespace ScheduleOne.Dialogue { - public class DialogueController_SkateboardSeller : global::ScheduleOne.Dialogue.DialogueController + public class DialogueController_SkateboardSeller : DialogueController { - [global::System.Serializable] + [Serializable] public class Option { public string Name; @@ -13,14 +18,14 @@ public class Option public string NotAvailableReason; - public global::ScheduleOne.ItemFramework.ItemDefinition Item; + public ItemDefinition Item; } - public global::System.Collections.Generic.List Options; + public List