Browse Source

修复房间滑动的效果

胡佳骏 1 year ago
parent
commit
16c6cb104d

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

@@ -0,0 +1,16 @@
+<?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" />
+    <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />
+  </application>
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+</manifest>

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

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

+ 29 - 0
Assets/Plugins/Android/baseProjectTemplate.gradle

@@ -0,0 +1,29 @@
+allprojects {
+    buildscript {
+        repositories {**ARTIFACTORYREPOSITORY**
+            google()
+            jcenter()
+        }
+
+        dependencies {
+            // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
+            // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
+            // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+            // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
+            classpath 'com.android.tools.build:gradle:4.0.1'
+            **BUILD_SCRIPT_DEPS**
+        }
+    }
+
+    repositories {**ARTIFACTORYREPOSITORY**
+        google()
+        jcenter()
+        flatDir {
+            dirs "${project(':unityLibrary').projectDir}/libs"
+        }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

+ 7 - 0
Assets/Plugins/Android/baseProjectTemplate.gradle.meta

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

+ 6 - 0
Assets/Plugins/Android/gradleTemplate.properties

@@ -0,0 +1,6 @@
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
+org.gradle.parallel=true
+android.enableR8=**MINIFY_WITH_R_EIGHT**
+unityStreamingAssets=**STREAMING_ASSETS**
+**ADDITIONAL_PROPERTIES**

+ 7 - 0
Assets/Plugins/Android/gradleTemplate.properties.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 027c763540e84d24aa2c293f14989cb9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/7/4 17:44:42
+Build from YUNYUNGEGE at 2023/7/20 11:04:32

+ 17 - 19
Assets/Studio/Scenes/Logo/Logo.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.70642865, g: 0.7837076, b: 0.97953075, a: 1}
+  m_IndirectSpecularColor: {r: 0.857776, g: 0.89812523, b: 0.99094766, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -452,6 +452,12 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 623507474}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &646664786 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5142388694048500748, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+    type: 3}
+  m_PrefabInstance: {fileID: 1836526756}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &653649476
 GameObject:
   m_ObjectHideFlags: 0
@@ -1884,6 +1890,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5394885976978340327}
     m_Modifications:
+    - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: isHand
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_Name
@@ -1946,12 +1957,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
---- !u!4 &1836526757 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-    type: 3}
-  m_PrefabInstance: {fileID: 1836526756}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1884441341
 GameObject:
   m_ObjectHideFlags: 0
@@ -3673,12 +3678,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -3814,7 +3822,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 1836526757}
+  - {fileID: 646664786}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3842,16 +3850,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e43ea5875156c3743943701fec0f757a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _appIdInput: {fileID: 11400000, guid: 300c6525f002a4dbaac41a5c4b054e35, type: 2}
-  _appID: 
-  _token: 
-  _channelName: 
-  LogText: {fileID: 8059137849200321621}
-  uid: 0
-  peerid: 
-  userAccount: 
-  menuIcon: {fileID: 0}
-  isSwitchCamera: 0
 --- !u!222 &8059137849200321610
 CanvasRenderer:
   m_ObjectHideFlags: 0

+ 22 - 10
Assets/Studio/_3HomeScene/HomeSceneScripts_new/UI/MenuUI.cs

@@ -198,19 +198,34 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
         return p;
     }
 
-
+    float bx;
+    GameObject ob;
     public void OnBeginDrag(PointerEventData eventData)
     {
         IsDrag(true);
+        if(ob!=null)
+        Destroy(ob);
+        SCPointEventData sed = eventData as SCPointEventData;
+        ob = new GameObject();
+        ob.transform.parent = sed.inputDevicePartBase.transform;
+        ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
+        ob.transform.localEulerAngles = Vector3.zero;
+        bx = ob.transform.localPosition.x;
     }
 
     public void OnDrag(PointerEventData eventData)
     {
-      //  return;
-        float _delta = eventData.delta.x / _maxDragValue;//记录拖动的增量比值(用作速度比值)
-
-        if (_delta < -0.1f)//向左拖动时
+        SCPointEventData sed = eventData as SCPointEventData;
+        ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
+        float ox = ob.transform.localPosition.x;
+        //  return;
+        float _delta = (bx - ox)*100;//eventData.delta.x / _maxDragValue;//记录拖动的增量比值(用作速度比值)
+        bx = ox;
+     //   Debug.Log("_delta===>"+_delta);
+        if (_delta < -0.01f)//向左拖动时
         {
+           // _delta = -0.5f;
+
             _isInRight = false;
 
             if (!_isInLeft)//如果没有归位到当前元素应该处于的位置上,就先让元素先移动到对应的位置上
@@ -252,7 +267,6 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
                     }
 
                     _menuElementGroup[i].DOKill();
-                    Debug.Log("_delta=======>" + -_delta * _velocityGroup[i + 1].magnitude);
                     //拖拽的增量比值乘以预设的最大速度,实现设备拖拽速度与游戏对象移动速度成正比
                     _menuElementGroup[i].DOLocalMove(_bezierPointGroup[i], -_delta * _velocityGroup[i + 1].magnitude).SetSpeedBased();
                 }
@@ -282,7 +296,6 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
                     }
 
                     _menuElementGroup[i].DOKill();
-                    Debug.Log("_delta=======>" + -_delta * _velocityGroup[i].magnitude);
                     _menuElementGroup[i].DOLocalMove(_bezierPointGroup[i - 1], -_delta * _velocityGroup[i].magnitude).SetSpeedBased();
 
                 }
@@ -297,8 +310,9 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
             }
         }
 
-        else if (_delta > 0.1f)//向右拖动时
+        else if (_delta > 0.01f)//向右拖动时
         {
+           // _delta = 0.5f;
             _isInLeft = false;
 
             if (!_isInRight)//如果没有归位到当前元素应该处于的位置上,就先让元素移动到对应的位置上
@@ -340,7 +354,6 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
                     }
 
                     _menuElementGroup[i].DOKill();
-                    Debug.Log("_delta=======>" + _delta * _velocityGroup[i].magnitude);
                     _menuElementGroup[i].DOLocalMove(_bezierPointGroup[i], _delta * _velocityGroup[i].magnitude).SetSpeedBased();
                 }
 
@@ -370,7 +383,6 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
                     }
 
                     _menuElementGroup[i].DOKill();
-                    Debug.Log("_delta=======>" + _delta * _velocityGroup[i + 1].magnitude);
                     _menuElementGroup[i].DOLocalMove(_bezierPointGroup[i + 1], _delta * _velocityGroup[i + 1].magnitude).SetSpeedBased();
                 }