diff --git a/Assets/GUIMainNetWorkInfo.cs b/Assets/GUIMainNetWorkInfo.cs index 122f965e..4a8004b6 100644 --- a/Assets/GUIMainNetWorkInfo.cs +++ b/Assets/GUIMainNetWorkInfo.cs @@ -114,7 +114,7 @@ public class GUIMainNetWorkInfo : MonoBehaviour { if (_delayTime != -1) { - labelBattery.text = $"{_delayTime.ToString("0")}MS"; + labelBattery.text = $"{_delayTime.ToString("0")}ms"; } else { diff --git a/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png new file mode 100644 index 00000000..a48cc2d1 Binary files /dev/null and b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png differ diff --git a/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta new file mode 100644 index 00000000..b27f15d5 --- /dev/null +++ b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 70b1fb66bf8a73f469abf2bfb1d9d9f3 +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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png new file mode 100644 index 00000000..d7b18f51 Binary files /dev/null and b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png differ diff --git a/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta new file mode 100644 index 00000000..38d1cccd --- /dev/null +++ b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 2d17c26700d18144e863e9a2864d3392 +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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab index d2c706e3..1e154d1c 100644 --- a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab @@ -1013,7 +1013,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1083,7 +1083,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2322716380738134732 RectTransform: m_ObjectHideFlags: 0 @@ -1568,6 +1568,7 @@ GameObject: - component: {fileID: 3007624748412546457} - component: {fileID: 3007624748412546459} - component: {fileID: 3007624748412546456} + - component: {fileID: 1205417753606850948} m_Layer: 5 m_Name: AltitudeGraph m_TagString: Untagged @@ -1628,6 +1629,18 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!225 &1205417753606850948 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007624748412546454} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3007624748526063403 GameObject: m_ObjectHideFlags: 0 @@ -1973,7 +1986,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624748790425457 RectTransform: m_ObjectHideFlags: 0 @@ -3038,6 +3051,7 @@ RectTransform: - {fileID: 145307033547521030} - {fileID: 145307033915764318} - {fileID: 3007624748790425457} + - {fileID: 4701201928324246661} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3410,7 +3424,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749774178323 RectTransform: m_ObjectHideFlags: 0 @@ -3763,7 +3777,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624750140628948 RectTransform: m_ObjectHideFlags: 0 @@ -5143,3 +5157,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8407922557894930437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4701201928324246661} + - component: {fileID: 7493996602696257833} + - component: {fileID: 4219654698686917511} + - component: {fileID: 7059618734746457030} + m_Layer: 5 + m_Name: Multips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4701201928324246661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + 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: 3007624749581944593} + m_RootOrder: 36 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -371} + m_SizeDelta: {x: 157.93146, y: 69.57846} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7493996602696257833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + m_CullTransparentMesh: 0 +--- !u!114 &4219654698686917511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + 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: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + 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: 321313 +--- !u!114 &7059618734746457030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} + m_Name: + m_EditorClassIdentifier: + key: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 948a11b5..e41e4c3b 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -2740,6 +2740,7 @@ RectTransform: - {fileID: 145307033547521030} - {fileID: 145307033915764318} - {fileID: 3007624748790425457} + - {fileID: 8724855723572369069} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3480,7 +3481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624750140628948 RectTransform: m_ObjectHideFlags: 0 @@ -4280,3 +4281,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8451213515812577717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8724855723572369069} + - component: {fileID: 6379280327630955396} + - component: {fileID: 7317912239976424843} + - component: {fileID: 2126716285580818362} + m_Layer: 5 + m_Name: MultiTips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8724855723572369069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451213515812577717} + 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: 3007624749581944593} + m_RootOrder: 33 + 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: -54.549988, y: -220} + m_SizeDelta: {x: 224.90002, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6379280327630955396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451213515812577717} + m_CullTransparentMesh: 0 +--- !u!114 &7317912239976424843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451213515812577717} + 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: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 10 + 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: "\u6D4B\u8BD5\u6D88\u606F" +--- !u!114 &2126716285580818362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451213515812577717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} + m_Name: + m_EditorClassIdentifier: + key: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab index 62963f0a..eb9c7992 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -1,161 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5886847867519306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8142303644134966952} - - component: {fileID: 7884485170271844939} - - component: {fileID: 1776319753696389405} - - component: {fileID: 2396585753925281098} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8142303644134966952 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} - 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: 7625499865705319464} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7884485170271844939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &1776319753696389405 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} - m_CullTransparentMesh: 0 ---- !u!114 &2396585753925281098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 2 ---- !u!1 &57147568557409725 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8541272499061165792} - - component: {fileID: 5544532908178546371} - - component: {fileID: 8527852191412959687} - - component: {fileID: 7746486061451219890} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8541272499061165792 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - 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: 7625499865705319464} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5544532908178546371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &8527852191412959687 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - m_CullTransparentMesh: 0 ---- !u!114 &7746486061451219890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 4 --- !u!1 &365549535543084997 GameObject: m_ObjectHideFlags: 0 @@ -449,69 +293,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &466444560392468680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 827351485679412186} - - component: {fileID: 4593846407361576127} - - component: {fileID: 1074501715381111145} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &827351485679412186 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - 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: 8408197236025588197} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -250, y: -25} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4593846407361576127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1074501715381111145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &561507438981283975 GameObject: m_ObjectHideFlags: 0 @@ -14095,7 +13876,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &765892906047967987 RectTransform: m_ObjectHideFlags: 0 @@ -22761,6 +22542,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 5fa948a6fdc055341b4b277982afe5c9, type: 3} + zhDisabledImage: {fileID: 0} + IsDisabled: 0 --- !u!1 &2385217535555903746 GameObject: m_ObjectHideFlags: 0 @@ -23607,7 +23390,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 67, y: 39} + m_AnchoredPosition: {x: 120, y: 39} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768604647024378 @@ -23858,7 +23641,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2385217536803672695 RectTransform: m_ObjectHideFlags: 0 @@ -24201,6 +23984,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 5de091020db8f394ea4c14e87223ee96, type: 3} + zhDisabledImage: {fileID: 21300000, guid: 2d17c26700d18144e863e9a2864d3392, type: 3} + IsDisabled: 0 --- !u!1 &2385217537198970645 GameObject: m_ObjectHideFlags: 0 @@ -24317,7 +24102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -67.3, y: 39} + m_AnchoredPosition: {x: -120, y: 39} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768605458228582 @@ -24453,7 +24238,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3232876379137052116 CanvasRenderer: @@ -25227,7 +25012,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3232876379645239232 CanvasRenderer: @@ -25676,6 +25461,56 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2859666532282724351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2501957534988390010} + - component: {fileID: 2301513808886640011} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2501957534988390010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859666532282724351} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_Children: + - {fileID: 8835428086056546725} + - {fileID: 1060261617345360865} + m_Father: {fileID: 2877296740073624297} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2301513808886640011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859666532282724351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2877296740073624296 GameObject: m_ObjectHideFlags: 0 @@ -25706,7 +25541,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8408197236025588197} + - {fileID: 2501957534988390010} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -26929,6 +26764,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 811cf43645936ee4da7d950ad83b55a0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3471175893888827976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5034558213354826224} + - component: {fileID: 339599373580667848} + - component: {fileID: 797684942330990337} + - component: {fileID: 4156410964938335222} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5034558213354826224 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471175893888827976} + 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: 8835428086056546725} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &339599373580667848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471175893888827976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &797684942330990337 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471175893888827976} + m_CullTransparentMesh: 0 +--- !u!114 &4156410964938335222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471175893888827976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 2 --- !u!1 &3488347418843239350 GameObject: m_ObjectHideFlags: 0 @@ -29039,6 +28952,69 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4986762249337810808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1060261617345360865} + - component: {fileID: 3405523599690093396} + - component: {fileID: 702666472358929229} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1060261617345360865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4986762249337810808} + 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: 2501957534988390010} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -250, y: -25} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3405523599690093396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4986762249337810808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &702666472358929229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4986762249337810808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &4990631999178063563 GameObject: m_ObjectHideFlags: 0 @@ -29404,159 +29380,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &5512030472687545640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8408197236025588197} - - component: {fileID: 6316971424807944698} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8408197236025588197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512030472687545640} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.96, z: 1} - m_Children: - - {fileID: 7625499865705319464} - - {fileID: 827351485679412186} - m_Father: {fileID: 2877296740073624297} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6316971424807944698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512030472687545640} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &5515285057735857196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7625499865705319464} - - component: {fileID: 8603209648559467427} - - component: {fileID: 470384501774073346} - - component: {fileID: 165852063626059467} - - component: {fileID: 480613437150409254} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7625499865705319464 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - 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: 8541272499061165792} - - {fileID: 8142303644134966952} - m_Father: {fileID: 8408197236025588197} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &8603209648559467427 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &470384501774073346 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - m_CullTransparentMesh: 0 ---- !u!114 &165852063626059467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &480613437150409254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &5572785103222812767 GameObject: m_ObjectHideFlags: 0 @@ -30331,6 +30154,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &6810065488072656257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3960665670112272673} + - component: {fileID: 783272403501512974} + - component: {fileID: 5983140173140408416} + - component: {fileID: 7653430663863221346} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3960665670112272673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6810065488072656257} + 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: 8835428086056546725} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &783272403501512974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6810065488072656257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &5983140173140408416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6810065488072656257} + m_CullTransparentMesh: 0 +--- !u!114 &7653430663863221346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6810065488072656257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 4 --- !u!1 &6885174058740936923 GameObject: m_ObjectHideFlags: 0 @@ -30457,9 +30358,9 @@ RectTransform: m_Father: {fileID: 951248185030851307} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6121681890121843548 @@ -31108,9 +31009,9 @@ RectTransform: m_Father: {fileID: 951248185656469759} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6121681890749567304 @@ -31246,6 +31147,109 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &7453220826725401043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8835428086056546725} + - component: {fileID: 2692915060420175579} + - component: {fileID: 4996293503157785262} + - component: {fileID: 7310259783042654913} + - component: {fileID: 7387929913927026625} + m_Layer: 5 + m_Name: RectMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8835428086056546725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7453220826725401043} + 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: 3960665670112272673} + - {fileID: 5034558213354826224} + m_Father: {fileID: 2501957534988390010} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2692915060420175579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7453220826725401043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &4996293503157785262 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7453220826725401043} + m_CullTransparentMesh: 0 +--- !u!114 &7310259783042654913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7453220826725401043} + 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: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &7387929913927026625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7453220826725401043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7494246632937800153 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Panel.prefab index cd3c22fc..e5fab91e 100644 --- a/Assets/Resources/UI/Prefab/Ride/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Panel.prefab @@ -21500,7 +21500,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &1841772427794494789 +--- !u!1 &1427023245172575862 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -21508,66 +21508,70 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1524692179908514834} - - component: {fileID: 9006575742698204332} - - component: {fileID: 1841187192482496792} - - component: {fileID: 1027710212115017174} + - component: {fileID: 4113790711181373871} + - component: {fileID: 6450463484982418469} + - component: {fileID: 1324473186799037362} + - component: {fileID: 7594547904822167657} + - component: {fileID: 7615240192105119783} m_Layer: 5 - m_Name: Lines + m_Name: RectMask(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1524692179908514834 +--- !u!224 &4113790711181373871 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} 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: 3815618195539376836} - m_RootOrder: 1 + m_Children: + - {fileID: 5424118817000444708} + - {fileID: 7264034656573343914} + m_Father: {fileID: 3024542420348446357} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &9006575742698204332 + m_AnchoredPosition: {x: 0, y: 88} + m_SizeDelta: {x: 1542, y: 88} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6450463484982418469 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1841187192482496792 + m_ShowMaskGraphic: 0 +--- !u!222 &1324473186799037362 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_CullTransparentMesh: 0 ---- !u!114 &1027710212115017174 +--- !u!114 &7594547904822167657 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -21577,7 +21581,28 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - Thickness: 2 + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + 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!114 &7615240192105119783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427023245172575862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2052024789909891574 GameObject: m_ObjectHideFlags: 0 @@ -22083,6 +22108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 3ee17ebca5455ee4ba91dc969e46e7b5, type: 3} + zhDisabledImage: {fileID: 0} + IsDisabled: 0 --- !u!1 &2385217535555903746 GameObject: m_ObjectHideFlags: 0 @@ -22943,7 +22970,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 171, y: 59} + m_AnchoredPosition: {x: 201, y: 59} m_SizeDelta: {x: 140, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768604647024378 @@ -23194,7 +23221,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2385217536803672695 RectTransform: m_ObjectHideFlags: 0 @@ -23551,6 +23578,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 0b7ed26ef0240ac4c8af57aad790f52b, type: 3} + zhDisabledImage: {fileID: 0} + IsDisabled: 0 --- !u!1 &2385217537198970645 GameObject: m_ObjectHideFlags: 0 @@ -23681,7 +23710,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -171, y: 59} + m_AnchoredPosition: {x: -201, y: 59} m_SizeDelta: {x: 140, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768605458228582 @@ -24810,6 +24839,69 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &2437625208092975975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2741385192104591345} + - component: {fileID: 5171774652611130977} + - component: {fileID: 5723101424284070663} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2741385192104591345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + 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: 3024542420348446357} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -771, y: -44} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5171774652611130977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5723101424284070663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &2877296740073624296 GameObject: m_ObjectHideFlags: 0 @@ -24840,7 +24932,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4733454955587414614} + - {fileID: 3024542420348446357} - {fileID: 3591901196367126761} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -25948,56 +26040,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 16 ---- !u!1 &3734950502015741349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4733454955587414614} - - component: {fileID: 2232501020190426150} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4733454955587414614 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3734950502015741349} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1} - m_Children: - - {fileID: 3815618195539376836} - - {fileID: 1030815424971078568} - m_Father: {fileID: 2877296740073624297} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1542, y: 88} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2232501020190426150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3734950502015741349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3828612076740334578 GameObject: m_ObjectHideFlags: 0 @@ -26354,109 +26396,6 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 ---- !u!1 &4085229450536673488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3815618195539376836} - - component: {fileID: 5914428406531824318} - - component: {fileID: 1653408354133244963} - - component: {fileID: 2308215009673906439} - - component: {fileID: 7067212900684240821} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3815618195539376836 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - 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: 5670651471090548523} - - {fileID: 1524692179908514834} - m_Father: {fileID: 4733454955587414614} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 88} - m_SizeDelta: {x: 1542, y: 88} - m_Pivot: {x: 0, y: 1} ---- !u!114 &5914428406531824318 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &1653408354133244963 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_CullTransparentMesh: 0 ---- !u!114 &2308215009673906439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &7067212900684240821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4192129661743811864 GameObject: m_ObjectHideFlags: 0 @@ -27276,6 +27215,84 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &4763292060387363662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5424118817000444708} + - component: {fileID: 8987389517874508356} + - component: {fileID: 5728445718189323839} + - component: {fileID: 268192667407689070} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5424118817000444708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + 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: 4113790711181373871} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8987389517874508356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &5728445718189323839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + m_CullTransparentMesh: 0 +--- !u!114 &268192667407689070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 4 --- !u!1 &5021725234302645678 GameObject: m_ObjectHideFlags: 0 @@ -27354,6 +27371,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &6037024517355502681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7264034656573343914} + - component: {fileID: 8109368357043984242} + - component: {fileID: 3386037865908136210} + - component: {fileID: 7191497092522594892} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7264034656573343914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + 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: 4113790711181373871} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8109368357043984242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &3386037865908136210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + m_CullTransparentMesh: 0 +--- !u!114 &7191497092522594892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 2 --- !u!1 &6653291467032316143 GameObject: m_ObjectHideFlags: 0 @@ -27487,69 +27582,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 12 ---- !u!1 &6771944074264837671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1030815424971078568} - - component: {fileID: 7615561039546261438} - - component: {fileID: 6939248899071747073} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1030815424971078568 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - 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: 4733454955587414614} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -771, y: -44} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7615561039546261438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6939248899071747073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &6885174058740936923 GameObject: m_ObjectHideFlags: 0 @@ -27657,7 +27689,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &7121906458166836188 +--- !u!1 &7067156022622667343 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -27665,76 +27697,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5670651471090548523} - - component: {fileID: 2423058573687125980} - - component: {fileID: 1000748488954438978} - - component: {fileID: 8311039683991739438} - m_Layer: 5 - m_Name: Lines + - component: {fileID: 3024542420348446357} + - component: {fileID: 158366799836849776} + m_Layer: 0 + m_Name: New Game Object m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5670651471090548523 +--- !u!224 &3024542420348446357 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} + m_GameObject: {fileID: 7067156022622667343} 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: 3815618195539376836} + m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1} + m_Children: + - {fileID: 4113790711181373871} + - {fileID: 2741385192104591345} + m_Father: {fileID: 2877296740073624297} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1542, y: 88} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2423058573687125980 +--- !u!114 &158366799836849776 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} + m_GameObject: {fileID: 7067156022622667343} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1000748488954438978 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} - m_CullTransparentMesh: 0 ---- !u!114 &8311039683991739438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 4 --- !u!1 &7128831287110258232 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index 6156aa42..4baff121 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -164,7 +164,7 @@ "Route Name": "线路名称", "SETTING": "设置", "NOTIFICATION": "通知", - "GO!": "进入!", + "GO!": "开始!", "Go": "进入", "Stay": "忽略", "ALL RACE": "所有赛事", diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index fb27fa2b..1d2f4217 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -16,7 +16,11 @@ namespace Assets.Scripts.Apis { return Get($"Map/GetMapToken?name={name}"); } - + public string GetTipsList() + { + return Get($"Map/GetTipList"); + } + /// /// 获取路线数据 /// diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index e464e9cc..8b754416 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -312,6 +312,7 @@ public class MainController : BaseScene //发送消息 var list = MapUDPService.GetAllOnlineUserList(); + var lang = App.GetLocalLanguage(); foreach (var item in list) { if (item.RouteId > 0) @@ -332,11 +333,11 @@ public class MainController : BaseScene var message = ""; if (item.TotalTicks == 0) { - message = $"发起了对{item.RouteName}的挑战"; + message = lang=="zh"?$"发起了对{item.RouteName}的挑战": $"start a challenge to the{item.RouteName}"; } if (item.IsCompleted) { - message = $"完成了{item.RouteName}的挑战"; + message = lang == "zh" ? $"完成了{item.RouteName}的挑战": $"completed the challenge of the{item.RouteName}"; } if (!string.IsNullOrEmpty(message)) { @@ -348,23 +349,35 @@ public class MainController : BaseScene var message = $"{item.Name}上线了"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.Id}{item.LastActiveTime}{item.Point}"); } - //距离 - if (item.EndDistance > 50) + //距离50 + if (item.EndDistance >= 50) { - var message = $"在骑行过程中突破了{"50KM"}的挑战"; + var message = lang == "zh" ? $"在骑行过程中突破了{"50KM"}的挑战" : $"distance up to {"50KM"} during riding!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); } - //速度 - if (item.Speed > 10) + //距离100 + if (item.EndDistance >= 100) { - var message = $"在骑行过程中速度达到了惊人的{item.Speed}KM/H"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}10KM/H"); + var message = lang == "zh" ? $"在骑行过程中突破了{"100KM"}的挑战": $"distance up to {"100KM"} during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); + } + //速度35 + if (item.Speed >= 35) + { + var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的{Math.Round(item.Speed, 2)}KM/H": $"speed up to {Math.Round(item.Speed, 2)}KM/H during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}35KM/H"); + } + //速度50 + if (item.Speed >= 50) + { + var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的{Math.Round(item.Speed,2)}KM/H" : $"speed up to {Math.Round(item.Speed, 2)}KM/H during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 - if (item.WeightKg > 2) + if (item.WeightKg >= 3) { - var message = $"在骑行过程中功体比达到了惊人的{item.WeightKg}w/kg"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}2WeightKg"); + var message = lang == "zh" ? $"在骑行过程中功体比达到了惊人的{Math.Round(item.WeightKg, 2)}w/kg": $"w/kg up to {Math.Round(item.WeightKg, 2)}w/kg during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}3WeightKg"); } } } diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 4aefe67b..2eb9319a 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -326,12 +326,30 @@ namespace Assets.Scenes.Ride.Scripts public static int GetNearRiderCount() { - return onlineUserHelper.OnlineUsers.Where(c=> (c.Point[0] != 0 && c.Point[1] != 0)|| (c.Point[0] != -1 && c.Point[1] != -1)).Count(); + int count = 0; + try + { + count = onlineUserHelper.OnlineUsers.Where(c => (c.Point[0] != 0 && c.Point[1] != 0) && (c.Point[0] != -1 && c.Point[1] != -1)).Count(); + } + catch (Exception) + { + + } + return count; } public static int GetAllOnlineUserCount() { - return onlineUserHelper.OnlineUsers.Count(); + int count = 0; + try + { + count = onlineUserHelper.OnlineUsers.Count(); + } + catch (Exception) + { + + } + return count; } /// /// 获取附近的人(当前在线的所有人) @@ -340,45 +358,46 @@ namespace Assets.Scenes.Ride.Scripts public static IList GetNearRiderData(int pageIndex, int pageSize = 5, double[] point = null) { if (point == null) return null; - - var dict = new List>(); - var allOnlineUsers = onlineUserHelper.OnlineUsers.Where(c=>c.CompetitionId == 0); - foreach (var item in allOnlineUsers) + try { - if (item.Id == App.CurrentUser.Id) + var dict = new List>(); + var allOnlineUsers = onlineUserHelper.OnlineUsers.Where(c => c.CompetitionId == 0); + foreach (var item in allOnlineUsers) { - dict.Add(new Tuple(0, item)); - continue; + if (item.Id == App.CurrentUser.Id) + { + dict.Add(new Tuple(0, item)); + continue; + } + if (item.Point[0] != 0 && item.Point[1] != 0) + { + var distance = Math.Round(TurfHelper.GetDistances(point, item.Point) / 1000, 2); + dict.Add(new Tuple(distance, item)); + } } - if (item.Point[0] != 0 && item.Point[1] != 0) + var allList = dict.OrderBy(d => d.Item1);//.Select(d=>d.Item2); + var list = allList.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); + + var nearData = list.Select(n => new NearRiderModel() { - var distance = Math.Round(TurfHelper.GetDistances(point, item.Point) / 1000, 2); - dict.Add(new Tuple(distance, item)); - } + Headimage = n.Item2.HeadImage, + Name = n.Item2.Name, + Near = n.Item1, //Math.Round(TurfHelper.GetDistances(point, n.Point) / 1000, 2), + KGWeight = n.Item2.WeightKg.ToString(), + Speed = Math.Round(n.Item2.Speed, 1), + CountryImg = App.Host + $"User/GetCountryImg?userid={n.Item2.Id}", + IsSelf = n.Item2.IsSelf, + Id = n.Item2.Id, + Country = n.Item2.Country, + }).ToList(); + return nearData; } - var allList = dict.OrderBy(d => d.Item1);//.Select(d=>d.Item2); - var list = allList.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); - - var nearData = list.Select(n => new NearRiderModel() + catch (Exception) { - Headimage = n.Item2.HeadImage, - Name = n.Item2.Name, - Near = n.Item1, //Math.Round(TurfHelper.GetDistances(point, n.Point) / 1000, 2), - KGWeight = n.Item2.WeightKg.ToString(), - Speed = Math.Round(n.Item2.Speed, 1), - CountryImg = App.Host + $"User/GetCountryImg?userid={n.Item2.Id}", - IsSelf = n.Item2.IsSelf, - Id = n.Item2.Id, - Country = n.Item2.Country, - }).ToList(); - return nearData; - //return new - //{ - // NearData = nearData, - // PageCount = (int)Math.Ceiling((double)allList.Count() / pageSize) - //}; - } + return null; + } + } private class OnlineUserHelper { diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs index 473bba1c..7f084fa1 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs @@ -315,7 +315,7 @@ namespace Assets.Scenes.Ride.Scripts if (mainController.mapRouteRankingList == null || mainController.mapRouteRankingList.Count == 0) { var lang = App.GetLocalLanguage(); - shadowButton.image.sprite = lang == "zh"? Resources.Load("Images/Ride/Shadow Mode_no"): Resources.Load("Images/Ride/Shadow Mode_no"); + shadowButton.image.sprite = lang == "zh"? Resources.Load("Images/Ride/Shadow Mode_PC_d") : Resources.Load("Images/Ride/Shadow Mode_no"); shadowButton.enabled = false; shadowButton.interactable = false; } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 968e147e..526ec552 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -294,28 +294,28 @@ public class CyclingController : DeviceServiceMonoBase }; TouchKit.addGestureRecognizer(rotationRecognizer); - //单指 - var touchRecognizer = new TKAnyTouchRecognizer(new TKRect(0, 0, Screen.width, Screen.height)); - DateTime startTimpStamp = DateTime.Now; - Vector2 touchLocation = Vector2.down; - touchRecognizer.onEnteredEvent += (r) => - { - touchLocation = r.startTouchLocation(); - startTimpStamp = DateTime.Now; - }; - touchRecognizer.onExitedEvent += (r) => - { - if (competitionId == 0 && isStart && IsPointerOverGameObject(touchLocation)) - { - var timespan = DateTime.Now - startTimpStamp; - UnityEngine.Debug.Log($"{timespan.TotalMilliseconds}"); - if (timespan.TotalMilliseconds <= 120) - { - singleUIManager?.ClearPanel(null); - } - } - }; - TouchKit.addGestureRecognizer(touchRecognizer); + ////单指 + //var touchRecognizer = new TKAnyTouchRecognizer(new TKRect(0, 0, Screen.width, Screen.height)); + //DateTime startTimpStamp = DateTime.Now; + //Vector2 touchLocation = Vector2.down; + //touchRecognizer.onEnteredEvent += (r) => + //{ + // touchLocation = r.startTouchLocation(); + // startTimpStamp = DateTime.Now; + //}; + //touchRecognizer.onExitedEvent += (r) => + //{ + // if (competitionId == 0 && isStart && IsPointerOverGameObject(touchRecognizer.STAR)) + // { + // var timespan = DateTime.Now - startTimpStamp; + // UnityEngine.Debug.Log($"{timespan.TotalMilliseconds}"); + // if (timespan.TotalMilliseconds <= 120) + // { + // singleUIManager?.ClearPanel(null); + // } + // } + //}; + //TouchKit.addGestureRecognizer(touchRecognizer); //双指 var PinchRecognizer = new TKPinchRecognizer(); PinchRecognizer.gestureRecognizedEvent += (r) => @@ -407,14 +407,15 @@ public class CyclingController : DeviceServiceMonoBase float touchTimer = 0.1f; private void FixedUpdate() { + HandleTouch(); HandleMouseScrollWheel(); } public bool isWatch { get; set; } private Vector3 currentCameraPos { get; set; } - Vector3 far = new Vector3(-18, 53, -48); - Vector3 plane = new Vector3(-15, 43, -40); - Vector3 near = new Vector3(-12, 35, -30); + Vector3 far = new Vector3(-18, 50, -48); + Vector3 plane = new Vector3(-15.1f, 42, -40); + Vector3 near = new Vector3(-11.4f, 31, -30); List cameraList { get; set; } /// @@ -423,8 +424,9 @@ public class CyclingController : DeviceServiceMonoBase private void HandleMouseScrollWheel() { var scrollDelta = Input.GetAxis("Mouse ScrollWheel"); - UnityEngine.Debug.Log($"scrolldelta{scrollDelta}"); - + + if (scrollDelta != 0 && Input.mousePosition != null && !IsPointerOverGameObject(Input.mousePosition)) + return; if (cameraList == null) { cameraList = new List(); @@ -450,6 +452,8 @@ public class CyclingController : DeviceServiceMonoBase //StartCoroutine(MoveCamera(prePos, nextPos)); } } + + DateTime startTimpStamp = DateTime.Now; private void HandleTouch() { if (singleUIManager == null) @@ -459,11 +463,19 @@ public class CyclingController : DeviceServiceMonoBase { case 1: { + UnityEngine.Debug.Log(Input.touches[0]); UnityEngine.Debug.Log($"{Input.touches[0]}{Input.touches[0].phase }"); - //单击切换极简模式 - if (Input.touches[0].tapCount==1 && Input.touches[0].phase == TouchPhase.Moved && isStart && singleUIManager.clearLock && competitionId == 0) + if (Input.touches[0].tapCount == 1 && Input.touches[0].phase == TouchPhase.Began && isStart && singleUIManager.clearLock && competitionId == 0) { - if (IsPointerOverGameObject(Input.mousePosition)) + startTimpStamp = DateTime.Now; + } + + //单击切换极简模式 + if (Input.touches[0].tapCount==1 && Input.touches[0].phase == TouchPhase.Ended && isStart && singleUIManager.clearLock && competitionId == 0) + { + var interval = DateTime.Now - startTimpStamp; + UnityEngine.Debug.Log(interval); + if (interval.TotalMilliseconds<=150 && IsPointerOverGameObject(Input.mousePosition)) { singleUIManager?.ClearPanel(null); } @@ -472,6 +484,7 @@ public class CyclingController : DeviceServiceMonoBase break; case 2: { + return; //双手触摸移动摄像机 // Store both touches. Touch touchZero = Input.GetTouch(0); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs index f383f5df..f5557ccb 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs @@ -154,10 +154,7 @@ namespace Assets.Scenes.Ride.Scripts #endif var parent = panel.transform.Find("MapRanking"); var title = panel.transform.Find("RankingTitle").gameObject; - if (list.Count == 0) - { - title.SetActive(false); - } + title.SetActive(list.Count != 0); foreach (var item in list) { GameObject newObj = (GameObject)Instantiate(prefab, parent); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs index 5ad9b0a4..3604ba79 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs @@ -37,6 +37,8 @@ namespace Assets.Scenes.Ride.Scripts OnlineUserNum.text = " "+ MapUDPService.GetNearRiderCount().ToString(); LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform); var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y }); + if (nearList == null) + return; var mod = MapUDPService.GetNearRiderCount() % pageSize; var pages = MapUDPService.GetNearRiderCount() / pageSize; totalPages = mod > 0 ? pages + 1 : pages; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 834f521a..61b04b19 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; //#if UNITY_EDITOR - power = 1430; + power = 143; //#endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs index 2de4167f..db20824d 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs @@ -100,7 +100,7 @@ namespace Assets.Scenes.Ride.Scripts timeRemaining = 1.0f; } } - countDownTxt.text = count==0?"GO!": count.ToString(); + countDownTxt.text = count==0?App.GetLocalString("GO!"): count.ToString(); } //重置游戏状态 public void Reset() diff --git a/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs index 7f823e6c..9eea247a 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs @@ -28,7 +28,7 @@ namespace Assets.Scenes.Ride.Scripts _delayTime = App.delayTime; if (_delayTime != -1) { - appVersion.text = $"{_delayTime.ToString("0")}MS\n{"V" + App.AppVersion}"; + appVersion.text = $"{_delayTime.ToString("0")}ms\n{"V" + App.AppVersion}"; } else { diff --git a/Assets/Scripts/UI/Control/PfUIButton.cs b/Assets/Scripts/UI/Control/PfUIButton.cs index aa85c09d..d6e9eb72 100644 --- a/Assets/Scripts/UI/Control/PfUIButton.cs +++ b/Assets/Scripts/UI/Control/PfUIButton.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.Events; using DG.Tweening; +using System.Timers; namespace Assets.Scripts.UI.Control { @@ -109,8 +110,18 @@ namespace Assets.Scripts.UI.Control } } public bool showTooltip { get; set; } + private void BindEvent() { + Timer timer = new Timer(); + timer.Interval = 1000; + var group = tooltips.GetComponent(); + timer.Elapsed += (r, s) => + { + timer.Stop(); + group.DOFade(1, 0.5f); + }; + //鼠标进入 UIManager.AddEvent(this.gameObject, EventTriggerType.PointerEnter, new UnityEngine.Events.UnityAction(e => { @@ -125,7 +136,7 @@ namespace Assets.Scripts.UI.Control #endif tooltips.GetComponent().alpha = 0f; tooltips.SetActive(true); - tooltips.GetComponent().DOFade(1f, 0.2f); + timer.Start(); } switch (mType) { @@ -154,14 +165,17 @@ namespace Assets.Scripts.UI.Control UIManager.AddEvent(this.gameObject, EventTriggerType.PointerExit, new UnityAction(e => { if (!this.isActiveAndEnabled) return; + timer.Stop(); #if !(UNITY_ANDROID || UNITY_IOS) if (!string.IsNullOrWhiteSpace(Tooltips)) { #else if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip) { -#endif - tooltips.SetActive(false); +#endif + group.DOFade(0, 1f).onComplete += () => { + tooltips.SetActive(false); + }; } //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); switch (mType) diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs b/Assets/Scripts/UI/Prefab/MultiTips.cs new file mode 100644 index 00000000..b0b0b2e5 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs @@ -0,0 +1,63 @@ +using System; +using UnityEngine; +using UnityEngine.UI; +using DG.Tweening; +using Assets.Scripts.UI.Control; +using Assets.Scripts; + +public class MultiTips:PFUIText +{ + private Text text; + private Button button; + private string[] tips { get; set; } + private int currentIndex = 0; + + new void Awake() + { + base.Awake(); + text = GetComponent(); + var tiplist = ConfigHelper.mapApi.GetTipsList(); + if (!string.IsNullOrEmpty(tiplist)) + { + tips = tiplist.Split(','); + } + var random = new System.Random(); + currentIndex = random.Next(0, tips.Length); + SetText(); + } + // Start is called before the first frame update + new void Start() + { + base.Awake(); + } + public void SetText() + { + if(text == null) + { + return; + } + if (currentIndex <= tips.Length) + { + text.text = tips[currentIndex]; + if (currentIndex + 1 < tips.Length) + { + currentIndex++; + } + else + { + currentIndex = 0; + } + } + } + float time = 5f; + // Update is called once per frame + void Update() + { + time -= Time.deltaTime; + while (time<0) + { + SetText(); + time += 5f; + } + } +} diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs.meta b/Assets/Scripts/UI/Prefab/MultiTips.cs.meta new file mode 100644 index 00000000..c0e28af8 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 81e6186d0c08df64ba2687b894591e90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: