Commit a9b58fac authored by Sylvain Buche's avatar Sylvain Buche
Browse files

Fix the "access building button" behavior in the server maintenance example.

parent 63bc11c2

Assets/ARContent/ARScenePrefabs/ValidateAccessToBuilding.cs

+2 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ public class ValidateAccessToBuilding : MonoBehaviour 
        }

    }



    



    public void OnClick()

    {

        Debug.Log("Click");

        foreach(GameObject a in arrows)

        {

            a.SetActive(true);

Assets/Plugins/Android/mainTemplate.gradle

+0 −16
Original line number Diff line number Diff line
@@ -4,24 +4,8 @@ apply plugin: 'com.android.library' 
dependencies {

    implementation fileTree(dir: 'libs', include: ['*.jar'])

    implementation 'com.google.android.gms:play-services-auth:16+'

// Android Resolver Dependencies Start

    implementation 'com.google.android.gms:play-services-auth-base:16+' // Google.XR.ARCoreExtensions.Editor.Internal.ExternalDependencyResolverHelper.RegisterAndroidDependencies

    implementation 'com.google.android.gms:play-services-location:17+' // Google.XR.ARCoreExtensions.Editor.Internal.ExternalDependencyResolverHelper.RegisterAndroidDependencies

// Android Resolver Dependencies End

**DEPS**}



// Android Resolver Exclusions Start

android {

  packagingOptions {

      exclude ('/lib/armeabi/*' + '*')

      exclude ('/lib/armeabi-v7a/*' + '*')

      exclude ('/lib/mips/*' + '*')

      exclude ('/lib/mips64/*' + '*')

      exclude ('/lib/x86/*' + '*')

      exclude ('/lib/x86_64/*' + '*')

  }

}

// Android Resolver Exclusions End

android {

    ndkPath "**NDKPATH**"

Assets/Plugins/Android/settingsTemplate.gradle

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ dependencyResolutionManagement { 
        **ARTIFACTORYREPOSITORY**

        google()

        mavenCentral()

// Android Resolver Repos Start

        def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")

        mavenLocal()

// Android Resolver Repos End

        flatDir {

            dirs "${project(':unityLibrary').projectDir}/libs"

        }

Assets/Resources/ARFWorldStorageServer.asset

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}

  m_Name: ARFWorldStorageServer

  m_EditorClassIdentifier: 

  serverName: 192.168.1.44

  serverName: 192.168.1.27

  company: Orange

  basePath: http://192.168.1.44

  basePath: http://192.168.1.27

  port: 8080

  currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}

Assets/Scenes/ExampleServerMaintenance.unity

+12 −0
Original line number Diff line number Diff line
@@ -594,6 +594,8 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: be1f62b8-ff00-4f6c-9f5a-d48795494037

  _ValiditySubscription: 1000000

  objectsToDeactivate:

  - {fileID: 565174133}

--- !u!114 &170622172 stripped

MonoBehaviour:

  m_CorrespondingSourceObject: {fileID: 7184359530916948220, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3}
@@ -1103,6 +1105,12 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: 6ca20738-d1dd-4210-9983-eda9f150bea7

  _ValiditySubscription: 100000

  objectsToDeactivate: []

--- !u!1 &565174133 stripped

GameObject:

  m_CorrespondingSourceObject: {fileID: 6320743541515548736, guid: 986e9c7298a161a4c9b18e0d21d77ae1, type: 3}

  m_PrefabInstance: {fileID: 170622168}

  m_PrefabAsset: {fileID: 0}

--- !u!1 &588578785

GameObject:

  m_ObjectHideFlags: 0
@@ -1667,6 +1675,7 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: 5ca5bb36-0001-44e5-a338-608ca8e7e787

  _ValiditySubscription: 1000000

  objectsToDeactivate: []

--- !u!1 &1113207502

GameObject:

  m_ObjectHideFlags: 0
@@ -2246,6 +2255,7 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: 15dd32c9-ff00-428c-a4f2-95df6e9cb3c2

  _ValiditySubscription: 1000000

  objectsToDeactivate: []

--- !u!1001 &1613199000

PrefabInstance:

  m_ObjectHideFlags: 0
@@ -2325,6 +2335,7 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: 269ae4e5-ff00-41f6-9eb3-011b8c87d158

  _ValiditySubscription: 1000000

  objectsToDeactivate: []

--- !u!1 &1805087985

GameObject:

  m_ObjectHideFlags: 0
@@ -2540,6 +2551,7 @@ MonoBehaviour: 
  m_EditorClassIdentifier: 

  _ARFNodeUUID: 859d2682-ff00-420e-8601-362084de7a7e

  _ValiditySubscription: 1000000

  objectsToDeactivate: []

--- !u!1 &1959103339

GameObject:

  m_ObjectHideFlags: 0