增加选择页,修改记录列表pc兼容

This commit is contained in:
CaiYanPeng 2021-09-28 15:25:52 +08:00
parent 8802676b98
commit 85e0a13f08
18 changed files with 2121 additions and 1426 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 711c97d00196faf4eab437657561fa8a
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 6e62bd329307e3a489f52cf28a3be817
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:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,413 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8180001677099435479
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8180001677099435476}
- component: {fileID: 8180001677099435467}
- component: {fileID: 8180001677099435466}
- component: {fileID: 8180001677099435477}
m_Layer: 5
m_Name: BtnRide
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8180001677099435476
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677099435479}
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: 8180001678567615470}
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: 129, y: 145}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8180001677099435467
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677099435479}
m_CullTransparentMesh: 0
--- !u!114 &8180001677099435466
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677099435479}
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: 21300000, guid: 711c97d00196faf4eab437657561fa8a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8180001677099435477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677099435479}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_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_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8180001677099435466}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8180001677565645550
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8180001677565645551}
- component: {fileID: 8180001677565645549}
- component: {fileID: 8180001677565645548}
- component: {fileID: 8180001677565645538}
m_Layer: 5
m_Name: RowerSelector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8180001677565645551
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677565645550}
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: 8180001678567615470}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8180001677565645549
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677565645550}
m_CullTransparentMesh: 0
--- !u!114 &8180001677565645548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677565645550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 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 &8180001677565645538
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001677565645550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 062e7f4cad92a34488b81254ede4cbe9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8180001678546077971
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8180001678546077968}
- component: {fileID: 8180001678546077975}
- component: {fileID: 8180001678546077974}
- component: {fileID: 8180001678546077969}
m_Layer: 5
m_Name: BtnRower
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8180001678546077968
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678546077971}
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: 8180001678567615470}
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: 129, y: 145}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8180001678546077975
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678546077971}
m_CullTransparentMesh: 0
--- !u!114 &8180001678546077974
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678546077971}
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: 21300000, guid: 6e62bd329307e3a489f52cf28a3be817, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8180001678546077969
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678546077971}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_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_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8180001678546077974}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8180001678567615465
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8180001678567615470}
- component: {fileID: 8180001678567615471}
- component: {fileID: 8180001678567615468}
- component: {fileID: 8180001678567615469}
m_Layer: 5
m_Name: Container
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8180001678567615470
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678567615465}
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: 8180001677099435476}
- {fileID: 8180001678546077968}
m_Father: {fileID: 8180001677565645551}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8180001678567615471
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678567615465}
m_CullTransparentMesh: 0
--- !u!114 &8180001678567615468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678567615465}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 40
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!114 &8180001678567615469
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8180001678567615465}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fc98065ce3e088344a2f354023c943c3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -121,12 +121,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!224 &139346069 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
m_PrefabInstance: {fileID: 2163100616201820359}
m_PrefabAsset: {fileID: 0}
--- !u!1 &845512357
GameObject:
m_ObjectHideFlags: 0
@ -479,7 +473,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 139346069}
- {fileID: 1713454709}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -496,6 +490,12 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1678571397}
m_CullTransparentMesh: 0
--- !u!224 &1713454709 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
m_PrefabInstance: {fileID: 8180001678066936986}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1944211662
GameObject:
m_ObjectHideFlags: 0
@ -579,197 +579,122 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
--- !u!1001 &2163100616201820359
--- !u!1001 &8180001678066936986
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1678571401}
m_Modifications:
- target: {fileID: 2163100615324320960, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645550, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
propertyPath: m_Name
value: RowerSelector
objectReference: {fileID: 0}
- target: {fileID: 2163100615324320960, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100615324320960, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100615324320960, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 2163100615324320960, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -8.5
objectReference: {fileID: 0}
- target: {fileID: 2163100615696049826, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100615696049826, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100615696049826, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100615696049826, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100615696049826, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -8.5
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871250, guid: 4854db54b95a3e842a8a0dc00cb7195b,
- target: {fileID: 8180001677565645551, guid: fc98065ce3e088344a2f354023c943c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616340871251, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_Name
value: RowerResult
objectReference: {fileID: 0}
- target: {fileID: 2163100616527924481, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100616527924481, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2163100616527924481, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2163100616527924481, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2163100616527924481, guid: 4854db54b95a3e842a8a0dc00cb7195b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -8.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4854db54b95a3e842a8a0dc00cb7195b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: fc98065ce3e088344a2f354023c943c3, type: 3}

View File

@ -32,8 +32,8 @@ public static class App
public static double longitude { get; internal set; }
public static bool FromLogin => false;
private static bool _IsRowerMode = false;
public static bool IsRowerMode
public static bool? _IsRowerMode = null;
public static bool? IsRowerMode
{
get => _IsRowerMode;
set
@ -106,8 +106,11 @@ public static class App
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
#endif
Debug.Log(PlayerPrefs.GetString("IsRowerMode"));
App._IsRowerMode = bool.Parse(PlayerPrefs.GetString("IsRowerMode"));
var isRower = PlayerPrefs.GetString("IsRowerMode");
if (!string.IsNullOrEmpty(isRower))
{
App._IsRowerMode = bool.Parse(isRower);
}
Screen.sleepTimeout = SleepTimeout.NeverSleep;
//Debug.Log(TimeSpan.FromSeconds(1).ToString(@"mm\:ss"));
}

View File

@ -137,7 +137,7 @@ namespace Assets.Scripts.Ble
Debug.Log($"設備信息,{item.IdGuid},{string.Join(";",item.IdByteArray)}" );
if (item.IdByteArray == ServiceUuids.Ftms)
{
if (App.IsRowerMode)
if (App.IsRowerMode == true)
{
sensor = SensorType.Rower;
}

View File

@ -121,7 +121,6 @@ public class LoginController : BaseScene
loadingPanel = transform.Find("LoadingPanel").gameObject;
#endif
#if UNITY_ANDROID
Debug.Log(Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead));
Permission.RequestUserPermission(Permission.FineLocation);
Permission.RequestUserPermission(Permission.ExternalStorageRead);
Permission.RequestUserPermission(Permission.ExternalStorageWrite);

View File

@ -62,7 +62,12 @@ public class MainController : BaseScene
//{
// UIManager.ShowHomePanel();
//});
if (App.IsRowerMode)
if (!App.IsRowerMode.HasValue)
{
UIManager.ShowRowerSelector();
return;
}
if (App.IsRowerMode == true)
{
UIManager.ShowRowerPanel();
return;

View File

@ -51,12 +51,16 @@ public class MainNav : MonoBehaviour
});
}
public void HideDevice()
public void ShowRowerTab()
{
if (transform.Find("Device"))
{
transform.Find("Device").gameObject.SetActive(false);
}
if (transform.Find("Exit"))
{
transform.Find("Exit").gameObject.SetActive(true);
}
}
// Start is called before the first frame update

View File

@ -89,9 +89,9 @@ public class RowerHomeScript : PFUIPanel
};
GetComponent<RectTransform>().localScale = Vector3.one;
GetComponent<RectTransform>().localPosition = Vector3.zero;
var mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
mainNav.ShowExit();
mainNav.HideDevice();
//mainNav.ShowExit();
var btnHome = transform.Find("Other/BtnHome").gameObject;
UIManager.AddEvent(btnHome, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => ReturnHome());
btnStart = transform.Find("Other1/BtnStart").gameObject;
@ -105,6 +105,9 @@ public class RowerHomeScript : PFUIPanel
public override void Show()
{
base.Show();
var mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
mainNav.ShowRowerTab();
transform.MyDOFade();
Init();
//transform.Find("Left/Rower").GetComponent<RowerAnimation>().StartAnimation();
}

View File

@ -53,7 +53,10 @@ public class ResultListController : PFUIPanel
matchScroll = scrollContent.Find("MatchList");
matchContent = matchScroll.Find("Viewport").Find("Content");
rowerScroll = scrollContent.Find("RowerList");
rowerContent = rowerScroll.Find("Viewport").Find("Content");
if (rowerScroll)
{
rowerContent = rowerScroll.Find("Viewport").Find("Content");
}
contents = new Transform[] { routeContent, matchContent, rowerContent};
if (btnRoute != null)
@ -112,7 +115,9 @@ public class ResultListController : PFUIPanel
scrolls = new Transform[] { routeScroll, matchScroll, rowerScroll };
//GetList(0);
GetList(1);
#if UNITY_ANDROID || UNITY_IOS
GetList(2);
#endif
}
public void Load()

