界面微调,设备连接中断跳时间bug修复
This commit is contained in:
parent
f1eeb11543
commit
7ba012f5f2
@ -162,7 +162,7 @@ AnimatorStateTransition:
|
|||||||
m_Conditions:
|
m_Conditions:
|
||||||
- m_ConditionMode: 4
|
- m_ConditionMode: 4
|
||||||
m_ConditionEvent: Speed
|
m_ConditionEvent: Speed
|
||||||
m_EventTreshold: 0
|
m_EventTreshold: 1
|
||||||
m_DstStateMachine: {fileID: 0}
|
m_DstStateMachine: {fileID: 0}
|
||||||
m_DstState: {fileID: 4337543228220508350}
|
m_DstState: {fileID: 4337543228220508350}
|
||||||
m_Solo: 0
|
m_Solo: 0
|
||||||
@ -326,25 +326,25 @@ AnimatorController:
|
|||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: ReachEnd
|
- m_Name: ReachEnd
|
||||||
m_Type: 4
|
m_Type: 4
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: Speed
|
- m_Name: Speed
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 30
|
m_DefaultFloat: 30
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: Slope
|
- m_Name: Slope
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 5
|
m_DefaultFloat: 5
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
- serializedVersion: 5
|
- serializedVersion: 5
|
||||||
m_Name: Base Layer
|
m_Name: Base Layer
|
||||||
@ -420,7 +420,7 @@ AnimatorStateTransition:
|
|||||||
m_Conditions:
|
m_Conditions:
|
||||||
- m_ConditionMode: 3
|
- m_ConditionMode: 3
|
||||||
m_ConditionEvent: Speed
|
m_ConditionEvent: Speed
|
||||||
m_EventTreshold: 0
|
m_EventTreshold: 1
|
||||||
m_DstStateMachine: {fileID: 0}
|
m_DstStateMachine: {fileID: 0}
|
||||||
m_DstState: {fileID: -2278438292350793016}
|
m_DstState: {fileID: -2278438292350793016}
|
||||||
m_Solo: 0
|
m_Solo: 0
|
||||||
|
|||||||
BIN
Assets/Resources/Images/Ride/change-mode.png
Normal file
BIN
Assets/Resources/Images/Ride/change-mode.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
104
Assets/Resources/Images/Ride/change-mode.png.meta
Normal file
104
Assets/Resources/Images/Ride/change-mode.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f47cb78230119f541bfc4950bfdd8ce0
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/Ride/full 1.png
Normal file
BIN
Assets/Resources/Images/Ride/full 1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
104
Assets/Resources/Images/Ride/full 1.png.meta
Normal file
104
Assets/Resources/Images/Ride/full 1.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2b5809638b47bfe468aa35842ee1fd50
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/Ride/simple 1.png
Normal file
BIN
Assets/Resources/Images/Ride/simple 1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
104
Assets/Resources/Images/Ride/simple 1.png.meta
Normal file
104
Assets/Resources/Images/Ride/simple 1.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 035bf86376f581f46af0bd5e15999ae0
|
||||||
|
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:
|
||||||
@ -509,8 +509,8 @@ MonoBehaviour:
|
|||||||
m_Colors:
|
m_Colors:
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
m_PressedColor: {r: 0.2974442, g: 0.23429158, b: 0.6132076, a: 1}
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
m_SelectedColor: {r: 0.12415449, g: 0.8490566, b: 0.28121665, a: 1}
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
m_ColorMultiplier: 1
|
m_ColorMultiplier: 1
|
||||||
m_FadeDuration: 0.1
|
m_FadeDuration: 0.1
|
||||||
|
|||||||
@ -481,8 +481,8 @@ MonoBehaviour:
|
|||||||
m_Colors:
|
m_Colors:
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
m_PressedColor: {r: 0.2974442, g: 0.23429158, b: 0.6132076, a: 1}
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
m_SelectedColor: {r: 0.12415449, g: 0.8490566, b: 0.28121665, a: 1}
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
m_ColorMultiplier: 1
|
m_ColorMultiplier: 1
|
||||||
m_FadeDuration: 0.1
|
m_FadeDuration: 0.1
|
||||||
|
|||||||
@ -198,7 +198,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 255, y: 48}
|
m_SizeDelta: {x: 215, y: 48}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8877223148509276859
|
--- !u!222 &8877223148509276859
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -381,8 +381,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 141, y: -17.5}
|
m_AnchoredPosition: {x: 126.09, y: -17.5}
|
||||||
m_SizeDelta: {x: 190, y: 19}
|
m_SizeDelta: {x: 160.17761, y: 19}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8877223148939721184
|
--- !u!222 &8877223148939721184
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -133,14 +133,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
characterAnimator.speed = 1f;
|
characterAnimator.speed = 1f;
|
||||||
}
|
}
|
||||||
//if (speed < 20 && speed >= 10)
|
|
||||||
//{
|
|
||||||
// characterAnimator.speed = 0.8f;
|
|
||||||
//}
|
|
||||||
//if (speed >= 20)
|
|
||||||
//{
|
|
||||||
// characterAnimator.speed = 1f;
|
|
||||||
//}
|
|
||||||
if (totalDistance >= mapData.TotalDistance)
|
if (totalDistance >= mapData.TotalDistance)
|
||||||
{
|
{
|
||||||
characterAnimator.SetBool("ReachEnd", true);//到达终点
|
characterAnimator.SetBool("ReachEnd", true);//到达终点
|
||||||
@ -176,7 +169,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//游戏开始开关
|
//游戏开始开关
|
||||||
protected virtual bool GetStart()
|
public virtual bool GetStart()
|
||||||
{
|
{
|
||||||
return mainController.isStart;
|
return mainController.isStart;
|
||||||
}
|
}
|
||||||
@ -252,16 +245,18 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
public Quaternion currentRotation;
|
public Quaternion currentRotation;
|
||||||
IEnumerator LookAtNextPos()
|
IEnumerator LookAtNextPos()
|
||||||
{
|
{
|
||||||
Quaternion neededRotation = Quaternion.LookRotation(prePos - nextPos);
|
if (prePos != nextPos)
|
||||||
//Quaternion thisRotation = character.transform.localRotation;
|
|
||||||
|
|
||||||
float t = 0;
|
|
||||||
while (t < 1.0f)
|
|
||||||
{
|
{
|
||||||
t += Time.deltaTime / 0.5f;
|
Quaternion neededRotation = Quaternion.LookRotation(prePos - nextPos);
|
||||||
currentRotation = Quaternion.Slerp(thisRotation, neededRotation, t);
|
|
||||||
character.transform.rotation = Quaternion.Euler(0, currentRotation.eulerAngles.y, 0);
|
float t = 0;
|
||||||
yield return null;
|
while (t < 1.0f)
|
||||||
|
{
|
||||||
|
t += Time.deltaTime / 0.5f;
|
||||||
|
currentRotation = Quaternion.Slerp(thisRotation, neededRotation, t);
|
||||||
|
character.transform.rotation = Quaternion.Euler(0, currentRotation.eulerAngles.y, 0);
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Vector3 deltaPos = Vector3.zero;
|
Vector3 deltaPos = Vector3.zero;
|
||||||
@ -285,13 +280,8 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
t += Time.deltaTime;
|
t += Time.deltaTime;
|
||||||
|
|
||||||
Vector3 v = Vector3.Lerp(prePos, nextPos, t);
|
Vector3 v = Vector3.Lerp(prePos, nextPos, t);
|
||||||
//Vector3 nextPosition = new Vector3((float)Math.Round(v.x, 2), (float)Math.Round(v.y, 2), (float)Math.Round(v.z, 2));
|
currentPos = v;
|
||||||
//if (!nextPosition.Equals(transform.localPosition))
|
transform.localPosition = v;
|
||||||
{
|
|
||||||
currentPos = v;
|
|
||||||
transform.localPosition = v;
|
|
||||||
//Camera.main.transform.localPosition = nextPosition;
|
|
||||||
}
|
|
||||||
yield return new WaitForEndOfFrame();
|
yield return new WaitForEndOfFrame();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,6 +23,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
get {
|
get {
|
||||||
var devices = AntConnector.Instance().discoveredDevices.Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer));
|
var devices = AntConnector.Instance().discoveredDevices.Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer));
|
||||||
|
_device = null;//重置设备状态
|
||||||
if (devices.Count() > 0)
|
if (devices.Count() > 0)
|
||||||
{
|
{
|
||||||
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
|
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
|
||||||
|
|||||||
@ -29,6 +29,8 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (!Directory.Exists(srcPath))
|
||||||
|
return;
|
||||||
DirectoryInfo dir = new DirectoryInfo(srcPath);
|
DirectoryInfo dir = new DirectoryInfo(srcPath);
|
||||||
FileSystemInfo[] fileinfo = dir.GetFileSystemInfos(); //返回目录中所有文件和子目录
|
FileSystemInfo[] fileinfo = dir.GetFileSystemInfos(); //返回目录中所有文件和子目录
|
||||||
foreach (FileSystemInfo i in fileinfo)
|
foreach (FileSystemInfo i in fileinfo)
|
||||||
|
|||||||
@ -23,6 +23,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
public PlayerController playerController;
|
public PlayerController playerController;
|
||||||
GameObject _mipMapRoute;
|
GameObject _mipMapRoute;
|
||||||
public RectTransform RectRoot;//rawImage
|
public RectTransform RectRoot;//rawImage
|
||||||
|
TrailRenderer trail;
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
cyclingCotroller = FindObjectOfType<CyclingController>();
|
cyclingCotroller = FindObjectOfType<CyclingController>();
|
||||||
@ -44,7 +45,13 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
}
|
}
|
||||||
RectRoot = transform.parent.Find("SingleUI/Panel/MiniMap/MiniMap").GetComponent<RectTransform>();
|
RectRoot = transform.parent.Find("SingleUI/Panel/MiniMap/MiniMap").GetComponent<RectTransform>();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
trail = transform.parent.Find("Sphere").GetComponent<TrailRenderer>();
|
||||||
|
trail.startWidth = 5f;
|
||||||
|
trail.endWidth = 5f;
|
||||||
|
trail.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
|
||||||
|
trail.endColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
|
||||||
|
}
|
||||||
float timer = 0;
|
float timer = 0;
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
@ -52,9 +59,12 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
var tr = transform.parent.Find("SingleUI/Panel/MiniMap/MiniMap/arrow");
|
var tr = transform.parent.Find("SingleUI/Panel/MiniMap/MiniMap/arrow");
|
||||||
tr.SetSiblingIndex(9999);
|
tr.SetSiblingIndex(9999);
|
||||||
_player.transform.localPosition = _map.GeoToWorldPosition(playerController.Currentlatlong);
|
var pos = _map.GeoToWorldPosition(playerController.Currentlatlong);
|
||||||
|
pos.y += 15f;
|
||||||
|
_player.transform.localPosition = pos;
|
||||||
Vector2 vp2 = _minicamera.WorldToViewportPoint(_player.transform.localPosition);//将三维物体的世界坐标转换为视口坐标
|
Vector2 vp2 = _minicamera.WorldToViewportPoint(_player.transform.localPosition);//将三维物体的世界坐标转换为视口坐标
|
||||||
((RectTransform)tr.transform).anchoredPosition = new Vector2((vp2.x * RectRoot.sizeDelta.x) - (RectRoot.sizeDelta.x * 0.5f), (vp2.y * RectRoot.sizeDelta.y) - (RectRoot.sizeDelta.y * 0.5f));
|
((RectTransform)tr.transform).anchoredPosition = new Vector2((vp2.x * RectRoot.sizeDelta.x) - (RectRoot.sizeDelta.x * 0.5f), (vp2.y * RectRoot.sizeDelta.y) - (RectRoot.sizeDelta.y * 0.5f));
|
||||||
|
trail.enabled = playerController.GetStart();
|
||||||
}
|
}
|
||||||
timer += Time.deltaTime;
|
timer += Time.deltaTime;
|
||||||
|
|
||||||
@ -81,7 +91,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
var point = mapData.List[i].Point;
|
var point = mapData.List[i].Point;
|
||||||
Vector3 item = _map.GeoToWorldPosition(new Vector2d(point[0], point[1]));
|
Vector3 item = _map.GeoToWorldPosition(new Vector2d(point[0], point[1]));
|
||||||
item.y += 5f;
|
item.y += 5f;
|
||||||
if (playerController.CurrentIndex >= i-1)
|
if (playerController.CurrentIndex >= i)
|
||||||
{
|
{
|
||||||
dat.Add(item);
|
dat.Add(item);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,6 +35,11 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
Vector2 vp2 = _minicamera.WorldToViewportPoint(transform.localPosition);//将三维物体的世界坐标转换为视口坐标
|
Vector2 vp2 = _minicamera.WorldToViewportPoint(transform.localPosition);//将三维物体的世界坐标转换为视口坐标
|
||||||
tr.anchoredPosition = new Vector2((vp2.x * RectRoot.sizeDelta.x) - (RectRoot.sizeDelta.x * 0.5f), (vp2.y * RectRoot.sizeDelta.y) - (RectRoot.sizeDelta.y * 0.5f));
|
tr.anchoredPosition = new Vector2((vp2.x * RectRoot.sizeDelta.x) - (RectRoot.sizeDelta.x * 0.5f), (vp2.y * RectRoot.sizeDelta.y) - (RectRoot.sizeDelta.y * 0.5f));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DestroyImmediate(arrow);
|
||||||
|
//DestroyImmediate(gameObject);
|
||||||
|
}
|
||||||
t = 1;
|
t = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,7 +41,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
protected override bool GetStart()
|
public override bool GetStart()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -50,6 +50,8 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
currentlatlong = mainController.Along(totalDistance);//下一个坐标
|
currentlatlong = mainController.Along(totalDistance);//下一个坐标
|
||||||
|
|
||||||
diff = Math.Round((totalDistance - _playerController.TotalDistance) * 1000, 0);
|
diff = Math.Round((totalDistance - _playerController.TotalDistance) * 1000, 0);
|
||||||
|
|
||||||
|
MoveHead(graph.transform);
|
||||||
}
|
}
|
||||||
double diff = 0;
|
double diff = 0;
|
||||||
public void SetDataSource(double _totalDistance, double _distance,string Name,double weightKg)
|
public void SetDataSource(double _totalDistance, double _distance,string Name,double weightKg)
|
||||||
@ -147,7 +149,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
public void RemoveSelf()
|
public void RemoveSelf()
|
||||||
{
|
{
|
||||||
//headPanel?.SetActive(false);
|
//headPanel?.SetActive(false);
|
||||||
arrowImage.gameObject.SetActive(false);
|
arrowImage.gameObject?.Destroy();
|
||||||
headPanel?.Destroy();
|
headPanel?.Destroy();
|
||||||
infoPanel?.Destroy();
|
infoPanel?.Destroy();
|
||||||
transform.gameObject.Destroy();
|
transform.gameObject.Destroy();
|
||||||
@ -159,7 +161,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
var playerScreenPos = Camera.main.WorldToScreenPoint(transform.position);
|
var playerScreenPos = Camera.main.WorldToScreenPoint(transform.position);
|
||||||
((RectTransform)arrowImage.transform).position = playerScreenPos;
|
((RectTransform)arrowImage.transform).position = playerScreenPos;
|
||||||
MoveHead(graph.transform);
|
|
||||||
if (IsShowInfo)
|
if (IsShowInfo)
|
||||||
{
|
{
|
||||||
ShowInfoPanel(playerScreenPos);
|
ShowInfoPanel(playerScreenPos);
|
||||||
|
|||||||
@ -43,16 +43,26 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
//计算数据
|
//计算数据
|
||||||
//speed = mainController.UpDateSpeed();
|
//speed = mainController.UpDateSpeed();
|
||||||
heartRate = mainController.UpDateHeart() ?? 0;
|
try
|
||||||
power = mainController.UpdatePower();
|
{
|
||||||
cadance = mainController.UpdateCadence();
|
heartRate = mainController.UpDateHeart() ?? 0;
|
||||||
weight = App.CurrentUser.Weight;
|
power = mainController.UpdatePower();
|
||||||
bicycleWeight = App.CurrentUser.BicycleWeight;
|
cadance = mainController.UpdateCadence();
|
||||||
|
weight = App.CurrentUser.Weight;
|
||||||
|
bicycleWeight = App.CurrentUser.BicycleWeight;
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
System.Random rd = new System.Random();
|
System.Random rd = new System.Random();
|
||||||
power = 500; //rd.Next(150, 300);////测试功率
|
power = rd.Next(150, 300);//测试功率
|
||||||
#endif
|
#endif
|
||||||
mainController.TrackResistance(currentSlope * App.rideSetting.sensitivity / 100);
|
mainController.TrackResistance(currentSlope * App.rideSetting.sensitivity / 100);
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
heartRate = 0;
|
||||||
|
power = 0;
|
||||||
|
cadance = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (power > 0)
|
if (power > 0)
|
||||||
{
|
{
|
||||||
speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);
|
speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);
|
||||||
|
|||||||
@ -465,15 +465,16 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
|
|
||||||
public void StartRide(BaseEventData baseEventData)
|
public void StartRide(BaseEventData baseEventData)
|
||||||
{
|
{
|
||||||
var antConnected = mainController.CheckAnt();//初始化ant+设备
|
// var antConnected = mainController.CheckAnt();//初始化ant+设备
|
||||||
#if UNITY_EDITOR
|
//#if UNITY_EDITOR
|
||||||
antConnected = true;
|
// antConnected = true;
|
||||||
#endif
|
//#endif
|
||||||
if (!antConnected)
|
// if (!antConnected)
|
||||||
|
// {
|
||||||
|
// alertPanel.SetActive(true);
|
||||||
|
// }
|
||||||
|
// else
|
||||||
{
|
{
|
||||||
alertPanel.SetActive(true);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
//加个5秒钟倒计时
|
//加个5秒钟倒计时
|
||||||
count = 5;
|
count = 5;
|
||||||
startPanel.SetActive(false);
|
startPanel.SetActive(false);
|
||||||
@ -562,7 +563,7 @@ namespace Assets.Scenes.Ride.Scripts
|
|||||||
{
|
{
|
||||||
clearLock = true;
|
clearLock = true;
|
||||||
isSimple *= -1;
|
isSimple *= -1;
|
||||||
simpleBtn.transform.GetComponent<Image>().sprite = isSimple == -1 ? Resources.Load<Sprite>("Images/Ride/full") : Resources.Load<Sprite>("Images/Ride/simple");
|
simpleBtn.transform.GetComponent<Image>().sprite = isSimple == -1 ? Resources.Load<Sprite>("Images/Ride/full 1") : Resources.Load<Sprite>("Images/Ride/simple 1");
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,15 +83,13 @@ public class LocalRouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterH
|
|||||||
}
|
}
|
||||||
void GoUplaod()
|
void GoUplaod()
|
||||||
{
|
{
|
||||||
if (!Directory.Exists(path))
|
|
||||||
return;
|
|
||||||
UIManager.ShowConfirm("Upload", "Upload the local record?", () =>
|
UIManager.ShowConfirm("Upload", "Upload the local record?", () =>
|
||||||
{
|
{
|
||||||
MapInterruptRecordApi service = new MapInterruptRecordApi();
|
|
||||||
var result = service.Add(record, listFileName);
|
|
||||||
//删除文件
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
MapInterruptRecordApi service = new MapInterruptRecordApi();
|
||||||
|
var result = service.Add(record, listFileName);
|
||||||
|
//删除文件
|
||||||
UIManager.CloseConfirm();
|
UIManager.CloseConfirm();
|
||||||
if (result.result)
|
if (result.result)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user