sdk update

ShanguUncle · Sep 28, 2020 · c6ad603 · c6ad603
1 parent fb68671
commit c6ad603
Show file tree

Hide file tree

Showing 33 changed files with 16,138 additions and 2,875 deletions.
diff --git a/HoloChat/Assets/Scenes/SampleScene.unity b/HoloChat/Assets/Scenes/SampleScene.unity
diff --git a/...)/Scenes/UnityChatDemo_HoloCapture1.unity → ...s/Scenes/UnityChatDemo_HoloCapture1.unity b/...)/Scenes/UnityChatDemo_HoloCapture1.unity → ...s/Scenes/UnityChatDemo_HoloCapture1.unity
@@ -6796,10 +6796,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AudioVolume: 1
+  MicVolumeScale: 1
   VideoType: 2
   VideoResolution: 1
   VideoQuality: 3
-  Framerate: 12
+  Framerate: 15
   EchoCancellation: 0
   EnableDetection: 0
   EnableSync: 0
@@ -6820,6 +6821,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   NetType: 0
+  ChunkLength: 50000
 --- !u!1 &1875980133
 GameObject:
   m_ObjectHideFlags: 0
@@ -7554,9 +7556,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 181ad11e12e9de04f94b05a39e6aa4fb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SipServerIP: 192.168.2.100
+  SipServerIP: 192.168.3.39
   SipServerPort: 6650
-  ChatStreamServerIP: 192.168.2.100
+  ChatStreamServerIP: 192.168.3.39
   ChatStreamServerPort: 6680
   NetPanl: {fileID: 47060843}
   SipServerIPInputField: {fileID: 819478864}

diff --git a/...nes/UnityChatDemo_HoloCapture1.unity.meta → ...nes/UnityChatDemo_HoloCapture1.unity.meta b/...nes/UnityChatDemo_HoloCapture1.unity.meta → ...nes/UnityChatDemo_HoloCapture1.unity.meta
diff --git a/...)/Scenes/UnityChatDemo_HoloCapture2.unity → ...s/Scenes/UnityChatDemo_HoloCapture2.unity b/...)/Scenes/UnityChatDemo_HoloCapture2.unity → ...s/Scenes/UnityChatDemo_HoloCapture2.unity
@@ -6800,7 +6800,7 @@ MonoBehaviour:
   VideoType: 2
   VideoResolution: 1
   VideoQuality: 3
-  Framerate: 12
+  Framerate: 15
   EchoCancellation: 0
   EnableDetection: 0
   EnableSync: 0
@@ -6821,6 +6821,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   NetType: 0
+  ChunkLength: 50000
 --- !u!1 &1875980133
 GameObject:
   m_ObjectHideFlags: 0
@@ -7555,9 +7556,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 181ad11e12e9de04f94b05a39e6aa4fb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SipServerIP: 192.168.3.3
+  SipServerIP: 192.168.3.39
   SipServerPort: 6650
-  ChatStreamServerIP: 192.168.3.3
+  ChatStreamServerIP: 192.168.3.39
   ChatStreamServerPort: 6680
   NetPanl: {fileID: 47060843}
   SipServerIPInputField: {fileID: 819478864}

diff --git a/...nes/UnityChatDemo_HoloCapture2.unity.meta → ...nes/UnityChatDemo_HoloCapture2.unity.meta b/...nes/UnityChatDemo_HoloCapture2.unity.meta → ...nes/UnityChatDemo_HoloCapture2.unity.meta
diff --git a/...t/Assets/UnityChatDemo(Can be deleted)/NetWorkPlugin/Scripts/ProtocolHandler/IMHandler.cs b/...t/Assets/UnityChatDemo(Can be deleted)/NetWorkPlugin/Scripts/ProtocolHandler/IMHandler.cs
@@ -52,7 +52,7 @@ private void PeerCall(ProtocolDataModel pdm)
     private void PeerMessage(ProtocolDataModel pdm)
     {
         print("Receive message：" + pdm.Message.Length);
-		ChatSendMessageManager.Instance?.OnReceivePeerMessage(pdm);
+        ChatSendMessageManager.Instance?.OnReceivePeerMessage(pdm);
     }
 
     private void PeerHang(ProtocolDataModel pdm)

diff --git a/HoloChat/Assets/UnityChatDemo(Can be deleted)/Res/Mat1.mat b/HoloChat/Assets/UnityChatDemo(Can be deleted)/Res/Mat1.mat
@@ -4,9 +4,8 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
   m_Name: Mat1
   m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: