lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source
This commit is contained in:
CaiYanPeng 2021-12-15 13:03:32 +08:00
commit 98de46f8b1
33 changed files with 2918 additions and 1747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Images/Ride/sliderHandler.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

128
Assets/Resources/Images/Ride/sliderHandler.png.meta Normal file
View File

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

888
Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab
View File

File diff suppressed because it is too large Load Diff

694
Assets/Resources/UI/Prefab/Ride/Panel.prefab
View File

@ -6361,6 +6361,7 @@ GameObject:
- component: {fileID: 765892905377797937}
- component: {fileID: 765892905377797938}
- component: {fileID: 765892905377797939}
- component: {fileID: 9103454464116137776}
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
@ -6383,7 +6384,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0.3011111, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -6414,8 +6415,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 2
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -6424,6 +6425,19 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &9103454464116137776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 765892905377797942}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 5
--- !u!1 &765892905378079235
GameObject:
m_ObjectHideFlags: 0
@ -8691,6 +8705,7 @@ RectTransform:
- {fileID: 765892905254351294}
- {fileID: 765892905013231241}
- {fileID: 765892906623057286}
- {fileID: 7492960773384561819}
m_Father: {fileID: 765892905298520748}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8740,12 +8755,12 @@ MonoBehaviour:
m_Interactable: 1
m_TargetGraphic: {fileID: 765892905377797939}
m_FillRect: {fileID: 765892905377797937}
m_HandleRect: {fileID: 0}
m_HandleRect: {fileID: 7492960773384561819}
m_Direction: 0
m_MinValue: 10
m_MaxValue: 100
m_WholeNumbers: 0
m_Value: 10
m_Value: 37.1
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
@ -18756,7 +18771,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &765892906623057286
RectTransform:
m_ObjectHideFlags: 0
@ -21485,7 +21500,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &1607117048962241785
--- !u!1 &1439238212449930410
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -21493,70 +21508,66 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6815912915175448021}
- component: {fileID: 6499529501487536518}
- component: {fileID: 3372323416617529214}
- component: {fileID: 9113712672160339203}
- component: {fileID: 4620944697447247901}
- component: {fileID: 5383510222917415436}
- component: {fileID: 797795419719483681}
- component: {fileID: 7569503687996421376}
- component: {fileID: 5239786890617421588}
m_Layer: 5
m_Name: RectMask(Clone)
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6815912915175448021
--- !u!224 &5383510222917415436
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607117048962241785}
m_GameObject: {fileID: 1439238212449930410}
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: 8018487536859969411}
- {fileID: 5243444683907451704}
m_Father: {fileID: 1535860056871697628}
m_Children: []
m_Father: {fileID: 4184279993953651928}
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 &6499529501487536518
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &797795419719483681
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607117048962241785}
m_GameObject: {fileID: 1439238212449930410}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!222 &3372323416617529214
--- !u!222 &7569503687996421376
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607117048962241785}
m_GameObject: {fileID: 1439238212449930410}
m_CullTransparentMesh: 0
--- !u!114 &9113712672160339203
--- !u!114 &5239786890617421588
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607117048962241785}
m_GameObject: {fileID: 1439238212449930410}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@ -21566,29 +21577,8 @@ MonoBehaviour:
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 &4620944697447247901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607117048962241785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1682009963446462814
Thickness: 4
--- !u!1 &1533290091456153093
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -21596,61 +21586,48 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4151039410569794974}
- component: {fileID: 7011120894830324256}
- component: {fileID: 5725687494741889573}
m_Layer: 5
m_Name: textController
- component: {fileID: 2092682218587943379}
- component: {fileID: 5036420025860947203}
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 &4151039410569794974
--- !u!224 &2092682218587943379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1682009963446462814}
m_GameObject: {fileID: 1533290091456153093}
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: 1535860056871697628}
m_RootOrder: 1
m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1}
m_Children:
- {fileID: 4184279993953651928}
- {fileID: 1105719373035842466}
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: -771, y: -44}
m_SizeDelta: {x: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7011120894830324256
--- !u!114 &5036420025860947203
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1682009963446462814}
m_GameObject: {fileID: 1533290091456153093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5725687494741889573
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1682009963446462814}
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 &2052024789909891574
GameObject:
m_ObjectHideFlags: 0
@ -22007,7 +21984,7 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &2273533094051272562
--- !u!1 &2108754900727729274
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -22015,66 +21992,70 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8018487536859969411}
- component: {fileID: 2352599041685746172}
- component: {fileID: 8509057071560825980}
- component: {fileID: 5421269249276033698}
- component: {fileID: 4184279993953651928}
- component: {fileID: 4308306783931218798}
- component: {fileID: 4171516924541757474}
- component: {fileID: 7459759852289743066}
- component: {fileID: 8190747112792359285}
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 &8018487536859969411
--- !u!224 &4184279993953651928
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273533094051272562}
m_GameObject: {fileID: 2108754900727729274}
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: 6815912915175448021}
m_Children:
- {fileID: 5383510222917415436}
- {fileID: 4111181271511369471}
m_Father: {fileID: 2092682218587943379}
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 &2352599041685746172
m_AnchoredPosition: {x: 0, y: 88}
m_SizeDelta: {x: 1542, y: 88}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4308306783931218798
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273533094051272562}
m_GameObject: {fileID: 2108754900727729274}
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 &8509057071560825980
m_ShowMaskGraphic: 0
--- !u!222 &4171516924541757474
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273533094051272562}
m_GameObject: {fileID: 2108754900727729274}
m_CullTransparentMesh: 0
--- !u!114 &5421269249276033698
--- !u!114 &7459759852289743066
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273533094051272562}
m_GameObject: {fileID: 2108754900727729274}
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}
@ -22084,7 +22065,28 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Thickness: 4
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 &8190747112792359285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2108754900727729274}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2385217535364865741
GameObject:
m_ObjectHideFlags: 0
@ -24963,7 +24965,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1535860056871697628}
- {fileID: 2092682218587943379}
- {fileID: 3591901196367126761}
m_Father: {fileID: 765892906030958096}
m_RootOrder: 3
@ -26427,56 +26429,6 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &4003067627407710796
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1535860056871697628}
- component: {fileID: 4890421978542892076}
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 &1535860056871697628
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4003067627407710796}
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: 6815912915175448021}
- {fileID: 4151039410569794974}
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 &4890421978542892076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4003067627407710796}
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
@ -27296,6 +27248,358 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5021725234302645678
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4861475920955042556}
- component: {fileID: 852148614078849143}
- component: {fileID: 3961264376150414559}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4861475920955042556
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5021725234302645678}
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: 7492960773384561819}
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 &852148614078849143
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5021725234302645678}
m_CullTransparentMesh: 0
--- !u!114 &3961264376150414559
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5021725234302645678}
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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 9
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:
--- !u!1 &5927718884558434966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4111181271511369471}
- component: {fileID: 6251301697037185993}
- component: {fileID: 2027774712100482142}
- component: {fileID: 4140411482242769490}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4111181271511369471
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5927718884558434966}
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: 4184279993953651928}
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 &6251301697037185993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5927718884558434966}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &2027774712100482142
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5927718884558434966}
m_CullTransparentMesh: 0
--- !u!114 &4140411482242769490
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5927718884558434966}
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 &6579013773991574272
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1105719373035842466}
- component: {fileID: 7078602984850959317}
- component: {fileID: 8067527447054612383}
m_Layer: 5
m_Name: textController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1105719373035842466
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6579013773991574272}
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: 2092682218587943379}
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 &7078602984850959317
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6579013773991574272}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8067527447054612383
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6579013773991574272}
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 &6653291467032316143
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7492960773384561819}
- component: {fileID: 5210596533345728038}
- component: {fileID: 2940216306957170585}
- component: {fileID: 866997317591458774}
- component: {fileID: 600217688288996665}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7492960773384561819
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6653291467032316143}
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: 4861475920955042556}
m_Father: {fileID: 765892905528978694}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.3011111, y: 0}
m_AnchorMax: {x: 0.3011111, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5210596533345728038
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6653291467032316143}
m_CullTransparentMesh: 0
--- !u!114 &2940216306957170585
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6653291467032316143}
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: 68b0eb368cdc3e94e89e26f1d3eba21a, 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 &866997317591458774
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6653291467032316143}
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: 2940216306957170585}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &600217688288996665
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6653291467032316143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 12
--- !u!1 &6885174058740936923
GameObject:
m_ObjectHideFlags: 0
@ -30146,84 +30450,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
mType: 3
Tooltips: QUIT
--- !u!1 &9042074687197122474
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5243444683907451704}
- component: {fileID: 1573815674748997323}
- component: {fileID: 6979813876199305109}
- component: {fileID: 5639507040431636371}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5243444683907451704
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9042074687197122474}
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: 6815912915175448021}
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 &1573815674748997323
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9042074687197122474}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &6979813876199305109
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9042074687197122474}
m_CullTransparentMesh: 0
--- !u!114 &5639507040431636371
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9042074687197122474}
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 &9118781381026562979
GameObject:
m_ObjectHideFlags: 0

8
Assets/Resources/audio.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d1c62968f02e62a468d6603f6edbbb42
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/dundundun.mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/dundundun.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 9acad2c654ce97d46bb24180be714e2c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/叮咚~.mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/叮咚~.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e7ebad23283aa5641aa2678d26397a86
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/极限运动.mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/极限运动.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 3e1dc34591f13b54a9f30bd03cfd1375
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/确认音效.wav Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/确认音效.wav.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 84e5b28161952094ba831270b7e55ab8
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/audio/赛车运动(Motor Sports)-模型(Model).mp3 Normal file
View File

Binary file not shown.

22
Assets/Resources/audio/赛车运动(Motor Sports)-模型(Model).mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: fbec0afbb254661448f0499d229e7042
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

37
Assets/Scenes/BackGroundTexure.renderTexture Normal file
View File

@ -0,0 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackGroundTexure
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 256
m_Height: 256
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1

8
Assets/Scenes/BackGroundTexure.renderTexture.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2935b59bfb70b71479285ff2850f3d99
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8400000
userData:
assetBundleName:
assetBundleVariant:

2231
Assets/Scenes/Login-Mobile.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/MainScene.unity
View File

@ -627,7 +627,7 @@ AudioListener:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728460487}
m_Enabled: 0
m_Enabled: 1
--- !u!20 &728460489
Camera:
m_ObjectHideFlags: 0

2
Assets/Scripts/App.cs
View File

@ -104,6 +104,8 @@ public static class App
public static string WorkoutsUrl { get; internal set; }
public static long delayTime { get; set; }
public static List<OnlineUser> userList = new List<OnlineUser>();
public static TempRecordData tempRecordData { get; set; }
private static string language { get; set; }
public static Dictionary<string, string> LanguageManager { get; set; }

13
Assets/Scripts/PFConstants.cs
View File

@ -37,6 +37,19 @@ public static class PFConstants
return Application.persistentDataPath + "/MapWorkoutRecords/";
}
}
public static string MapWorkoutRecordTempFolder
{
get
{
if (!Directory.Exists(Application.persistentDataPath + "/MapWorkoutTempRecords/"))
{
Directory.CreateDirectory(Application.persistentDataPath + "/MapWorkoutTempRecords/");
}
return Application.persistentDataPath + "/MapWorkoutTempRecords/";
}
}
/// <summary>
/// 设备连接缓存在本地的路径
/// </summary>

23
Assets/Scripts/Scenes/MainController.cs
View File

@ -1,4 +1,5 @@
using Assets.Scenes.Ride.Scripts;
using Assets.Scenes.Ride.Scripts.Model;
using Assets.Scripts;
using Assets.Scripts.Devices.Ant;
using Assets.Scripts.Scenes;
@ -10,6 +11,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class MainController : BaseScene
@ -116,6 +118,7 @@ public class MainController : BaseScene
}
UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
LastRide();//检查本地异常中断的骑行并弹窗提示继续
}
@ -169,4 +172,24 @@ public class MainController : BaseScene
var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", "");
App.CurrentUser = result.data;
}
/// <summary>
/// 检查上次异常中断的骑行
/// </summary>
private void LastRide()
{
var tempFileList = System.IO.Directory.GetFiles(PFConstants.MapWorkoutRecordTempFolder);
if (tempFileList.Length > 0)
{
var tempFile = tempFileList[0];
var content = System.IO.File.ReadAllText(tempFile);
if (!string.IsNullOrEmpty(content))
{
var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject<TempRecordData>(content);
App.tempRecordData = tempRecordData;
SceneManager.LoadScene("Ride");
}
}
}
}

1
Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs
View File

@ -65,6 +65,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
CurrentRouteStartDistance = param.EndDistance == 0 ? 0 : param.EndDistance,
//DeviceNumber = DeviceNumber,
//AntModelId = antModelId
selectParam = param,
};
IsRecord = true;

1
Assets/Scripts/Scenes/Ride/Model/CyclingModels/ReviewModel.cs
View File

@ -53,6 +53,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
CurrentRouteStartDistance = 0,
//DeviceNumber = DeviceNumber,
//AntModelId = antModelId
selectParam = param
};
if (param != null)

1
Assets/Scripts/Scenes/Ride/Model/CyclingModels/SingleModel.cs
View File

@ -28,6 +28,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
CurrentRoute = route,
CurrentRouteStartDistance = 0,
StartTime = UIManager.Now.GetDateTime(),//DateTime.Now
selectParam = param
};
if (param != null)

23
Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs
View File

@ -117,6 +117,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
public double? OneMinuteMaxAP { get; set; }
public double? FiveMinutesMaxAp { get; set; }
public RouteResultParam selectParam { get; set; }
public void SaveWithLocalRecordAysnc(CyclingModel cyclingModel, RouteResultParam selectParam, string imageName,string recordId,string path)
{
Saved = true;
@ -261,4 +263,25 @@ namespace Assets.Scenes.Ride.Scripts.Model
}
}
}
public class TempRecordData
{
public int RouteId { get; set; }
public RouteResultParam selectParam { get; set; }
public double CurrentRouteStartDistance { get; set; }
public DateTime StartTime { get; set; }
public double EndDistance { get; set; }
public int? ManufacturerId { get; set; }
public string ManufacturerName { get; set; }
public string Mode { get; set; }
public int? AntModelId { get; set; }
/// <summary>
/// 骑行数据
/// </summary>
public List<TargetData> RiderDatas = new List<TargetData>();
}
}

39
Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs
View File

@ -94,7 +94,9 @@ namespace Assets.Scenes.Ride.Scripts
slope = panel.transform.Find("Slope").GetComponent<Text>();
mapRouteImage = panel.transform.Find("MapRouteImage").GetComponent<RawImage>();
slider = panel.transform.Find("Process").GetComponent<Slider>();
slider.gameObject.SetActive(false);
processText = panel.transform.Find("ProcessText").GetComponent<Text>();
processText.gameObject.SetActive(false);
mapDescText = panel.transform.Find("MapDesc").GetComponent<Text>();
rideNow = panel.transform.Find("RideNow").GetComponent<Button>();
rideNowText = rideNow.transform.Find("Text").GetComponent<Text>();
@ -176,21 +178,12 @@ namespace Assets.Scenes.Ride.Scripts
{
if (!rideNow.IsInteractable())
return;
//var checkAnt = cyclingController.CheckAnt();
//#if UNITY_EDITOR
// checkAnt = true;
//#endif
// if (!checkAnt && !cyclingController.isWatch)
// {
//#if UNITY_IOS || UNITY_ANDROID
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Mobile/Alert"), panel.transform);
//#else
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Alert"), panel.transform);
//#endif
// alert.SetActive(true);
// }
// else
{
rideNow.interactable = false;
processText.gameObject.SetActive(true);
slider.gameObject.SetActive(true);
var preValue = slider.value;
slider.value = 0;
slider.DOValue(preValue, 2).onComplete+=()=> {
cyclingController.InitTcp();
MapUDPService.SendGizpModel();
cyclingController.ReSetUIManager();
@ -198,7 +191,21 @@ namespace Assets.Scenes.Ride.Scripts
//启用ridenow
canvasGroup.blocksRaycasts = false;
depressFlag = true;
}
};
//var checkAnt = cyclingController.CheckAnt();
//#if UNITY_EDITOR
// checkAnt = true;
//#endif
// if (!checkAnt && !cyclingController.isWatch)
// {
//#if UNITY_IOS || UNITY_ANDROID
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Mobile/Alert"), panel.transform);
//#else
// var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Alert"), panel.transform);
//#endif
// alert.SetActive(true);
// }
// else
}
protected virtual void Cancel(BaseEventData baseEvent)
{

61
Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
View File

@ -106,6 +106,8 @@ namespace Assets.Scenes.Ride.Scripts
protected Slider cameraSlider;
protected Transform graphChart;
protected virtual void Awake()
{
@ -158,9 +160,11 @@ namespace Assets.Scenes.Ride.Scripts
mapName = uipanel.transform.Find("TitlePanel/MapName").GetComponent<Text>();
totalClimb = uipanel.transform.Find("ComputerPanel/TotalClimb").GetComponent<Text>();
//img = uipanel.transform.Find("ElevationChart/HeadImage").GetComponent<RawImage>();
head = uipanel.transform.Find("GraphChart/HeadPanel/Head").GetComponent<RawImage>();
headPanel = uipanel.transform.Find("GraphChart/HeadPanel").gameObject;
t = uipanel.transform.Find("GraphChart/Button");
graphChart = uipanel.transform.Find("GraphChart");
head = graphChart.Find("HeadPanel/Head").GetComponent<RawImage>();
headPanel = graphChart.Find("HeadPanel").gameObject;
t = graphChart.Find("Button");
miniMap = uipanel.transform.Find("MiniMap").gameObject;
alertPanel = uipanel.transform.Find("Alert").gameObject;
@ -284,18 +288,18 @@ namespace Assets.Scenes.Ride.Scripts
cameraSlider = uipanel.transform.Find("CameraSlider").GetComponent<Slider>();
Text CameraText = uipanel.transform.Find("CameraSlider/Text").GetComponent<Text>();
#if !(UNITY_IOS || UNITY_ANDROID)
string[] phoneList = new string[] { "18120141032", "15651831367", "18120141031", "15261826280", "18662240319" };
if (phoneList.Contains(App.CurrentUser.Phone))
{
cameraSlider.gameObject.SetActive(true);
cameraSlider.value = cameraY;
CameraText.text = cameraY.ToString("f0");
cameraSlider.onValueChanged.AddListener((f) =>
{
cameraY = f;
CameraText.text = f.ToString("f0");
});
}
//string[] phoneList = new string[] { "18120141032", "15651831367", "18120141031", "15261826280", "18662240319" };
//if (phoneList.Contains(App.CurrentUser.Phone))
//{
// cameraSlider.gameObject.SetActive(true);
// cameraSlider.value = cameraY;
// CameraText.text = cameraY.ToString("f0");
// cameraSlider.onValueChanged.AddListener((f) =>
// {
// cameraY = f;
// CameraText.text = f.ToString("f0");
// });
//}
#endif
//路书基本信息绑定
mapName.text = routeInstance.Name;
@ -361,10 +365,14 @@ namespace Assets.Scenes.Ride.Scripts
}
else
{
CameraVector.x = cameraX;
CameraVector.y = cameraY;
CameraVector.z = cameraZ;
target.transform.eulerAngles = CameraVector;
//3d视角跟随人物转动
//CameraVector.x = cameraX;
//CameraVector.y = cameraY;
//CameraVector.z = cameraZ;
//target.transform.eulerAngles = CameraVector;
Vector3 v = Vector3.zero;
v.y += mainController.currentPlayer.currentRotation.eulerAngles.y + 160f; //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
target.transform.eulerAngles = v; //.Set(0, playerController.currentRotation.eulerAngles.y + 160f, 0);// = new Vector3(0, playerController.transform.eulerAngles.y + 160f, 0);
}
//控制照片移动
((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position);
@ -469,6 +477,7 @@ namespace Assets.Scenes.Ride.Scripts
//保存游戏
public virtual void SaveRide(BaseEventData baseEventData)
{
mainController.ClearTempFile();
if (playerController?.TotalTicks > 0 && !mainController.isQuit)
{
mainController.SetQuit();
@ -484,6 +493,7 @@ namespace Assets.Scenes.Ride.Scripts
public virtual void CancelQuit(BaseEventData baseEventData)
{
quitPanel.SetActive(false);
mainController.ClearTempFile();
SceneManager.LoadScene("MainScene");
}
//取消退出
@ -538,6 +548,19 @@ namespace Assets.Scenes.Ride.Scripts
#if UNITY_IOS || UNITY_ANDROID
toolbar.transform.DOLocalMove(new Vector3(toolbar.transform.localPosition.x, toolbar.transform.localPosition.y + isSimple * 260f, toolbar.transform.localPosition.z), 1);
//中间的海拔图变长
if (isSimple == 1)
{
graphChart.DOMoveX(0, 1f);
var graphRect = ((RectTransform)graphChart);
graphRect.sizeDelta = new Vector2(App.MobileResolution.x, graphRect.rect.height);
}
else
{
graphChart.DOLocalMoveX(-250f, 1f);
var graphRect = ((RectTransform)graphChart);
graphRect.sizeDelta = new Vector2(500f, graphRect.rect.height);
}
#else
viewButton.transform.DOLocalMove(new Vector3(viewButton.transform.localPosition.x + isSimple * 200f, viewButton.transform.localPosition.y, viewButton.transform.localPosition.z), 1);
nextSlopePanel.transform.DOLocalMove(new Vector3(nextSlopePanel.transform.localPosition.x, nextSlopePanel.transform.localPosition.y + isSimple * 260f, nextSlopePanel.transform.localPosition.z), 1);

354
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -22,6 +22,7 @@ using System.IO;
using ChartAndGraph;
using UnityEngine.UI;
using System.Diagnostics;
using UnityEngine.SceneManagement;
public class CyclingController : DeviceServiceMonoBase
{
@ -35,13 +36,13 @@ public class CyclingController : DeviceServiceMonoBase
public Dictionary<int, SeletedPlayerScript> selectPlayerDic { set; get; } = new Dictionary<int, SeletedPlayerScript>();
public int preticks;
public int preticks { get; set; }
#region 参数
public MapRoute mapRoute { get; set; }//当前路书数据
public MapCompetition competition { get; set; }//当前赛事数据
private MapDataModel mapData { get; set; }//当前路书数据
private Route route;//当前路书综合数据
private Route route { get; set; }//当前路书综合数据
public List<MapRouteRanking> mapRouteRankingList { get; set; }
private Vector2d coordiantes;//当前地图中心
@ -73,17 +74,25 @@ public class CyclingController : DeviceServiceMonoBase
protected override void Awake()
{
base.Awake();
#if UNITY_EDITOR
#if UNITY_EDITOR
if (App.CurrentUser == null)
{
Login();
}
#endif
#endif
//获取路书信息
mapApi = ConfigHelper.mapApi;
routeId = App.RouteIdParam > 0? App.RouteIdParam : 2633;
routeId = App.RouteIdParam > 0 ? App.RouteIdParam : 2633;
competitionId = App.CompetionId;
App.CompetionId = 0;//清空比赛参数
//处理异常中断的骑行
if (App.tempRecordData != null)
{
selectParamModel = App.tempRecordData.selectParam;
competitionId = selectParamModel.CompetitionId ?? 0;
routeId = selectParamModel.RouteId ?? 0;
}
Resources.UnloadUnusedAssets();
}
@ -130,7 +139,7 @@ public class CyclingController : DeviceServiceMonoBase
}
return Graph4;
}
public Material GetMaterial1()
{
@ -218,6 +227,9 @@ public class CyclingController : DeviceServiceMonoBase
//loadingController = FindObjectOfType<LoadingController>();
//
loadingController.InjectController(this);
SceneManager.activeSceneChanged += SceneManager_activeSceneChanged;
//进入比赛
if (competitionId > 0)
{
@ -234,23 +246,38 @@ public class CyclingController : DeviceServiceMonoBase
}
float timer = 1f;
bool clearLock = false;
private void SceneManager_activeSceneChanged(Scene arg0, Scene arg1)
{
ClearTempFile();
}
/// <summary>
/// 检测是否点击UI
/// </summary>
/// <param name="mousePosition"></param>
/// <returns></returns>
private bool IsPointerOverGameObject(Vector2 mousePosition)
{
//创建一个点击事件
PointerEventData eventData = new PointerEventData(EventSystem.current);
eventData.position = mousePosition;
List<RaycastResult> raycastResults = new List<RaycastResult>();
//向点击位置发射一条射线，检测是否点击UI
EventSystem.current.RaycastAll(eventData, raycastResults);
if (raycastResults.Count > 0)
{
return !raycastResults.Where(c => c.gameObject.name == "NearPanel" || c.gameObject.name == "ToolBarPanel" || c.gameObject.name == "SettingPanel" || c.gameObject.name == "QuitPanel").Any();
}
else
{
return false;
}
}
bool _dragStartedOnUI = false;
protected override void Update()
{
base.Update();
//CamControl();
#if UNITY_IOS || UNITY_ANDROID
if (competitionId == 0 && singleUIManager != null)
{
var mouse = Input.GetMouseButton(0);
if (mouse && clearLock && singleUIManager.clearLock)
{
clearLock = false;
activeSeconds = 0;
singleUIManager?.ClearPanel(null);
}
}
#endif
timer -= Time.deltaTime;
if (timer <= 0)//定时器 一秒执行一次
{
@ -261,23 +288,154 @@ public class CyclingController : DeviceServiceMonoBase
UIManager.SendCompetitionStartMessage("Ride");
}
#if UNITY_IOS || UNITY_ANDROID
if (isStart)
{
activeSeconds++;
}
if (activeSeconds >= App.autoClearTimes && !clearLock)
{
if (competitionId == 0)
{
clearLock = true;
singleUIManager?.ClearPanel(null);
}
}
//if (isStart)
//{
// activeSeconds++;
//}
//if (activeSeconds >= App.autoClearTimes && !clearLock)
//{
// if (competitionId == 0)
// {
// clearLock = true;
// singleUIManager?.ClearPanel(null);
// }
//}
#endif
timer += 1.0f;
}
}
float touchTimer = 0.1f;
private void FixedUpdate()
{
touchTimer -= Time.deltaTime;
if (touchTimer <= 0)
{
#if UNITY_IOS || UNITY_ANDROID
HandleTouch();
#else
HandleMouseScrollWheel();
#endif
touchTimer += 0.1f;
}
}
public bool isWatch { get; set; }
private Vector3 currentCameraPos { get; set; }
Vector3 far = new Vector3(-25, 73, -70);
Vector3 plane = new Vector3(-15, 43, -40);
Vector3 near = new Vector3(-8, 23, -20);
List<Vector3> cameraList { get; set; }
/// <summary>
/// 处理PC端
/// </summary>
private void HandleMouseScrollWheel()
{
var scrollDelta = Input.GetAxis("Mouse ScrollWheel");
UnityEngine.Debug.Log($"scrolldelta{scrollDelta}");
if (cameraList == null)
{
cameraList = new List<Vector3>();
cameraList.Add(near);
cameraList.Add(plane);
cameraList.Add(far);
}
var prePos = Camera.main.transform.localPosition;
var nextPos = Camera.main.transform.localPosition;
if (scrollDelta < 0)
{
nextPos = cameraList.Where(c => c.y > Camera.main.transform.localPosition.y).FirstOrDefault();
if (nextPos != Vector3.zero)
StartCoroutine(MoveCamera(prePos, nextPos));
}
if (scrollDelta > 0)
{
nextPos = cameraList.Where(c => c.y < Camera.main.transform.localPosition.y).LastOrDefault();
if (nextPos != Vector3.zero)
StartCoroutine(MoveCamera(prePos, nextPos));
}
}
private void HandleTouch()
{
if (singleUIManager == null)
return;
var touchCount = Input.touchCount;
switch (Input.touchCount)
{
case 1:
{
//单击切换极简模式
if (Input.touches[0].tapCount==1 && isStart && singleUIManager.clearLock && competitionId == 0)
{
if (IsPointerOverGameObject(Input.mousePosition))
{
singleUIManager?.ClearPanel(null);
}
}
}
break;
case 2:
{
//双手触摸移动摄像机
// Store both touches.
Touch touchZero = Input.GetTouch(0);
Touch touchOne = Input.GetTouch(1);
// Find the position in the previous frame of each touch.
Vector2 touchZeroPrevPos = touchZero.position - touchZero.deltaPosition;
Vector2 touchOnePrevPos = touchOne.position - touchOne.deltaPosition;
// Find the magnitude of the vector (the distance) between the touches in each frame.
float prevTouchDeltaMag = (touchZeroPrevPos - touchOnePrevPos).magnitude;
float touchDeltaMag = (touchZero.position - touchOne.position).magnitude;
var offset = touchDeltaMag - prevTouchDeltaMag;
if (cameraList == null)
{
cameraList = new List<Vector3>();
cameraList.Add(near);
cameraList.Add(plane);
cameraList.Add(far);
}
var prePos = Camera.main.transform.localPosition;
var nextPos = Camera.main.transform.localPosition;
if (offset < 0)
{
nextPos = cameraList.Where(c => c.y > Camera.main.transform.localPosition.y).FirstOrDefault();
if (nextPos != Vector3.zero)
StartCoroutine(MoveCamera(prePos, nextPos));
}
if (offset > 0)
{
nextPos = cameraList.Where(c => c.y < Camera.main.transform.localPosition.y).LastOrDefault();
if (nextPos != Vector3.zero)
StartCoroutine(MoveCamera(prePos, nextPos));
}
}
break;
}
}
/// <summary>
/// 处理中断骑行
/// </summary>
private void TempFileHandler()
{
//处理异常中断的骑行
if (App.tempRecordData != null)
{
recorderData.EndDistance = App.tempRecordData.EndDistance;
recorderData.StartTime = App.tempRecordData.StartTime;
recorderData.RiderDatas = App.tempRecordData.RiderDatas;
coordiantes = Along(App.tempRecordData.EndDistance);
startTime = App.tempRecordData.StartTime;
preticks = recorderData.RiderDatas.Last().Ticks;
App.tempRecordData = null;//清空
}
}
private IEnumerator Init()
{
yield return new WaitForSeconds(1);
@ -289,7 +447,7 @@ public class CyclingController : DeviceServiceMonoBase
MapUDPService.Init();//初始化TCP
loadingController.AddProcess(10);
}
public bool isWatch { get; set; }
//初始比赛
private IEnumerator InitRace()
{
@ -315,15 +473,15 @@ public class CyclingController : DeviceServiceMonoBase
mapData = mapApi.GetData(routeId);//获取路书地理数据
route = new Route(mapData, mapRoute);
loadingController.AddProcess(10);
#region 其他场景传参处理
#region 其他场景传参处理
//骑行结果
if (App.routeResult != null )
if (App.routeResult != null)
{
routeResult = App.routeResult;
selectParamModel = App.routeResult.ContinueCyclingParam;//继续骑行
preticks = App.routeResult.Ticks;
}
if (selectParamModel == null)
{
selectParamModel = new RouteResultParam
@ -339,12 +497,14 @@ public class CyclingController : DeviceServiceMonoBase
};
}
App.routeResult = null;
#endregion
#endregion
double endDistance = selectParamModel.EndDistance;
coordiantes = Along(endDistance);
var shaowList = mapApi.GetShadowList(App.RouteIdParam, "", 0, 10);
coordiantes = Along(endDistance);
var shaowList = mapApi.GetShadowList(routeId, "", 0, 10);
if (shaowList.result)
{
mapRouteRankingList = shaowList.data.list;
@ -356,7 +516,7 @@ public class CyclingController : DeviceServiceMonoBase
mapData = mapApi.GetData(routeId);//获取路书地理数据
route = new Route(mapData, mapRoute);
loadingController.AddProcess(10);
#region 其他场景传参处理
#region 其他场景传参处理
selectParamModel = new RouteResultParam
{
CompetitionId = competitionId,
@ -369,10 +529,9 @@ public class CyclingController : DeviceServiceMonoBase
RouteId = App.RouteIdParam
};
#endregion
//计算上次骑行距离调整地图中心点
#endregion
double endDistance = selectParamModel.EndDistance;
//计算上次骑行距离调整地图中心点
coordiantes = Along(endDistance);
}
@ -400,7 +559,7 @@ public class CyclingController : DeviceServiceMonoBase
map.gameObject.SetActive(true);
player.SetActive(true);
UIObject.SetActive(true);
singleUIManager = UIObject.AddComponent<CompetitionUIManager>();
singleUIManager = UIObject.AddComponent<CompetitionUIManager>();
//miniMap.SetActive(true);
map.OnTileFinished += Map_OnTileFinished;
mapPos = map.transform.position;
@ -444,7 +603,7 @@ public class CyclingController : DeviceServiceMonoBase
public void ChangeCurrentPlayer(int userId)
{
var coll = FindObjectsOfType<AbstractPlayer>();
var selectedPlayer =coll.Where(c => c.UserId == userId).FirstOrDefault();
var selectedPlayer = coll.Where(c => c.UserId == userId).FirstOrDefault();
if (selectedPlayer != null)
{
currentPlayer = selectedPlayer;
@ -459,7 +618,7 @@ public class CyclingController : DeviceServiceMonoBase
ss.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
}
}
var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
foreach (var item in unselectedPlayers)
{
@ -477,6 +636,8 @@ public class CyclingController : DeviceServiceMonoBase
//初始化人物位置角度
private void InitPlayer()
{
TempFileHandler();//处理中断骑行继续骑的逻辑
lockView = true;
Vector2d lastLatLon = Along(recorderData.EndDistance);
@ -497,16 +658,34 @@ public class CyclingController : DeviceServiceMonoBase
//初始化海拔图头像位置
var index = GetCurrentIndex(recorderData.EndDistance);
InitGraph(index);
playerController.CurrentIndex = index;
int tick = 0;
if (recorderData.RiderDatas.Count > 0)
{
tick = recorderData.RiderDatas.Last().Ticks;
}
playerController.Init(index, recorderData.EndDistance, tick);
}
public void InitGraph(int index)
{
chartDataSourceScript.InitHorizontalScrolling(index);
}
//SingleUIManager singleUIManager;
public BaseUIManager singleUIManager;
private IEnumerator MoveCamera(Vector3 prePos, Vector3 nextPos)
{
float t = 0;
while (t < 0.5f)
{
t += Time.deltaTime;
Vector3 v = Vector3.Lerp(prePos, nextPos, t);
Camera.main.transform.localPosition = v;
yield return new WaitForEndOfFrame();
}
}
//SingleUIManager singleUIManager;
public BaseUIManager singleUIManager;
public void GameStart()
{
StartCoroutine(MoveCamera(far, plane));//初始摄像头
var check = CheckAnt();
#if UNITY_EDITOR
check = true;
@ -517,15 +696,15 @@ public class CyclingController : DeviceServiceMonoBase
transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
transform.Find("UI/Panel(Clone)/ToolBarPanel/SettingButton").GetComponent<Button>().enabled = true;
}
else
else
{
transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = false;
transform.Find("UI/Panel(Clone)/ToolBarPanel/SettingButton").GetComponent<Button>().enabled = false;
Utils.showToast(null, "Please connect the device!", duration: int.MaxValue, isLowest: true
, stopFunc: () => isWatch || CheckAnt() || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
, endCallback: () =>
, endCallback: () =>
{
if (!transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy)
if (!transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy)
{
UIManager.Instance.DevicePanel.Close();
singleUIManager.StartRide();
@ -538,10 +717,10 @@ public class CyclingController : DeviceServiceMonoBase
public void GoContinueRide()
{
singleUIManager.ContinueRide();
singleUIManager.ContinueRide();
}
#region TCP相关
#region TCP相关
public void TcpHandler()
{
@ -585,8 +764,8 @@ public class CyclingController : DeviceServiceMonoBase
otherList.Add(onlinePlayerController);
onlinePlayerController.UserId = onlineRider.UserId;
onlinePlayerController.SetDataSource(onlineTotalDistance, onlineDistance, onlineRider.Power, onlineRider.HeartRate, onlineRider.Cadence, onlineRider.TotalTicks, onlineRider.NickName, onlineRider.WeightKg, new Vector2d(onlineRider.Point.Latitude, onlineRider.Point.Longitude),index);
onlinePlayerController.SetDataSource(onlineTotalDistance, onlineDistance, onlineRider.Power, onlineRider.HeartRate, onlineRider.Cadence, onlineRider.TotalTicks, onlineRider.NickName, onlineRider.WeightKg, new Vector2d(onlineRider.Point.Latitude, onlineRider.Point.Longitude), index);
onlinePlayerController.SetHead(onlineRider.WxHeadImg);
if (competitionId == 0)
{
@ -596,7 +775,7 @@ public class CyclingController : DeviceServiceMonoBase
miniController.SetController(onlinePlayerController);
}
//发消息xx进入路书
if(messageIndex > 0)
if (messageIndex > 0)
EventQueueSystem.QueueEvent(new JoinMessageEvent(onlineRider.NickName, onlineRider.WxHeadImg));
}
@ -617,8 +796,8 @@ public class CyclingController : DeviceServiceMonoBase
}
//显示观察者头像
}
if(onlineRiders.Count > 0)
messageIndex++;
if (onlineRiders.Count > 0)
messageIndex++;
//移除
foreach (var item in currentOnlineUserList)
{
@ -634,9 +813,9 @@ public class CyclingController : DeviceServiceMonoBase
{
item.IsShowInfo = false;
}
var frontPlayer = others.Where(c => c.TotalDistance - currentPlayer.TotalDistance < 0.25 && c.TotalDistance - currentPlayer.TotalDistance >= 0 && c.UserId != currentPlayer.UserId).OrderBy(c=>c.TotalDistance).FirstOrDefault();
var bakePlayer = others.Where(c => c.TotalDistance - currentPlayer.TotalDistance >-0.25 && c.TotalDistance - currentPlayer.TotalDistance < 0 && c.UserId != currentPlayer.UserId).OrderByDescending(c=>c.TotalDistance).FirstOrDefault();
if(frontPlayer != null)
var frontPlayer = others.Where(c => c.TotalDistance - currentPlayer.TotalDistance < 0.25 && c.TotalDistance - currentPlayer.TotalDistance >= 0 && c.UserId != currentPlayer.UserId).OrderBy(c => c.TotalDistance).FirstOrDefault();
var bakePlayer = others.Where(c => c.TotalDistance - currentPlayer.TotalDistance > -0.25 && c.TotalDistance - currentPlayer.TotalDistance < 0 && c.UserId != currentPlayer.UserId).OrderByDescending(c => c.TotalDistance).FirstOrDefault();
if (frontPlayer != null)
frontPlayer.IsShowInfo = true;
if (bakePlayer != null)
bakePlayer.IsShowInfo = true;
@ -647,7 +826,7 @@ public class CyclingController : DeviceServiceMonoBase
{
return MapUDPService.GetCompetitionWatchers(competitionId);
}
#endregion
#endregion
public void SetUIManager(PFUIPanel mainPanel, PFUIPanel model)
{
@ -684,7 +863,7 @@ public class CyclingController : DeviceServiceMonoBase
return UIManager.Instance.loginRegOptions.GetCountryImageByName(name);
}
#region 视角切换
#region 视角切换
public AbstractMap map3d;
public bool Is3dView;
@ -744,9 +923,9 @@ public class CyclingController : DeviceServiceMonoBase
private bool lockView = false;
private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
{
if (!lockView)
if (!lockView)
{
var playerController = player.GetComponent<PlayerController>();
player.transform.localScale = new Vector3(3f, 3f, 3f);
var locations = playerController.Currentlatlong == null ? playerController.Currentlatlong : new Vector2d(mapData.List[0].Point[0], mapData.List[0].Point[1]);
@ -755,7 +934,7 @@ public class CyclingController : DeviceServiceMonoBase
if (recorderData != null)
{
var lastLatLon = Along(recorderData.EndDistance);
var nextLatLon = Along(recorderData.EndDistance+0.1);
var nextLatLon = Along(recorderData.EndDistance + 0.1);
player.transform.position = map.GeoToWorldPosition(lastLatLon);
//设定人物方向
var s = map.GeoToWorldPosition(lastLatLon);
@ -776,14 +955,14 @@ public class CyclingController : DeviceServiceMonoBase
}
}
#endregion
#endregion
#region 游戏状态控制
#region 游戏状态控制
Stopwatch sw { get; set; }
//开始骑行
public void SetStart()
{
if (!isPause || DateTime.MinValue == startTime)
if (!isPause && DateTime.MinValue == startTime)
{
isStart = true;
startTime = UIManager.Now.GetDateTime();
@ -823,9 +1002,9 @@ public class CyclingController : DeviceServiceMonoBase
isStart = false;
isQuit = true;
}
#endregion
#endregion
#region 数据处理
#region 数据处理
/// <summary>
/// 当前骑行数据的记录器
/// </summary>
@ -836,7 +1015,7 @@ public class CyclingController : DeviceServiceMonoBase
return cyclingController?.recorderData;
}
}
public Route GetRoute()
public Route GetRoute()
{
return route;
}
@ -850,9 +1029,40 @@ public class CyclingController : DeviceServiceMonoBase
{
return mapData;
}
/// <summary>
/// 清空临时文件
/// </summary>
public void ClearTempFile()
{
Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder);
App.tempRecordData = null;
}
TempRecordData tempRecordData { get; set; }
public void SaveRealTime()
{
if (tempRecordData == null)
{
tempRecordData = new TempRecordData();
}
RecorderDataModel recorderData = cyclingController.recorderData;
tempRecordData.RiderDatas = recorderData.RiderDatas;
tempRecordData.selectParam = recorderData.selectParam;
tempRecordData.RouteId = mapRoute.Id;
tempRecordData.StartTime = startTime;
tempRecordData.ManufacturerId = recorderData.ManufacturerId;
tempRecordData.ManufacturerName = recorderData.ManufacturerName;
tempRecordData.Mode = cyclingModel.ToString();
tempRecordData.EndDistance = recorderData.EndDistance;
var guid = recorderData.ContinueMark;
var filePath = PFConstants.MapWorkoutRecordTempFolder + "/" + guid.ToString()+".txt";
var tempContent = Newtonsoft.Json.JsonConvert.SerializeObject(tempRecordData);
System.IO.File.WriteAllText(filePath, tempContent);
}
public void Save(double totalDistance)
{
ClearTempFile();
cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime();
isQuit = true;
isStart = false;

13
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts
weight = App.CurrentUser.Weight;
bicycleWeight = App.CurrentUser.BicycleWeight;
#if UNITY_EDITOR
power = 143;
power = 1430;
#endif
mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
}
@ -85,7 +85,13 @@ namespace Assets.Scenes.Ride.Scripts
distance = 0;
}
}
protected override void Record()
public void Init(int index, double distance, int tick)
{
CurrentIndex = index;
totalDistance = distance;
ticks = tick;
}
protected override void Record()
{
if (!stopRecord)
{
@ -110,6 +116,9 @@ namespace Assets.Scenes.Ride.Scripts
recorderData.RiderDatas.Add(targetData);
//实时计算MaxAp
//mainController.ComputeMaxAP(Power, ticks);
//实时保存骑行记录
mainController.SaveRealTime();
}
}
protected override void BeforeRun()

2
Assets/Scripts/Scenes/Ride/Scripts/RideSettingScript.cs
View File

@ -20,7 +20,7 @@ namespace Assets.Scenes.Ride.Scripts
cancelButton = transform.Find("CancelButton").GetComponent<Button>();
saveButton = transform.Find("SaveButton").GetComponent<Button>();
slider = transform.Find("Sensitivity").GetComponent<Slider>();
text = transform.Find("Sensitivity/Text").GetComponent<Text>();
text = transform.Find("Sensitivity/Button/Text").GetComponent<Text>();
text.text = App.RideSetting.Sensitivity.ToString("#0")+ "%";
slider.value =(float)App.RideSetting.Sensitivity;
slider.onValueChanged.AddListener((f) =>

24
Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs
View File

@ -4,6 +4,7 @@ using Assets.Scenes.Ride.Scripts.Model;
using UnityEngine.EventSystems;
using Assets.Scripts;
using Assets.Scripts.Apis;
using System.Collections.Generic;
namespace Assets.Scenes.Ride.Scripts
{
@ -28,22 +29,37 @@ namespace Assets.Scenes.Ride.Scripts
//继续骑行如果有伴侣就自动进入伴侣骑行
public override void ContinueRide()
{
string mode = string.Empty;
List<string> rankingsId = null;
//继续骑
if (mainController.routeResult != null)
{
mode = mainController.routeResult.Mode;
rankingsId = mainController.routeResult.ContinueCyclingParam.RankingsId;
}
//异常中断骑行继续骑
if (App.tempRecordData != null)
{
mode = App.tempRecordData.Mode;
rankingsId = App.tempRecordData.selectParam.RankingsId;
}
if (!string.IsNullOrEmpty(mode))
{
#region 注释伴侣骑行的重骑和继续骑行的逻辑
if (mainController.routeResult.Mode == CyclingModel.Review.ToString())
if (mode == CyclingModel.Review.ToString())
{
mainController.SetCyclingModel(CyclingModel.Review);
selectPanel.SetActive(false);
//查询选中人员的骑行记录
MapApi mapApi = new MapApi();
var rankingList = mapApi.GetRecordFileFromServer(mainController.routeResult.ContinueCyclingParam.RankingsId);
MapApi mapApi = ConfigHelper.mapApi;
var rankingList = mapApi.GetRecordFileFromServer(rankingsId);
var reviewFactory = reviewPanel.transform.GetComponent<ReviewFactory>();
reviewFactory.Refresh();
reviewFactory.SetReview(rankingList);
}
#endregion
if (mainController.routeResult.Mode == CyclingModel.Single.ToString())
if (mode == CyclingModel.Single.ToString())
{
mainController.SetCyclingModel(CyclingModel.Single);
reviewPanel.SetActive(false);

2
ProjectSettings/AudioManager.asset
View File

@ -14,6 +14,6 @@ AudioManager:
m_RealVoiceCount: 32
m_SpatializerPlugin:
m_AmbisonicDecoderPlugin:
m_DisableAudio: 1
m_DisableAudio: 0
m_VirtualizeEffects: 1
m_RequestedDSPBufferSize: 1024