View File

@ -0,0 +1,36 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class RowerSelector : PFUIPanel
{
// Start is called before the first frame update
void Start()
{
var btnRide = transform.Find("Container/BtnRide").gameObject;
if (btnRide)
{
UIManager.AddEvent(btnRide, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
Close();
UIManager.ShowHomePanel();
});
}
var btnRower = transform.Find("Container/BtnRower").gameObject;
if (btnRower)
{
UIManager.AddEvent(btnRower, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
Close();
UIManager.ShowRowerPanel();
});
}
}
// Update is called once per frame
void Update()
{
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 062e7f4cad92a34488b81254ede4cbe9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -257,6 +257,19 @@ public class UIManager : MonoBehaviour
UIManager.Instance.RowerResult.Initial(id);
}
}
private RowerSelector mRowerSelector;
public RowerSelector RowerSelector
{
get
{
return this.GetPanelInstance("RowerSelector", ref this.mRowerSelector);
}
}
public static void ShowRowerSelector()
{
Debug.Log("进入Rower");
UIManager.Show(UIManager.Instance.RowerSelector, null, true);
}
/*划船机页面*/
#region
private RaceModalScript mRaceModalScript;
@ -324,6 +337,8 @@ public class UIManager : MonoBehaviour
InitNow();
}
EventQueueSystem.AddListener<CompetitonStartMessageEvent>(CompetitonStartHandler);
}
//比赛即将开始消息提醒