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 
# Conflicts:
#	Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs
This commit is contained in:
CaiYanPeng 2021-12-28 18:26:56 +08:00
commit b3f6bb6861
15 changed files with 1175 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

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

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

8
Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab
View File

@ -2984,7 +2984,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1567329384924788571
RectTransform:
m_ObjectHideFlags: 0
@ -4945,7 +4945,7 @@ PrefabInstance:
- target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b,
type: 3}
propertyPath: m_LocalScale.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b,
type: 3}
@ -4985,12 +4985,12 @@ PrefabInstance:
- target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 177
value: 137.5
objectReference: {fileID: 0}
- target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -78
value: -29.100006
objectReference: {fileID: 0}
- target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b,
type: 3}

134
Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab
View File

@ -3159,6 +3159,7 @@ RectTransform:
- {fileID: 3664757228482092608}
- {fileID: 6558498177216885471}
- {fileID: 6558498178561756610}
- {fileID: 978563753921066300}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3763,9 +3764,9 @@ RectTransform:
m_Father: {fileID: 6558498177448486125}
m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -344, y: 79}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 414.5, y: 38}
m_SizeDelta: {x: 39, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6558498177866866919
@ -3802,7 +3803,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 2
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -7491,3 +7492,128 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1001 &5356534747490461938
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6558498177448486125}
m_Modifications:
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_RootOrder
value: 42
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_SizeDelta.x
value: 345
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_SizeDelta.y
value: 14
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 222.5
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 39
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5449041719336151766, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Name
value: MultiTips
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3}
--- !u!224 &978563753921066300 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
m_PrefabInstance: {fileID: 5356534747490461938}
m_PrefabAsset: {fileID: 0}

10
Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab
View File

@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0016d579a79d1324b8c0ab019d7b324e, type: 3}
m_Sprite: {fileID: 21300000, guid: b48ea72f3838c7c488621e80fc51c270, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -183,7 +183,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a52d3365198fe5046ad9d0aa48ce18a6, type: 3}
m_Sprite: {fileID: 21300000, guid: 78b0b245ac3f5d14ca7854e685d94361, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -308,7 +308,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -474,7 +474,7 @@ RectTransform:
m_GameObject: {fileID: 6130612940446107805}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6130612939804614209}
- {fileID: 6130612938828236869}
@ -510,7 +510,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8}
m_Color: {r: 0.09019608, g: 0.09019608, b: 0.11372549, a: 0.8}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

235
Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab
View File

@ -493,7 +493,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 0, y: 34}
m_SizeDelta: {x: 40, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1135116821091102494
CanvasRenderer:
@ -622,7 +622,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 0, y: 34}
m_SizeDelta: {x: 40, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1135116820989721926
CanvasRenderer:
@ -941,7 +941,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -1011,7 +1011,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2322716380738134732
RectTransform:
m_ObjectHideFlags: 0
@ -1835,7 +1835,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 410, y: -102}
m_SizeDelta: {x: 360, y: 0}
m_SizeDelta: {x: 360, y: 12}
m_Pivot: {x: 1, y: 1}
--- !u!222 &3007624748807431536
CanvasRenderer:
@ -3169,7 +3169,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 2
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -4028,9 +4028,9 @@ RectTransform:
m_Father: {fileID: 3327674565846436473}
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: 20, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20, y: -9}
m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8640525812794733518
@ -4135,9 +4135,9 @@ RectTransform:
m_Father: {fileID: 3327674566083090465}
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: 20, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20, y: -9}
m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8640525813296669078
@ -4479,95 +4479,128 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8451213515812577717
GameObject:
--- !u!1001 &4527911445537327971
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8724855723572369069}
- component: {fileID: 6379280327630955396}
- component: {fileID: 7317912239976424843}
- component: {fileID: 2126716285580818362}
m_Layer: 5
m_Name: MultiTips
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8724855723572369069
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3007624749581944593}
m_Modifications:
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_RootOrder
value: 33
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_SizeDelta.x
value: 440
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_SizeDelta.y
value: 14
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 269.9
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 45.899994
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5449041719336151766, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
propertyPath: m_Name
value: MultiTips
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3}
--- !u!224 &8724855723572369069 stripped
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777,
type: 3}
m_PrefabInstance: {fileID: 4527911445537327971}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8451213515812577717}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3007624749581944593}
m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 284.33, y: 53.9}
m_SizeDelta: {x: 467.1488, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6379280327630955396
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8451213515812577717}
m_CullTransparentMesh: 0
--- !u!114 &7317912239976424843
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8451213515812577717}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 10
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6D4B\u8BD5\u6D88\u606F"
--- !u!114 &2126716285580818362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8451213515812577717}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3}
m_Name:
m_EditorClassIdentifier:
key:

94
Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab Normal file
View File

