diff --git a/MorphoNet/Assets/DataSet/BasicObject.cs b/MorphoNet/Assets/DataSet/BasicObject.cs index 35d6addae9a00eed76fbbca27e098765e22ca009..473156b096e47022f8c372396ae7c2b7aa046683 100644 --- a/MorphoNet/Assets/DataSet/BasicObject.cs +++ b/MorphoNet/Assets/DataSet/BasicObject.cs @@ -43,6 +43,8 @@ namespace AssemblyCSharp public bool UploadedMetallicParameter = false; //Color2 upload by the user public float UploadSmoothnessParameter; public bool UploadedSmoothnessParameter = false; //Color2 upload by the user + public float UploadTransparencyParameter; + public bool UploadedTransparencyParameter = false; //Color2 upload by the user public int lifePast; @@ -714,6 +716,13 @@ namespace AssemblyCSharp this.updateShader(); } + public void UploadTransparency(float val) + { + this.UploadTransparencyParameter = val; + this.UploadedTransparencyParameter = true; + this.updateShader(); + } + public void removeUploadColor(){ if (this.UploadedColor) { @@ -762,6 +771,15 @@ namespace AssemblyCSharp } } + public void removeUploadTransparencyParameter() + { + if (this.UploadedTransparencyParameter) + { + this.UploadedTransparencyParameter = false; + this.updateShader(); + } + } + public void removeUploadSmoothnessParameter() { if (this.UploadedSmoothnessParameter) diff --git a/MorphoNet/Assets/DataSet/LoadParameters.cs b/MorphoNet/Assets/DataSet/LoadParameters.cs index 517b16d4f694cfdf2f0547a7c00e3c94f5053142..10df75e0aaed765fe7b48d13c1231193113ad6b3 100644 --- a/MorphoNet/Assets/DataSet/LoadParameters.cs +++ b/MorphoNet/Assets/DataSet/LoadParameters.cs @@ -58,6 +58,7 @@ public class LoadParameters : MonoBehaviour public DebugManager debug_m; public string urlSERVER = "http://morphonet.org/"; public int id_dataset; + public string privacy = "p"; public string embryo_name; public int min_time; public int max_time; @@ -206,6 +207,7 @@ public class LoadParameters : MonoBehaviour urlSERVER = "https://morphonet.org"; id_dataset = 0; + privacy = "private"; embryo_name = ""; min_time = 0; max_time = 0; @@ -376,6 +378,7 @@ public class LoadParameters : MonoBehaviour urlSERVER = "https://morphonet.org"; id_dataset = 0; + privacy = "private"; embryo_name = ""; min_time = 0; max_time = 0; @@ -932,6 +935,7 @@ if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "LoadParam JSONNode N = JSONNode.Parse(parameters); //UnityEngine.Debug.Log(parameters); id_dataset = -2; + privacy = "private"; embryo_name = N["name"].ToString().Replace('"', ' ').Trim(); min_time = 0; @@ -961,6 +965,7 @@ if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "LoadParam //MORPHOPLOT STANDALONE , NOT USED ANY MORE // Debug.Log("setup Desktop MorphoPlot "); id_dataset = 0; + privacy = "private"; //morphoplot_port_send = 9200; morphoplot_port_send = 9875; //morphoplot_port_recieve = 9201; @@ -993,7 +998,8 @@ if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "LoadParam // Debug.Log(N); //UnityEngine.Debug.Log(N["id"].ToString().Replace('"', ' ').Trim()); id_dataset = int.Parse(N["id"].ToString().Replace('"', ' ').Trim()); - // Debug.Log("Apres ID_dataset"); + privacy = "private"; + // Debug.Log("Apres ID_dataset"); if (id_dataset == 0) { #if UNITY_WEBGL @@ -1138,6 +1144,11 @@ WebGLInput.captureAllKeyboardInput = true; type = N["type"].ToString().Replace('"', ' ').Trim(); } + if (N["privacy"] != null && UtilsManager.convertJSON(N["privacy"]) != "null") + { + privacy = N["privacy"].ToString().Replace('"', ' ').Trim(); + } + // UnityEngine.Debug.Log("Parsing fini !"); parseAPIMode(N); // UnityEngine.Debug.Log("Apres API"); diff --git a/MorphoNet/Assets/DataSet/ObjectRender.cs b/MorphoNet/Assets/DataSet/ObjectRender.cs index a529c2282326f8fccca9816edff0232ee1b7297d..128564a142ce4b9e82ba58c95db0065987d95618 100644 --- a/MorphoNet/Assets/DataSet/ObjectRender.cs +++ b/MorphoNet/Assets/DataSet/ObjectRender.cs @@ -586,7 +586,7 @@ public class ObjectRender : MonoBehaviour if (Channel.updateShader) { - if (Channel.cell.UploadedMainColor || Channel.cell.UploadedHaloColor || Channel.cell.UploadedSecondColor || Channel.cell.UploadedMetallicParameter || Channel.cell.UploadedSmoothnessParameter) + if (Channel.cell.UploadedMainColor || Channel.cell.UploadedHaloColor || Channel.cell.UploadedSecondColor || Channel.cell.UploadedMetallicParameter || Channel.cell.UploadedSmoothnessParameter || Channel.cell.UploadedTransparencyParameter) { Color c1 = Color.white; if (_Renderer.sharedMaterial == null) { @@ -608,7 +608,7 @@ public class ObjectRender : MonoBehaviour } else if (_Renderer.sharedMaterial.name != "FresnellCell (Instance)" && !Channel.cell.UploadedSecondColor) { - c1 = _Renderer.material.GetColor("Color1"); + c1 = _Renderer.material.GetColor("_Color1"); AssignMaterial(SetsManager.instance.Default); AssignColor(false, c1); } @@ -625,6 +625,10 @@ public class ObjectRender : MonoBehaviour { AssignColor(false, Channel.cell.UploadColorMain); } + else + { + AssignColor(false, Color.white); + } if (Channel.cell.UploadedHaloColor) { AssignColorHalo(false, Channel.cell.UploadColorHalo); @@ -652,6 +656,14 @@ public class ObjectRender : MonoBehaviour { _Renderer.material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); } + if (Channel.cell.UploadedTransparencyParameter) + { + _Renderer.material.SetFloat("_Transparency", Channel.cell.UploadTransparencyParameter); + } + else + { + _Renderer.material.SetFloat("_Transparency", InterfaceManager.instance.defaultShaderTransparency); + } } Channel.updateShader = false; } diff --git a/MorphoNet/Assets/DataSet/Shaders/FresnelCell.shader b/MorphoNet/Assets/DataSet/Shaders/FresnelCell.shader index c61b51122bbe236a0a361f18f2080fe3a08ea928..a4955b26147bb8c2362addcca12d48430df381d0 100644 --- a/MorphoNet/Assets/DataSet/Shaders/FresnelCell.shader +++ b/MorphoNet/Assets/DataSet/Shaders/FresnelCell.shader @@ -11,6 +11,7 @@ _Smoothness("Smoothness", Range(0, 1)) = 0.0 _Metallic("Metallic", Range(0, 1)) = 0.0 _ActivateFrenel("ActivateFrenel",Range(0, 1)) = 0.0 + _Transparency("Transparency", Range(0, 1)) = 1.0 [Toggle] _DoClip("Do Clip", float) = 0 _XClippingPlane("XClipping Plane", Vector) = (0,0,0,0) _XViewPlan("X View Plan",int) = 1 @@ -56,6 +57,7 @@ float _Thickness; float _Emission; float _ActivateFrenel; + float _Transparency; uniform float _ToggleFreeCuttingPlane; float4 _FreeCuttingPlaneRepresentation; @@ -123,7 +125,7 @@ o.Emission = _ActivateFrenel<0.5?_Emission * FresnelEffect(newNormal, IN.viewDir, _FresnelPower) : _Emission * _FresnelColor.rgb * FresnelEffect(newNormal, IN.viewDir, _FresnelPower); o.Metallic = _Metallic; o.Smoothness = _Smoothness; - o.Alpha = 1.0; + o.Alpha = _Transparency; } ENDCG } diff --git a/MorphoNet/Assets/Informations/DataSetInformations.cs b/MorphoNet/Assets/Informations/DataSetInformations.cs index 4e5aa8f781154d3e85da88a98d6195e30a2b4581..e02e5389e524e1bbc12170639cd11a3180f5ff12 100644 --- a/MorphoNet/Assets/Informations/DataSetInformations.cs +++ b/MorphoNet/Assets/Informations/DataSetInformations.cs @@ -697,7 +697,7 @@ public class Correspondence else { InterfaceManager.instance.MenuColorBar.SetActive(true); - MenuColorBar.instance.assignValues(ctype, int.Parse(MenuColorBar.buttonToColorize.transform.Find("min").gameObject.GetComponentInChildren<Text>().text), int.Parse(MenuColorBar.buttonToColorize.transform.Find("max").gameObject.GetComponentInChildren<Text>().text), MinV, MaxV, name, float.Parse(MenuColorBar.buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text), float.Parse(MenuColorBar.buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text), MenuColorBar.buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text); + MenuColorBar.instance.assignValues(ctype, int.Parse(MenuColorBar.buttonToColorize.transform.Find("min").gameObject.GetComponentInChildren<Text>().text), int.Parse(MenuColorBar.buttonToColorize.transform.Find("max").gameObject.GetComponentInChildren<Text>().text), MinV, MaxV, name, float.Parse(MenuColorBar.buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text), float.Parse(MenuColorBar.buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text), this.inf.transform.Find("InfosColor").gameObject.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text); } } @@ -733,6 +733,9 @@ public class Correspondence case "Smoothness": cancelSmoothnessMap(); break; + case "Transparency": + cancelTransparencyMap(); + break; default: break; } @@ -770,6 +773,9 @@ public class Correspondence case "Smoothness": applySmoothnessMap(minV, maxV, minVOther, maxVOther, this); break; + case "Transparency": + applyTransparencyMap(minV, maxV, minVOther, maxVOther, this); + break; default: break; } @@ -1163,6 +1169,80 @@ public class Correspondence #endif } + public void applyTransparencyMap(float minV, float maxV, float minVOther, float maxVOther, Correspondence cor) + { + List<BasicObject> cells = new List<BasicObject>(parent.AttachedDataset.PickedManager.clickedCells); + if (InterfaceManager.instance.lineage_viewer != null && InterfaceManager.instance.lineage_viewer.isActive) + { + InterfaceManager.instance.lineage_viewer.LoadInfoInLineage(this); + } + bool lineage_all = false; + if (parent.AttachedDataset.PickedManager.clickedCells.Count == 0) + { //ALL CELLS + lineage_all = true; + for (int t = parent.AttachedDataset.MinTime; t <= parent.AttachedDataset.MaxTime; t++) + { + Dictionary<string, BasicObject> CellAtT = parent.AttachedDataset.objects_by_time[t]; + foreach (var itemc in CellAtT) + { + BasicObject c = itemc.Value; + float v; + if (float.TryParse(c.getInfos(id_infos), out v)) + { + float val = minVOther + (maxVOther - minVOther) * (v - minV) / (maxV - minV); + c.UploadTransparency(val); + } + } + } + } + else + { //ONLY SELECTED CELLS + if (datatype == "dict") + { + lineage_all = false; + + foreach (BasicObject c in parent.AttachedDataset.PickedManager.clickedCells) + { + float v; + string[] all_v = c.getInfos(id_infos).Split(';'); + foreach (string vs in all_v) + { + string[] vz = vs.Split(':'); + if (vz.Count() == 2) + if (float.TryParse(vz[1], out v)) + { + float val = minVOther + (maxVOther - minVOther) * (v - minV) / (maxV - minV); + BasicObject n2 = parent.AttachedDataset.getCell(vz[0], false); + if (n2 != null) n2.UploadTransparency(val); + } + } + } + } + else + { + lineage_all = false; + foreach (BasicObject c in parent.AttachedDataset.PickedManager.clickedCells) + { + float v; + if (float.TryParse(c.getInfos(id_infos), out v)) + { + float val = minVOther + (maxVOther - minVOther) * (v - minV) / (maxV - minV); + c.UploadTransparency(val); + } + } + } + parent.AttachedDataset.PickedManager.ClearSelectedCells(); + } +#if UNITY_WEBGL + //if (Lineage.isLineage) { Lineage.applyColormapInfo(cor, typecmap, minC, maxC, minV, maxV, lineage_all,cells) ; } +#else + if (InterfaceManager.instance.lineage_viewer != null && InterfaceManager.instance.lineage_viewer.isActive) + { + InterfaceManager.instance.lineage_viewer.Redraw(); + } +#endif + } + //Reset Upload Color public void cancelCmap() @@ -1189,7 +1269,7 @@ public class Correspondence foreach (var itemc in CellAtT) { BasicObject c = itemc.Value; - c.UploadedMainColor = false; + c.UploadMainColor(Color.white); c.updateShader(); } } @@ -1255,6 +1335,21 @@ public class Correspondence } } + //Reset Upload Transparency + public void cancelTransparencyMap() + { + for (int t = parent.AttachedDataset.MinTime; t <= parent.AttachedDataset.MaxTime; t++) + { + Dictionary<string, BasicObject> CellAtT = parent.AttachedDataset.objects_by_time[t]; + foreach (var itemc in CellAtT) + { + BasicObject c = itemc.Value; + c.UploadedTransparencyParameter = false; + c.updateShader(); + } + } + } + //When we click on a value in the infos we want to change it public void changeValue() { @@ -2189,6 +2284,7 @@ public class DataSetInformations : MonoBehaviour c.removeUploadSecondColor(); c.removeUploadMetallicParameter(); c.removeUploadSmoothnessParameter(); + c.removeUploadTransparencyParameter(); c.removeAllSelection(); } if (Lineage.isLineage) Lineage.UpdateWebsiteLineage(); diff --git a/MorphoNet/Assets/Informations/MenuColorBar.cs b/MorphoNet/Assets/Informations/MenuColorBar.cs index ec2c1c1a28017a3f6de24c98515ae8708c5ef692..89ff48f581c4feb95e33d461cc04bbc13708ab5b 100644 --- a/MorphoNet/Assets/Informations/MenuColorBar.cs +++ b/MorphoNet/Assets/Informations/MenuColorBar.cs @@ -37,6 +37,7 @@ public class MenuColorBar : MonoBehaviour { public static Slider SliderMaxVOther; public static Text infosNameT; + public static Text infosNameT2; public static string infosName; public static GameObject buttonToColorize; public static Toggle activeToggle; @@ -46,6 +47,11 @@ public class MenuColorBar : MonoBehaviour { public static GameObject ShaderMoy; public static GameObject ShaderMax; + + private static Material MatMin; + private static Material MatMoy; + private static Material MatMax; + private void Awake() { if (instance == null) @@ -101,6 +107,7 @@ public class MenuColorBar : MonoBehaviour { MinVText = MenuBarColor.transform.Find("MinV").gameObject.GetComponent<InputField>(); MaxVText = MenuBarColor.transform.Find("MaxV").gameObject.GetComponent<InputField>(); infosNameT = MenuBarColor.transform.Find("InfosText").gameObject.GetComponent<Text>(); + infosNameT2 = MenuBarColor.transform.Find("Info").gameObject.GetComponent<Text>(); //FOR ReallValue SliderMinVOther = MenuBarColor.transform.Find("SubMenuOther").Find("SliderMinV").gameObject.GetComponent<Slider>(); @@ -113,21 +120,25 @@ public class MenuColorBar : MonoBehaviour { ShaderMoy = MenuBarColor.transform.Find("Moy").gameObject; ShaderMax = MenuBarColor.transform.Find("Max").gameObject; - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_FresnelPower", 1.5f); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_FresnelPower", 1.5f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_FresnelPower", 1.5f); + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_FresnelPower", 1.5f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_FresnelPower", 1.5f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_FresnelPower", 1.5f); - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_ActivateFrenel", 1f); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_ActivateFrenel", 1f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_ActivateFrenel", 1f); + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_ActivateFrenel", 1f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_ActivateFrenel", 1f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_ActivateFrenel", 1f); + + MatMin = ShaderMin.GetComponent<MeshRenderer>().material; + MatMoy = ShaderMoy.GetComponent<MeshRenderer>().material; + MatMax = ShaderMax.GetComponent<MeshRenderer>().material; } //if (MapColorV != 0) changeColorMap(MapColorV); updatSliders(); @@ -143,8 +154,12 @@ public class MenuColorBar : MonoBehaviour { MinVOther = minVOther; MaxVOther = maxVOther; infosName = name; + if (parameter == "") + { parameter = "Main Color"; + } + ParametersChoice.transform.Find(parameter).gameObject.GetComponent<Toggle>().isOn = true; activeToggle = ParametersChoice.transform.Find(parameter).gameObject.GetComponent<Toggle>(); if(activeToggle.name == "Main Color" || activeToggle.name == "Halo Color" || activeToggle.name == "Second Color") { @@ -156,6 +171,10 @@ public class MenuColorBar : MonoBehaviour { SubMenuColor.SetActive(false); SubMenuOther.SetActive(true); } + + MatMin = ShaderMin.GetComponent<MeshRenderer>().material; + MatMoy = ShaderMoy.GetComponent<MeshRenderer>().material; + MatMax = ShaderMax.GetComponent<MeshRenderer>().material; updatSliders(); } @@ -168,6 +187,13 @@ public class MenuColorBar : MonoBehaviour { wait = 0; //updatSliders(); } + + if (!MenuBarColor.activeSelf) + { + ShaderMin.GetComponent<MeshRenderer>().material = MatMin; + ShaderMoy.GetComponent<MeshRenderer>().material = MatMoy; + ShaderMax.GetComponent<MeshRenderer>().material = MatMax; + } } static float minSlider = float.MinValue; @@ -211,6 +237,7 @@ public class MenuColorBar : MonoBehaviour { SliderMinVOther.SetValueWithoutNotify(result); MinVOther = result; minSliderOther = result; + updatSliders(); } } @@ -224,6 +251,7 @@ public class MenuColorBar : MonoBehaviour { SliderMaxVOther.SetValueWithoutNotify(result); MaxVOther = result; maxSliderOther = result; + updatSliders(); } } @@ -270,95 +298,221 @@ public class MenuColorBar : MonoBehaviour { } if (infosNameT.text != infosName) infosNameT.text = infosName; + if (infosNameT2.text != infosName) infosNameT2.text = infosName; - /*if (buttonToColorize.transform.Find("lastParameter").gameObject.GetComponentInChildren<Text>().text != activeToggle.name) + if (buttonToColorize != null) { - switch (buttonToColorize.transform.Find("lastParameter").gameObject.GetComponentInChildren<Text>().text) + ShaderMin.GetComponent<MeshRenderer>().material = MatMin; + ShaderMoy.GetComponent<MeshRenderer>().material = MatMoy; + ShaderMax.GetComponent<MeshRenderer>().material = MatMax; + + Sprite def; + Texture2D texty; + int min, max; + + if (buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text != activeToggle.name) + { + switch (buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text) + { + case "Main Color": + if (MatMax.name == "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_Color") == texty.GetPixel(MaxC, 0)) + { + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + } + } + else + { + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + } + } + break; + case "Halo Color": + if (MatMax.name == "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_FresnelColor") == texty.GetPixel(MaxC, 0)) + { + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + } + } + else + { + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 0f); + } + } + break; + case "Second Color": + if (MatMax.name != "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_Color2") == texty.GetPixel(MaxC, 0)) + { + ShaderMin.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMoy.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMax.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMin.GetColor("_Color1")); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMoy.GetColor("_Color1")); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMax.GetColor("_Color1")); + } + } + else + { + ShaderMin.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMoy.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMax.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMin.GetColor("_Color1")); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMoy.GetColor("_Color1")); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", MatMax.GetColor("_Color1")); + } + } + break; + case "Metallic": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Metallic") == max && MatMin.GetFloat("_Metallic") == min) + { + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); + } + } + break; + case "Smoothness": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Smoothness") == max && MatMin.GetFloat("_Smoothness") == min) + { + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + } + } + break; + case "Transparency": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Transparency") == max && MatMin.GetFloat("_Transparency") == min) + { + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + } + } + break; + default: + break; + } + } + + + switch (activeToggle.name) { case "Main Color": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); + if (MatMax.name != "FresnellCell (Instance)") + { + ShaderMin.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMoy.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMax.GetComponent<MeshRenderer>().material = SetsManager.instance.Default; + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", Color.white); + } + def = MapColor.options[MapColor.value].image; + if (def != null) + { + texty = def.texture; + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color", texty.GetPixel(MinC, 0)); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color", texty.GetPixel((int)(MaxC - MinC) / 2 + MinC, 0)); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color", texty.GetPixel(MaxC, 0)); + } break; case "Halo Color": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); + def = MapColor.options[MapColor.value].image; + if (def != null) + { + texty = def.texture; + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 1f); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 1f); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Emission", 1f); + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_FresnelColor", texty.GetPixel(MinC, 0)); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_FresnelColor", texty.GetPixel((int)(MaxC - MinC) / 2 + MinC, 0)); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_FresnelColor", texty.GetPixel(MaxC, 0)); + } break; case "Second Color": - ShaderMin.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.Default; - ShaderMoy.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.Default; - ShaderMax.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.Default; - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", Color.white); + def = MapColor.options[MapColor.value].image; + if (def != null) + { + texty = def.texture; + Color col1, col2, col3; + if (MatMax.name == "FresnellCell (Instance)") + { + col1 = ShaderMin.GetComponent<MeshRenderer>().material.GetColor("_Color"); + col2 = ShaderMoy.GetComponent<MeshRenderer>().material.GetColor("_Color"); + col3 = ShaderMax.GetComponent<MeshRenderer>().material.GetColor("_Color"); + } + else + { + col1 = ShaderMin.GetComponent<MeshRenderer>().material.GetColor("_Color1"); + col2 = ShaderMoy.GetComponent<MeshRenderer>().material.GetColor("_Color1"); + col3 = ShaderMax.GetComponent<MeshRenderer>().material.GetColor("_Color1"); + } + ShaderMin.GetComponent<MeshRenderer>().material = SetsManager.instance.StainSelection[0]; + ShaderMoy.GetComponent<MeshRenderer>().material = SetsManager.instance.StainSelection[0]; + ShaderMax.GetComponent<MeshRenderer>().material = SetsManager.instance.StainSelection[0]; + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color1", col1); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color1", col2); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color1", col3); + ShaderMin.GetComponent<MeshRenderer>().material.SetColor("_Color2", texty.GetPixel(MinC, 0)); + ShaderMoy.GetComponent<MeshRenderer>().material.SetColor("_Color2", texty.GetPixel((int)(MaxC - MinC) / 2 + MinC, 0)); + ShaderMax.GetComponent<MeshRenderer>().material.SetColor("_Color2", texty.GetPixel(MaxC, 0)); + } break; case "Metallic": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", InterfaceManager.instance.defaultShaderMetallic); + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", MinVOther); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", (float)(MaxVOther - MinVOther) / 2.0f + MinVOther); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Metallic", MaxVOther); break; case "Smoothness": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", InterfaceManager.instance.defaultShaderSmoothness); + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", MinVOther); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", (float)(MaxVOther - MinVOther) / 2.0f + MinVOther); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Smoothness", MaxVOther); + break; + case "Transparency": + ShaderMin.GetComponent<MeshRenderer>().material.SetFloat("_Transparency", MinVOther); + ShaderMoy.GetComponent<MeshRenderer>().material.SetFloat("_Transparency", (float)(MaxVOther - MinVOther) / 2.0f + MinVOther); + ShaderMax.GetComponent<MeshRenderer>().material.SetFloat("_Transparency", MaxVOther); break; default: break; } } - - Sprite def; - Texture2D texty; - switch (activeToggle.name) - { - case "Main Color": - def = MapColor.options[MapColor.value].image; - texty = def.texture; - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", texty.GetPixel(MinC, 0)); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", texty.GetPixel((int)(MaxC - MinC) / 2, 0)); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color", texty.GetPixel(MaxC, 0)); - break; - case "Halo Color": - def = MapColor.options[MapColor.value].image; - texty = def.texture; - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Emission", 0f); - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_FresnelColor", texty.GetPixel(MinC, 0)); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_FresnelColor", texty.GetPixel((int)(MaxC - MinC) / 2, 0)); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_FresnelColor", texty.GetPixel(MaxC, 0)); - break; - case "Second Color": - def = MapColor.options[MapColor.value].image; - texty = def.texture; - Color col1 = ShaderMin.GetComponent<MeshRenderer>().materials[0].GetColor("_Color"); - Color col2 = ShaderMoy.GetComponent<MeshRenderer>().materials[0].GetColor("_Color"); - Color col3 = ShaderMax.GetComponent<MeshRenderer>().materials[0].GetColor("_Color"); - ShaderMin.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.StainSelection[0]; - ShaderMoy.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.StainSelection[0]; - ShaderMax.GetComponent<MeshRenderer>().materials[0] = SetsManager.instance.StainSelection[0]; - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color1", col1); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color1", col2); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color1", col3); - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetColor("_Color2", texty.GetPixel(MinC, 0)); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetColor("_Color2", texty.GetPixel((int)(MaxC - MinC) / 2, 0)); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetColor("_Color2", texty.GetPixel(MaxC, 0)); - break; - break; - case "Metallic": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", MinVOther); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", (float)(MaxVOther - MinVOther) / 2.0f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Metallic", MaxVOther); - break; - case "Smoothness": - ShaderMin.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", MinVOther); - ShaderMoy.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", (float)(MaxVOther - MinVOther) / 2.0f); - ShaderMax.GetComponent<MeshRenderer>().materials[0].SetFloat("_Smoothness", MaxVOther); - break; - default: - break; - }*/ } @@ -437,6 +591,7 @@ public class MenuColorBar : MonoBehaviour { MaxVTextOther.SetTextWithoutNotify(value + ""); MaxVOther = value; maxSliderOther = value; + updatSliders(); } public void updateMinFromSliderOther(float value) @@ -445,6 +600,7 @@ public class MenuColorBar : MonoBehaviour { MinVTextOther.SetTextWithoutNotify(value + ""); MinVOther = value; minSliderOther = value; + updatSliders(); } public void changeSlidersMinV(){ @@ -468,6 +624,7 @@ public class MenuColorBar : MonoBehaviour { Colorbar.GetComponent<Image>().sprite = AssignSprite(v); if(!InterfaceManager.instance.ColorMapScale) InterfaceManager.instance.ColorMapScale.sprite = AssignSprite(v); + updatSliders(); } public static Sprite AssignSprite(int v){ @@ -494,12 +651,23 @@ public class MenuColorBar : MonoBehaviour { SubMenuColor.SetActive(false); SubMenuOther.SetActive(true); } + ShaderMin.GetComponent<MeshRenderer>().material = MatMin; + ShaderMoy.GetComponent<MeshRenderer>().material = MatMoy; + ShaderMax.GetComponent<MeshRenderer>().material = MatMax; + updatSliders(); } - } + } - public void cancel(){ MenuBarColor.SetActive (false);} + public void cancel() + { + ShaderMin.GetComponent<MeshRenderer>().material = MatMin; + ShaderMoy.GetComponent<MeshRenderer>().material = MatMoy; + ShaderMax.GetComponent<MeshRenderer>().material = MatMax; + + MenuBarColor.SetActive (false); + } public static string SetColorMapName(int v){ if (v == 0) return "None";return MapColor.options[v].text; } public static int NameColorMapToInt(string s) @@ -521,7 +689,7 @@ public class MenuColorBar : MonoBehaviour { Image ColorMapScale; List<Text> ColorMapScalePercent; - if (activeToggle.name == "Metallic" || activeToggle.name == "Smoothness") + if (activeToggle.name == "Metallic" || activeToggle.name == "Smoothness" || activeToggle.name == "Transparency") { if (buttonToColorize.transform.Find("numMapScale").gameObject.GetComponentInChildren<Text>().text == "1") InterfaceManager.instance.ColorMapScale.gameObject.SetActive(false); @@ -568,7 +736,115 @@ public class MenuColorBar : MonoBehaviour { current_scale += 1f / (ColorMapScalePercent.Count - 1 == 0 ? 1f : ColorMapScalePercent.Count - 1); } } - + + + Correspondence c = MorphoTools.GetDataset().Infos.Correspondences[0]; + foreach (Correspondence cor in MorphoTools.GetDataset().Infos.Correspondences) + { + if (cor.inf.transform.Find("InfosColor").gameObject == buttonToColorize) + { + c = cor; + } + } + + Sprite def; + Texture2D texty; + int min, max; + switch (buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text) + { + case "Main Color": + if (MatMax.name == "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_Color") == texty.GetPixel(MaxC, 0)) + { + c.cancelMainCmap(); + } + } + else + { + c.cancelMainCmap(); + } + } + break; + case "Halo Color": + if (MatMax.name == "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_FresnelColor") == texty.GetPixel(MaxC, 0)) + { + c.cancelHaloCmap(); + } + } + else + { + c.cancelHaloCmap(); + } + } + break; + case "Second Color": + if (MatMax.name != "FresnellCell (Instance)") + { + def = MapColor.options[int.Parse(buttonToColorize.transform.Find("type").gameObject.GetComponentInChildren<Text>().text)].image; + if (def != null) + { + texty = def.texture; + if (MatMax.GetColor("_Color2") == texty.GetPixel(MaxC, 0)) + { + c.cancelSecondCmap(); + } + } + else + { + c.cancelSecondCmap(); + } + } + break; + case "Metallic": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Metallic") == max && MatMin.GetFloat("_Metallic") == min) + { + c.cancelMetallicMap(); + } + } + break; + case "Smoothness": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Smoothness") == max && MatMin.GetFloat("_Smoothness") == min) + { + c.cancelSmoothnessMap(); + } + } + break; + case "Transparency": + if (MatMax.name == "FresnellCell (Instance)") + { + min = int.Parse(buttonToColorize.transform.Find("minVOther").gameObject.GetComponentInChildren<Text>().text); + max = int.Parse(buttonToColorize.transform.Find("maxVOther").gameObject.GetComponentInChildren<Text>().text); + if (MatMax.GetFloat("_Transparency") == max && MatMin.GetFloat("_Transparency") == min) + { + c.cancelSmoothnessMap(); + } + } + break; + default: + break; + } + + + buttonToColorize.GetComponent<Image>().sprite = AssignSprite(colv); if (buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text != "") buttonToColorize.transform.Find("lastParameter").gameObject.GetComponentInChildren<Text>().text = buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text; @@ -583,6 +859,9 @@ public class MenuColorBar : MonoBehaviour { buttonToColorize.transform.Find("execute").gameObject.GetComponentInChildren<Button>().onClick.Invoke(); + + + //RESET THE OTHER foreach (Correspondence cor in MorphoTools.GetDataset().Infos.Correspondences) { @@ -594,10 +873,22 @@ public class MenuColorBar : MonoBehaviour { } if (cor.inf.transform.Find("InfosColor").Find("parameter").gameObject.GetComponentInChildren<Text>().text == buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text && cor.inf.transform.Find("InfosColor").gameObject != buttonToColorize) { + if(buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text == "Main Color" || buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text == "Halo Color" || buttonToColorize.transform.Find("parameter").gameObject.GetComponentInChildren<Text>().text == "Second Color") + { + if (cor.inf.transform.Find("InfosColor").Find("numMapScale").gameObject.GetComponentInChildren<Text>().text == "1") + InterfaceManager.instance.ColorMapScale.gameObject.SetActive(false); + else + InterfaceManager.instance.ColorMapScale2.gameObject.SetActive(false); + } cor.inf.transform.Find("InfosColor").Find("parameter").gameObject.GetComponentInChildren<Text>().text = ""; cor.inf.transform.Find("InfosColor").Find("lastParameter").gameObject.GetComponentInChildren<Text>().text = ""; } } + + MatMin = ShaderMin.GetComponent<MeshRenderer>().material; + MatMoy = ShaderMoy.GetComponent<MeshRenderer>().material; + MatMax = ShaderMax.GetComponent<MeshRenderer>().material; + MenuBarColor.SetActive(false); } } diff --git a/MorphoNet/Assets/Informations/images/Wistia.png.meta b/MorphoNet/Assets/Informations/images/Wistia.png.meta index 333bbc339a5537f1ba2b5055ddc2794b9c7d77c3..805f5b5d6b15e71ff1406339ec93ab1af0b30e34 100644 --- a/MorphoNet/Assets/Informations/images/Wistia.png.meta +++ b/MorphoNet/Assets/Informations/images/Wistia.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -33,7 +33,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 16 mipBias: 0 wrapU: 1 wrapV: 1 @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -92,7 +92,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -104,7 +104,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MorphoNet/Assets/Informations/images/gray.png b/MorphoNet/Assets/Informations/images/gray.png index 934e0bd3cfc2526c9fc79f0e8e6cc68393a76b9d..571e26f14b6535aac24c2c76f6cdc7c0a2d70fa6 100644 Binary files a/MorphoNet/Assets/Informations/images/gray.png and b/MorphoNet/Assets/Informations/images/gray.png differ diff --git a/MorphoNet/Assets/Informations/images/gray.png.meta b/MorphoNet/Assets/Informations/images/gray.png.meta index 7f157564a19857dae9c987c3a15305112e2a5560..2a086c2bcd820f35f675cb11ba34edf21657619e 100644 --- a/MorphoNet/Assets/Informations/images/gray.png.meta +++ b/MorphoNet/Assets/Informations/images/gray.png.meta @@ -3,10 +3,10 @@ guid: e84ab6111d33a4301a9d74744416bf27 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,9 +20,10 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 16 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -54,16 +55,20 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -75,7 +80,19 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -87,7 +104,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MorphoNet/Assets/Informations/images/summer.png.meta b/MorphoNet/Assets/Informations/images/summer.png.meta index 6779b15e7ac9a8e134ce0bc9d5d5f60f03830516..67fe8560d7b3d51dfff6f652628ed4d7b74f1456 100644 --- a/MorphoNet/Assets/Informations/images/summer.png.meta +++ b/MorphoNet/Assets/Informations/images/summer.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -33,7 +33,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 16 mipBias: 0 wrapU: 1 wrapV: 1 @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -92,7 +92,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -104,7 +104,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MorphoNet/Assets/Informations/images/winter.png.meta b/MorphoNet/Assets/Informations/images/winter.png.meta index 4ec4abef37cff57e6fd09600fb163b023fe83ee9..68ea787611b68e062efea1b0194ecbd62633f7df 100644 --- a/MorphoNet/Assets/Informations/images/winter.png.meta +++ b/MorphoNet/Assets/Informations/images/winter.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -33,7 +33,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 16 mipBias: 0 wrapU: 1 wrapV: 1 @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -92,7 +92,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -104,7 +104,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MorphoNet/Assets/Interface/InterfaceManager.cs b/MorphoNet/Assets/Interface/InterfaceManager.cs index 816586b0f8d4b4068a9c732ff5d0b2fd2973cff8..ceb65a423a981d1023f6f79f7ec70ad99fb59d1a 100644 --- a/MorphoNet/Assets/Interface/InterfaceManager.cs +++ b/MorphoNet/Assets/Interface/InterfaceManager.cs @@ -276,6 +276,7 @@ public class InterfaceManager : MonoBehaviour public float defaultShaderRoughness = 0f; public float defaultShaderRoughness_backup = 0f; public float defaultShaderMetallic = 0f; + public float defaultShaderTransparency = 1f; public float defaultShaderMetallic_backup = 0f; public float r_fresnel_color = 0.5f; public float r_fresnel_color_backup = 0.5f; diff --git a/MorphoNet/Assets/Interface/Prefabs/MenuColorBar.prefab b/MorphoNet/Assets/Interface/Prefabs/MenuColorBar.prefab index 6c9622c644e33a090358006ca97ca038a1d53cd2..0016e225e5d0b76137f612ad05efc2fc049c6fc3 100644 --- a/MorphoNet/Assets/Interface/Prefabs/MenuColorBar.prefab +++ b/MorphoNet/Assets/Interface/Prefabs/MenuColorBar.prefab @@ -501,14 +501,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -576,7 +576,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1245,7 +1245,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1544,14 +1544,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1711,7 +1711,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318460106967533 CanvasRenderer: @@ -2152,10 +2152,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -2222,7 +2222,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -2301,7 +2301,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2376,7 +2376,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -3375,7 +3375,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318460783495408 CanvasRenderer: @@ -3405,7 +3405,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300090, guid: 3a23c65532a98fa409e94bf90a84543e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3473,7 +3473,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3548,7 +3548,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3623,14 +3623,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3698,14 +3698,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3991,6 +3991,7 @@ RectTransform: - {fileID: 8324757724214106418} - {fileID: 8600781980076746147} - {fileID: 4567018420186570635} + - {fileID: 676107868201182082} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4121,7 +4122,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4277,7 +4278,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 65, y: -48} + m_AnchoredPosition: {x: 65, y: -58} m_SizeDelta: {x: 79.5, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318460986586337 @@ -4301,7 +4302,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.11764706, g: 0.6117647, b: 0.7529412, a: 0.42745098} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4698,7 +4699,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -4852,7 +4853,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318461108359247 CanvasRenderer: @@ -4882,7 +4883,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300090, guid: 3a23c65532a98fa409e94bf90a84543e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6102,7 +6103,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318461492775473 CanvasRenderer: @@ -6132,7 +6133,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300090, guid: 3a23c65532a98fa409e94bf90a84543e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6176,8 +6177,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -23, y: -15} - m_SizeDelta: {x: 220, y: 20} + m_AnchoredPosition: {x: -23, y: -30} + m_SizeDelta: {x: 220, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318461511237834 CanvasRenderer: @@ -6209,7 +6210,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -6220,7 +6221,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'Apply it on ' + m_Text: 'Min and Max of ' --- !u!1 &5780318461514925929 GameObject: m_ObjectHideFlags: 0 @@ -6530,7 +6531,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3647059, g: 0.79215693, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6681,7 +6682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -7075,14 +7076,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7150,7 +7151,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7359,7 +7360,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7434,7 +7435,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7509,7 +7510,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7934,7 +7935,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7988,7 +7989,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 65, y: -77} + m_AnchoredPosition: {x: 65, y: -87} m_SizeDelta: {x: 79.5, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318461777365495 @@ -8012,7 +8013,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.11764706, g: 0.6117647, b: 0.7529412, a: 0.42745098} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -8141,7 +8142,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5780318461786577824 CanvasRenderer: @@ -8171,7 +8172,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300090, guid: 3a23c65532a98fa409e94bf90a84543e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8275,14 +8276,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.54901963, g: 0.8078432, b: 0.9607844, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8368,6 +8369,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6989502350553345060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676107868201182082} + - component: {fileID: 4324134647864503909} + - component: {fileID: 6283459407173376541} + m_Layer: 5 + m_Name: InfosText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &676107868201182082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989502350553345060} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.000174, y: 1.000174, z: 1.000174} + m_Children: [] + m_Father: {fileID: 5780318460899546047} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 55, y: -15} + m_SizeDelta: {x: 220, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4324134647864503909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989502350553345060} + m_CullTransparentMesh: 0 +--- !u!114 &6283459407173376541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989502350553345060} + 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: infos --- !u!1 &7821997719682562542 GameObject: m_ObjectHideFlags: 0 diff --git a/MorphoNet/Assets/Plot/DirectPlot.cs b/MorphoNet/Assets/Plot/DirectPlot.cs index 5782497bc0f0cd713444e51d11965e0b813aa50d..49d731ac87449092e1ad16f12ca594773a68f640 100644 --- a/MorphoNet/Assets/Plot/DirectPlot.cs +++ b/MorphoNet/Assets/Plot/DirectPlot.cs @@ -132,7 +132,8 @@ public class DirectPlot : MonoBehaviour Parents = new Dictionary<string, GameObject>(); ParentsLPY = new Dictionary<string, GameObject>(); uploadButton.SetActive(LoadParameters.instance.id_user > 0); - uploadButtonLPY.SetActive(LoadParameters.instance.id_user > 0); + if(LoadParameters.instance.id_user > 0) + uploadButtonLPY.SetActive(LoadParameters.instance.privacy == "public"); } } void OnEnable() diff --git a/MorphoNet/Assets/Scenes/SceneEmbryo.unity b/MorphoNet/Assets/Scenes/SceneEmbryo.unity index 96203ebadbfbc71c441d0a84fd49c507958449dc..4cbba9e2572de946947daecf5c310335a7febbeb 100644 --- a/MorphoNet/Assets/Scenes/SceneEmbryo.unity +++ b/MorphoNet/Assets/Scenes/SceneEmbryo.unity @@ -2680,6 +2680,7 @@ MonoBehaviour: defaultShaderRoughness: 0 defaultShaderRoughness_backup: 0 defaultShaderMetallic: 0 + defaultShaderTransparency: 1 defaultShaderMetallic_backup: 0 r_fresnel_color: 0.5 r_fresnel_color_backup: 0.5 @@ -35600,6 +35601,11 @@ PrefabInstance: propertyPath: m_Name value: Simulation objectReference: {fileID: 0} + - target: {fileID: 7397319357175025389, guid: 2087facc1f219014d8863fa300076b92, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7586830119037757571, guid: 2087facc1f219014d8863fa300076b92, type: 3} propertyPath: m_AnchorMax.x @@ -165230,6 +165236,7 @@ MonoBehaviour: debug_m: {fileID: 1699752422} urlSERVER: http://morphonet.org/ id_dataset: 0 + privacy: p embryo_name: min_time: 0 max_time: 0 @@ -231714,6 +231721,41 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 474156057} m_Modifications: + - target: {fileID: 676107868201182082, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_SizeDelta.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 676107868201182082, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 23.500008 + objectReference: {fileID: 0} + - target: {fileID: 676107868201182082, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 147.49998 + objectReference: {fileID: 0} + - target: {fileID: 5780318459776150681, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318459776150681, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318459776150681, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318459776150681, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318459799907544, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -231789,6 +231831,41 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5780318459918212972, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318459918212972, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318459918212972, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318459925058659, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318459925058659, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318459925058659, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318459925058659, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318459986662606, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_IsActive @@ -231889,6 +231966,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -10 objectReference: {fileID: 0} + - target: {fileID: 5780318460106967530, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300090, guid: 3a23c65532a98fa409e94bf90a84543e, + type: 3} + - target: {fileID: 5780318460315363935, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_SizeDelta.y + value: 25 + objectReference: {fileID: 0} - target: {fileID: 5780318460364579104, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchorMax.x @@ -231909,6 +231997,11 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318460464279032, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -58 + objectReference: {fileID: 0} - target: {fileID: 5780318460464279035, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -231924,11 +232017,46 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318460474550933, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318460474550933, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318460474550933, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318460474550933, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318460496038048, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318460506556828, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318460506556828, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318460506556828, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5780318460805514784, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchorMax.x @@ -231954,16 +232082,66 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5780318460848106712, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_CullTransparentMesh + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5780318460853670004, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318460853670004, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318460853670004, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318460853670004, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318460892799324, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318460892799327, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318460892799327, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318460892799327, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318460892799327, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318460899546044, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_Name value: MenuColorBar objectReference: {fileID: 0} + - target: {fileID: 5780318460899546044, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_Pivot.x @@ -231982,7 +232160,7 @@ PrefabInstance: - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} @@ -231992,7 +232170,7 @@ PrefabInstance: - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} @@ -232047,7 +232225,7 @@ PrefabInstance: - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchoredPosition.x - value: 417 + value: 140 objectReference: {fileID: 0} - target: {fileID: 5780318460899546047, guid: 73509de8609e14347b70f23400788a01, type: 3} @@ -232084,6 +232262,11 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} + - target: {fileID: 5780318460923013794, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -87 + objectReference: {fileID: 0} - target: {fileID: 5780318460923013797, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -232094,6 +232277,21 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318460997145632, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318460997145632, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318460997145632, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5780318461099845858, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -232174,10 +232372,60 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} - - target: {fileID: 5780318461511237832, guid: 73509de8609e14347b70f23400788a01, + - target: {fileID: 5780318461409737900, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5780318461409737901, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_SizeDelta.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5780318461409737901, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_AnchoredPosition.x - value: -23 + value: 117 + objectReference: {fileID: 0} + - target: {fileID: 5780318461409737901, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 5780318461440224599, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318461440224599, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318461440224599, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318461440224599, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} + - target: {fileID: 5780318461448755029, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318461448755029, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5780318461448755029, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 1 objectReference: {fileID: 0} - target: {fileID: 5780318461531000808, guid: 73509de8609e14347b70f23400788a01, type: 3} @@ -232194,6 +232442,26 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5780318461549957865, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318461549957865, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318461549957865, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318461549957865, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} - target: {fileID: 5780318461612148353, guid: 73509de8609e14347b70f23400788a01, type: 3} propertyPath: m_Options.m_Options.Array.size @@ -232478,6 +232746,46 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 23184934} + - target: {fileID: 5780318461812850566, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 5780318461812850566, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.a + value: 0.42745098 + objectReference: {fileID: 0} + - target: {fileID: 5780318461812850566, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.b + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 5780318461812850566, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.g + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 5780318461812850566, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Color.r + value: 0.11764706 + objectReference: {fileID: 0} + - target: {fileID: 6283459407173376541, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6283459407173376541, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6989502350553345060, guid: 73509de8609e14347b70f23400788a01, + type: 3} + propertyPath: m_Name + value: Info + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 6948985007245879750, guid: 73509de8609e14347b70f23400788a01, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 73509de8609e14347b70f23400788a01, type: 3}