|
@@ -81,6 +81,7 @@ public class EditorController : MonoBehaviour
|
|
newLocation = new Location
|
|
newLocation = new Location
|
|
{
|
|
{
|
|
id = uintNumber,
|
|
id = uintNumber,
|
|
|
|
+ company_id=(uint)company.active_company,
|
|
location = NewLocation,
|
|
location = NewLocation,
|
|
walls = new List<Wall>(),
|
|
walls = new List<Wall>(),
|
|
zones = new List<Zone>(),
|
|
zones = new List<Zone>(),
|
|
@@ -107,8 +108,6 @@ public class EditorController : MonoBehaviour
|
|
//}
|
|
//}
|
|
}
|
|
}
|
|
|
|
|
|
- string texture_url = "";
|
|
|
|
-
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
/// Изменение размеров панели
|
|
/// Изменение размеров панели
|
|
/// Загрузка текстуры
|
|
/// Загрузка текстуры
|
|
@@ -119,7 +118,7 @@ public class EditorController : MonoBehaviour
|
|
//if (!Image.text.Equals(texture_url))
|
|
//if (!Image.text.Equals(texture_url))
|
|
//{
|
|
//{
|
|
StartCoroutine(SendingFormController.LoadImage(Image.text, p, Vector3.zero, Vector3.zero, LoadTexture));
|
|
StartCoroutine(SendingFormController.LoadImage(Image.text, p, Vector3.zero, Vector3.zero, LoadTexture));
|
|
- texture_url = Image.text;
|
|
|
|
|
|
+ //texture_url = Image.text;
|
|
//}
|
|
//}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -159,7 +158,7 @@ public class EditorController : MonoBehaviour
|
|
//var location = new Location { id = 0, name = Name.text, beacons = Beacons, zones = WallCreate.Zones, walls = WallCreate.Walls, texture_url = Image.text, plane = plane, location = NewLocation};
|
|
//var location = new Location { id = 0, name = Name.text, beacons = Beacons, zones = WallCreate.Zones, walls = WallCreate.Walls, texture_url = Image.text, plane = plane, location = NewLocation};
|
|
Location location;
|
|
Location location;
|
|
if (EditLocation.id != 0) location = EditLocation;
|
|
if (EditLocation.id != 0) location = EditLocation;
|
|
- else location = new Location { id = Convert.ToUInt32(4000000000), plane = plane, location = NewLocation };
|
|
|
|
|
|
+ else location = new Location { id = Convert.ToUInt32(4000000000), plane = plane, location = NewLocation, company_id = (uint)company.active_company };
|
|
location.name = Name.text;
|
|
location.name = Name.text;
|
|
location.texture_url = Image.text;
|
|
location.texture_url = Image.text;
|
|
|
|
|