@ -0,0 +1,94 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5449041719336151766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5170894839205404110}
- component: {fileID: 7372848685446146279}
- component: {fileID: 6582060407730122472}
- component: {fileID: 2546154786923265241}
m_Layer: 5
m_Name: MultiTips
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5170894839205404110
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5449041719336151766}
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: 0}
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: 269.9, y: 45.899994}
m_SizeDelta: {x: 440, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7372848685446146279
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5449041719336151766}
m_CullTransparentMesh: 0
--- !u!114 &6582060407730122472
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5449041719336151766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 10
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!114 &2546154786923265241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5449041719336151766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3}
m_Name:
m_EditorClassIdentifier:
key:

7
Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab.meta Normal file
View File

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

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

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/Apis/Models/MapRoute.cs
View File

@ -111,5 +111,7 @@ namespace Assets.Scripts.Apis.Models
public int MineCount { get; set; }
public int[] RouteIds { get; set; }
//最近骑行列表使用
public RouteResult RecentRecord { get; set; }
}
}

23
Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
View File

@ -23,7 +23,8 @@ namespace Assets.Scenes.Ride.Scripts
GameObject ShareButton { get; set; }
GameObject ToolBarPanel { get; set; }
GameObject WeChatButton { get; set; }
GameObject WeChatGpButton { get; set; }
RawImage TopHead { get; set; }
RawImage SecondHead { get; set; }
@ -60,9 +61,9 @@ namespace Assets.Scenes.Ride.Scripts
ShareButton = transform.Find("ShareButton").gameObject;
ToolBarPanel = transform.Find("ToolBarPanel").gameObject;
WeChatButton = transform.Find("ToolBarPanel/WeChatButton").gameObject;
ShareButton.SetActive(!cyclingController.isWatch);
UIManager.AddEvent(ShareButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare);
UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare);
WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat);
UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp);
#endif
SpriteTop = Resources.Load<Sprite>("Images/Ride/Match/top-1");
SpriteSecond = Resources.Load<Sprite>("Images/Ride/Match/top-2");
@ -114,7 +115,7 @@ namespace Assets.Scenes.Ride.Scripts
Mine.SetActive(!cyclingController.isWatch);
RankingPanel.SetActive(cyclingController.isWatch);
TitleImage.SetActive(!cyclingController.isWatch);
//TitleImage.SetActive(!cyclingController.isWatch);
WatchTitle.SetActive(cyclingController.isWatch);
if (!cyclingController.isWatch)
@ -243,5 +244,17 @@ namespace Assets.Scenes.Ride.Scripts
Utils.showToast(null, "未安装微信");
}
}
private void ShareWechatGp(BaseEventData baseEventData)
{
if (App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
}
}

28
Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs
View File

@ -41,7 +41,7 @@ namespace Assets.Scenes.Ride.Scripts
GameObject goResultBtn;
GameObject cancelBtn;
GameObject shareWxBtn;
GameObject shareButton;
GameObject shareWxGpButton;
Transform toolbar;
#endregion
@ -74,7 +74,7 @@ namespace Assets.Scenes.Ride.Scripts
toolbar = transform.Find("ToolBarPanel");
#if UNITY_ANDROID || UNITY_IOS
shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject;
shareButton = transform.Find("ShareButton").gameObject;
shareWxGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
#endif
}
@ -83,19 +83,25 @@ namespace Assets.Scenes.Ride.Scripts
cyclingController = controller;
cyclingController.AddEvent(goResultBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, GoResult);
cyclingController.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
#if UNITY_ANDROID || UNITY_IOS
cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx);
cyclingController.AddEvent(shareButton, EventTriggerType.PointerClick, opneShare);
}
private void opneShare(BaseEventData baseEventData)
{
((RectTransform)toolbar).pivot = new Vector2(0, ((RectTransform)toolbar).pivot.y);
toolbar.gameObject.SetActive(true);
shareButton.SetActive(false);
toolbar.DOScaleX(1,1);
cyclingController.AddEvent(shareWxGpButton, EventTriggerType.PointerClick, shareToWxGp);
#endif
}
private void shareToWx(BaseEventData b)
{
if (App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname);
}
else
{
Utils.showToast(null, "未安装微信");
}
}
private void shareToWxGp(BaseEventData b)
{
if (App.weChatController.IsWeChatAppInstalled())
{

2
Assets/Scripts/UI/Prefab/MultiTips.cs
View File

@ -19,7 +19,7 @@ public class MultiTips:PFUIText
var tiplist = ConfigHelper.mapApi.GetTipsList();
if (!string.IsNullOrEmpty(tiplist))
{
tips = tiplist.Split(',');
tips = tiplist.Split('#');
}
var random = new System.Random();
currentIndex = random.Next(0, tips.Length);