diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 047bf8c..dd48cad 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -22632,6 +22632,84 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &698110339 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.36084083 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.872 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.8953414 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8645847 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.5024871 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -60.329 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2680774075646407315, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: 919132149155446097, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_Name + value: SM_JailChain + objectReference: {fileID: 0} + - target: {fileID: 5012489691599256561, guid: 8901870a9aafd294b8d483f8aafc1383, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8901870a9aafd294b8d483f8aafc1383, type: 3} --- !u!1 &698498814 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5583246166076743144, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -72775,34 +72853,35 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -77329,3 +77408,4 @@ SceneRoots: - {fileID: 1027471609} - {fileID: 1276291775} - {fileID: 1855771788} + - {fileID: 698110339} diff --git a/Assets/Textures/Maps/T_Africa_Colours.png b/Assets/Textures/Maps/T_Africa_Colours.png index 7e829b6..0496215 100644 Binary files a/Assets/Textures/Maps/T_Africa_Colours.png and b/Assets/Textures/Maps/T_Africa_Colours.png differ diff --git a/Assets/Textures/Maps/T_Africa_SDF.png b/Assets/Textures/Maps/T_Africa_SDF.png index d1bcaee..42a13fa 100644 Binary files a/Assets/Textures/Maps/T_Africa_SDF.png and b/Assets/Textures/Maps/T_Africa_SDF.png differ diff --git a/Assets/Textures/Maps/T_Asia_Colours.png b/Assets/Textures/Maps/T_Asia_Colours.png index 97d7966..5dfff0e 100644 Binary files a/Assets/Textures/Maps/T_Asia_Colours.png and b/Assets/Textures/Maps/T_Asia_Colours.png differ diff --git a/Assets/Textures/Maps/T_Asia_SDF.png b/Assets/Textures/Maps/T_Asia_SDF.png index e5e61f1..7572061 100644 Binary files a/Assets/Textures/Maps/T_Asia_SDF.png and b/Assets/Textures/Maps/T_Asia_SDF.png differ diff --git a/Assets/Textures/Maps/T_Europe_Colours.png b/Assets/Textures/Maps/T_Europe_Colours.png index d4ee845..0c3077d 100644 Binary files a/Assets/Textures/Maps/T_Europe_Colours.png and b/Assets/Textures/Maps/T_Europe_Colours.png differ diff --git a/Assets/Textures/Maps/T_Europe_SDF.png b/Assets/Textures/Maps/T_Europe_SDF.png index 0d48845..f5deb35 100644 Binary files a/Assets/Textures/Maps/T_Europe_SDF.png and b/Assets/Textures/Maps/T_Europe_SDF.png differ diff --git a/Assets/Textures/Maps/T_NorthAmerica_Colours.png b/Assets/Textures/Maps/T_NorthAmerica_Colours.png index 77d8f86..9da2828 100644 Binary files a/Assets/Textures/Maps/T_NorthAmerica_Colours.png and b/Assets/Textures/Maps/T_NorthAmerica_Colours.png differ diff --git a/Assets/Textures/Maps/T_NorthAmerica_SDF.png b/Assets/Textures/Maps/T_NorthAmerica_SDF.png index 5ee5878..2389db9 100644 Binary files a/Assets/Textures/Maps/T_NorthAmerica_SDF.png and b/Assets/Textures/Maps/T_NorthAmerica_SDF.png differ diff --git a/Assets/Textures/Maps/T_SouthAmerica_Colours.png b/Assets/Textures/Maps/T_SouthAmerica_Colours.png index be0f931..0084379 100644 Binary files a/Assets/Textures/Maps/T_SouthAmerica_Colours.png and b/Assets/Textures/Maps/T_SouthAmerica_Colours.png differ diff --git a/Assets/Textures/Maps/T_SouthAmerica_SDF.png b/Assets/Textures/Maps/T_SouthAmerica_SDF.png index 39ccf44..ddbca8a 100644 Binary files a/Assets/Textures/Maps/T_SouthAmerica_SDF.png and b/Assets/Textures/Maps/T_SouthAmerica_SDF.png differ diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: