Browse Source

修复 房主画线 播放器拖动进度

胡佳骏 1 year ago
parent
commit
9329d14fb0

+ 15 - 0
Assets/Plugins/Android/AndroidManifest.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
+  <uses-sdk tools:overrideLibrary="com.nreal.glasses_sdk" />
+  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
+  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <meta-data android:name="nreal_sdk" android:value="true" />
+  </application>
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+</manifest>

+ 7 - 0
Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6c0439466d930643824744322200e90
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/8/24 14:09:39
+Build from YUNYUNGEGE at 2023/8/29 18:12:24

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

@@ -140,10 +140,10 @@ namespace ShadowStudio.Model
         public void OnSliderUp(PointerEventData eventData)
         {
             MoviesPlayer.sliderChanged(MoviesPlayer.XRSlider.value);
-            StopCoroutine(pointerUp(false));
-            MoviesPlayer.isDown = true;
-            StartCoroutine(pointerUp(true));
-            MoviesPlayer.isDown = true;
+        //    StopCoroutine(pointerUp(false));
+            MoviesPlayer.isDown = false;
+        //    StartCoroutine(pointerUp(true));
+         //   MoviesPlayer.isDown = true;
         }
 
 

+ 5 - 2
Assets/Studio/XRLib/Codes/XRUI/UI/XRVideoPlayer.cs

@@ -436,8 +436,11 @@ namespace XRTool.WorldUI
             {
                 //float targetFrame = VideoPlayer.frameCount * per;
                 //VideoPlayer.frame = (long)targetFrame;
-
-                AVProVideoPlayer.SetSeek(per);
+                Debug.Log("Hjj  GetMaxTimer  : " + per);
+                Debug.Log("Hjj  GetMaxTimer  : " + AVProVideoPlayer.GetMaxTimer());
+                Debug.Log("Hjj  GetMaxTimer  : " + per * AVProVideoPlayer.GetMaxTimer() );
+                AVProVideoPlayer.SetSeek(per* AVProVideoPlayer.GetMaxTimer()/1000);
+               // AVProVideoPlayer.Play();
             }
         }
 

+ 3 - 3
Assets/Studio/_4ShowScene/ConsoleFunctionModule/FileListFunctionModule/Scripts/FileListDlg.cs

@@ -165,10 +165,10 @@ namespace ShadowStudio.UI
         private void OnClickClearall()
         {
             //Debug.Log(CommonMethod.roomConfig.Is_created + "+++");
-            if (CommonMethod.roomConfig.Is_created == "1")
-            {
+           // if (CommonMethod.roomConfig.Is_created == "1")
+            //{
                 DrawPener.Instance.ClearAllLine(true);
-            }
+            //}
         }
         private void OnClickClearyour()
         {