Browse Source

修改 进入房间后 Video物体会自带变小Bug

DGJ 1 year ago
parent
commit
b03a292c51

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libAVProVideo2Native.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: fef09def6abbb10498a91d1ccf15475a
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libAudio360-JNI.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: 7e5c878f344b98545883e0d12bf11271
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libAudio360.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: 4d539d2b1007e8249a0f40ce055b763c
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libopus.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: 6570c8aa0c696e944be583378a97496e
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libopusJNI.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: fef09def6abbb10498a91d1ccf15473a
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libresample-rh.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: 16580ba252d8f204b9d04de92628f83e
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 16 - 7
Assets/AVProVideo/Runtime/Plugins/Android/libs/x86/libsamplerate-android.so.meta

@@ -1,21 +1,30 @@
 fileFormatVersion: 2
 guid: 2a15271d87e133c429c6ba25d78d6889
-timeCreated: 1510239370
-licenseType: Store
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
-        CPU: x86
-    Any:
+        CPU: X86
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from LAPTOP-KUIJ34JI at 2023/7/10 16:55:04
+Build from LAPTOP-KUIJ34JI at 2023/7/10 19:23:12

+ 4 - 1
Assets/Studio/MediaSoup/WebSocket/WSHandler.cs

@@ -268,7 +268,8 @@ public class WSHandler
     }
     public static void SendRoomMessage(string data)
     {
-       // UnityLog.Instance.Log("SendRoomMessage===>" + data, 4);
+        Debug.Log("SendRoomMessage===>" + data);
+        // UnityLog.Instance.Log("SendRoomMessage===>" + data, 4);
         if (_roomClient != null)
             _roomClient.Send(data);
     }
@@ -284,6 +285,7 @@ public class WSHandler
 
     public static void SendMessage(JsonData data)
     {
+       
         UnityLog.Instance.Log("SendMessage===>" + data.ToJson(), 4);
         string message = data.ToJson();
         if (_client != null)
@@ -293,6 +295,7 @@ public class WSHandler
     private static JsonData message_data = new JsonData();
     public static void OnMessageReceived(string message)
     {
+      //  Debug.Log("SocketMessage===>" + message);
         UnityLog.Instance.Log("SocketMessage===>" + message, 4);
         //message_data.Clear();
         //message_data = JsonMapper.ToObject(message);

+ 3 - 1
Assets/Studio/Scripts/Room/Container/Base/ArtContainerHandler.cs

@@ -391,6 +391,7 @@ namespace ShadowStudio.Model
                         }
                         if (posture.count >= 2)
                         {
+                            Debug.Log(transform.name+"  localScale  " + 1);
                             transform.localScale = Vector3.Lerp(transform.localScale, posture.scale, (Time.deltaTime * smoothTween));
                         }
                     }
@@ -408,7 +409,8 @@ namespace ShadowStudio.Model
                         {
                             Debug.LogError(transform.name + " DoScale   2  ");
                            // if(artType == ArtType.WorldDlg) {  }
-                          //  transform.DOScale(posture.scale, 0.1f);
+                            transform.DOScale(posture.scale, 0.1f);
+                           // transform.localScale
                         }
                     }
                 }

+ 1 - 1
Assets/Studio/Scripts/Room/Container/Component/VideoComponent.cs

@@ -59,7 +59,7 @@ namespace ShadowStudio.Model
         IEnumerator PlayerFirstFrame()
         {
             int temp = 0;
-            yield return new WaitForSeconds(0.3f);
+            yield return new WaitForSeconds(2f);
             while (temp < 2)
             {
                 playVideoManager();

+ 3 - 2
ProjectSettings/ProjectSettings.asset

@@ -152,6 +152,7 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 3407827143893180361, guid: 93ed3b462c7c82d4594fa4d925b91911, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -939,8 +940,8 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
+      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -961,9 +962,9 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: True
       Proximity: False
       CodeGeneration: False
+      BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False