RemoteAssist продолжаю

Assets/Draw/DrawControl.cs

@@ -5,6 +5,12 @@ using UnityEngine.UI;
 
 public class DrawControl : MonoBehaviour
 {
+    public Toggle arrowToggle_;
+    public Toggle textToggle_;
+    public Toggle brushToggle_;
+    public Toggle targetToggle_;
+
+    DrawScript drawScript_;
     public void Clear()
     {
         drawScript_.Clear();
@@ -16,20 +22,12 @@ public class DrawControl : MonoBehaviour
     }
 
     // Use this for initialization
-    void Start()
+    public void Init()
     {
-        arrowToggle_ = GameObject.Find("ArrowToggle").GetComponent<Toggle>();
         arrowToggle_.onValueChanged.AddListener(OnArrowToggleValueChanged);
-
-        textToggle_ = GameObject.Find("TextToggle").GetComponent<Toggle>();
         textToggle_.onValueChanged.AddListener(OnTextToggleValueChanged);
-
-        brushToggle_ = GameObject.Find("BrushToggle").GetComponent<Toggle>();
         brushToggle_.onValueChanged.AddListener(OnBrushToggleValueChanged);
-
-        targetToggle_ = GameObject.Find("TargetToggle").GetComponent<Toggle>();
         targetToggle_.onValueChanged.AddListener(OnTargetToggleValueChanged);
-
         drawScript_ = FindObjectOfType<DrawScript>();
     }
 
@@ -127,12 +125,5 @@ public class DrawControl : MonoBehaviour
             drawScript_.DrawMode = DrawScript.DRAW_MODE.NO_DRAW;
         }
         targetToggle_.colors = cb;
-    }
-
-    Toggle arrowToggle_;
-    Toggle textToggle_;
-    Toggle brushToggle_;
-    Toggle targetToggle_;
-
-    DrawScript drawScript_;
+    }    
 }

Assets/Draw/DrawScript.cs

@@ -8,7 +8,7 @@ public class DrawScript : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
 {
     public DrawShape ArrowPrefab;
     public DrawShape TextPrefab;
-    public DrawShape PaintbrushPrefab;
+    DrawPaintbrush PaintbrushPrefab;
     public DrawShape TargetPrefab;
 
     private RectTransform rectTransform_;
@@ -32,7 +32,7 @@ public class DrawScript : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     {
         //ArrowPrefab = Resources.Load("prefabs/prefab1", GameObject) as GameObject;
         rectTransform_ = GetComponent<RectTransform>();
-
+        PaintbrushPrefab  = gameObject.GetComponentsInChildren<DrawPaintbrush>(true)[0];
         posMin = rectTransform_.TransformPoint(new Vector2(0, 0));
         posMax = rectTransform_.TransformPoint(new Vector2(rectTransform_.rect.width - 1, rectTransform_.rect.height - 1));
     }

Assets/Draw/DrawText.cs

@@ -15,7 +15,7 @@ public class DrawText : DrawShape
     private void Awake()
     {
         rectTransform_ = GetComponent<RectTransform>();
-
+        Debug.Log("DrawText awake");
         lineCorners_ = new Vector3[4];
         // 2 вершины будут рассчитываться, другие 2 получаться
         lineCorners_[1] = new Vector3();

Assets/Scenes/Player.unity

@@ -12747,6 +12747,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   UserInfo: {fileID: 0}
   UserCameraImage: {fileID: 0}
+  RemoteAssistCanvas: {fileID: 0}
   account_id: 0
   company_id: 0
   connected: 0
@@ -57726,7 +57727,6 @@ GameObject:
   - component: {fileID: 7150456488228975578}
   - component: {fileID: 7150456488228975577}
   - component: {fileID: 7150456488228975576}
-  - component: {fileID: 7150456488228975579}
   m_Layer: 5
   m_Name: RemoteCanvas
   m_TagString: Untagged
@@ -57750,7 +57750,7 @@ RectTransform:
   - {fileID: 7150456488041873546}
   - {fileID: 7150456488924132819}
   m_Father: {fileID: 7150456489557922005}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -57817,18 +57817,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!114 &7150456488228975579
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7150456488228975558}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8d3950dcfc0661e4f9e267337c49d757, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &7150456488255603475
 GameObject:
   m_ObjectHideFlags: 0
@@ -60143,7 +60131,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456489398360863
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60159,7 +60147,7 @@ RectTransform:
   - {fileID: 7150456488054982395}
   - {fileID: 7150456489567944649}
   m_Father: {fileID: 7150456489557922005}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -60450,6 +60438,9 @@ GameObject:
   - component: {fileID: 7150456489557922004}
   - component: {fileID: 7150456489557922003}
   - component: {fileID: 7150456489557922002}
+  - component: {fileID: 7150456489557922007}
+  - component: {fileID: 7150456489557922006}
+  - component: {fileID: 7150456489557922008}
   m_Layer: 5
   m_Name: RemoteAssistCanvas
   m_TagString: Untagged
@@ -60530,8 +60521,8 @@ RectTransform:
   m_Children:
   - {fileID: 7150456489272170879}
   - {fileID: 7150456489135836744}
-  - {fileID: 7150456489398360863}
   - {fileID: 7150456488228975559}
+  - {fileID: 7150456489398360863}
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -60540,6 +60531,53 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!114 &7150456489557922006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7150456489557922001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d3950dcfc0661e4f9e267337c49d757, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  remoteCamImage: {fileID: 0}
+--- !u!114 &7150456489557922007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7150456489557922001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d597c0da0231f0e44a72bbdbd27cfa0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  arrowToggle_: {fileID: 0}
+  textToggle_: {fileID: 0}
+  brushToggle_: {fileID: 0}
+  targetToggle_: {fileID: 0}
+--- !u!114 &7150456489557922008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7150456489557922001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 984dbc8f606de954e8fd4e0c55120425, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ArrowPrefab: {fileID: 114055029338669254, guid: d697c668d045fe64a8fe7992c551d751,
+    type: 3}
+  TextPrefab: {fileID: 114056125162703176, guid: fb0150c5df73c7c4fb69d906051c61d6,
+    type: 3}
+  TargetPrefab: {fileID: 114027635279559752, guid: afa926266b4536e4caf7bf75c2858392,
+    type: 3}
 --- !u!1 &7150456489567944648
 GameObject:
   m_ObjectHideFlags: 0
@@ -60558,7 +60596,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7150456489567944649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -61718,6 +61756,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d597c0da0231f0e44a72bbdbd27cfa0c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  arrowToggle_: {fileID: 0}
+  textToggle_: {fileID: 0}
+  brushToggle_: {fileID: 0}
+  targetToggle_: {fileID: 0}
 --- !u!114 &7150456489876284967
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -62067,10 +62109,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 984dbc8f606de954e8fd4e0c55120425, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ArrowPrefab: {fileID: 0}
-  TextPrefab: {fileID: 0}
-  PaintbrushPrefab: {fileID: 0}
-  TargetPrefab: {fileID: 0}
+  ArrowPrefab: {fileID: 114055029338669254, guid: d697c668d045fe64a8fe7992c551d751,
+    type: 3}
+  TextPrefab: {fileID: 114056125162703176, guid: fb0150c5df73c7c4fb69d906051c61d6,
+    type: 3}
+  TargetPrefab: {fileID: 114027635279559752, guid: afa926266b4536e4caf7bf75c2858392,
+    type: 3}
 --- !u!1 &7150456490016195675
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Net/Client.cs

@@ -347,7 +347,7 @@ public class Client : MonoBehaviour
     public static void printBytes(byte[] bytedata, bool sent = false)
     {
         var num = bytedata[0];
-        if (num == PING_PACKET)
+        if (num == PING_PACKET || num==55)
             return;        
 
         var func = packets[num];

Assets/Scripts/RemoteAssist/RemoteClickAction.cs

@@ -67,7 +67,7 @@ public class RemoteClickAction : MonoBehaviour, IVideoCallSession
     {
         Client.instance.RemoteAssistCanvas = GameObject.Find("RemoteAssistCanvas");        
         var lst = Client.instance.RemoteAssistCanvas.GetComponentsInChildren<RectTransform>(true);
-
+        drawControl_ = FindObjectOfType<DrawControl>();
 
         foreach (var l in lst)
         {
@@ -96,19 +96,29 @@ public class RemoteClickAction : MonoBehaviour, IVideoCallSession
                 case "DrawControlCanvas": drawToolsCanvas_ = l.gameObject; break;
                 case "SendImageButton": sendImageButton_ = l.gameObject.GetComponent<Button>(); break;
                 case "CancelDrawButton": cancelDrawButton_ = l.gameObject.GetComponent<Button>(); break;
+
+                case "ArrowToggle":
+                    drawControl_.arrowToggle_ = l.gameObject.GetComponent<Toggle>(); break;
+                case "TextToggle":
+                    drawControl_.textToggle_ = l.gameObject.GetComponent<Toggle>(); break;
+                case "BrushToggle":
+                    drawControl_.brushToggle_ = l.gameObject.GetComponent<Toggle>(); break;
+                case "TargetToggle":
+                    drawControl_.targetToggle_ = l.gameObject.GetComponent<Toggle>(); break;
+
             }
          //   Debug.Log("asdsa " + l.name);
         }
 
-               
+        drawControl_.Init();
         answerButton_.onClick.AddListener(this.OnAnswer);
         declineButton_.onClick.AddListener(this.OnDecline);
         callCanvas_.SetActive(false);        
-        drawButton_.onClick.AddListener(this.OnDraw);
+        drawButton_.onClick.AddListener(OnDraw);
         hangupButton_.onClick.AddListener(this.OnHangup);
         onConnectCanvas_.SetActive(false);
         drawCanvas_.SetActive(false); //TODO
-        drawControl_ = FindObjectOfType<DrawControl>();
+        
         sendImageButton_.onClick.AddListener(this.OnSendImage);
         cancelDrawButton_.onClick.AddListener(this.OnCancelDraw);
         drawToolsCanvas_.SetActive(false); //TODO
@@ -206,6 +216,7 @@ public class RemoteClickAction : MonoBehaviour, IVideoCallSession
         drawToolsCanvas_.SetActive(true);
         drawCanvas_.SetActive(true);
         state_ = STATE.DRAWING;
+        Debug.Log("OnDraw");
     }
     public void OnHangup()
     {