diode connect

Assets/Scenes/Player.unity

@@ -2357,6 +2357,7 @@ RectTransform:
   - {fileID: 2022292461}
   - {fileID: 935354066}
   - {fileID: 583944820}
+  - {fileID: 2098093787}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -28659,6 +28660,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6ff4c5b9b9033f24cbcb4cd46ba2cac4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ButtonStatus: {fileID: 2098093788}
   Player: {fileID: 995816062}
   Editor: {fileID: 1379126276}
   DropdownCompany: {fileID: 1812257529}
@@ -40037,6 +40039,83 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 58872813}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1663974292
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1663974293}
+  - component: {fileID: 1663974295}
+  - component: {fileID: 1663974294}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1663974293
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1663974292}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2098093787}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1663974294
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1663974292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Button
+--- !u!222 &1663974295
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1663974292}
+  m_CullTransparentMesh: 0
 --- !u!1 &1670014313
 GameObject:
   m_ObjectHideFlags: 0
@@ -51173,6 +51252,124 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2095569832}
   m_CullTransparentMesh: 0
+--- !u!1 &2098093786
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2098093787}
+  - component: {fileID: 2098093790}
+  - component: {fileID: 2098093789}
+  - component: {fileID: 2098093788}
+  m_Layer: 5
+  m_Name: ButtonStatus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2098093787
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098093786}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1663974293}
+  m_Father: {fileID: 100471033}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -6, y: 6}
+  m_SizeDelta: {x: 10, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2098093788
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098093786}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2098093789}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2098093789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098093786}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2098093790
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098093786}
+  m_CullTransparentMesh: 0
 --- !u!1 &2102920552
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Controllers/AuthorizationController.cs

@@ -41,12 +41,13 @@ public class AuthorizationController : MonoBehaviour
     {
         if (success)
         {//SceneManager.LoadScene("Location");
-            transform.gameObject.SetActive(false);
+            gameObject.SetActive(false);
             //client.SendGetUsers((uint)PlayerController.active_company + 1);
             //if (ModeController.editor == true && PlayerController.active_location != PlayerController.locations.Count) client.BeaconsRequest((uint)PlayerController.locations[PlayerController.active_location].id);
             //if (ModeController.editor == false) client.BeaconsRequest((uint)PlayerController.locations[PlayerController.active_location].id);
         }
         if(error) Error.SetActive(true);
+        if (!Client.instance.connected) gameObject.SetActive(true);
     }
 
     public void Authorization()

Assets/Scripts/Controllers/CompanyController.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 public class CompanyController : MonoBehaviour
 {
     public static CompanyController instance;
+    public Button ButtonStatus;
     public GameObject Player;
     public GameObject Editor;
     public Dropdown DropdownCompany;
@@ -26,7 +27,7 @@ public class CompanyController : MonoBehaviour
 
     PlayerController player;
     EditorController editor;
-    Client client = Client.instance;
+    Client client;
 
     private void Awake()
     {
@@ -38,6 +39,7 @@ public class CompanyController : MonoBehaviour
     {
         player = Player.GetComponent<PlayerController>();
         editor = Editor.GetComponent<EditorController>();
+        client = Client.instance;
         DropdownCompany.options.Add(new Dropdown.OptionData("Тайшет"));
         DropdownCompany.options.Add(new Dropdown.OptionData("Тестовая"));
         DropdownCompany.options.Add(new Dropdown.OptionData("Братское"));
@@ -91,6 +93,11 @@ public class CompanyController : MonoBehaviour
             //active_location = -1;
             ChangeLocation();
         }
+
+        if(client.connected)
+            ButtonStatus.GetComponent<Image>().color = Color.green;
+        else
+            ButtonStatus.GetComponent<Image>().color = Color.red;
     }
 
     /// <summary>

Assets/Scripts/Controllers/SendingFormController.cs

@@ -134,34 +134,44 @@ public class SendingFormController : MonoBehaviour
     {
 
         //string url = "https://example.com/image.jpeg";
-        WWWForm form = new WWWForm();
-        var headers = form.headers;
-        headers["Access-Control-Allow-Credentials"] = "true";
-        headers["Access-Control-Allow-Headers"] = "Accept, X-Access-Token, X-Application-Name, X-Request-Sent-Time";
-        headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS";
-        //headers["Access-Control-Allow-Origin"] = "http://test.prmsys.net/";
-        headers["Content-type"] = "image/jpg, image/jpeg, image/png, image/bmp";
-
-        Debug.Log(url);
-        WWW img = new WWW( url); //, null, headers);
-
-        yield return img;
+        ////WWWForm form = new WWWForm();
+        ////var headers = form.headers;
+        ////headers["Access-Control-Allow-Credentials"] = "true";
+        ////headers["Access-Control-Allow-Headers"] = "Accept, X-Access-Token, X-Application-Name, X-Request-Sent-Time";
+        ////headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS";
+        //////headers["Access-Control-Allow-Origin"] = "http://test.prmsys.net/";
+        ////headers["Content-type"] = "image/jpg, image/jpeg, image/png, image/bmp";
+
+        using (UnityWebRequest img = UnityWebRequestTexture.GetTexture(url))
+        {
+            //Debug.Log(url);
+            //var img = UnityWebRequestTexture.GetTexture(url); //, null, headers);
 
-        Texture2D texture = new Texture2D(1, 1);
-        img.LoadImageIntoTexture(texture);
+            yield return img.SendWebRequest();
+            if (img.isNetworkError || img.isHttpError)
+            {
+                Debug.Log(img.error);
+            }
+            else
+            {
+                //Texture2D texture = new Texture2D(1, 1);
+                var texture = DownloadHandlerTexture.GetContent(img);
+                //img.LoadImageIntoTexture(texture);
 
-        Renderer renderer = plane.GetComponent<Renderer>();
-        renderer.material.mainTexture = texture;
-        if (scale.x == 0 && scale.z == 0)
-        {
-            plane.transform.localScale = new Vector3(img.texture.width / 1000f, 1, img.texture.height / 1000f);
-            scale = plane.transform.localScale;
+                Renderer renderer = plane.GetComponent<Renderer>();
+                renderer.material.mainTexture = texture;
+                if (scale.x == 0 && scale.z == 0)
+                {
+                    plane.transform.localScale = new Vector3(texture.width / 1000f, 1, texture.height / 1000f);
+                    scale = plane.transform.localScale;
+                }
+                else plane.transform.localScale = scale;
+                if (pos.x == 0 && pos.z == 0)
+                    plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
+                else plane.transform.position = pos;
+                //GetComponent<Renderer>().material.mainTexture = img.texture;
+            }
         }
-        else plane.transform.localScale = scale;
-        if (pos.x == 0 && pos.z == 0)
-            plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
-        else plane.transform.position = pos;
-        //GetComponent<Renderer>().material.mainTexture = img.texture;
 
     }
 

Assets/Scripts/Net/Client.cs

@@ -106,7 +106,7 @@ public class Client : MonoBehaviour
         }
         else
         {
-            _dataPath = "file://" + Application.dataPath + "/StreamingAssets"; ;
+            _dataPath = "file://" + Application.dataPath + "/StreamingAssets"; 
             clientType = ClientType.Desktop;
         }
         _dataPath = Application.streamingAssetsPath;
@@ -188,7 +188,7 @@ public class Client : MonoBehaviour
         totalbytes = 0;
         account_id = 0;
         ACCOUNT_NAME = "";
-        connected = false;
+        //connected = false;
         sendDone = false;
         receiveDone = false;
         connectDone = false;