diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 197d25a45..d1adc8c30 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -693,13 +693,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191889754} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -7.6, y: 3.71, z: -12.7} + m_LocalRotation: {x: 0.34200886, y: 0.00762623, z: -0.0027757206, w: 0.9396617} + m_LocalPosition: {x: -7.44, y: 3.71, z: -12.7} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0.93, z: 0} --- !u!114 &191889763 MonoBehaviour: m_ObjectHideFlags: 0 @@ -812,7 +812,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.x - value: -6.8589997 + value: -6.726 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.y @@ -820,7 +820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.z - value: -7.989 + value: -7.987 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalRotation.w @@ -1279,6 +1279,10 @@ PrefabInstance: propertyPath: m_Name value: Barrel (14) objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1997,7 +2001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.x - value: -7.5 + value: -5.475 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.y @@ -2005,7 +2009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.z - value: -8.938 + value: -8.901 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalRotation.w @@ -2112,7 +2116,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalPosition.x - value: -7.449 + value: -7.347 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalPosition.y @@ -2120,7 +2124,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalPosition.z - value: -6.25 + value: -6.477 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalRotation.w @@ -2184,7 +2188,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.x - value: -3.47 + value: -3.053 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.y @@ -2192,7 +2196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.z - value: -6.2 + value: -6.423 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalRotation.w @@ -2924,7 +2928,7 @@ Transform: m_GameObject: {fileID: 1495039989} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -2.7, y: 0, z: -9.796} + m_LocalPosition: {x: -1.844, y: 0, z: -9.78} m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 1 m_Children: [] @@ -3186,7 +3190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalPosition.x - value: -0.04 + value: -0.369 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalPosition.y @@ -3194,7 +3198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalPosition.z - value: -5.9 + value: -5.906 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalRotation.w @@ -3260,6 +3264,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7561940206882113, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -7.089 + objectReference: {fileID: 0} + - target: {fileID: 7561940206882113, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: -2.54 + objectReference: {fileID: 0} - target: {fileID: 117609072178405330, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3278,16 +3290,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 334852209123821565, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x - value: -0.95 + value: -0.785 objectReference: {fileID: 0} - target: {fileID: 334852209123821565, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.z - value: -6.85 + value: -7.235 objectReference: {fileID: 0} - target: {fileID: 352929351692761553, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 381853629435639939, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 394003937711580801, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -3348,6 +3364,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 1200240270071279120, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -9.75 + objectReference: {fileID: 0} + - target: {fileID: 1200240270071279120, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: 16.4 + objectReference: {fileID: 0} - target: {fileID: 1354402583694537608, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_IsActive value: 0 @@ -3404,6 +3428,14 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.713 objectReference: {fileID: 0} + - target: {fileID: 2288477811011035906, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -9.744001 + objectReference: {fileID: 0} + - target: {fileID: 2288477811011035906, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: 11.377999 + objectReference: {fileID: 0} - target: {fileID: 2320191751092028979, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3496,6 +3528,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -7.8519998 objectReference: {fileID: 0} + - target: {fileID: 3373000136849301196, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3406291917062991511, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3504,6 +3540,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 3663087690131114752, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3703827150791370242, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x value: -7.16 @@ -3516,6 +3556,14 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.37 objectReference: {fileID: 0} + - target: {fileID: 3716263192340156244, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -5.432 + objectReference: {fileID: 0} + - target: {fileID: 3716263192340156244, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: -5.914 + objectReference: {fileID: 0} - target: {fileID: 3935951250666479032, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x value: -9.75 @@ -3528,9 +3576,13 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 4038941631108449159, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -3.071 + objectReference: {fileID: 0} - target: {fileID: 4038941631108449159, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: -6.186 objectReference: {fileID: 0} - target: {fileID: 4119089025960676272, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x @@ -3556,6 +3608,18 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4500856900101370960, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -9.744001 + objectReference: {fileID: 0} + - target: {fileID: 4500856900101370960, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: 14.648 + objectReference: {fileID: 0} + - target: {fileID: 4521684160322213079, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4626167543767749151, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_IsActive value: 1 @@ -3580,6 +3644,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5034117154605842585, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5063844418420020728, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3592,6 +3660,18 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5212230026617154118, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -11.079 + objectReference: {fileID: 0} + - target: {fileID: 5212230026617154118, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.y + value: -4.748 + objectReference: {fileID: 0} + - target: {fileID: 5212230026617154118, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: -0.058 + objectReference: {fileID: 0} - target: {fileID: 5394028855058528100, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3600,6 +3680,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -7.738 objectReference: {fileID: 0} + - target: {fileID: 5541051185064822166, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5623516395497252574, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3616,6 +3700,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 5760859309047557455, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5923748825219422986, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -9.744 + objectReference: {fileID: 0} + - target: {fileID: 5923748825219422986, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.z + value: 12.938 + objectReference: {fileID: 0} - target: {fileID: 6137803970887072510, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Enabled value: 0 @@ -3812,6 +3908,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8637783763420145511, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8723261710043243478, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_IsActive value: 0 @@ -3820,9 +3920,25 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8759793617275541421, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalScale.x + value: 3.89392 + objectReference: {fileID: 0} + - target: {fileID: 8759793617275541421, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalScale.y + value: 3.89392 + objectReference: {fileID: 0} + - target: {fileID: 8759793617275541421, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalScale.z + value: 3.89392 + objectReference: {fileID: 0} + - target: {fileID: 8759793617275541421, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: -7.625 + objectReference: {fileID: 0} - target: {fileID: 8759793617275541421, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.z - value: -8.18 + value: -8.178 objectReference: {fileID: 0} - target: {fileID: 8829561038016547888, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x @@ -4223,7 +4339,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.x - value: -7.425 + value: -7.206 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.y @@ -4231,7 +4347,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalPosition.z - value: -10.717 + value: -10.713 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} propertyPath: m_LocalRotation.w @@ -4513,7 +4629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.x - value: -5.745 + value: -5.611 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.y @@ -4521,7 +4637,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalPosition.z - value: -7.989 + value: -7.987 objectReference: {fileID: 0} - target: {fileID: 2397117528733804567, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/01.Scenes/99.Title/GameObject Profile.asset b/Assets/01.Scenes/99.Title/GameObject Profile.asset index 6dc3a6030..0cc3f246f 100644 --- a/Assets/01.Scenes/99.Title/GameObject Profile.asset +++ b/Assets/01.Scenes/99.Title/GameObject Profile.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Value: {x: 0.69, y: 0.51} intensity: m_OverrideState: 1 - m_Value: 0.25 + m_Value: 0.282 smoothness: m_OverrideState: 1 m_Value: 0.68 @@ -40,7 +40,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} m_Name: DepthOfField m_EditorClassIdentifier: - active: 1 + active: 0 mode: m_OverrideState: 1 m_Value: 2 @@ -58,15 +58,15 @@ MonoBehaviour: m_Value: 0 focusDistance: m_OverrideState: 1 - m_Value: 33.87 + m_Value: 3.6 aperture: m_OverrideState: 1 - m_Value: 19.3 + m_Value: 7.62 focalLength: m_OverrideState: 1 - m_Value: 182 + m_Value: 82 bladeCount: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 5 bladeCurvature: m_OverrideState: 0 @@ -92,10 +92,10 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 0.4 intensity: m_OverrideState: 1 - m_Value: 0.4 + m_Value: 0.3 scatter: m_OverrideState: 1 m_Value: 0.15 @@ -104,7 +104,7 @@ MonoBehaviour: m_Value: 65472 tint: m_OverrideState: 1 - m_Value: {r: 0.8066038, g: 1, b: 0.91149664, a: 1} + m_Value: {r: 1, g: 0.8952732, b: 0.80784315, a: 1} highQualityFiltering: m_OverrideState: 0 m_Value: 0 diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 62ce7303c..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index a6bbef241..000000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 234f4d47697e60e449c7e4d259bf6746 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: