From 6a4256738a8689045d12d705e6f5ecb7b8229b81 Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Sat, 24 Mar 2018 14:48:53 +0000 Subject: [PATCH] Added Experimental update to UI Knob to enable working in World/SS-Camera. May revert. Unity seems to calculate the mouse cursor position wrong between frames. --- Examples/ColorPicker/PickerTest.unity | 304 +++++++++++++------------- Scripts/Controls/UI_Knob.cs | 66 ++++-- 2 files changed, 197 insertions(+), 173 deletions(-) diff --git a/Examples/ColorPicker/PickerTest.unity b/Examples/ColorPicker/PickerTest.unity index ab2b6e3..b0da1bd 100644 --- a/Examples/ColorPicker/PickerTest.unity +++ b/Examples/ColorPicker/PickerTest.unity @@ -378,7 +378,7 @@ Prefab: - target: {fileID: 224077522108235048, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 371 objectReference: {fileID: 0} - target: {fileID: 224077522108235048, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -413,37 +413,37 @@ Prefab: - target: {fileID: 224689318808354388, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224410629219527790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224726732051852470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224133724377910672, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224614331221918950, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224408674738500128, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224348066419100816, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -463,7 +463,7 @@ Prefab: - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -473,7 +473,7 @@ Prefab: - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -493,7 +493,7 @@ Prefab: - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -503,7 +503,7 @@ Prefab: - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -523,7 +523,7 @@ Prefab: - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -533,7 +533,7 @@ Prefab: - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -553,7 +553,7 @@ Prefab: - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -563,7 +563,7 @@ Prefab: - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -583,7 +583,7 @@ Prefab: - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -593,7 +593,7 @@ Prefab: - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -613,7 +613,7 @@ Prefab: - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -623,7 +623,7 @@ Prefab: - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -643,7 +643,7 @@ Prefab: - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -653,7 +653,7 @@ Prefab: - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -673,7 +673,7 @@ Prefab: - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -683,7 +683,7 @@ Prefab: - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -703,7 +703,7 @@ Prefab: - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -713,7 +713,7 @@ Prefab: - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 114609493644510624, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -838,7 +838,7 @@ Prefab: - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -858,7 +858,7 @@ Prefab: - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -868,7 +868,7 @@ Prefab: - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -888,7 +888,7 @@ Prefab: - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -898,7 +898,7 @@ Prefab: - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -918,7 +918,7 @@ Prefab: - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -928,7 +928,7 @@ Prefab: - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -948,7 +948,7 @@ Prefab: - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -958,7 +958,7 @@ Prefab: - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -978,7 +978,7 @@ Prefab: - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -988,7 +988,7 @@ Prefab: - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1008,7 +1008,7 @@ Prefab: - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1018,7 +1018,7 @@ Prefab: - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1038,7 +1038,7 @@ Prefab: - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1048,7 +1048,7 @@ Prefab: - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1068,7 +1068,7 @@ Prefab: - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1078,7 +1078,7 @@ Prefab: - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1098,7 +1098,7 @@ Prefab: - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1108,7 +1108,7 @@ Prefab: - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1128,7 +1128,7 @@ Prefab: - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1138,7 +1138,7 @@ Prefab: - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1158,7 +1158,7 @@ Prefab: - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1168,7 +1168,7 @@ Prefab: - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1188,7 +1188,7 @@ Prefab: - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1198,7 +1198,7 @@ Prefab: - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1218,7 +1218,7 @@ Prefab: - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1228,7 +1228,7 @@ Prefab: - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1248,7 +1248,7 @@ Prefab: - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -24 objectReference: {fileID: 0} - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1258,7 +1258,7 @@ Prefab: - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1278,7 +1278,7 @@ Prefab: - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40 objectReference: {fileID: 0} - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1288,7 +1288,7 @@ Prefab: - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1308,7 +1308,7 @@ Prefab: - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1318,7 +1318,7 @@ Prefab: - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1338,7 +1338,7 @@ Prefab: - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1348,7 +1348,7 @@ Prefab: - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1368,7 +1368,7 @@ Prefab: - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -88 objectReference: {fileID: 0} - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1378,7 +1378,7 @@ Prefab: - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1398,7 +1398,7 @@ Prefab: - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -104 objectReference: {fileID: 0} - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1408,7 +1408,7 @@ Prefab: - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1428,7 +1428,7 @@ Prefab: - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -120 objectReference: {fileID: 0} - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1438,7 +1438,7 @@ Prefab: - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1458,7 +1458,7 @@ Prefab: - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -136 objectReference: {fileID: 0} - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1468,12 +1468,12 @@ Prefab: - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 144 objectReference: {fileID: 0} - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1493,7 +1493,7 @@ Prefab: - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1503,7 +1503,7 @@ Prefab: - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1523,7 +1523,7 @@ Prefab: - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1533,12 +1533,12 @@ Prefab: - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 224005557239440826, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224640248834238406, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1558,7 +1558,7 @@ Prefab: - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -207 objectReference: {fileID: 0} - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1573,7 +1573,7 @@ Prefab: - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -351 objectReference: {fileID: 0} - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1628,7 +1628,7 @@ Prefab: - target: {fileID: 224064241042592928, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1643,7 +1643,7 @@ Prefab: - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1653,7 +1653,7 @@ Prefab: - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 157 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -1983,7 +1983,7 @@ Prefab: - target: {fileID: 224077522108235048, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 371 objectReference: {fileID: 0} - target: {fileID: 224077522108235048, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2158,7 +2158,7 @@ Prefab: - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2168,7 +2168,7 @@ Prefab: - target: {fileID: 224581958472260916, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2188,7 +2188,7 @@ Prefab: - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2198,7 +2198,7 @@ Prefab: - target: {fileID: 224214295039064506, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 224892848223092540, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2278,7 +2278,7 @@ Prefab: - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2288,7 +2288,7 @@ Prefab: - target: {fileID: 224475685173174426, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2308,7 +2308,7 @@ Prefab: - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2318,7 +2318,7 @@ Prefab: - target: {fileID: 224354264537592726, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2338,7 +2338,7 @@ Prefab: - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2348,7 +2348,7 @@ Prefab: - target: {fileID: 224360908592950358, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2368,7 +2368,7 @@ Prefab: - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2378,7 +2378,7 @@ Prefab: - target: {fileID: 224971275004697644, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2398,7 +2398,7 @@ Prefab: - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2408,7 +2408,7 @@ Prefab: - target: {fileID: 224660955639102404, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2428,7 +2428,7 @@ Prefab: - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2438,7 +2438,7 @@ Prefab: - target: {fileID: 224095406630919606, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2458,7 +2458,7 @@ Prefab: - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2468,7 +2468,7 @@ Prefab: - target: {fileID: 224927269330184902, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2488,7 +2488,7 @@ Prefab: - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2498,7 +2498,7 @@ Prefab: - target: {fileID: 224863704584257808, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2518,7 +2518,7 @@ Prefab: - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2528,7 +2528,7 @@ Prefab: - target: {fileID: 224732698925375344, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2548,7 +2548,7 @@ Prefab: - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2558,7 +2558,7 @@ Prefab: - target: {fileID: 224399137899453306, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2578,7 +2578,7 @@ Prefab: - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2588,7 +2588,7 @@ Prefab: - target: {fileID: 224069193118129476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2608,7 +2608,7 @@ Prefab: - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2618,7 +2618,7 @@ Prefab: - target: {fileID: 224658407108353570, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2638,7 +2638,7 @@ Prefab: - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2648,7 +2648,7 @@ Prefab: - target: {fileID: 224226199402462476, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2668,7 +2668,7 @@ Prefab: - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2678,7 +2678,7 @@ Prefab: - target: {fileID: 224935029125555986, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2698,7 +2698,7 @@ Prefab: - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2708,7 +2708,7 @@ Prefab: - target: {fileID: 224650824435197908, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2728,7 +2728,7 @@ Prefab: - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2738,7 +2738,7 @@ Prefab: - target: {fileID: 224884208144114790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2758,7 +2758,7 @@ Prefab: - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2768,7 +2768,7 @@ Prefab: - target: {fileID: 224101731850405088, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2788,7 +2788,7 @@ Prefab: - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2798,7 +2798,7 @@ Prefab: - target: {fileID: 224282814497158698, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2818,7 +2818,7 @@ Prefab: - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2828,7 +2828,7 @@ Prefab: - target: {fileID: 224259440032518056, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2848,7 +2848,7 @@ Prefab: - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2858,7 +2858,7 @@ Prefab: - target: {fileID: 224640719985598304, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2878,7 +2878,7 @@ Prefab: - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2888,7 +2888,7 @@ Prefab: - target: {fileID: 224033990879219116, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2908,7 +2908,7 @@ Prefab: - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2918,7 +2918,7 @@ Prefab: - target: {fileID: 224370564098919790, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2938,7 +2938,7 @@ Prefab: - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -24 objectReference: {fileID: 0} - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2948,7 +2948,7 @@ Prefab: - target: {fileID: 224513373176138574, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2968,7 +2968,7 @@ Prefab: - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40 objectReference: {fileID: 0} - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2978,7 +2978,7 @@ Prefab: - target: {fileID: 224514261220045470, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -2998,7 +2998,7 @@ Prefab: - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -56 objectReference: {fileID: 0} - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3008,7 +3008,7 @@ Prefab: - target: {fileID: 224425075229294896, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3028,7 +3028,7 @@ Prefab: - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3038,7 +3038,7 @@ Prefab: - target: {fileID: 224105126088428784, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3058,7 +3058,7 @@ Prefab: - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -88 objectReference: {fileID: 0} - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3068,7 +3068,7 @@ Prefab: - target: {fileID: 224481539784638704, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3088,7 +3088,7 @@ Prefab: - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -104 objectReference: {fileID: 0} - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3098,7 +3098,7 @@ Prefab: - target: {fileID: 224125977752704284, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3118,7 +3118,7 @@ Prefab: - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -120 objectReference: {fileID: 0} - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3128,7 +3128,7 @@ Prefab: - target: {fileID: 224762244350383586, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3148,7 +3148,7 @@ Prefab: - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -136 objectReference: {fileID: 0} - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3158,7 +3158,7 @@ Prefab: - target: {fileID: 224728460422737004, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3173,12 +3173,12 @@ Prefab: - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -207 objectReference: {fileID: 0} - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 144 objectReference: {fileID: 0} - target: {fileID: 224064241042592928, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3203,7 +3203,7 @@ Prefab: - target: {fileID: 224064241042592928, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3218,7 +3218,7 @@ Prefab: - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3228,7 +3228,7 @@ Prefab: - target: {fileID: 224919684780906234, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 157 objectReference: {fileID: 0} - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3243,7 +3243,7 @@ Prefab: - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -351 objectReference: {fileID: 0} - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} @@ -3253,7 +3253,7 @@ Prefab: - target: {fileID: 224603186546489490, guid: 53b194f66900add419869c57ffbe7b85, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 224147135900216772, guid: 53b194f66900add419869c57ffbe7b85, type: 2} diff --git a/Scripts/Controls/UI_Knob.cs b/Scripts/Controls/UI_Knob.cs index ebf40b3..0c14864 100644 --- a/Scripts/Controls/UI_Knob.cs +++ b/Scripts/Controls/UI_Knob.cs @@ -15,17 +15,17 @@ using UnityEngine.EventSystems; /// - clampOutput01 - if true the output knobValue will be clamped between 0 and 1 regardless of number of loops. /// - snapToPosition - snap to step. NOTE: max value will override the step. /// - snapStepsPerLoop - how many snap positions are in one knob loop; -/// - OnValueChanged - event that is called every frame while rotationg knob, sends argument of knobValue +/// - OnValueChanged - event that is called every frame while rotating knob, sends argument of knobValue /// NOTES /// - script works only in images rotation on Z axis; -/// - while dragging outside of control, the rotation will be cancelled +/// - while dragging outside of control, the rotation will be canceled /// /// namespace UnityEngine.UI.Extensions { [RequireComponent(typeof(Image))] [AddComponentMenu("UI/Extensions/UI_Knob")] - public class UI_Knob : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerEnterHandler, IPointerExitHandler, IBeginDragHandler, IDragHandler + public class UI_Knob : Selectable, IPointerDownHandler, IPointerUpHandler, IPointerEnterHandler, IPointerExitHandler, IDragHandler, IInitializePotentialDragHandler { public enum Direction { CW, CCW }; [Tooltip("Direction of rotation CW - clockwise, CCW - counterClockwise")] @@ -36,7 +36,7 @@ namespace UnityEngine.UI.Extensions public float maxValue = 0; [Tooltip("How many rotations knob can do, if higher than max value, the latter will limit max value")] public int loops = 1; - [Tooltip("Clamp output value between 0 and 1, usefull with loops > 1")] + [Tooltip("Clamp output value between 0 and 1, useful with loops > 1")] public bool clampOutput01 = false; [Tooltip("snap to position?")] public bool snapToPosition = false; @@ -51,43 +51,65 @@ namespace UnityEngine.UI.Extensions private Vector2 _currentVector; private Quaternion _initRotation; private bool _canDrag = false; + [SerializeField] + private bool experimental = false; - //ONLY ALLOW ROTATION WITH POINTER OVER THE CONTROL - public void OnPointerDown(PointerEventData eventData) + private RectTransform m_HandleRect; + + + protected override void Awake() { - _canDrag = true; + m_HandleRect = GetComponent(); } - public void OnPointerUp(PointerEventData eventData) + + public override void OnPointerUp(PointerEventData eventData) { _canDrag = false; } - public void OnPointerEnter(PointerEventData eventData) + public override void OnPointerEnter(PointerEventData eventData) { _canDrag = true; } - public void OnPointerExit(PointerEventData eventData) + public override void OnPointerExit(PointerEventData eventData) { _canDrag = false; } - public void OnBeginDrag(PointerEventData eventData) - { - SetInitPointerData(eventData); - } - void SetInitPointerData(PointerEventData eventData) + + + public override void OnPointerDown(PointerEventData eventData) { + _canDrag = true; + + base.OnPointerDown(eventData); + _initRotation = transform.rotation; - _currentVector = eventData.position - (Vector2)transform.position; + if (experimental) + { + RectTransformUtility.ScreenPointToLocalPointInRectangle(m_HandleRect, eventData.position, eventData.pressEventCamera, out _currentVector); + } + else + { + _currentVector = eventData.position - (Vector2)transform.position; + } _initAngle = Mathf.Atan2(_currentVector.y, _currentVector.x) * Mathf.Rad2Deg; } + public void OnDrag(PointerEventData eventData) { //CHECK IF CAN DRAG if (!_canDrag) { - SetInitPointerData(eventData); return; } - _currentVector = eventData.position - (Vector2)transform.position; + + if (experimental) + { + RectTransformUtility.ScreenPointToLocalPointInRectangle(m_HandleRect, eventData.position, eventData.pressEventCamera, out _currentVector); + } + else + { + _currentVector = eventData.position - (Vector2)transform.position; + } _currentAngle = Mathf.Atan2(_currentVector.y, _currentVector.x) * Mathf.Rad2Deg; Quaternion addRotation = Quaternion.AngleAxis(_currentAngle - _initAngle, this.transform.forward); @@ -133,7 +155,6 @@ namespace UnityEngine.UI.Extensions { knobValue = 0; transform.localEulerAngles = Vector3.zero; - SetInitPointerData(eventData); InvokeEvents(knobValue + _currentLoops); return; } @@ -141,7 +162,6 @@ namespace UnityEngine.UI.Extensions { knobValue = 1; transform.localEulerAngles = Vector3.zero; - SetInitPointerData(eventData); InvokeEvents(knobValue + _currentLoops); return; } @@ -156,7 +176,6 @@ namespace UnityEngine.UI.Extensions knobValue = maxValue; float maxAngle = direction == Direction.CW ? 360f - 360f * maxValue : 360f * maxValue; transform.localEulerAngles = new Vector3(0, 0, maxAngle); - SetInitPointerData(eventData); InvokeEvents(knobValue); return; } @@ -179,6 +198,11 @@ namespace UnityEngine.UI.Extensions value /= loops; OnValueChanged.Invoke(value); } + + public virtual void OnInitializePotentialDrag(PointerEventData eventData) + { + eventData.useDragThreshold = false; + } } [System.Serializable]