diff --git a/Assets/Animations/ActivityUI.meta b/Assets/Animations/ActivityUI.meta new file mode 100644 index 0000000..071cc67 --- /dev/null +++ b/Assets/Animations/ActivityUI.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0433b759badd44ce4a1d9ffd31ba8da0 +folderAsset: yes +timeCreated: 1533164457 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/ActivityUI/Activity.controller b/Assets/Animations/ActivityUI/Activity.controller new file mode 100644 index 0000000..baa2353 --- /dev/null +++ b/Assets/Animations/ActivityUI/Activity.controller @@ -0,0 +1,988 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Activity + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107005777523631554} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!74 &74033312265784454 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Pressed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] +--- !u!74 &74626376228226074 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Disabled + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] +--- !u!74 &74699714824621970 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Highlighted + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.7058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.8156863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.7058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.8156863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2134552862 + attribute: 2526845255 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2134552862 + attribute: 4215373228 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2134552862 + attribute: 2334886179 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 2526845255 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 4215373228 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 2334886179 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.7058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.8156863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.7058824 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.8156863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] +--- !u!74 &74910849970124946 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Normal + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.21960784 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.14901961 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19607843 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2134552862 + attribute: 2334886179 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 2334886179 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2134552862 + attribute: 2526845255 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2134552862 + attribute: 4215373228 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 2526845255 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 4215373228 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3114013974 + attribute: 304273561 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.21960784 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.14901961 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19607843 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: TextsPlace/Text + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0.19215687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Place/Icon + classID: 114 + script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] +--- !u!1101 &1101491431267532684 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102439971907667300} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101692340002403458 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102612591031888566} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101724070801954204 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102183329195178742} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101965875873773016 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102824914084523540} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102183329195178742 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 74033312265784454} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102439971907667300 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 74699714824621970} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102612591031888566 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 74626376228226074} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102824914084523540 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 74910849970124946} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107005777523631554 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102824914084523540} + m_Position: {x: 288, y: -12, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102439971907667300} + m_Position: {x: 324, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102183329195178742} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102612591031888566} + m_Position: {x: 305, y: 195, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 1101965875873773016} + - {fileID: 1101491431267532684} + - {fileID: 1101724070801954204} + - {fileID: 1101692340002403458} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102824914084523540} diff --git a/Assets/Animations/ActivityUI/Activity.controller.meta b/Assets/Animations/ActivityUI/Activity.controller.meta new file mode 100644 index 0000000..01e394c --- /dev/null +++ b/Assets/Animations/ActivityUI/Activity.controller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 30614b8c7e6964019be7b0b285a07d13 +timeCreated: 1533164457 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArcConverter/ConverterLibrary.dll b/Assets/ArcConverter/ConverterLibrary.dll index 698842d..4991301 100755 Binary files a/Assets/ArcConverter/ConverterLibrary.dll and b/Assets/ArcConverter/ConverterLibrary.dll differ diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity index 3ea6986..512b6b6 100644 --- a/Assets/MainScene.unity +++ b/Assets/MainScene.unity @@ -1767,30 +1767,25 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224958316100717460, guid: 8e282ef4d99024cb5a048493d8d6c935, - type: 2} - propertyPath: m_LocalPosition.x - value: 104.399994 - objectReference: {fileID: 0} - - target: {fileID: 224542639417993280, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224229132856477308, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.x - value: -76.265 + value: -16.753067 objectReference: {fileID: 0} - - target: {fileID: 224165227414091912, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224229132856477308, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} - propertyPath: m_LocalPosition.x - value: -94.8 + propertyPath: m_LocalPosition.y + value: -0.000061035156 objectReference: {fileID: 0} - - target: {fileID: 224899909195807244, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224319481528541512, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.x - value: -465.73706 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224899909195807244, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224319481528541512, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.y - value: -224.50002 + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 224616449348268312, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} @@ -1802,30 +1797,70 @@ Prefab: propertyPath: m_LocalPosition.y value: -224.50002 objectReference: {fileID: 0} - - target: {fileID: 224319481528541512, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224899909195807244, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -465.73706 objectReference: {fileID: 0} - - target: {fileID: 224319481528541512, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224899909195807244, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.y - value: -0.000061035156 + value: -224.50002 objectReference: {fileID: 0} - - target: {fileID: 224229132856477308, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224165227414091912, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_LocalPosition.x - value: -16.753067 + value: -89.590004 objectReference: {fileID: 0} - - target: {fileID: 224229132856477308, guid: 8e282ef4d99024cb5a048493d8d6c935, + - target: {fileID: 224542639417993280, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} - propertyPath: m_LocalPosition.y - value: -0.000061035156 + propertyPath: m_LocalPosition.x + value: -76.265 + objectReference: {fileID: 0} + - target: {fileID: 224958316100717460, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_LocalPosition.x + value: 104.399994 objectReference: {fileID: 0} - target: {fileID: 1589908768377518, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 114619083342929520, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.b + value: 0.19117647 + objectReference: {fileID: 0} + - target: {fileID: 114619083342929520, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.r + value: 0.19117647 + objectReference: {fileID: 0} + - target: {fileID: 114619083342929520, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.g + value: 0.19117647 + objectReference: {fileID: 0} + - target: {fileID: 114444736863936146, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.r + value: 0.14901961 + objectReference: {fileID: 0} + - target: {fileID: 114444736863936146, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.g + value: 0.19607843 + objectReference: {fileID: 0} + - target: {fileID: 114444736863936146, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.b + value: 0.21960784 + objectReference: {fileID: 0} + - target: {fileID: 114619083342929520, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8e282ef4d99024cb5a048493d8d6c935, type: 2} m_IsPrefabParent: 0 @@ -4163,7 +4198,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565950011} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 281.4623, y: 281.64618, z: 0} + m_LocalPosition: {x: 282.61615, y: 268.18463, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1881068476} @@ -6129,7 +6164,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 715392269} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.180008, y: 154.97116, z: 0} + m_LocalPosition: {x: 18.180008, y: 141.50961, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1202556823} @@ -7469,7 +7504,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 897516546} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.05000305, y: 273.97116, z: 0} + m_LocalPosition: {x: 0.05000305, y: 260.5096, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1059206952} @@ -9082,7 +9117,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1144076161} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.829956, y: -218.11113, z: 0} + m_LocalPosition: {x: 119.82999, y: -204.64958, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1340324852} @@ -9414,7 +9449,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197122674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.025032043, y: 308.87338, z: 0} + m_LocalPosition: {x: 0.025032043, y: 295.41183, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 211861403} @@ -9485,6 +9520,44 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 831126303} m_Script: {fileID: 11500000, guid: 596dca55ee24440aab90153b252babca, type: 3} +--- !u!1 &1226501001 stripped +GameObject: + m_PrefabParentObject: {fileID: 1589908768377518, guid: 8e282ef4d99024cb5a048493d8d6c935, + type: 2} + m_PrefabInternal: {fileID: 231352740} +--- !u!114 &1226501005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1226501001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1226501006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1226501001} --- !u!1 &1252815526 GameObject: m_ObjectHideFlags: 0 @@ -10186,7 +10259,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371052590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.1500015, y: 308.91263, z: 0} + m_LocalPosition: {x: 1.1500015, y: 295.45108, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1051724950} @@ -10476,7 +10549,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1433522475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 274.00433, y: 60, z: 0} + m_LocalPosition: {x: 275.16223, y: 60, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 637090571} @@ -10485,7 +10558,7 @@ RectTransform: 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: 274.00433, y: 60} + m_AnchoredPosition: {x: 275.16223, y: 60} m_SizeDelta: {x: 400, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &1433522477 @@ -11395,7 +11468,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1616544792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.000015258789, y: 275.9762, z: 0} + m_LocalPosition: {x: 0.000015258789, y: 262.51465, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2119123834} @@ -12334,7 +12407,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1764345208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -274.71228, y: 0.12503052, z: 0} + m_LocalPosition: {x: -275.86615, y: 0.12503052, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 157423044} @@ -13106,7 +13179,6 @@ MonoBehaviour: m_EditorClassIdentifier: tilePrefab: {fileID: 799699132} zoomLevelTiers: - - {x: 0.0625, y: 17} - {x: 0.125, y: 16} - {x: 0.25, y: 15} - {x: 0.5, y: 14} @@ -13125,7 +13197,7 @@ MonoBehaviour: - {x: 4096, y: 1} style: '&style=element:geometry%7Ccolor:0x121212&style=element:labels.icon%7Cvisibility:off&style=element:labels.text.fill%7Ccolor:0x757575&style=element:labels.text.stroke%7Ccolor:0x212121&style=feature:administrative%7Celement:geometry%7Ccolor:0x757575&style=feature:administrative.country%7Celement:labels.text.fill%7Ccolor:0x9e9e9e&style=feature:administrative.land_parcel%7Cvisibility:off&style=feature:administrative.locality%7Celement:labels.text.fill%7Ccolor:0xbdbdbd&style=feature:poi%7Celement:labels.text.fill%7Ccolor:0x757575&style=feature:poi.park%7Celement:geometry%7Ccolor:0x181818&style=feature:poi.park%7Celement:labels.text.fill%7Ccolor:0x616161&style=feature:poi.park%7Celement:labels.text.stroke%7Ccolor:0x1b1b1b&style=feature:road%7Celement:geometry.fill%7Ccolor:0x2c2c2c&style=feature:road%7Celement:labels.text.fill%7Ccolor:0x8a8a8a&style=feature:road.arterial%7Celement:geometry%7Ccolor:0x373737&style=feature:road.highway%7Celement:geometry%7Ccolor:0x3c3c3c&style=feature:road.highway.controlled_access%7Celement:geometry%7Ccolor:0x4e4e4e&style=feature:road.local%7Celement:labels.text.fill%7Ccolor:0x616161&style=feature:transit%7Celement:labels.text.fill%7Ccolor:0x757575&style=feature:water%7Celement:geometry%7Ccolor:0x000000&style=feature:water%7Celement:labels.text.fill%7Ccolor:0x3d3d3d' timeMarginAfterMove: 0.04 - useGoogleMaps: 1 + useGoogleMaps: 0 --- !u!1 &1840281080 GameObject: m_ObjectHideFlags: 0 @@ -13253,7 +13325,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1861917361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 278.59232, y: 254.74617, z: 0} + m_LocalPosition: {x: 279.74615, y: 241.28462, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1659316461} @@ -14432,7 +14504,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2063773714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 278.59235, y: 254.74155, z: 0} + m_LocalPosition: {x: 279.7462, y: 241.28, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 59370673} @@ -14578,7 +14650,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2078342590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.07500458, y: 273.97116, z: 0} + m_LocalPosition: {x: 0.07500458, y: 260.5096, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2102326051} @@ -15026,7 +15098,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2127403378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 510.5, y: 401.5, z: 0} + m_LocalPosition: {x: 512, y: 384, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: - {fileID: 187655526} @@ -15065,13 +15137,90 @@ MonoBehaviour: - {r: 0.78676474, g: 0.66069084, b: 0.32974696, a: 1} - {r: 0, g: 0.8039216, b: 0.9254902, a: 1} - {r: 1, g: 0.50020283, b: 0.17647058, a: 1} - - {r: 0.9529412, g: 0.1764706, b: 1, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} - {r: 0.9558824, g: 0.21788493, b: 0.21788493, a: 1} - {r: 1, g: 0.5019608, b: 0.1764706, a: 1} - {r: 0.9529412, g: 0.1764706, b: 1, a: 1} - {r: 1, g: 0.77254903, b: 0.1764706, a: 1} - {r: 1, g: 0.77254903, b: 0.1764706, a: 1} - {r: 0.44827604, g: 0, b: 1, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0.7882353, g: 0.65882355, b: 0.32941177, a: 1} + - {r: 0, g: 0.8039216, b: 0.9254902, a: 1} + - {r: 0.9529412, g: 0.1764706, b: 1, a: 1} + - {r: 0, g: 0.8352941, b: 0.3529412, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} + - {r: 1, g: 0.50980395, b: 0.65882355, a: 1} placeColor: {r: 0.5441177, g: 0.5441177, b: 0.5441177, a: 1} selectedDayDateText: - {fileID: 694427860} diff --git a/Assets/Prefabs/Activity.prefab b/Assets/Prefabs/Activity.prefab index ce68a04..91fedd9 100644 --- a/Assets/Prefabs/Activity.prefab +++ b/Assets/Prefabs/Activity.prefab @@ -189,6 +189,10 @@ GameObject: m_Component: - component: {fileID: 224401933494136514} - component: {fileID: 114089621755831614} + - component: {fileID: 114548413512968074} + - component: {fileID: 95411683808064274} + - component: {fileID: 222200096292625734} + - component: {fileID: 114356938199605106} m_Layer: 5 m_Name: Activity m_TagString: Untagged @@ -206,7 +210,6 @@ GameObject: - component: {fileID: 224165227414091912} - component: {fileID: 222006047858654036} - component: {fileID: 114602558850753674} - - component: {fileID: 114159820007300824} m_Layer: 5 m_Name: Place m_TagString: Untagged @@ -214,6 +217,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!95 &95411683808064274 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1589908768377518} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 30614b8c7e6964019be7b0b285a07d13, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!114 &114027156592648574 MonoBehaviour: m_ObjectHideFlags: 1 @@ -292,58 +312,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 7 ---- !u!114 &114159820007300824 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1968563039070408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 114602558850753674} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 114089621755831614} - m_MethodName: ClickOnPlace - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &114277105777075346 MonoBehaviour: m_ObjectHideFlags: 1 @@ -377,6 +345,33 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 'Walk ' +--- !u!114 &114356938199605106 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1589908768377518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114390672355640514 MonoBehaviour: m_ObjectHideFlags: 1 @@ -432,6 +427,58 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Dom +--- !u!114 &114548413512968074 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1589908768377518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.77205884, g: 0.77205884, b: 0.77205884, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1.5 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114444736863936146} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114089621755831614} + m_MethodName: ClickOnPlace + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &114602558850753674 MonoBehaviour: m_ObjectHideFlags: 1 @@ -451,7 +498,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: 83ae38067433b430abc6972a87d2bc65, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -640,6 +687,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1968563039070408} +--- !u!222 &222200096292625734 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1589908768377518} --- !u!222 &222226565537452646 CanvasRenderer: m_ObjectHideFlags: 1 @@ -695,7 +748,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1968563039070408} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -94.8, y: 0, z: 0} + m_LocalPosition: {x: -89.590004, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224265631903753658} @@ -704,8 +757,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8, y: 0} - m_SizeDelta: {x: 37.07, y: 2} + m_AnchoredPosition: {x: 13.21, y: 0} + m_SizeDelta: {x: 26.64, y: -28.31} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224229132856477308 RectTransform: @@ -732,7 +785,7 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1083888107052624} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.535, y: 0, z: 0} + m_LocalPosition: {x: 13.32, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224165227414091912} diff --git a/Assets/Scripts/ActivityUI.cs b/Assets/Scripts/ActivityUI.cs index 1e61b89..af2a22f 100644 --- a/Assets/Scripts/ActivityUI.cs +++ b/Assets/Scripts/ActivityUI.cs @@ -75,7 +75,7 @@ public void Setup(ActivityType? type, double distance, float time, DateTime endT MoveMinText.gameObject.SetActive(false); //if (distance >= 100) // Subheader.text += distance.ToString() + "m"; - if (placeGroup.placeInfo != null) + if (placeGroup != null && placeGroup.placeInfo != null) placeIcon.sprite = placeGroup.IconSprite; } else { place.SetActive(false); @@ -128,7 +128,8 @@ void SetSize(TimeSpan t) { } public void ClickOnPlace() { - RightListUI.instance.NewPlace(placeGroup); + if (placename != null) + RightListUI.instance.NewPlace(placeGroup); } public void DestroyActivity() { diff --git a/Assets/Scripts/Place.cs b/Assets/Scripts/Place.cs index fdf93e7..002ea4b 100644 --- a/Assets/Scripts/Place.cs +++ b/Assets/Scripts/Place.cs @@ -12,7 +12,10 @@ public class Place : MonoBehaviour { public void SetupPlace(MovesJson.SegmentsInfo.PlaceInfo placeInfo) { place = PlacesRanking.instance.FindPlace(placeInfo, this); - text.text = place.placeInfo.name; + if (placeInfo.name == null) + text.text = "???"; + else + text.text = place.placeInfo.name; } void OnMouseDown() { @@ -33,9 +36,10 @@ public void ChangeIconVisible(float zoom) { circle.color = currentColor; } - public void Select() { + public void Select(bool clickedFromActivityUI = false) { if (currentlySelected != this) { - RightListUI.instance.NewPlace(place, true); + if (!clickedFromActivityUI) + RightListUI.instance.NewPlace(place, true); if (currentlySelected != null) currentlySelected.Deselect(); currentlySelected = this; diff --git a/Assets/Scripts/PlacesRanking.cs b/Assets/Scripts/PlacesRanking.cs index 8f63458..d3c5276 100644 --- a/Assets/Scripts/PlacesRanking.cs +++ b/Assets/Scripts/PlacesRanking.cs @@ -26,7 +26,9 @@ void Awake() { public void AnalyseDay(MovesJson day) { foreach (var item in day.segments) { - if (item.place != null && item.place.name != null) { + if (item.place != null) { + if (item.place.name == null) + item.place.name = "???"; AddOrSetupRanking(item.place, day, item); } } diff --git a/Assets/Scripts/ReadJson.cs b/Assets/Scripts/ReadJson.cs index 237b256..a78ec04 100644 --- a/Assets/Scripts/ReadJson.cs +++ b/Assets/Scripts/ReadJson.cs @@ -18,7 +18,84 @@ public enum ActivityType { running, //F32DFF 7 car, //FFC52D 8 underground,//FF802D 9 - airplane //6033EE 10 + airplane, //6033EE 10 + boat, + escalator, + ferry, + funicular, + motorcycle, + sailing, + scooter, + cross_country_skiing, + downhill_skiing, + golfing, + kayaking, + paddling, + paintball, + riding, + roller_skiing, + rollerblading, + rollerskating, + rowing, + skateboarding, + skating, + snowboarding, + snowshoeing, + wheel_chair, + indoor_cycling, + running_on_treadmill, + walking_on_treadmill, + aerobics, + american_football, + badminton, + ballet, + bandy, + baseball, + basketball, + beach_volleyball, + bodypump, + bowling, + boxing, + circuit_training, + cleaning, + climbing, + cricket, + curling, + disc_ultimate, + elliptical_training, + fencing, + floorball, + gym_training, + gymnastics, + handball, + hockey, + kettlebell, + kite_surfing, + lacrosse, + martial_arts, + parkour, + petanque, + pilates, + polo, + racquetball, + rugby, + scuba_diving, + soccer, + spinning, + squash, + stair_climbing, + stretching, + surfing, + swimming, + table_tennis, + tennis, + volleyball, + water_polo, + weight_training, + windsurfing, + wrestling, + yoga, + zumba, } public enum PlaceType { diff --git a/Assets/Scripts/RenderMap.cs b/Assets/Scripts/RenderMap.cs index f1acd29..6e5e3a9 100644 --- a/Assets/Scripts/RenderMap.cs +++ b/Assets/Scripts/RenderMap.cs @@ -13,7 +13,7 @@ public enum FilterTypes { bus, train, plane, - otherTransport + otherTransport, } public class RenderMap : MonoBehaviour { @@ -47,7 +47,10 @@ void Update() { mapScale = 0.0625f; UpdateMapSize(); } else if (Input.mouseScrollDelta.y < 0) { - mapScale *= 1.5f; + mapScale *= 1.5f; + if (mapScale > 64) + mapScale = 127; + Debug.Log(mapScale); UpdateMapSize(); } } @@ -73,15 +76,18 @@ public void RenderDay(MovesJson day) { filterDays.Add(ReadJson.ReturnSimpleDate(day.date), dateGO); foreach (var item in day.segments) { - if (item.place != null && !alreadyRenderedPlaces.Contains(item.place.id) && item.place.name != null) { + if (item.place != null && !alreadyRenderedPlaces.Contains(item.place.id)) { Vector2 position = Conversion.LatLonToMeters(item.place.location.lat, item.place.location.lon); Vector3 finalPos = new Vector3(position.x, position.y, 0); GameObject placeTemp = Instantiate(PlacePrefab, finalPos, transform.rotation); placeTemp.transform.SetParent(loactionsGO.transform); finalPos = placeTemp.transform.position; finalPos.z = -3; - placeTemp.transform.position = finalPos; - placeTemp.name = item.place.name; + placeTemp.transform.position = finalPos; + if (item.place.name == null) + placeTemp.name = "???"; + else + placeTemp.name = item.place.name; placeTemp.GetComponent().SetupPlace(item.place); alreadyRenderedPlaces.Add(item.place.id); } else if (item.place == null) { diff --git a/Assets/Scripts/RightListUI.cs b/Assets/Scripts/RightListUI.cs index 159db5d..c9fbc58 100644 --- a/Assets/Scripts/RightListUI.cs +++ b/Assets/Scripts/RightListUI.cs @@ -54,20 +54,32 @@ public void NewPlace(PlaceGroup place, bool clickedOnMap = false) { wait = false; TopBar.instance.SwitchTab(2); } + Debug.Log("Wait1: " + wait); StopAllCoroutines(); - + Debug.Log("Wait2: " + wait); if (!clickedOnMap) { + Debug.Log("Wait3: " + wait); RenderMap.instance.UpdateMapSize(0.3f); GlobalVariables.inst.MoveCamera(place.mapObject.gameObject.transform.position); - place.mapObject.Select(); + place.mapObject.Select(true); + Debug.Log("Wait4: " + wait); } + Debug.Log("Wait5: " + wait); this.place = place; - StartCoroutine(AfterAnimationChange(wait)); - } - IEnumerator AfterAnimationChange(bool wait = true) { + Debug.Log("Wait6: " + wait); if (wait) - yield return new WaitForSeconds(0.1f); + StartCoroutine(AfterAnimationChange()); + else + TasksAfterWaiting(); + } + IEnumerator AfterAnimationChange() { + yield return new WaitForSeconds(0.1f); + TasksAfterWaiting(); + } + + void TasksAfterWaiting() { + Debug.Log("WOW"); placeName.text = place.placeInfo.name; if (placeIcon != null) placeIcon.sprite = PlacesRanking.instance.categories[place.icon].smallIcon; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 77de55e..cd82316 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -607,12 +607,13 @@ PlayerSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: {} + cloudServicesEnabled: + UNet: 1 facebookSdkVersion: 7.9.4 apiCompatibilityLevel: 3 - cloudProjectId: - projectName: - organizationId: + cloudProjectId: d2981cf3-3c96-41ad-bac0-10ee5e0d52ea + projectName: MapMoves + organizationId: maciej-maj cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 3da14d5..1e57113 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -17,9 +17,9 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: - m_Enabled: 0 + m_Enabled: 1 m_InitializeOnStartup: 1 - m_TestMode: 0 + m_TestMode: 1 m_TestEventUrl: m_TestConfigUrl: UnityAdsSettings: