From 64ed0b38958d62d0e87a13de1d5e03890ec772e4 Mon Sep 17 00:00:00 2001 From: Tejas Shroff Date: Sun, 20 Jan 2019 12:23:56 -0500 Subject: [PATCH] Updating speech icons --- Assets/App/Scene/AR Test.unity | 97 ++++++++++++++++--- Assets/App/Scene/Intro.unity | 9 +- Assets/App/Scripts/SceneSwitch.anim | 67 ++++++++++++- Assets/App/Scripts/SimpleFollow.cs | 2 + .../Textures/UI/URSA_speach - yeah (2).png | 3 + .../UI/URSA_speach - yeah (2).png.meta | 96 ++++++++++++++++++ .../UI/URSA_speach bubble-nah (2).png | 3 + .../UI/URSA_speach bubble-nah (2).png.meta | 96 ++++++++++++++++++ Assets/StreamingAssets/UrsaIntro.mp4 | 4 +- Assets/StreamingAssets/UrsaIntro.mp4.meta | 2 +- 10 files changed, 358 insertions(+), 21 deletions(-) create mode 100644 Assets/App/Textures/UI/URSA_speach - yeah (2).png create mode 100644 Assets/App/Textures/UI/URSA_speach - yeah (2).png.meta create mode 100644 Assets/App/Textures/UI/URSA_speach bubble-nah (2).png create mode 100644 Assets/App/Textures/UI/URSA_speach bubble-nah (2).png.meta diff --git a/Assets/App/Scene/AR Test.unity b/Assets/App/Scene/AR Test.unity index 60fff22..c279f97 100644 --- a/Assets/App/Scene/AR Test.unity +++ b/Assets/App/Scene/AR Test.unity @@ -579,7 +579,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c255f00ba0ed74c519a079fc17756e3b, type: 3} + m_Sprite: {fileID: 21300000, guid: 867ea5150d15f4abfbc7aca37e9e46e3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1027,6 +1027,7 @@ MonoBehaviour: m_EditorClassIdentifier: trackerObjects: - {fileID: 1355410473} + - {fileID: 2039129037} trackerText: Globe isTracked: 0 --- !u!1 &235769595 @@ -2230,14 +2231,14 @@ RectTransform: m_GameObject: {fileID: 391328406} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.01} - m_LocalScale: {x: 0.00025, y: 0.00025, z: 1} + m_LocalScale: {x: 0.00039148884, y: 0.00039148884, z: 1.5659553} m_Children: [] m_Father: {fileID: 1473566396} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.001, y: -0.205} + m_AnchoredPosition: {x: 0.001, y: -0.182} m_SizeDelta: {x: 1526, y: 859} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &391328408 @@ -2259,7 +2260,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fc68b15b280f14ca39e984049cc9f5a2, type: 3} + m_Sprite: {fileID: 21300000, guid: abe00485df6424f21bbaeb94762e0ee3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2386,16 +2387,16 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 423779863} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.1948261, y: 1.194826, z: 1.194826} + m_LocalScale: {x: 1.194826, y: 1.194826, z: 1.194826} m_Children: - {fileID: 211487749} - {fileID: 527746115} - {fileID: 595783601} - {fileID: 788095939} - {fileID: 1375234643} - m_Father: {fileID: 1355410474} + m_Father: {fileID: 2039129038} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &423779865 @@ -5322,7 +5323,7 @@ MonoBehaviour: lineCount: 2 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} @@ -5775,7 +5776,7 @@ RectTransform: - {fileID: 2006003675} - {fileID: 1010829665} - {fileID: 948948180} - m_Father: {fileID: 1355410474} + m_Father: {fileID: 2039129038} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6541,8 +6542,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 423779864} - - {fileID: 1137053355} + - {fileID: 1444096672} + - {fileID: 2039129038} m_Father: {fileID: 227308900} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10312,6 +10313,34 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 +--- !u!1 &1444096671 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1444096672} + m_Layer: 0 + m_Name: FollowTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1444096672 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1444096671} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1355410474} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1459432128 GameObject: m_ObjectHideFlags: 0 @@ -13072,7 +13101,7 @@ MonoBehaviour: lineCount: 2 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} @@ -13491,6 +13520,50 @@ RectTransform: m_PrefabParentObject: {fileID: 224808180771659656, guid: 6d53c866ffad34d0e9ed724b91832a06, type: 2} m_PrefabInternal: {fileID: 2022111576} +--- !u!1 &2039129037 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2039129038} + - component: {fileID: 2039129039} + m_Layer: 0 + m_Name: AccountFollowObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2039129038 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2039129037} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 423779864} + - {fileID: 1137053355} + m_Father: {fileID: 1355410474} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2039129039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2039129037} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bb04eb557ed742249862e7e3c01f3e2, type: 3} + m_Name: + m_EditorClassIdentifier: + followTransform: {fileID: 1444096672} + followSpeed: 2 --- !u!21 &2042529537 Material: serializedVersion: 6 diff --git a/Assets/App/Scene/Intro.unity b/Assets/App/Scene/Intro.unity index e289405..366c217 100644 --- a/Assets/App/Scene/Intro.unity +++ b/Assets/App/Scene/Intro.unity @@ -198,8 +198,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1216441366} + - {fileID: 1484121222} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &242053459 Animator: @@ -587,7 +588,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!328 &1484121221 VideoPlayer: m_ObjectHideFlags: 0 @@ -629,8 +630,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 242053458} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/App/Scripts/SceneSwitch.anim b/Assets/App/Scripts/SceneSwitch.anim index df54f1b..656f397 100644 --- a/Assets/App/Scripts/SceneSwitch.anim +++ b/Assets/App/Scripts/SceneSwitch.anim @@ -26,7 +26,7 @@ AnimationClip: outSlope: Infinity tangentMode: 103 - serializedVersion: 2 - time: 0.18333334 + time: 0.25 value: 1 inSlope: Infinity outSlope: Infinity @@ -44,6 +44,34 @@ AnimationClip: path: SceneOnEnable classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.05 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: VideoPlayer + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -59,6 +87,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 477304250 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -91,7 +126,7 @@ AnimationClip: outSlope: Infinity tangentMode: 103 - serializedVersion: 2 - time: 0.18333334 + time: 0.25 value: 1 inSlope: Infinity outSlope: Infinity @@ -109,6 +144,34 @@ AnimationClip: path: SceneOnEnable classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 0.05 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: VideoPlayer + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/App/Scripts/SimpleFollow.cs b/Assets/App/Scripts/SimpleFollow.cs index 4595f0b..60d2966 100644 --- a/Assets/App/Scripts/SimpleFollow.cs +++ b/Assets/App/Scripts/SimpleFollow.cs @@ -8,6 +8,8 @@ public class SimpleFollow : MonoBehaviour { public float followSpeed; + //public bool followRotation + // Use this for initialization void Start () { diff --git a/Assets/App/Textures/UI/URSA_speach - yeah (2).png b/Assets/App/Textures/UI/URSA_speach - yeah (2).png new file mode 100644 index 0000000..e0c00d4 --- /dev/null +++ b/Assets/App/Textures/UI/URSA_speach - yeah (2).png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce00697edcd5bbd70f1158e8382961c5710e0d24d8d667333083cebac7288f38 +size 51124 diff --git a/Assets/App/Textures/UI/URSA_speach - yeah (2).png.meta b/Assets/App/Textures/UI/URSA_speach - yeah (2).png.meta new file mode 100644 index 0000000..0921478 --- /dev/null +++ b/Assets/App/Textures/UI/URSA_speach - yeah (2).png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 867ea5150d15f4abfbc7aca37e9e46e3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png b/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png new file mode 100644 index 0000000..af2f43b --- /dev/null +++ b/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dffd0df156c5754c3e27d468f3b8ba41904b4cf961893c2b7033f35f7e846b0c +size 40369 diff --git a/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png.meta b/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png.meta new file mode 100644 index 0000000..cbe3188 --- /dev/null +++ b/Assets/App/Textures/UI/URSA_speach bubble-nah (2).png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: abe00485df6424f21bbaeb94762e0ee3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/UrsaIntro.mp4 b/Assets/StreamingAssets/UrsaIntro.mp4 index ee78606..586adf6 100644 --- a/Assets/StreamingAssets/UrsaIntro.mp4 +++ b/Assets/StreamingAssets/UrsaIntro.mp4 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e221dd12a80d9e41701875fe440e39540c0aaf2b540495de6daf47d10b1b27db -size 3444145 +oid sha256:1830f4ecac1255359d416aeb5e6a0a4b899516f1416a1a51891429ddf9621b5b +size 3749081 diff --git a/Assets/StreamingAssets/UrsaIntro.mp4.meta b/Assets/StreamingAssets/UrsaIntro.mp4.meta index c098a00..3cfe2a1 100644 --- a/Assets/StreamingAssets/UrsaIntro.mp4.meta +++ b/Assets/StreamingAssets/UrsaIntro.mp4.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75ae3d4991a8e409c90a646c408edfbc +guid: 5fad272b3fc2243a6917e97093d8fc67 DefaultImporter: externalObjects: {} userData: