diff --git a/Assets/Resources/Images/Devices/Cadence_4.png b/Assets/Resources/Images/Devices/Cadence_4.png new file mode 100644 index 00000000..3d486353 Binary files /dev/null and b/Assets/Resources/Images/Devices/Cadence_4.png differ diff --git a/Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta b/Assets/Resources/Images/Devices/Cadence_4.png.meta similarity index 98% rename from Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta rename to Assets/Resources/Images/Devices/Cadence_4.png.meta index 357d1b5a..684a130b 100644 --- a/Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta +++ b/Assets/Resources/Images/Devices/Cadence_4.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f801cf1a87a735b49890bdb5ab4022d6 +guid: 2182cc9d3f0c66341a3a6a02263cc70d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Images/Device Connect_BG.png b/Assets/Resources/Images/Devices/Device Connect_BG.png similarity index 100% rename from Assets/Resources/Images/Device Connect_BG.png rename to Assets/Resources/Images/Devices/Device Connect_BG.png diff --git a/Assets/Resources/Images/Device Connect_BG.png.meta b/Assets/Resources/Images/Devices/Device Connect_BG.png.meta similarity index 100% rename from Assets/Resources/Images/Device Connect_BG.png.meta rename to Assets/Resources/Images/Devices/Device Connect_BG.png.meta diff --git a/Assets/Resources/Images/Devices/Heart Rate_4.png b/Assets/Resources/Images/Devices/Heart Rate_4.png new file mode 100644 index 00000000..34f3d54b Binary files /dev/null and b/Assets/Resources/Images/Devices/Heart Rate_4.png differ diff --git a/Assets/Resources/Images/Devices/Heart Rate_4.png.meta b/Assets/Resources/Images/Devices/Heart Rate_4.png.meta new file mode 100644 index 00000000..6cb6e94b --- /dev/null +++ b/Assets/Resources/Images/Devices/Heart Rate_4.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 04b20b7b05bfe2e4c8dd315d5f9cd781 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + applyGammaDecoding: 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 + 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/Resources/Images/Devices/Power_4.png b/Assets/Resources/Images/Devices/Power_4.png new file mode 100644 index 00000000..c7ac239c Binary files /dev/null and b/Assets/Resources/Images/Devices/Power_4.png differ diff --git a/Assets/Resources/Images/Devices/Power_4.png.meta b/Assets/Resources/Images/Devices/Power_4.png.meta new file mode 100644 index 00000000..9a0d19c2 --- /dev/null +++ b/Assets/Resources/Images/Devices/Power_4.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: fc3a6cb76a852784da3ecd94e7cc32b5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + applyGammaDecoding: 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 + 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/Resources/Images/Smart Trainer Connect _BG.png b/Assets/Resources/Images/Devices/Smart Trainer Connect _BG.png similarity index 100% rename from Assets/Resources/Images/Smart Trainer Connect _BG.png rename to Assets/Resources/Images/Devices/Smart Trainer Connect _BG.png diff --git a/Assets/Resources/Images/Smart Trainer Connect _BG.png.meta b/Assets/Resources/Images/Devices/Smart Trainer Connect _BG.png.meta similarity index 100% rename from Assets/Resources/Images/Smart Trainer Connect _BG.png.meta rename to Assets/Resources/Images/Devices/Smart Trainer Connect _BG.png.meta diff --git a/Assets/Resources/Images/Devices/Speed_4.png b/Assets/Resources/Images/Devices/Speed_4.png new file mode 100644 index 00000000..c75864e1 Binary files /dev/null and b/Assets/Resources/Images/Devices/Speed_4.png differ diff --git a/Assets/Resources/Images/Devices/Speed_4.png.meta b/Assets/Resources/Images/Devices/Speed_4.png.meta new file mode 100644 index 00000000..d043c9a5 --- /dev/null +++ b/Assets/Resources/Images/Devices/Speed_4.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 5415da980b5baed49bba373b5582dda4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + applyGammaDecoding: 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 + 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/Resources/Images/Devices/Trainer_4.png b/Assets/Resources/Images/Devices/Trainer_4.png new file mode 100644 index 00000000..c4ef7d55 Binary files /dev/null and b/Assets/Resources/Images/Devices/Trainer_4.png differ diff --git a/Assets/Resources/Images/Devices/Trainer_4.png.meta b/Assets/Resources/Images/Devices/Trainer_4.png.meta new file mode 100644 index 00000000..4d033a78 --- /dev/null +++ b/Assets/Resources/Images/Devices/Trainer_4.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 87da3a8c745e5cd4c911df4478a15371 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + applyGammaDecoding: 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 + 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/Resources/Images/Smart Trainer Connectd _BG.png b/Assets/Resources/Images/Smart Trainer Connectd _BG.png deleted file mode 100644 index 9f02187d..00000000 Binary files a/Assets/Resources/Images/Smart Trainer Connectd _BG.png and /dev/null differ diff --git a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab index 7b852fa0..4d0736b4 100644 --- a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab +++ b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab @@ -1209,7 +1209,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: 290.3, y: 150.2} + m_AnchoredPosition: {x: 290.3, y: 165.19} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6682538152067005844 @@ -1367,6 +1367,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8260988677505792498} m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.x @@ -1487,6 +1492,26 @@ PrefabInstance: propertyPath: m_Text value: CLOSE objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} --- !u!224 &4486570865570418447 stripped @@ -1502,6 +1527,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8260988677505792498} m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.x @@ -1622,6 +1652,26 @@ PrefabInstance: propertyPath: m_Text value: CONNECT objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: mType diff --git a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab index 7c0e2ff9..deb8ddcd 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab @@ -188,7 +188,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 50, y: -12} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 220, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &7318458415531256946 CanvasRenderer: diff --git a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab index 4e982eb8..87e28ccf 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4634260803276928508} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -108,7 +108,7 @@ RectTransform: - {fileID: 9180225337925263917} - {fileID: 148432596127633060} m_Father: {fileID: 4634260803276928508} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -130,14 +130,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3007755211628186793} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} m_Name: m_EditorClassIdentifier: m_Direction: 2 - m_Color1: {r: 1, g: 1, b: 1, a: 1} - m_Color2: {r: 1, g: 1, b: 1, a: 1} + m_Color1: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_Color2: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} m_Color3: {r: 1, g: 1, b: 1, a: 1} m_Color4: {r: 1, g: 1, b: 1, a: 1} m_Rotation: -45 @@ -153,6 +153,81 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3007755211628186793} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3751370570215337982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6519277372510991419} + - component: {fileID: 349298079394877050} + - component: {fileID: 3775514372275276618} + - component: {fileID: 3644398141814426171} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6519277372510991419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3751370570215337982} + 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: 4634260803276928508} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &349298079394877050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3751370570215337982} + m_CullTransparentMesh: 0 +--- !u!114 &3775514372275276618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3751370570215337982} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -175,6 +250,29 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3644398141814426171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3751370570215337982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 2 + m_Color1: {r: 1, g: 1, b: 1, a: 1} + m_Color2: {r: 1, g: 1, b: 1, a: 1} + m_Color3: {r: 1, g: 1, b: 1, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: -45 + m_Offset1: 0.06 + m_Offset2: 0 + m_GradientStyle: 0 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 --- !u!1 &5772803864504489695 GameObject: m_ObjectHideFlags: 0 @@ -205,7 +303,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4634260803276928508} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -284,6 +382,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6519277372510991419} - {fileID: 7798478013840739828} - {fileID: 5089620964070337009} - {fileID: 2369684988162489271} @@ -312,13 +411,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6268110712645026277} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -354,7 +453,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6268110712645026277} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} m_Name: @@ -400,7 +499,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4634260803276928508} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -506,7 +605,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -559,9 +658,9 @@ RectTransform: m_Children: - {fileID: 7546860446366912190} - {fileID: 3430727207188717179} - - {fileID: 4114774581960948430} + - {fileID: 3676947790931884127} m_Father: {fileID: 4634260803276928508} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -583,7 +682,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8089520134167711217} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -612,7 +711,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8089520134167711217} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} m_Name: @@ -698,7 +797,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -796,161 +895,165 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Searching... ---- !u!1001 &6025721485945698204 +--- !u!1001 &1782903961702437631 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7798478013840739828} m_Modifications: - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} - propertyPath: m_Text - value: CHANGE - objectReference: {fileID: 0} - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, - type: 3} - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_FontData.m_FontStyle + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.b - value: 0.44313726 - objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.g - value: 0.105882354 - objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.r - value: 0.89411765 - objectReference: {fileID: 0} - - target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Name - value: DisconnectBtn - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x value: -60 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.y value: -273 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x value: 30 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y value: -243 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: DisconnectBtn + objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Text + value: CHANGE + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} ---- !u!224 &4114774581960948430 stripped + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &3676947790931884127 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} - m_PrefabInstance: {fileID: 6025721485945698204} + m_PrefabInstance: {fileID: 1782903961702437631} m_PrefabAsset: {fileID: 0} --- !u!1001 &7280673541190099480 PrefabInstance: diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index 4f7aa3e1..ace207c4 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -980,12 +980,12 @@ MonoBehaviour: _initializeOnStart: 1 _imagery: _layerProperty: - sourceType: 2 + sourceType: 6 sourceOptions: isActive: 1 layerSource: Name: Dark - Id: mapbox://styles/mapbox/dark-v9 + Id: mapbox://styles/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs Modified: UserName: rasterOptions: diff --git a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab index 632d34cd..19106e44 100644 --- a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6430829710355291381} + - {fileID: 6433345661206930646} m_Father: {fileID: 4032660314221060952} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -538,6 +539,84 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &5016888644382238916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8514492127894923416} + - component: {fileID: 4585468493436783220} + - component: {fileID: 8283118426691692348} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8514492127894923416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5016888644382238916} + 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: 6433345661206930646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4585468493436783220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5016888644382238916} + m_CullTransparentMesh: 0 +--- !u!114 &8283118426691692348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5016888644382238916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ANT+ Connected --- !u!1 &5023905775086954472 GameObject: m_ObjectHideFlags: 0 @@ -568,7 +647,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7083947446564401048} + - {fileID: 9025162244713455666} m_Father: {fileID: 2802884444860417888} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -604,7 +683,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f801cf1a87a735b49890bdb5ab4022d6, type: 3} + m_Sprite: {fileID: 21300000, guid: bb78a6427b2dd2e468f35d12d18c3945, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -626,6 +705,94 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &5440549946619805752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6433345661206930646} + - component: {fileID: 3527654833021650121} + - component: {fileID: 6086896978797584917} + - component: {fileID: 7540254063473169582} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6433345661206930646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5440549946619805752} + 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: 8514492127894923416} + m_Father: {fileID: 2716191576886074694} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 134, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3527654833021650121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5440549946619805752} + m_CullTransparentMesh: 0 +--- !u!114 &6086896978797584917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5440549946619805752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!225 &7540254063473169582 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5440549946619805752} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &5941259351214417460 GameObject: m_ObjectHideFlags: 0 @@ -1164,162 +1331,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 564608893206712879} m_PrefabAsset: {fileID: 0} ---- !u!1001 &633328326876619466 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4987533108072491894} - m_Modifications: - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Text - value: CHANGE - objectReference: {fileID: 0} - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, - type: 3} - - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_FontData.m_FontStyle - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.b - value: 0.44313726 - objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.g - value: 0.105882354 - objectReference: {fileID: 0} - - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Color.r - value: 0.89411765 - objectReference: {fileID: 0} - - target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Name - value: DisconnectBtn - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_SizeDelta.y - value: 38 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -146 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} ---- !u!224 &7083947446564401048 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7675598771499945298, guid: f9b4f89e2e3738c459fe1a4f852d6774, - type: 3} - m_PrefabInstance: {fileID: 633328326876619466} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2047724928461123620 PrefabInstance: m_ObjectHideFlags: 0 @@ -1327,6 +1338,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4032660314221060952} m_Modifications: + - target: {fileID: 2246549722614324344, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4634260803276928508, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: m_Pivot.x @@ -1432,6 +1448,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6268110712645026277, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: m_Name @@ -1452,6 +1488,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4032660314221060952} m_Modifications: + - target: {fileID: 2246549722614324344, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2947521786256289149, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: mType @@ -1562,6 +1603,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6268110712645026277, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: m_Name @@ -1582,6 +1643,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4032660314221060952} m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Type @@ -1733,6 +1799,26 @@ PrefabInstance: propertyPath: m_Colors.m_HighlightedColor.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: mType @@ -1746,6 +1832,166 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2186264729535284436} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6234899443928681106 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4987533108072491894} + m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -146 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: DisconnectBtn + objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Text + value: CHANGE + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &9025162244713455666 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 6234899443928681106} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7779191180664939548 PrefabInstance: m_ObjectHideFlags: 0 @@ -1753,6 +1999,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4032660314221060952} m_Modifications: + - target: {fileID: 2246549722614324344, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2947521786256289149, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: mType @@ -1863,6 +2114,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6268110712645026277, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: m_Name @@ -2039,6 +2310,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4032660314221060952} m_Modifications: + - target: {fileID: 2246549722614324344, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2947521786256289149, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: mType @@ -2149,6 +2425,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5857877235721508160, guid: 95d5b69c6ebb5f34bb864b2c0756d442, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6268110712645026277, guid: 95d5b69c6ebb5f34bb864b2c0756d442, type: 3} propertyPath: m_Name diff --git a/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab b/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab index 928d65a1..b9540106 100644 --- a/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab @@ -115,6 +115,36 @@ RectTransform: m_AnchoredPosition: {x: 20, y: -180} m_SizeDelta: {x: -40, y: 30} m_Pivot: {x: 0, y: 1} +--- !u!1 &649392898321414508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3618218501706026522} + m_Layer: 0 + m_Name: Frontiers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3618218501706026522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649392898321414508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} + m_Children: [] + m_Father: {fileID: 4208825652373016533} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1014057559378321659 GameObject: m_ObjectHideFlags: 0 @@ -230,7 +260,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Recommended Routes ---- !u!1 &1443207584849820019 +--- !u!1 &1358934727900484167 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,45 +268,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 225548298086912594} - - component: {fileID: 5038974846372488643} - - component: {fileID: 6914995114586000965} + - component: {fileID: 7405959183363362764} + - component: {fileID: 4918816525929522740} + - component: {fileID: 7189762764679154879} m_Layer: 0 - m_Name: Vertical + m_Name: Horizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &225548298086912594 +--- !u!4 &7405959183363362764 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1443207584849820019} + m_GameObject: {fileID: 1358934727900484167} 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: 4443610222176026466} - m_RootOrder: 0 + m_Father: {fileID: 9219022226803143192} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5038974846372488643 +--- !u!33 &4918816525929522740 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1443207584849820019} + m_GameObject: {fileID: 1358934727900484167} m_Mesh: {fileID: 0} ---- !u!23 &6914995114586000965 +--- !u!23 &7189762764679154879 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1443207584849820019} + m_GameObject: {fileID: 1358934727900484167} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -491,49 +521,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &2556038877156890949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7879760243438751217} - - component: {fileID: 3749913352446277094} - m_Layer: 0 - m_Name: Mount Points - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7879760243438751217 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2556038877156890949} - 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: 4208825652373016533} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3749913352446277094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2556038877156890949} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b06c5ef98471a4a0896b496f3a3c06c9, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2834785108472360228 GameObject: m_ObjectHideFlags: 0 @@ -690,6 +677,92 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 000 +--- !u!1 &3391716410617243932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8808863962045984909} + - component: {fileID: 373192956914035828} + m_Layer: 0 + m_Name: Mount Points + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8808863962045984909 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391716410617243932} + 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: 4208825652373016533} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &373192956914035828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391716410617243932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b06c5ef98471a4a0896b496f3a3c06c9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3505746003295315595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7956285964528925671} + - component: {fileID: 3514612905896676540} + m_Layer: 0 + m_Name: Cities + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7956285964528925671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3505746003295315595} + 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: 4208825652373016533} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3514612905896676540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3505746003295315595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0be62bb3cbdf24291b0b2eff022c95bf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3656926796813646425 GameObject: m_ObjectHideFlags: 0 @@ -1170,12 +1243,12 @@ Transform: - {fileID: 4208825652201158175} - {fileID: 4208825652215443232} - {fileID: 4208825652348703869} - - {fileID: 3180118263788884690} - - {fileID: 9108621511401588444} - - {fileID: 7879760243438751217} - - {fileID: 4443610222176026466} - - {fileID: 7832668512013505937} - - {fileID: 4290446962742936193} + - {fileID: 3618218501706026522} + - {fileID: 7956285964528925671} + - {fileID: 8808863962045984909} + - {fileID: 9219022226803143192} + - {fileID: 5576649157226118203} + - {fileID: 8660488608163060961} - {fileID: 300954412051337823} m_Father: {fileID: 4208825652095249312} m_RootOrder: 0 @@ -3889,9 +3962,9 @@ MonoBehaviour: _enableCountryHighlight: 1 _highlightAllCountryRegions: 0 _countryHighlightMaxScreenAreaSize: 1 - _showFrontiers: 1 + _showFrontiers: 0 _showCoastalFrontiers: 1 - _fillColor: {r: 0.9843137, g: 0.27450982, b: 0.52156866, a: 0.7} + _fillColor: {r: 0.14117648, g: 0.14117648, b: 0.21960784, a: 1} _frontiersColor: {r: 0.9646866, g: 0.06124607, b: 0.23455065, a: 1} _showOutline: 1 _showProvinceCountryOutline: 0 @@ -3913,7 +3986,7 @@ MonoBehaviour: _labelsElevation: 0 _showLabelsShadow: 1 _countryLabelsColor: {r: 1, g: 1, b: 1, a: 1} - _countryLabelsShadowColor: {r: 0, g: 0, b: 0, a: 1} + _countryLabelsShadowColor: {r: 0.14117648, g: 0.14117648, b: 0.21960784, a: 1} _countryLabelsShadowOffset: 1 _countryLabelsFont: {fileID: 0} _labelsFaceToCamera: 0 @@ -3988,7 +4061,7 @@ MonoBehaviour: _rightClickRotatingClockwise: 0 _respectOtherUI: 1 _allowUserZoom: 1 - _zoomMaxDistance: 10 + _zoomMaxDistance: 2 _zoomMinDistance: 0 _zoomMode: 1 _invertZoomDirection: 1 @@ -4038,9 +4111,9 @@ MonoBehaviour: _pathFindingSearchMaxCost: 2000 _enableProvinceHighlight: 1 _provinceHighlightMaxScreenAreaSize: 1 - _showProvinces: 0 + _showProvinces: 1 _drawAllProvinces: 0 - _provincesFillColor: {r: 0, g: 0, b: 1, a: 0.7} + _provincesFillColor: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} _provincesColor: {r: 1, g: 1, b: 1, a: 1} _enableProvinceEnclaves: 0 _tileDownloadTimeout: 10 @@ -4110,9 +4183,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7592490534108398853} - {fileID: 8814413454309935799} - {fileID: 2956680531251441759} - - {fileID: 7592490534108398853} - {fileID: 7258651371060959300} m_Father: {fileID: 4208825651943795011} m_RootOrder: 0 @@ -4312,7 +4385,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &4704490989976526937 +--- !u!1 &4977661515930245677 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4320,41 +4393,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9108621511401588444} - - component: {fileID: 4646191247188584300} + - component: {fileID: 6841631030391482904} + - component: {fileID: 1589931757912691871} + - component: {fileID: 4834778471757378038} m_Layer: 0 - m_Name: Cities + m_Name: Vertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9108621511401588444 +--- !u!4 &6841631030391482904 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4704490989976526937} + m_GameObject: {fileID: 4977661515930245677} 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: 4208825652373016533} - m_RootOrder: 4 + m_Father: {fileID: 9219022226803143192} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4646191247188584300 -MonoBehaviour: +--- !u!33 &1589931757912691871 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4704490989976526937} + m_GameObject: {fileID: 4977661515930245677} + m_Mesh: {fileID: 0} +--- !u!23 &4834778471757378038 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4977661515930245677} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0be62bb3cbdf24291b0b2eff022c95bf, type: 3} - m_Name: - m_EditorClassIdentifier: + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &5074804616082347886 GameObject: m_ObjectHideFlags: 0 @@ -4426,38 +4535,6 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1 &5093537329309874711 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4443610222176026466} - m_Layer: 0 - m_Name: Cursor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4443610222176026466 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5093537329309874711} - 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: 225548298086912594} - - {fileID: 2743959422175376879} - m_Father: {fileID: 4208825652373016533} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5243057192309193606 GameObject: m_ObjectHideFlags: 0 @@ -4536,85 +4613,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 000 ---- !u!1 &5866223628788507548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2743959422175376879} - - component: {fileID: 8445217147270545593} - - component: {fileID: 3462043826977954663} - m_Layer: 0 - m_Name: Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2743959422175376879 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866223628788507548} - 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: 4443610222176026466} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8445217147270545593 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866223628788507548} - m_Mesh: {fileID: 0} ---- !u!23 &3462043826977954663 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866223628788507548} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 --- !u!1 &5919200257070549327 GameObject: m_ObjectHideFlags: 0 @@ -4632,7 +4630,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2956680531251441759 RectTransform: m_ObjectHideFlags: 0 @@ -4647,7 +4645,7 @@ RectTransform: - {fileID: 1544009924689008171} - {fileID: 7941556003264812763} m_Father: {fileID: 4208825652493915609} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4858,7 +4856,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &6675243773001195269 +--- !u!1 &6723504054334293420 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4866,77 +4864,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4290446962742936193} - - component: {fileID: 2360679078927603191} - - component: {fileID: 441289779692071615} + - component: {fileID: 9219022226803143192} m_Layer: 0 - m_Name: LongitudeLines + m_Name: Cursor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &4290446962742936193 +--- !u!4 &9219022226803143192 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675243773001195269} + m_GameObject: {fileID: 6723504054334293420} 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_Children: + - {fileID: 6841631030391482904} + - {fileID: 7405959183363362764} m_Father: {fileID: 4208825652373016533} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2360679078927603191 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675243773001195269} - m_Mesh: {fileID: 0} ---- !u!23 &441289779692071615 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675243773001195269} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 --- !u!1 &7212495366841866540 GameObject: m_ObjectHideFlags: 0 @@ -5015,6 +4966,164 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Total Riders +--- !u!1 &7294364107050887959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5576649157226118203} + - component: {fileID: 483017442707009052} + - component: {fileID: 8696506439077255630} + m_Layer: 0 + m_Name: LatitudeLines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5576649157226118203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294364107050887959} + 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: 4208825652373016533} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &483017442707009052 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294364107050887959} + m_Mesh: {fileID: 0} +--- !u!23 &8696506439077255630 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294364107050887959} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &7360058777542656544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8660488608163060961} + - component: {fileID: 4174989503353971657} + - component: {fileID: 3010657973676759029} + m_Layer: 0 + m_Name: LongitudeLines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8660488608163060961 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7360058777542656544} + 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: 4208825652373016533} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4174989503353971657 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7360058777542656544} + m_Mesh: {fileID: 0} +--- !u!23 &3010657973676759029 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7360058777542656544} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &7789944021923734042 GameObject: m_ObjectHideFlags: 0 @@ -5026,6 +5135,7 @@ GameObject: - component: {fileID: 8814413454309935799} - component: {fileID: 5240844599554286234} - component: {fileID: 429655744057919332} + - component: {fileID: 7541499284788348115} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -5050,7 +5160,7 @@ RectTransform: - {fileID: 8769387429708312568} - {fileID: 212748707908199544} m_Father: {fileID: 4208825652493915609} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5094,115 +5204,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8511505404461149205 -GameObject: +--- !u!225 &7541499284788348115 +CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3180118263788884690} - m_Layer: 0 - m_Name: Frontiers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3180118263788884690 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8511505404461149205} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} - m_Children: [] - m_Father: {fileID: 4208825652373016533} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8720385788331787197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7832668512013505937} - - component: {fileID: 8962999900674683057} - - component: {fileID: 288559279243077998} - m_Layer: 0 - m_Name: LatitudeLines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7832668512013505937 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8720385788331787197} - 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: 4208825652373016533} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8962999900674683057 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8720385788331787197} - m_Mesh: {fileID: 0} ---- !u!23 &288559279243077998 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8720385788331787197} + m_GameObject: {fileID: 7789944021923734042} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &9116095847844501617 GameObject: m_ObjectHideFlags: 0 @@ -5401,7 +5414,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5431,7 +5444,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_SizeDelta.y - value: 64 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5548,11 +5561,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 242a81ed..325ae9e6 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -278,7 +278,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!224 &273807004 RectTransform: @@ -352,9 +352,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 953f0e846565c4086a4bcdc6bc14cf85, type: 3} m_Name: m_EditorClassIdentifier: - m_NowVersion: 2.0.1-20210226 - m_NewVersion: - m_ChartList: [] --- !u!4 &584235027 Transform: m_ObjectHideFlags: 0 @@ -486,7 +483,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -513,8 +510,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 728460487} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 200, z: 0} + m_LocalRotation: {x: 0.70533687, y: 0, z: 0, w: 0.7088723} + m_LocalPosition: {x: 0, y: 1.193485, z: 0.9940326} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -644,7 +641,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!108 &873388894 Light: m_ObjectHideFlags: 0 @@ -652,7 +649,7 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873388893} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 10 m_Type: 1 m_Shape: 0 diff --git a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs index 010d119a..520f8c7f 100644 --- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs +++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs @@ -20,7 +20,7 @@ public class ConnectDeviceModal : PFUIPanel } set { - Debug.Log(value); + //Debug.Log(value); mSensorType = value; var deviceInfoStr = Utils.deviceDict[value.ToString()]; if (deviceInfoStr != null) @@ -66,8 +66,8 @@ public class ConnectDeviceModal : PFUIPanel UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(e => { - //this.gameObject.SetActive(false); this.Close(); + //DestroyImmediate(this.gameObject); })); deviceItem = Resources.Load("UI/Prefab/Device/DeviceItem"); @@ -156,6 +156,7 @@ public class ConnectDeviceModal : PFUIPanel var gameObject = (GameObject)Instantiate(deviceItem); gameObject.transform.SetParent(content.transform); + gameObject.transform.localScale = new Vector3(1, 1, 1); var deviceItemObj = gameObject.GetComponent(); deviceItemObj.DeviceInfo = device; @@ -200,13 +201,17 @@ public class ConnectDeviceModal : PFUIPanel public override void Close() { base.Close(); - DestroyImmediate(this.gameObject); + //DestroyImmediate(this.gameObject); + Destroy(this.gameObject); } float time = 0; float _x = 0; float _y = 0; + /// + /// 做search动画 + /// void Move() { var hudu = (2 * Mathf.PI / 360) * 1 * time; diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs index 57760116..268519d9 100644 --- a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs +++ b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs @@ -70,18 +70,19 @@ public class DeviceView : MonoBehaviour var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); var rect = ((RectTransform)transform).rect; material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.2f, 0)); - //this.GetComponent().material = material; + this.GetComponent().material = material; + var img1 = unconnectionPanel.GetComponent(); if(img1 != null) { img1.material = material; - var gradient = unconnectionPanel.GetComponent(); - if (gradient != null) - { - gradient.color1 = Utils.HexToColor("353543"); - gradient.color2 = Utils.HexToColor("23232D"); - } + //var gradient = unconnectionPanel.GetComponent(); + //if (gradient != null) + //{ + // gradient.color1 = Utils.HexToColor("353543"); + // gradient.color2 = Utils.HexToColor("23232D"); + //} } var img2 = connectionPanel.GetComponent(); @@ -89,12 +90,12 @@ public class DeviceView : MonoBehaviour { img2.material = material; - var gradient1 = connectionPanel.GetComponent(); - if (gradient1 != null) - { - gradient1.color1 = Utils.HexToColor("FF7485"); - gradient1.color2 = Utils.HexToColor("F93086"); - } + //var gradient1 = connectionPanel.GetComponent(); + //if (gradient1 != null) + //{ + // gradient1.color1 = Utils.HexToColor("FF7485"); + // gradient1.color2 = Utils.HexToColor("F93086"); + //} } logo = this.transform.Find("Logo").GetComponent(); @@ -151,7 +152,7 @@ public class DeviceView : MonoBehaviour { sprite0 = Resources.Load("Images/Devices/Power_0"); sprite1 = Resources.Load("Images/Devices/Power_1"); - sprite3 = Resources.Load("Images/Devices/Power_3"); + sprite3 = Resources.Load("Images/Devices/Power_4"); powerUnit.text = "W"; } @@ -159,7 +160,7 @@ public class DeviceView : MonoBehaviour { sprite0 = Resources.Load("Images/Devices/Speed_0"); sprite1 = Resources.Load("Images/Devices/Speed_1"); - sprite3 = Resources.Load("Images/Devices/Speed_3"); + sprite3 = Resources.Load("Images/Devices/Speed_4"); powerUnit.text = "KPH"; } @@ -167,7 +168,7 @@ public class DeviceView : MonoBehaviour { sprite0 = Resources.Load("Images/Devices/Cadence_0"); sprite1 = Resources.Load("Images/Devices/Cadence_1"); - sprite3 = Resources.Load("Images/Devices/Cadence_3"); + sprite3 = Resources.Load("Images/Devices/Cadence_4"); powerUnit.text = "RPM"; } @@ -175,7 +176,7 @@ public class DeviceView : MonoBehaviour { sprite0 = Resources.Load("Images/Devices/Heart Rate_0"); sprite1 = Resources.Load("Images/Devices/Heart Rate_1"); - sprite3 = Resources.Load("Images/Devices/Heart Rate_3"); + sprite3 = Resources.Load("Images/Devices/Heart Rate_4"); powerUnit.text = "BPM"; } @@ -183,7 +184,7 @@ public class DeviceView : MonoBehaviour { sprite0 = Resources.Load("Images/Devices/Trainer_0"); sprite1 = Resources.Load("Images/Devices/Trainer_1"); - sprite3 = Resources.Load("Images/Devices/Trainer_3"); + sprite3 = Resources.Load("Images/Devices/Trainer_4"); } } @@ -255,7 +256,11 @@ public class DeviceView : MonoBehaviour var connectionCanvasGroup = connectionPanel.GetComponent(); connectionCanvasGroup.alpha = 0; connectionPanel.SetActive(true); - connectionCanvasGroup.DOFade(1f, .3f); + connectionCanvasGroup.DOFade(1f, .3f).OnComplete(()=> { + //if (logoSprite != null) { + // logo.sprite = logoSprite; + //} + }); } logo.sprite = sprite3; diff --git a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs index e2761dae..0cd3e1c4 100644 --- a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs @@ -19,6 +19,8 @@ public class DeviceController : PFUIPanel private Sprite circuloCarga; private Sprite circuloCompleto; RectTransform circulo; + private GameObject statusText; + private bool _available = false; private bool Available { @@ -37,6 +39,8 @@ public class DeviceController : PFUIPanel //circulo.gameObject.SetActive(false); DOTween.Kill(circulo, false); circulo.GetComponent().sprite = circuloCompleto; + + ShowStatusText("ANT+ Connected"); } else { @@ -44,6 +48,8 @@ public class DeviceController : PFUIPanel //circulo.gameObject.SetActive(true); circulo.GetComponent().sprite = circuloCarga; circulo.DOLocalRotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360).SetEase(Ease.Linear).SetLoops(-1); + + ShowStatusText("ANT+ Disconnect"); } } } @@ -80,6 +86,10 @@ public class DeviceController : PFUIPanel var bg = this.transform.Find("Status").Find("Bg"); antStatus = bg.Find("Ant+").GetComponent(); + statusText = this.transform.Find("Status").Find("GameObject").gameObject; + statusText.SetActive(false); + + circulo = bg.Find("Image").GetComponent(); //circulo.DORotate(new Vector3(0, 0, 360), 1.5f, RotateMode.Fast).SetLoops(-1); circulo.DOLocalRotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360).SetEase(Ease.Linear).SetLoops(-1); @@ -126,4 +136,14 @@ public class DeviceController : PFUIPanel { } + + private void ShowStatusText(string text) + { + statusText.transform.Find("Text").GetComponent().text = text; + statusText.GetComponent().alpha = 0; + statusText.SetActive(true); + statusText.GetComponent().DOFade(1f, 0.1f).OnComplete(()=> { + statusText.GetComponent().DOFade(0f, 0.3f).SetDelay(3f); + }); + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs index 705bc734..7ca0c4e7 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs @@ -19,14 +19,15 @@ public class EarthController : PFUIPanel private Text CountText; private Text OfficialText; private Text RiderText; - private GameObject hotPanel; - private GameObject content; - private Object itemObject; + //private GameObject hotPanel; + //private GameObject content; + //private Object itemObject; Transform rootPanel; Canvas canvas; float time = 0f; bool showSummary = false; Vector2 latlonCenter; + private GameObject panel; protected override void Awake() { base.Awake(); @@ -40,40 +41,41 @@ public class EarthController : PFUIPanel map = WorldMapGlobe.instance; map.showProvinces = true; map.showCities = true; - map.autoRotationSpeed = 0f; + //map.autoRotationSpeed = 0f; //map.autoRotationSpeed = 0.1f; //Camera.main.fieldOfView = 180; - map.SetZoomLevel(1.4f); //map.allowUserZoom = false; map.showLatitudeLines = false; map.showLongitudeLines = false; map.showCursor = false; + } // Start is called before the first frame update protected override void Start() { - itemObject = Resources.Load("UI/Prefab/BigMap/Item"); + //itemObject = Resources.Load("UI/Prefab/BigMap/Item"); - var panel = rootPanel.Find("Panel"); + panel = rootPanel.Find("Panel").gameObject; + SetRounded(panel.transform, 60); + panel.gameObject.SetActive(false); - SetRounded(panel, 60); - - hotPanel = rootPanel.Find("HotPanel").gameObject; - SetRounded(hotPanel.transform, 60); maskImage = rootPanel.Find("MaskImage").GetComponent(); - Country = panel.Find("Country").GetComponent(); - Province = panel.Find("Province").GetComponent(); - CountText = panel.Find("CountPanel").Find("Count").GetComponent(); - OfficialText = panel.Find("OfficialPanel").Find("Count").GetComponent(); - RiderText = panel.Find("RiderPanel").Find("Count").GetComponent(); + Country = panel.transform.Find("Country").GetComponent(); + Province = panel.transform.Find("Province").GetComponent(); + CountText = panel.transform.Find("CountPanel").Find("Count").GetComponent(); + OfficialText = panel.transform.Find("OfficialPanel").Find("Count").GetComponent(); + RiderText = panel.transform.Find("RiderPanel").Find("Count").GetComponent(); - content = hotPanel.transform.Find("Scroll View").Find("Viewport").Find("Content").gameObject; - //map.SetZoomLevel(10); + //hotPanel = rootPanel.Find("HotPanel").gameObject; + //SetRounded(hotPanel.transform, 60); + //content = hotPanel.transform.Find("Scroll View").Find("Viewport").Find("Content").gameObject; + + //var mainCanvas = GameObject.Find("Canvas"); //mainCanvas.gameObject.SetActive(false); @@ -82,10 +84,10 @@ public class EarthController : PFUIPanel Camera.main.transform.position = new Vector3(0, 0); Camera.main.transform.rotation = Quaternion.Euler(0, 0, 0); - - - var zoom = map.GetZoomLevel(); + map.SetZoomLevel(1.43f); + //var zoom = map.GetZoomLevel(); + //Debug.Log(zoom); map.OnZoomStart += Map_OnZoomStart; map.OnZoomEnd += Map_OnZoomEnd; @@ -93,6 +95,7 @@ public class EarthController : PFUIPanel map.OnCountryEnter += (int countryIndex, int regionIndex) => { + map.autoRotationSpeed = 0f; var country = map.countries[countryIndex]; if (country.name.ToLower().Contains("taiwan")) { @@ -144,6 +147,13 @@ public class EarthController : PFUIPanel /// private async void ShowSummary(Vector2 latlonCenter) { + if(panel.activeInHierarchy == false) + { + panel.SetActive(true); + panel.GetComponent().alpha = 0; + panel.GetComponent().DOFade(1f, 0.1f); + } + var result = await mapApi.GetEarthData(latlonCenter.x, latlonCenter.y); if (result.result == false) { @@ -155,29 +165,26 @@ public class EarthController : PFUIPanel OfficialText.text = obj.Value("officialCount"); RiderText.text = obj.Value("riderCount"); - //for (int i = 0; i < content.transform.childCount; i++) + + //foreach (Transform item in content.transform) //{ - // DestroyImmediate(content.transform.GetChild(i)); - //} - foreach (Transform item in content.transform) - { - GameObject.Destroy(item.gameObject); - } + // GameObject.Destroy(item.gameObject); + //} - var list = JArray.FromObject(obj["list"]); - foreach (var item in list) - { - var itemObject1 = (GameObject)Instantiate(itemObject, content.transform, false); - var iii = itemObject1.GetComponent(); - iii.SetModel(new Assets.Scripts.Apis.Models.NearRouteModel - { - Id = item.Value("Id"), - Name = item.Value("Name"), - TheHeat = item.Value("TheHat"), - IsFire = item.Value("IsFire") - }); - } + //var list = JArray.FromObject(obj["list"]); + //foreach (var item in list) + //{ + // var itemObject1 = (GameObject)Instantiate(itemObject, content.transform, false); + // var iii = itemObject1.GetComponent(); + // iii.SetModel(new Assets.Scripts.Apis.Models.NearRouteModel + // { + // Id = item.Value("Id"), + // Name = item.Value("Name"), + // TheHeat = item.Value("TheHat"), + // IsFire = item.Value("IsFire") + // }); + //} } @@ -187,6 +194,8 @@ public class EarthController : PFUIPanel /// private void EnterBigMap(Vector2 latLon) { + Debug.Log("enter big map"); + map.FlyToLocation(latLon.x, latLon.y, 1f, 0.1f).Then(() => { //Close(); @@ -223,7 +232,7 @@ public class EarthController : PFUIPanel // Update is called once per frame void Update() { - //var zoom = map.GetZoomLevel(); + var zoom = map.GetZoomLevel(); //Debug.Log(zoom); if (showSummary)