diff --git a/.vs/vrtripn/v16/.suo b/.vs/vrtripn/v16/.suo index c31378ef..87655151 100644 Binary files a/.vs/vrtripn/v16/.suo and b/.vs/vrtripn/v16/.suo differ diff --git a/AVProVideo.Demos.csproj b/AVProVideo.Demos.csproj index d79e9a1d..e5f6c55f 100644 --- a/AVProVideo.Demos.csproj +++ b/AVProVideo.Demos.csproj @@ -70,12 +70,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll diff --git a/AVProVideo.Editor.csproj b/AVProVideo.Editor.csproj index 11493b96..23d04a6c 100644 --- a/AVProVideo.Editor.csproj +++ b/AVProVideo.Editor.csproj @@ -98,12 +98,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.TestRunner.dll diff --git a/AVProVideo.Extensions.Timeline.csproj b/AVProVideo.Extensions.Timeline.csproj index 2527a2db..26812472 100644 --- a/AVProVideo.Extensions.Timeline.csproj +++ b/AVProVideo.Extensions.Timeline.csproj @@ -69,12 +69,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll diff --git a/AVProVideo.Extensions.UnityUI.Editor.csproj b/AVProVideo.Extensions.UnityUI.Editor.csproj index 0b6535e3..a2533fd6 100644 --- a/AVProVideo.Extensions.UnityUI.Editor.csproj +++ b/AVProVideo.Extensions.UnityUI.Editor.csproj @@ -66,12 +66,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.TestRunner.dll diff --git a/AVProVideo.Extensions.UnityUI.csproj b/AVProVideo.Extensions.UnityUI.csproj index 09343198..671f65f5 100644 --- a/AVProVideo.Extensions.UnityUI.csproj +++ b/AVProVideo.Extensions.UnityUI.csproj @@ -67,12 +67,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll diff --git a/AVProVideo.Extensions.VisualEffectGraph.csproj b/AVProVideo.Extensions.VisualEffectGraph.csproj index 47ddc57c..693037d8 100644 --- a/AVProVideo.Extensions.VisualEffectGraph.csproj +++ b/AVProVideo.Extensions.VisualEffectGraph.csproj @@ -66,12 +66,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll diff --git a/AVProVideo.Runtime.csproj b/AVProVideo.Runtime.csproj index f51f9e88..dbb618c2 100644 --- a/AVProVideo.Runtime.csproj +++ b/AVProVideo.Runtime.csproj @@ -126,12 +126,12 @@ - - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEditor.UI.dll + + C:/Users/Panchop/Documents/GitHub/vrtripn/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll diff --git a/Assets/Materials/vrtripn.png b/Assets/Materials/vrtripn.png new file mode 100644 index 00000000..3679f39c Binary files /dev/null and b/Assets/Materials/vrtripn.png differ diff --git a/Assets/Materials/vrtripn.png.meta b/Assets/Materials/vrtripn.png.meta new file mode 100644 index 00000000..5b57fbaf --- /dev/null +++ b/Assets/Materials/vrtripn.png.meta @@ -0,0 +1,139 @@ +fileFormatVersion: 2 +guid: 48ced344086b36b43ab13d469a3a674b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-7.2.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-7.2.0.aar index 5401c40f..0fae3e7a 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-7.2.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-7.2.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-7.2.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-7.2.0.aar index c33ce485..b0954452 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-7.2.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-7.2.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-7.2.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-7.2.0.aar index 127031f1..8d2fe5c7 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-7.2.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-7.2.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-common-19.5.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-common-19.5.0.aar index 0d8f9e80..6d548aa8 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-common-19.5.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-common-19.5.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-database-unity-7.2.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-database-unity-7.2.0.aar index 997ed9a6..6c68db29 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-database-unity-7.2.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-database-unity-7.2.0.aar differ diff --git a/Assets/Scripts/StopVideo.cs b/Assets/Scripts/StopVideo.cs index 50b59578..8db7bc78 100644 --- a/Assets/Scripts/StopVideo.cs +++ b/Assets/Scripts/StopVideo.cs @@ -21,6 +21,7 @@ private void Update() if (timer >= 2.0f) { + LoadScenes.scenes = new ArrayList(); SceneManager.LoadScene(sceneName); } } @@ -28,6 +29,7 @@ private void Update() public void NextScene(string sceneName) { + LoadScenes.scenes = new ArrayList(); SceneManager.LoadSceneAsync(sceneName); } diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index b91296d0..48cf5537 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 5} - m_MinSize: {x: 950, y: 394} + m_MinSize: {x: 950, y: 544} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -73,7 +73,7 @@ MonoBehaviour: m_MinSize: {x: 406, y: 222} m_MaxSize: {x: 8006, y: 4022} vertical: 0 - controlID: 15 + controlID: 38 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,15 +93,15 @@ MonoBehaviour: y: 459 width: 1178 height: 272 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 12} + m_MinSize: {x: 232, y: 272} + m_MaxSize: {x: 10002, y: 10022} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 12} - {fileID: 16} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,10 +169,10 @@ MonoBehaviour: y: 30 width: 1536 height: 731 - m_MinSize: {x: 681, y: 344} - m_MaxSize: {x: 12006, y: 8044} + m_MinSize: {x: 683, y: 494} + m_MaxSize: {x: 14004, y: 14044} vertical: 0 - controlID: 13 + controlID: 36 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -215,10 +215,10 @@ MonoBehaviour: y: 0 width: 1178 height: 731 - m_MinSize: {x: 406, y: 344} - m_MaxSize: {x: 8006, y: 8044} + m_MinSize: {x: 406, y: 494} + m_MaxSize: {x: 10002, y: 14044} vertical: 1 - controlID: 14 + controlID: 37 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -355,7 +355,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 70bdffffa2bdffffb2beffffe2beffffeabeffff1cbfffff4abfffff80c0ffffb2c0ffffbec1ffffeac1ffffeec1ffff1cc2ffff46c2ffff82c4ffffb4c4ffffc0c5ffffecc5fffff0c5ffff1ec6ffff48c6ffff28caffff5acaffff66cbffff92cbffff96cbffffc2cbffffeccbffff04cfffff36cfffff42d0ffff6ed0ffff72d0ffff9ed0ffffc8d0ffff1ed2ffff50d2ffff5cd2ffff84d2ffff88d2ffffb0d2ffffced2ffffe8d4ffff1ad5ffff26d6ffff52d6ffff56d6ffff82d6ffffacd6ffffd2d9ffff04daffff10dbffff3cdbffff40dbffff6cdbffff96dbffff58ddffff8addffff96ddffffbeddffffc2ddffffeaddffff08defffff2deffff24dfffff30e0ffff5ce0ffff60e0ffff8ce0ffffb6e0ffffe2e1ffff14e2ffff20e3ffff4ce3ffff50e3ffff7ce3ffffa6e3ffff44e5ffff76e5ffff82e6ffffaee6ffffb2e6ffffdee6ffff08e7ffff20e9ffff52e9ffff5eeaffff8aeaffff8eeaffffbaeaffffe4eafffffcebffff2eecffff3aedffff66edffff6aedffff96edffffc0edffff1cefffff4eefffff5af0ffff86f0ffff8af0ffffb6f0ffffe0f0ffff1af2ffff4cf2ffff58f3ffff84f3ffff88f3ffffb4f3ffffdef3fffffaf4ffff2cf5ffff38f6ffff64f6ffff68f6ffff94f6ffffbef6ffffe6f7ffff18f8ffff28f9ffff58f9ffff60f9ffff90f9ffffbef9ffff3afbffff3c760000b07c0000c47c0000de7c0000e87c000028870000008d0000e0920000 + m_ExpandedIDs: 84f2ffffb8f2ffffc4f2ffffecf2fffff0f2ffff18f3ffff36f3ffffe0f3ffff14f4ffff24f5ffff54f5ffff5cf5ffff8ef5ffffbcf5ffff3afbffff043b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -456,20 +456,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Tour + - Assets/Materials m_ViewMode: 1 m_StartGridSize: 60 m_LastFolders: - - Assets/Scripts/Tour + - Assets/Materials m_LastFoldersGridSize: 60 m_LastProjectPath: C:\Users\Panchop\Documents\GitHub\vrtripn m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 579} - m_SelectedIDs: c8380000 - m_LastClickedID: 14536 - m_ExpandedIDs: 000000009a320000103300001c33000080330000303600003a360000ce360000d4360000de36000062380000d8380000743b0000763b0000783b000000ca9a3b + scrollPos: {x: 0, y: 387} + m_SelectedIDs: 42370000 + m_LastClickedID: 14146 + m_ExpandedIDs: 000000009e320000143300002033000084330000343600003e360000d2360000d8360000e236000066380000dc380000763b0000783b00007a3b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -497,7 +497,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 386} m_SelectedIDs: b2300000 m_LastClickedID: 12466 - m_ExpandedIDs: 000000009a320000103300001c33000080330000303600003a360000ce360000d4360000de36000062380000d8380000743b0000763b0000783b0000 + m_ExpandedIDs: 000000009e320000143300002033000084330000343600003e360000d2360000d8360000e236000066380000dc380000763b0000783b00007a3b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -522,8 +522,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: aa2e0000 - m_LastClickedInstanceID: 11946 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: aa410000ae410000b6410000d24100008646000066460000824000000000000050360000 m_RenameOverlay: diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 34932e32..0ae364cb 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index a7ab5c97..7bd2fee5 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.dll b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.dll index c5a24258..833b12a1 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.dll and b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.pdb b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.pdb deleted file mode 100644 index 8f465fff..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Demos.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.dll b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.dll index 3429f4bc..8d4ac933 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.dll and b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.pdb b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.pdb deleted file mode 100644 index c326a853..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.Timeline.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.dll b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.dll index 93186b2b..1abdca5d 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.dll and b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.pdb b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.pdb deleted file mode 100644 index f4e771b7..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.UnityUI.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.dll b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.dll index b16e03e1..44224b81 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.dll and b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.pdb b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.pdb deleted file mode 100644 index c326a853..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Extensions.VisualEffectGraph.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.dll b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.dll index 650a647f..ae2d1e6f 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.dll and b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.pdb b/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.pdb deleted file mode 100644 index fed5f5d5..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/AVProVideo.Runtime.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll index c3ea0ff6..f3501105 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.pdb b/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.pdb deleted file mode 100644 index 3c3dba47..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Analytics.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.Analytics.dll.mdb deleted file mode 100644 index 485accb9..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Analytics.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.App.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.App.dll.mdb deleted file mode 100644 index adcfa99a..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.App.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Auth.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.Auth.dll.mdb deleted file mode 100644 index bf18dd6a..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Auth.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Database.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.Database.dll.mdb deleted file mode 100644 index 4ec63000..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Database.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Platform.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.Platform.dll.mdb deleted file mode 100644 index a4f8fcbe..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.Platform.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Firebase.TaskExtension.dll.mdb b/Library/PlayerDataCache/Android/Data/Managed/Firebase.TaskExtension.dll.mdb deleted file mode 100644 index 99671f99..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Firebase.TaskExtension.dll.mdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll index ceed0f3e..6b3c4217 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.pdb b/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.pdb deleted file mode 100644 index 6a5c03e9..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll index 4e9b7788..71c0dbf8 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.pdb b/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.pdb deleted file mode 100644 index 827645b2..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll b/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll index 439e1a09..05815702 100644 Binary files a/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll and b/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll differ diff --git a/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.pdb b/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.pdb deleted file mode 100644 index 2eb37a89..00000000 Binary files a/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.pdb and /dev/null differ diff --git a/Library/PlayerDataCache/Android/Data/boot.config b/Library/PlayerDataCache/Android/Data/boot.config index f3bf1bd0..42fdfeec 100644 --- a/Library/PlayerDataCache/Android/Data/boot.config +++ b/Library/PlayerDataCache/Android/Data/boot.config @@ -1,16 +1,9 @@ -player-connection-mode=Listen -player-connection-guid=304674831 -player-connection-debug=1 -player-connection-wait-timeout=-1 -player-connection-ip=192.168.1.48 -player-connection-ip=192.168.56.1 gfx-enable-native-gfx-jobs= wait-for-native-debugger=0 -wait-for-managed-debugger=1 scripting-runtime-version=latest vr-enabled=1 vr-device-list=None,cardboard hdr-display-enabled=0 androidStartInFullscreen=1 androidRenderOutsideSafeArea=1 -buildDate=637566249924596825 +buildDate=637566342740472840 diff --git a/Library/PlayerDataCache/Android/Data/globalgamemanagers b/Library/PlayerDataCache/Android/Data/globalgamemanagers index ee099f66..1010175b 100644 Binary files a/Library/PlayerDataCache/Android/Data/globalgamemanagers and b/Library/PlayerDataCache/Android/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Android/Data/level0 b/Library/PlayerDataCache/Android/Data/level0 index 392a0d10..dbb2f0ee 100644 Binary files a/Library/PlayerDataCache/Android/Data/level0 and b/Library/PlayerDataCache/Android/Data/level0 differ diff --git a/Library/PlayerDataCache/Android/Data/level3 b/Library/PlayerDataCache/Android/Data/level3 index 1ae9da4e..75de841f 100644 Binary files a/Library/PlayerDataCache/Android/Data/level3 and b/Library/PlayerDataCache/Android/Data/level3 differ diff --git a/Library/PlayerDataCache/Android/Data/level4 b/Library/PlayerDataCache/Android/Data/level4 index e15facc6..affafd2a 100644 Binary files a/Library/PlayerDataCache/Android/Data/level4 and b/Library/PlayerDataCache/Android/Data/level4 differ diff --git a/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml index a0c9c7a2..1c6ed747 100644 --- a/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml @@ -72,17 +72,17 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10968} - Class: 114 - Script: {instanceID: 11468} + Script: {instanceID: 11470} - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 12036} + Script: {instanceID: 12038} - Class: 114 - Script: {instanceID: 12110} + Script: {instanceID: 12112} - Class: 114 - Script: {instanceID: 12342} + Script: {instanceID: 12344} - Class: 114 - Script: {instanceID: 12628} + Script: {instanceID: 12630} - Class: 115 Script: {instanceID: 0} - Class: 157 @@ -135,25 +135,25 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10998} - Class: 114 - Script: {instanceID: 11468} + Script: {instanceID: 11470} - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 11768} + Script: {instanceID: 11770} - Class: 114 - Script: {instanceID: 11780} + Script: {instanceID: 11782} - Class: 114 - Script: {instanceID: 12036} + Script: {instanceID: 12038} - Class: 114 - Script: {instanceID: 12110} + Script: {instanceID: 12112} - Class: 114 - Script: {instanceID: 12336} + Script: {instanceID: 12338} - Class: 114 - Script: {instanceID: 12370} + Script: {instanceID: 12372} - Class: 114 - Script: {instanceID: 12442} + Script: {instanceID: 12444} - Class: 114 - Script: {instanceID: 12628} + Script: {instanceID: 12630} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -212,27 +212,27 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10968} - Class: 114 - Script: {instanceID: 11236} + Script: {instanceID: 11238} - Class: 114 - Script: {instanceID: 11384} + Script: {instanceID: 11386} - Class: 114 - Script: {instanceID: 11468} + Script: {instanceID: 11470} - Class: 114 - Script: {instanceID: 11490} + Script: {instanceID: 11492} - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 11998} + Script: {instanceID: 12000} - Class: 114 - Script: {instanceID: 12036} + Script: {instanceID: 12038} - Class: 114 - Script: {instanceID: 12062} + Script: {instanceID: 12064} - Class: 114 - Script: {instanceID: 12110} + Script: {instanceID: 12112} - Class: 114 - Script: {instanceID: 12544} + Script: {instanceID: 12546} - Class: 114 - Script: {instanceID: 12576} + Script: {instanceID: 12578} - Class: 115 Script: {instanceID: 0} - Class: 124 @@ -285,17 +285,17 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10968} - Class: 114 - Script: {instanceID: 11468} + Script: {instanceID: 11470} - Class: 114 - Script: {instanceID: 11578} + Script: {instanceID: 11580} - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 12036} + Script: {instanceID: 12038} - Class: 114 - Script: {instanceID: 12110} + Script: {instanceID: 12112} - Class: 114 - Script: {instanceID: 12628} + Script: {instanceID: 12630} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -352,33 +352,33 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11090} - Class: 114 - Script: {instanceID: 11334} + Script: {instanceID: 11166} - Class: 114 - Script: {instanceID: 11384} + Script: {instanceID: 11336} - Class: 114 - Script: {instanceID: 11468} + Script: {instanceID: 11386} - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11470} - Class: 114 - Script: {instanceID: 11796} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 11946} + Script: {instanceID: 11798} - Class: 114 - Script: {instanceID: 11998} + Script: {instanceID: 11948} - Class: 114 - Script: {instanceID: 12036} + Script: {instanceID: 12000} - Class: 114 - Script: {instanceID: 12060} + Script: {instanceID: 12038} - Class: 114 Script: {instanceID: 12062} - Class: 114 - Script: {instanceID: 12110} + Script: {instanceID: 12064} - Class: 114 - Script: {instanceID: 12544} + Script: {instanceID: 12112} - Class: 114 - Script: {instanceID: 12576} + Script: {instanceID: 12546} - Class: 114 - Script: {instanceID: 36152} + Script: {instanceID: 12578} - Class: 115 Script: {instanceID: 0} - Class: 124 @@ -746,6 +746,12 @@ ScriptsOnlyBuild: assemblyName: AVProVideo.Demos.dll namespaceName: RenderHeads.Media.AVProVideo.Demos.UI className: HorizontalSegmentsPrimitive + - hash: + serializedVersion: 2 + Hash: d91fcd9ac7bd86d3d771dd6171620fad + assemblyName: Assembly-CSharp.dll + namespaceName: + className: StopVideo - hash: serializedVersion: 2 Hash: b3ab2106268377ffe25dd18ac23dca28 @@ -1286,12 +1292,6 @@ ScriptsOnlyBuild: assemblyName: Unity.Timeline.dll namespaceName: UnityEngine.Timeline className: PlayableTrack - - hash: - serializedVersion: 2 - Hash: d91fcd9ac7bd86d3d771dd6171620fad - assemblyName: Assembly-CSharp.dll - namespaceName: - className: StopVideo platform: 13 scenePathNames: - Assets/Scenes/Login.unity @@ -1299,4 +1299,4 @@ ScriptsOnlyBuild: - Assets/Scenes/Tour.unity - Assets/Scenes/Register.unity - Assets/Scenes/Instructions.unity - playerPath: C:/Users/Panchop/Downloads/VRTripn_New (1) 10-05/VRTripn_New/Build/v0.10.4.apk + playerPath: C:/Users/Panchop/OneDrive/Escritorio/VRTripn-0.10.7.apk diff --git a/Library/ProjectSettings.asset b/Library/ProjectSettings.asset index 1385ee89..00ef3035 100644 --- a/Library/ProjectSettings.asset +++ b/Library/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: cct_test - productName: vrtripn + productName: VRTripn defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -120,7 +120,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.10.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -163,7 +163,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Android: com.ccttest.vrtripn buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22 @@ -275,40 +276,17 @@ PlayerSettings: AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 48ced344086b36b43ab13d469a3a674b, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: - - m_Textures: [] - m_Width: 432 - m_Height: 432 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 324 - m_Height: 324 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 216 - m_Height: 216 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 162 - m_Height: 162 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 108 - m_Height: 108 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 81 - m_Height: 81 - m_Kind: 2 - m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 @@ -369,6 +347,36 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 diff --git a/Library/ScriptAssemblies/AVProVideo.Demos.dll b/Library/ScriptAssemblies/AVProVideo.Demos.dll index 4672e8b0..168cb5a9 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Demos.dll and b/Library/ScriptAssemblies/AVProVideo.Demos.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Editor.dll b/Library/ScriptAssemblies/AVProVideo.Editor.dll index a11c17f1..c1846d59 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Editor.dll and b/Library/ScriptAssemblies/AVProVideo.Editor.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Extensions.Timeline.dll b/Library/ScriptAssemblies/AVProVideo.Extensions.Timeline.dll index bc1f434c..ca1c35c7 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Extensions.Timeline.dll and b/Library/ScriptAssemblies/AVProVideo.Extensions.Timeline.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.Editor.dll b/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.Editor.dll index b398d4c3..e589f6c7 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.Editor.dll and b/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.Editor.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.dll b/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.dll index 045ed0cd..27a7df3f 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.dll and b/Library/ScriptAssemblies/AVProVideo.Extensions.UnityUI.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Extensions.VisualEffectGraph.dll b/Library/ScriptAssemblies/AVProVideo.Extensions.VisualEffectGraph.dll index 35df1112..de029fa2 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Extensions.VisualEffectGraph.dll and b/Library/ScriptAssemblies/AVProVideo.Extensions.VisualEffectGraph.dll differ diff --git a/Library/ScriptAssemblies/AVProVideo.Runtime.dll b/Library/ScriptAssemblies/AVProVideo.Runtime.dll index d5b7c8ae..39f38834 100644 Binary files a/Library/ScriptAssemblies/AVProVideo.Runtime.dll and b/Library/ScriptAssemblies/AVProVideo.Runtime.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 394e5b02..cf24515b 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 0f682635..c03ccebb 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index 3f0169b5..edbdf7c4 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index ba2e0373..9d1277bf 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/Library/ScriptAssemblies/Unity.Rider.Editor.dll index 68be9127..aa872c63 100644 Binary files a/Library/ScriptAssemblies/Unity.Rider.Editor.dll and b/Library/ScriptAssemblies/Unity.Rider.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index 542c7953..8178bcf8 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll index 3dd341a4..4a02cd8d 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index 7ee2a88d..61d26d33 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.dll b/Library/ScriptAssemblies/Unity.Timeline.dll index 15fefc81..3c9c9180 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.dll and b/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index 081cfb2a..c92e9183 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index e26bd9eb..0a1f1c4f 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.UI.dll b/Library/ScriptAssemblies/UnityEditor.UI.dll index 821e14f2..7c9f0ee3 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.UI.dll and b/Library/ScriptAssemblies/UnityEditor.UI.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll index 259381cd..2ea1d6f2 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.UI.dll b/Library/ScriptAssemblies/UnityEngine.UI.dll index 3e0164ae..e58df78c 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.UI.dll and b/Library/ScriptAssemblies/UnityEngine.UI.dll differ diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index c118edc5..508bf592 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/metadata/1d/1d0b5e76a4df933439d7df542b788cb8 b/Library/metadata/1d/1d0b5e76a4df933439d7df542b788cb8 index f34e43e6..87a7ba34 100644 Binary files a/Library/metadata/1d/1d0b5e76a4df933439d7df542b788cb8 and b/Library/metadata/1d/1d0b5e76a4df933439d7df542b788cb8 differ diff --git a/Library/metadata/48/48ced344086b36b43ab13d469a3a674b b/Library/metadata/48/48ced344086b36b43ab13d469a3a674b new file mode 100644 index 00000000..16613d0f Binary files /dev/null and b/Library/metadata/48/48ced344086b36b43ab13d469a3a674b differ diff --git a/Library/metadata/48/48ced344086b36b43ab13d469a3a674b.info b/Library/metadata/48/48ced344086b36b43ab13d469a3a674b.info new file mode 100644 index 00000000..b5d164ad Binary files /dev/null and b/Library/metadata/48/48ced344086b36b43ab13d469a3a674b.info differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe4.log b/Library/shadercompiler-UnityShaderCompiler.exe4.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe6.log b/Library/shadercompiler-UnityShaderCompiler.exe6.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe7.log b/Library/shadercompiler-UnityShaderCompiler.exe7.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe8.log b/Library/shadercompiler-UnityShaderCompiler.exe8.log index 4467cf14..13cb5006 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe8.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe8.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.2.10f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1385ee89..00ef3035 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: cct_test - productName: vrtripn + productName: VRTripn defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -120,7 +120,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.10.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -163,7 +163,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Android: com.ccttest.vrtripn buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22 @@ -275,40 +276,17 @@ PlayerSettings: AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 48ced344086b36b43ab13d469a3a674b, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: - - m_Textures: [] - m_Width: 432 - m_Height: 432 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 324 - m_Height: 324 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 216 - m_Height: 216 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 162 - m_Height: 162 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 108 - m_Height: 108 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 81 - m_Height: 81 - m_Kind: 2 - m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 @@ -369,6 +347,36 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 diff --git a/obj/Debug/AVProVideo.Demos.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Demos.csprojAssemblyReference.cache index 9e2128e7..cbc3d689 100644 Binary files a/obj/Debug/AVProVideo.Demos.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Demos.csprojAssemblyReference.cache differ diff --git a/obj/Debug/AVProVideo.Editor.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Editor.csprojAssemblyReference.cache index 1375e6f5..cb8b4430 100644 Binary files a/obj/Debug/AVProVideo.Editor.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Editor.csprojAssemblyReference.cache differ diff --git a/obj/Debug/AVProVideo.Extensions.Timeline.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Extensions.Timeline.csprojAssemblyReference.cache index 3f006543..b0be3ff5 100644 Binary files a/obj/Debug/AVProVideo.Extensions.Timeline.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Extensions.Timeline.csprojAssemblyReference.cache differ diff --git a/obj/Debug/AVProVideo.Extensions.UnityUI.Editor.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Extensions.UnityUI.Editor.csprojAssemblyReference.cache index 3d23cdc2..5b3c9a32 100644 Binary files a/obj/Debug/AVProVideo.Extensions.UnityUI.Editor.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Extensions.UnityUI.Editor.csprojAssemblyReference.cache differ diff --git a/obj/Debug/AVProVideo.Extensions.VisualEffectGraph.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Extensions.VisualEffectGraph.csprojAssemblyReference.cache index ae7d8926..6be608a4 100644 Binary files a/obj/Debug/AVProVideo.Extensions.VisualEffectGraph.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Extensions.VisualEffectGraph.csprojAssemblyReference.cache differ diff --git a/obj/Debug/AVProVideo.Runtime.csprojAssemblyReference.cache b/obj/Debug/AVProVideo.Runtime.csprojAssemblyReference.cache index 79af025f..ddef0072 100644 Binary files a/obj/Debug/AVProVideo.Runtime.csprojAssemblyReference.cache and b/obj/Debug/AVProVideo.Runtime.csprojAssemblyReference.cache differ