From af909162e2b294638973559c9b15cf62d244fd51 Mon Sep 17 00:00:00 2001 From: BlackYps Date: Thu, 30 Jan 2025 02:15:10 +0100 Subject: [PATCH] Add buttons and resource browser support --- Assets/MapEditor.unity | 555 +++++++++++++--- .../Fields/TextFieldWithButton.prefab | 628 ++++++++++++++++++ .../Fields/TextFieldWithButton.prefab.meta | 9 + .../UI/Elements/Fields/WavesField.prefab | 272 ++++---- Assets/Scripts/UI/Tools/Terrain/WaterInfo.cs | 46 ++ .../ResourceBrowser/ResourceBrowser.cs | 64 +- 6 files changed, 1346 insertions(+), 228 deletions(-) create mode 100644 Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab create mode 100644 Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab.meta diff --git a/Assets/MapEditor.unity b/Assets/MapEditor.unity index 5509fa70..10a6c582 100644 --- a/Assets/MapEditor.unity +++ b/Assets/MapEditor.unity @@ -9928,6 +9928,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 893203673} m_PrefabAsset: {fileID: 0} +--- !u!1 &121522349 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + m_PrefabInstance: {fileID: 602167199} + m_PrefabAsset: {fileID: 0} --- !u!1001 &121701137 PrefabInstance: m_ObjectHideFlags: 0 @@ -21047,7 +21053,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1792739080} + m_TransformParent: {fileID: 1293125328} m_Modifications: - target: {fileID: 1822058447359452, guid: b68527975f2edce489c9336fa9650c39, type: 3} propertyPath: m_Name @@ -21190,7 +21196,7 @@ PrefabInstance: - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 244 objectReference: {fileID: 0} - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 3} @@ -29673,7 +29679,7 @@ PrefabInstance: - target: {fileID: 114967704095949198, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: m_Text - value: ' Wave Texture 1' + value: ' Normal Map 1' objectReference: {fileID: 0} - target: {fileID: 224077777350642360, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} @@ -29775,6 +29781,56 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickWave1Button + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: selectTexture + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1124418735} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.UI.InputField, UnityEngine.UI + objectReference: {fileID: 0} - target: {fileID: 5453136791122846506, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -36560,6 +36616,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 432647673} m_CullTransparentMesh: 0 +--- !u!114 &432801438 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1905705112697087882, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + m_PrefabInstance: {fileID: 1269148613} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &433953020 GameObject: m_ObjectHideFlags: 0 @@ -45411,10 +45479,39 @@ RectTransform: m_PrefabAsset: {fileID: 0} --- !u!224 &520988928 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 602167199} m_PrefabAsset: {fileID: 0} +--- !u!114 &520988931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121522349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 6 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1063236829} + m_TargetAssemblyTypeName: EditMap.WaterInfo, Assembly-CSharp + m_MethodName: selectTexture + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 607157486} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.InputField, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &521471737 PrefabInstance: m_ObjectHideFlags: 0 @@ -53973,140 +54070,169 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 145902914} m_Modifications: - - target: {fileID: 1541227934717128, guid: 148b00b6296385545afdc97e83496834, type: 3} + - target: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Name value: WaterRamp objectReference: {fileID: 0} - - target: {fileID: 114300400988709808, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114300400988709808, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Text value: Water ramp texture path objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 6 objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1063236829} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: WaterSettingsChanged objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: EditMap.WaterInfo, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickWaterRampButton + objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 148b00b6296385545afdc97e83496834, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + insertIndex: -1 + addedObject: {fileID: 520988931} + m_SourcePrefab: {fileID: 100100000, guid: e6265867d457e8545b0b9e582f674244, type: 3} --- !u!1001 &604921799 PrefabInstance: m_ObjectHideFlags: 0 @@ -54496,7 +54622,7 @@ MonoBehaviour: m_IsOn: 1 --- !u!114 &607157486 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 602167199} m_PrefabAsset: {fileID: 0} @@ -66427,10 +66553,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 520988928} - - targetCorrespondingSourceObject: {fileID: 7116784941686974531, guid: 19f207330ece4db409fb300e477c9218, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2053104026} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19f207330ece4db409fb300e477c9218, type: 3} --- !u!1001 &752636806 @@ -71384,7 +71506,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!114 &814150101 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 1456584760} m_PrefabAsset: {fileID: 0} @@ -73072,6 +73194,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 837326805} m_CullTransparentMesh: 0 +--- !u!114 &837754345 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1905705112697087882, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + m_PrefabInstance: {fileID: 1564120525} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &837835109 GameObject: m_ObjectHideFlags: 0 @@ -95373,6 +95507,7 @@ MonoBehaviour: TerrainMenu: {fileID: 1431475374} HasWater: {fileID: 626248049} WaterSettings: {fileID: 1293125329} + LightSettings: {fileID: 1792739083} WaterElevation: {fileID: 676547209} DepthElevation: {fileID: 1186127327} AbyssElevation: {fileID: 910495054} @@ -99085,6 +99220,18 @@ RectTransform: m_AnchoredPosition: {x: 1.300003, y: 0} m_SizeDelta: {x: -2.6, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1124418735 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1905705112697087882, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + m_PrefabInstance: {fileID: 351871364} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1126850576 GameObject: m_ObjectHideFlags: 0 @@ -102066,6 +102213,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1155952397} m_CullTransparentMesh: 0 +--- !u!1 &1158588197 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + m_PrefabInstance: {fileID: 1456584760} + m_PrefabAsset: {fileID: 0} --- !u!1 &1161523269 GameObject: m_ObjectHideFlags: 0 @@ -113681,7 +113834,7 @@ PrefabInstance: - target: {fileID: 114967704095949198, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: m_Text - value: ' Wave Texture 2' + value: ' Normal Map 2' objectReference: {fileID: 0} - target: {fileID: 224077777350642360, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} @@ -113783,6 +113936,56 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickWave2Button + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: selectTexture + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 432801438} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.UI.InputField, UnityEngine.UI + objectReference: {fileID: 0} - target: {fileID: 5453136791122846506, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -115734,6 +115937,7 @@ RectTransform: - {fileID: 910495055} - {fileID: 1119400007} - {fileID: 1792739080} + - {fileID: 837976027} - {fileID: 145902914} - {fileID: 481371103} m_Father: {fileID: 8706823359361796796} @@ -128790,142 +128994,166 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 145902914} + m_TransformParent: {fileID: 1792739080} m_Modifications: - - target: {fileID: 1541227934717128, guid: 148b00b6296385545afdc97e83496834, type: 3} + - target: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Name - value: Cubemap + value: SkyCube objectReference: {fileID: 0} - - target: {fileID: 114300400988709808, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114300400988709808, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Text value: Cubemap texture path objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 6 objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1063236829} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: WaterSettingsChanged objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: EditMap.WaterInfo, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -244 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickSkyCubeButton + objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4208568493511107778, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 148b00b6296385545afdc97e83496834, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2053104029} + m_SourcePrefab: {fileID: 100100000, guid: e6265867d457e8545b0b9e582f674244, type: 3} --- !u!1 &1459538976 GameObject: m_ObjectHideFlags: 0 @@ -136323,7 +136551,7 @@ PrefabInstance: - target: {fileID: 1024034798395756909, guid: 19f207330ece4db409fb300e477c9218, type: 3} propertyPath: m_Name - value: Sun Settings + value: Light Settings objectReference: {fileID: 0} - target: {fileID: 1024034798395756909, guid: 19f207330ece4db409fb300e477c9218, type: 3} @@ -136333,12 +136561,12 @@ PrefabInstance: - target: {fileID: 3816013940329814442, guid: 19f207330ece4db409fb300e477c9218, type: 3} propertyPath: m_Text - value: Only affects water reflections + value: Affects water reflections objectReference: {fileID: 0} - target: {fileID: 3816269228668523686, guid: 19f207330ece4db409fb300e477c9218, type: 3} propertyPath: m_Text - value: Sun settings + value: Light settings objectReference: {fileID: 0} - target: {fileID: 3926609239394685170, guid: 19f207330ece4db409fb300e477c9218, type: 3} @@ -136510,7 +136738,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7116784941686974531, guid: 19f207330ece4db409fb300e477c9218, type: 3} insertIndex: -1 - addedObject: {fileID: 837976027} + addedObject: {fileID: 2053104026} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19f207330ece4db409fb300e477c9218, type: 3} --- !u!1 &1548078118 @@ -138211,7 +138439,7 @@ PrefabInstance: - target: {fileID: 114967704095949198, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: m_Text - value: ' Wave Texture 0' + value: ' Normal Map 0' objectReference: {fileID: 0} - target: {fileID: 224077777350642360, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} @@ -138313,6 +138541,61 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickWave0Button + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: selectTexture + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 837754345} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.UI.InputField, UnityEngine.UI + objectReference: {fileID: 0} - target: {fileID: 5453136791122846506, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -138338,6 +138621,21 @@ PrefabInstance: propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 9102977670760507391, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9102977670760507391, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9102977670760507391, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -155194,6 +155492,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1547421050} m_PrefabAsset: {fileID: 0} +--- !u!225 &1792739083 stripped +CanvasGroup: + m_CorrespondingSourceObject: {fileID: 450582799042723063, guid: 19f207330ece4db409fb300e477c9218, + type: 3} + m_PrefabInstance: {fileID: 1547421050} + m_PrefabAsset: {fileID: 0} --- !u!1 &1793108341 GameObject: m_ObjectHideFlags: 0 @@ -159546,6 +159850,18 @@ RectTransform: m_AnchoredPosition: {x: 139.85, y: -260.5} m_SizeDelta: {x: 279.7, y: 17} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1842203310 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1905705112697087882, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + m_PrefabInstance: {fileID: 2049722382} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1845082473 GameObject: m_ObjectHideFlags: 0 @@ -176066,7 +176382,7 @@ PrefabInstance: - target: {fileID: 114967704095949198, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: m_Text - value: ' Wave Texture 3' + value: ' Normal Map 3' objectReference: {fileID: 0} - target: {fileID: 224077777350642360, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} @@ -176168,6 +176484,56 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickWave3Button + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2413968296636341616, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1063236829} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: selectTexture + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EditMap.WaterInfo, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1842203310} + - target: {fileID: 5282452186332367451, guid: e842d4c896a90e444b7d5db7e16e8cb9, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.UI.InputField, UnityEngine.UI + objectReference: {fileID: 0} - target: {fileID: 5453136791122846506, guid: e842d4c896a90e444b7d5db7e16e8cb9, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -176850,10 +177216,39 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!224 &2053104026 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 1456584760} m_PrefabAsset: {fileID: 0} +--- !u!114 &2053104029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158588197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 6 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1063236829} + m_TargetAssemblyTypeName: EditMap.WaterInfo, Assembly-CSharp + m_MethodName: selectTexture + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 814150101} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.InputField, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2054124562 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab b/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab new file mode 100644 index 00000000..194f9d53 --- /dev/null +++ b/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab @@ -0,0 +1,628 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1231960054393548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224496981761810270} + - component: {fileID: 222406176028405140} + - component: {fileID: 114636255185287652} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224496981761810270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231960054393548} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224136032993035622} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -12, y: -8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222406176028405140 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231960054393548} + m_CullTransparentMesh: 1 +--- !u!114 &114636255185287652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231960054393548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8455882, g: 0.8455882, b: 0.8455882, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: default text +--- !u!1 &1488650782695916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224781202619835206} + - component: {fileID: 222452104215449096} + - component: {fileID: 114300400988709808} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224781202619835206 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488650782695916} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224682333546820604} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -5, y: 14} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &222452104215449096 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488650782695916} + m_CullTransparentMesh: 1 +--- !u!114 &114300400988709808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488650782695916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 300 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Title +--- !u!1 &1541227934717128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224682333546820604} + - component: {fileID: 114549324857000576} + - component: {fileID: 114005359902274034} + m_Layer: 5 + m_Name: TextFieldWithButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224682333546820604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541227934717128} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 224781202619835206} + - {fileID: 224136032993035622} + - {fileID: 1231067782962443275} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 38} + m_Pivot: {x: 0, y: 1} +--- !u!114 &114549324857000576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541227934717128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c60df5520bfea740b1f3db0c3478272, type: 3} + m_Name: + m_EditorClassIdentifier: + FieldType: 0 + BeginValue: 0 + FiltredChars: '''"\' + InputFieldUi: {fileID: 114166052291976760} + SliderUi: {fileID: 0} + Title: {fileID: 0} + OnBeginChange: + m_PersistentCalls: + m_Calls: [] + OnValueChanged: + m_PersistentCalls: + m_Calls: [] + OnEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: EndFieldEdit + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &114005359902274034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541227934717128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 38 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1713578169675998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224136032993035622} + - component: {fileID: 222939239051315292} + - component: {fileID: 114388405306425434} + - component: {fileID: 114166052291976760} + m_Layer: 5 + m_Name: InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224136032993035622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713578169675998} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 224496981761810270} + m_Father: {fileID: 224682333546820604} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12, y: 0} + m_SizeDelta: {x: -24, y: -15} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &222939239051315292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713578169675998} + m_CullTransparentMesh: 1 +--- !u!114 &114388405306425434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713578169675998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c8be034c0fbf7ea4f813b3c9dcd0e079, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &114166052291976760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713578169675998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114388405306425434} + m_TextComponent: {fileID: 114636255185287652} + m_Placeholder: {fileID: 0} + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 0 + m_CharacterLimit: 0 + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114549324857000576} + m_TargetAssemblyTypeName: Ozone.UI.UiTextField, Assembly-CSharp + m_MethodName: OnEndEditInvoke + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0, g: 0.4367814, b: 1, a: 0.7529412} + m_Text: default text + m_CaretBlinkRate: 1.7 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 +--- !u!1 &228668655003959159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1231067782962443275} + - component: {fileID: 2957847691073555932} + - component: {fileID: 180886264708843630} + - component: {fileID: 4208568493511107778} + m_Layer: 5 + m_Name: BtnBrowse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1231067782962443275 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228668655003959159} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7584126250000106554} + m_Father: {fileID: 224682333546820604} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 11.5} + m_SizeDelta: {x: 24, y: 23} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2957847691073555932 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228668655003959159} + m_CullTransparentMesh: 0 +--- !u!114 &180886264708843630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228668655003959159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 64a6191ada4e90446bb848c4d4d395a8, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4208568493511107778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228668655003959159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.35294116, g: 0.35294116, b: 0.35294116, a: 1} + m_HighlightedColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 1} + m_PressedColor: {r: 0, g: 0.53200006, b: 1, a: 1} + m_SelectedColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 1} + m_DisabledColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 0.234} + m_ColorMultiplier: 2 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 180886264708843630} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &2534562477108550551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7584126250000106554} + - component: {fileID: 1228014241615405991} + - component: {fileID: 2478920753893813288} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7584126250000106554 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534562477108550551} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1231067782962443275} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1228014241615405991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534562477108550551} + m_CullTransparentMesh: 0 +--- !u!114 &2478920753893813288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534562477108550551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1b6ff10c2d7b6f5429a517cd2b9c8656, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ... diff --git a/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab.meta b/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab.meta new file mode 100644 index 00000000..0df97182 --- /dev/null +++ b/Assets/Prefabs/UI/Elements/Fields/TextFieldWithButton.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e6265867d457e8545b0b9e582f674244 +timeCreated: 1512393467 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Elements/Fields/WavesField.prefab b/Assets/Prefabs/UI/Elements/Fields/WavesField.prefab index 6cea5a1a..84482792 100644 --- a/Assets/Prefabs/UI/Elements/Fields/WavesField.prefab +++ b/Assets/Prefabs/UI/Elements/Fields/WavesField.prefab @@ -34,7 +34,6 @@ RectTransform: m_Children: - {fileID: 1799696829318433358} - {fileID: 1440164035346449623} - - {fileID: 224884705212684000} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -306,7 +305,7 @@ GameObject: - component: {fileID: 114046863692515478} - component: {fileID: 114227852599666468} m_Layer: 5 - m_Name: Speed + m_Name: InputField m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -320,17 +319,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1603118433705556} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 224182901363867934} - m_Father: {fileID: 224884705212684000} + m_Father: {fileID: 3089013240759916093} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.099998474, y: -27.1} + m_SizeDelta: {x: 0, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222516603614250172 CanvasRenderer: @@ -450,71 +449,6 @@ MonoBehaviour: m_CaretWidth: 1 m_ReadOnly: 0 m_ShouldActivateOnSelect: 1 ---- !u!1 &1657943657451612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224884705212684000} - - component: {fileID: 114539022423843022} - m_Layer: 5 - m_Name: HorizontalLayout - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224884705212684000 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657943657451612} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 224967656716360054} - - {fileID: 224356248506192742} - - {fileID: 224613529751611004} - m_Father: {fileID: 224077777350642360} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.30000305, y: -75.6} - m_SizeDelta: {x: -5.600006, y: 18} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &114539022423843022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657943657451612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 2 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &1736100799739464 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +541,7 @@ GameObject: - component: {fileID: 114439743702864388} - component: {fileID: 114908838917561428} m_Layer: 5 - m_Name: Angle + m_Name: InputField m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -621,17 +555,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1851101692964948} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 224377940002547392} - m_Father: {fileID: 224884705212684000} + m_Father: {fileID: 2448422211284181366} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.19999695, y: -26.6} + m_SizeDelta: {x: 0, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222760701678811256 CanvasRenderer: @@ -763,8 +697,9 @@ GameObject: - component: {fileID: 222700295271756078} - component: {fileID: 114461504423717834} - component: {fileID: 114253102147753970} + - component: {fileID: 729866930993517546} m_Layer: 5 - m_Name: Scale + m_Name: Input Field m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -778,17 +713,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1922235653755034} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 224944099529966730} - m_Father: {fileID: 224884705212684000} + m_Father: {fileID: 6761256465200217865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -26.299988} + m_SizeDelta: {x: -0.0000019073486, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222700295271756078 CanvasRenderer: @@ -908,6 +843,19 @@ MonoBehaviour: m_CaretWidth: 1 m_ReadOnly: 0 m_ShouldActivateOnSelect: 1 +--- !u!114 &729866930993517546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922235653755034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa1a2693f2ccf724ead028a0f6f4299e, type: 3} + m_Name: + m_EditorClassIdentifier: + text: In ogrids (1 ogrid = 20m) --- !u!1 &2792655026492699934 GameObject: m_ObjectHideFlags: 0 @@ -920,7 +868,7 @@ GameObject: - component: {fileID: 3717101271506927104} - component: {fileID: 5466369864933694934} m_Layer: 5 - m_Name: Title (1) + m_Name: Speed m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -937,13 +885,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 224356248506192742} m_Father: {fileID: 1440164035346449623} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 93, y: 18} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3717101271506927104 CanvasRenderer: @@ -986,7 +935,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Speed + m_Text: ' Speed' --- !u!1 &7681617231778971422 GameObject: m_ObjectHideFlags: 0 @@ -999,7 +948,7 @@ GameObject: - component: {fileID: 4602958495150554600} - component: {fileID: 5646291259418030274} m_Layer: 5 - m_Name: Title + m_Name: Scale m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1016,13 +965,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 224967656716360054} m_Father: {fileID: 1440164035346449623} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 93, y: 18} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4602958495150554600 CanvasRenderer: @@ -1065,7 +1015,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Scale + m_Text: ' Scale' --- !u!1 &7865110104359169267 GameObject: m_ObjectHideFlags: 0 @@ -1102,8 +1052,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1, y: -65.8} - m_SizeDelta: {x: -10.349977, y: 15} + m_AnchoredPosition: {x: 0, y: -65.8} + m_SizeDelta: {x: 0, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2382853063632688258 MonoBehaviour: @@ -1126,7 +1076,7 @@ MonoBehaviour: m_Spacing: 6 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -1143,7 +1093,7 @@ GameObject: - component: {fileID: 3268322070175239863} - component: {fileID: 3533733103473139278} m_Layer: 5 - m_Name: Title (2) + m_Name: Angle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1160,13 +1110,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 224613529751611004} m_Father: {fileID: 1440164035346449623} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 93, y: 18} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3268322070175239863 CanvasRenderer: @@ -1209,7 +1160,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Angle + m_Text: ' Angle' --- !u!1001 &2010846098661390770 PrefabInstance: m_ObjectHideFlags: 0 @@ -1218,171 +1169,171 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 224077777350642360} m_Modifications: - - target: {fileID: 1541227934717128, guid: 148b00b6296385545afdc97e83496834, type: 3} + - target: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Name - value: TextField + value: TextFieldWithButton objectReference: {fileID: 0} - - target: {fileID: 114005359902274034, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114005359902274034, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_MinWidth value: -1 objectReference: {fileID: 0} - - target: {fileID: 114005359902274034, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114005359902274034, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_MinHeight value: -1 objectReference: {fileID: 0} - - target: {fileID: 114005359902274034, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114005359902274034, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_IgnoreLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114005359902274034, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114005359902274034, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_PreferredWidth value: -20 objectReference: {fileID: 0} - - target: {fileID: 114005359902274034, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114005359902274034, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_PreferredHeight value: 20 objectReference: {fileID: 0} - - target: {fileID: 114300400988709808, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114300400988709808, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Text value: Texture Path objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 5453136791122846506} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: InputFieldUpdate objectReference: {fileID: 0} - - target: {fileID: 114549324857000576, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 114549324857000576, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: Ozone.UI.UiWaves, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 224136032993035622, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224136032993035622, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224136032993035622, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224136032993035622, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224136032993035622, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224136032993035622, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.y value: 23 objectReference: {fileID: 0} - - target: {fileID: 224136032993035622, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224136032993035622, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.y value: -19 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_SizeDelta.y value: 38 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.x value: -0.3999939 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_AnchoredPosition.y value: -36.1 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + - target: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -1390,17 +1341,21 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 148b00b6296385545afdc97e83496834, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5282452186332367451} + m_SourcePrefab: {fileID: 100100000, guid: e6265867d457e8545b0b9e582f674244, type: 3} --- !u!224 &1799696829318433358 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 224682333546820604, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 2010846098661390770} m_PrefabAsset: {fileID: 0} --- !u!114 &1905705112697087882 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: 148b00b6296385545afdc97e83496834, + m_CorrespondingSourceObject: {fileID: 114166052291976760, guid: e6265867d457e8545b0b9e582f674244, type: 3} m_PrefabInstance: {fileID: 2010846098661390770} m_PrefabAsset: {fileID: 0} @@ -1410,3 +1365,38 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2009322738025508218 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1541227934717128, guid: e6265867d457e8545b0b9e582f674244, + type: 3} + m_PrefabInstance: {fileID: 2010846098661390770} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5282452186332367451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2009322738025508218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 6 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/Scripts/UI/Tools/Terrain/WaterInfo.cs b/Assets/Scripts/UI/Tools/Terrain/WaterInfo.cs index cc9d980c..b3b02c40 100644 --- a/Assets/Scripts/UI/Tools/Terrain/WaterInfo.cs +++ b/Assets/Scripts/UI/Tools/Terrain/WaterInfo.cs @@ -2,6 +2,7 @@ using UnityEngine.UI; using Ozone.UI; using System.IO; +using FAF.MapEditor; using SFB; namespace EditMap @@ -15,6 +16,7 @@ public partial class WaterInfo : MonoBehaviour public Toggle HasWater; public CanvasGroup WaterSettings; + public CanvasGroup LightSettings; public UiTextField WaterElevation; public UiTextField DepthElevation; @@ -96,6 +98,7 @@ public void ReloadValues(bool Undo = false) Cubemap.text = ScmapEditor.Current.map.Water.TexPathCubemap; WaterSettings.interactable = HasWater.isOn; + LightSettings.interactable = !UseLightingSettings.isOn; SetWaves(); @@ -269,6 +272,8 @@ public void WaterSettingsChanged(bool Slider) ScmapEditor.Current.map.Water.WaveTextures[3].NormalRepeat = Waves3.GetScale() ; ScmapEditor.Current.map.Water.WaveTextures[3].NormalMovement = Waves3.GetMovement(); + LightSettings.interactable = !UseLightingSettings.isOn; + UpdateScmap(false); } @@ -300,6 +305,47 @@ private bool AnyChanged() ; } + public void selectTexture(InputField inputField) + { + if(ResourceBrowser.DragedObject == null || ResourceBrowser.DragedObject.ContentType != ResourceObject.ContentTypes.Texture) + return; + if (!ResourceBrowser.Current.gameObject.activeSelf) + return; + inputField.text = ResourceBrowser.Current.LoadedPaths[ResourceBrowser.DragedObject.InstanceId]; + ResourceBrowser.ClearDrag(); + WaterSettingsChanged(false); + } + + public void ClickWaterRampButton() + { + ResourceBrowser.Current.LoadWaterRampTexture(WaterRamp.text); + } + + public void ClickSkyCubeButton() + { + ResourceBrowser.Current.LoadSkyCube(Cubemap.text); + } + + public void ClickWave0Button() + { + ResourceBrowser.Current.LoadWaveTexture(Waves0.TexPath.text); + } + + public void ClickWave1Button() + { + ResourceBrowser.Current.LoadWaveTexture(Waves1.TexPath.text); + } + + public void ClickWave2Button() + { + ResourceBrowser.Current.LoadWaveTexture(Waves2.TexPath.text); + } + + public void ClickWave3Button() + { + ResourceBrowser.Current.LoadWaveTexture(Waves3.TexPath.text); + } + #region Import/Export const string ExportPathKey = "WaterExport"; static string DefaultPath diff --git a/Assets/Scripts/UI/Windows/ResourceBrowser/ResourceBrowser.cs b/Assets/Scripts/UI/Windows/ResourceBrowser/ResourceBrowser.cs index 208d8e28..d7580156 100644 --- a/Assets/Scripts/UI/Windows/ResourceBrowser/ResourceBrowser.cs +++ b/Assets/Scripts/UI/Windows/ResourceBrowser/ResourceBrowser.cs @@ -227,13 +227,7 @@ public void LoadStratumTexture(string path) else if(LoadedEnvPaths[EnvType.value] != CurrentMapFolderPath) DontReload = LastCategory == Category.value && LastEnvType == EnvType.value && !IsGenerating; - if (!DontReload) - Pivot.GetComponent().anchoredPosition = Vector2.zero; - - if (IsGenerating) - StopCoroutine(GeneratingList); - CustomLoading = false; - GeneratingList = StartCoroutine(GenerateList()); + LoadTextures(); } private string SelectEnvType(string path) @@ -330,6 +324,62 @@ public void LoadDecalTexture(string path) gameObject.SetActive(true); + LoadTextures(); + } + + public void LoadSkyCube(string path) + { + ReadAllFolders(); + int LastEnvType = EnvType.value; + + CustomLoading = true; + SelectedObject = path; + SelectEnvType(SkyCubesFolderPathName); + SelectCategory("layers/"); + + DontReload = LastEnvType == EnvType.value && !IsGenerating; + + gameObject.SetActive(true); + + LoadTextures(); + } + + public void LoadWaveTexture(string path) + { + ReadAllFolders(); + int LastEnvType = EnvType.value; + + CustomLoading = true; + SelectedObject = path; + SelectEnvType(WavesFolderPathName); + SelectCategory("layers/"); + + DontReload = LastEnvType == EnvType.value && !IsGenerating; + + gameObject.SetActive(true); + + LoadTextures(); + } + + public void LoadWaterRampTexture(string path) + { + ReadAllFolders(); + int LastEnvType = EnvType.value; + + CustomLoading = true; + SelectedObject = path; + SelectEnvType(WaterRampFolderPathName); + SelectCategory("layers/"); + + DontReload = LastEnvType == EnvType.value && !IsGenerating; + + gameObject.SetActive(true); + + LoadTextures(); + } + + private void LoadTextures() + { if (!DontReload) Pivot.GetComponent().anchoredPosition = Vector2.zero;