修改细节
This commit is contained in:
parent
6ab3ee19f2
commit
edce9c676d
29
Assets/RaceMaskScript.cs
Normal file
29
Assets/RaceMaskScript.cs
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
using DG.Tweening;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
public class RaceMaskScript : MonoBehaviour, IPointerEnterHandler,IPointerExitHandler
|
||||||
|
{
|
||||||
|
public void OnPointerEnter(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
GetComponent<CanvasGroup>().DOFade(1, 0.5f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnPointerExit(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
GetComponent<CanvasGroup>().DOFade(0, 0.5f);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/RaceMaskScript.cs.meta
Normal file
11
Assets/RaceMaskScript.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7f8a12a33aebf7b4cbfcd56590ec2016
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/Race/7.png
Normal file
BIN
Assets/Resources/Images/Race/7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 552 B |
116
Assets/Resources/Images/Race/7.png.meta
Normal file
116
Assets/Resources/Images/Race/7.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 39a817c4ab1138d4dbdb2e1a5b058d77
|
||||||
|
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: 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:
|
||||||
@ -418,7 +418,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Text
|
propertyPath: m_Text
|
||||||
value: Ok
|
value: Yes
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -744,7 +744,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Text
|
propertyPath: m_Text
|
||||||
value: Cancel
|
value: No
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -819,7 +819,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: -160
|
value: -40
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -864,7 +864,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 80
|
value: 20
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@ -498,6 +498,7 @@ RectTransform:
|
|||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 746931305142587941}
|
||||||
- {fileID: 4573235036268973749}
|
- {fileID: 4573235036268973749}
|
||||||
- {fileID: 4573235036785167472}
|
- {fileID: 4573235036785167472}
|
||||||
- {fileID: 4573235036014977059}
|
- {fileID: 4573235036014977059}
|
||||||
@ -612,7 +613,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4573235035984813207}
|
m_Father: {fileID: 4573235035984813207}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
@ -686,7 +687,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4573235035984813207}
|
m_Father: {fileID: 4573235035984813207}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
@ -845,7 +846,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4573235035984813207}
|
m_Father: {fileID: 4573235035984813207}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
@ -893,6 +894,120 @@ MonoBehaviour:
|
|||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: ALL RACE
|
m_Text: ALL RACE
|
||||||
|
--- !u!1 &7337022735317176614
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 746931305142587941}
|
||||||
|
- component: {fileID: 9060068186179921971}
|
||||||
|
- component: {fileID: 3546599840402343035}
|
||||||
|
- component: {fileID: 4367154909318870032}
|
||||||
|
- component: {fileID: 6903105543186716152}
|
||||||
|
- component: {fileID: 2128218079967102783}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Panel
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &746931305142587941
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
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: 4573235035984813207}
|
||||||
|
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 &9060068186179921971
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3546599840402343035
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
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: 0.14509805}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 0}
|
||||||
|
m_Type: 1
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &4367154909318870032
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
radius: 20
|
||||||
|
--- !u!225 &6903105543186716152
|
||||||
|
CanvasGroup:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Alpha: 0
|
||||||
|
m_Interactable: 1
|
||||||
|
m_BlocksRaycasts: 1
|
||||||
|
m_IgnoreParentGroups: 0
|
||||||
|
--- !u!114 &2128218079967102783
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7337022735317176614}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 7f8a12a33aebf7b4cbfcd56590ec2016, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &9215991903109907486
|
--- !u!1 &9215991903109907486
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1507,7 +1622,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 20
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -1672,7 +1787,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 20
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -1692,7 +1807,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 20
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -1712,7 +1827,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 20
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@ -995,6 +995,80 @@ MonoBehaviour:
|
|||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
--- !u!1 &2514235273621485032
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7052195156892582935}
|
||||||
|
- component: {fileID: 1002401694468084519}
|
||||||
|
- component: {fileID: 3114464817730356364}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7052195156892582935
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2514235273621485032}
|
||||||
|
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: 9114115754477968003}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 419.5, y: 0}
|
||||||
|
m_SizeDelta: {x: 1, y: 40}
|
||||||
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
|
--- !u!222 &1002401694468084519
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2514235273621485032}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3114464817730356364
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2514235273621485032}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.25490198, g: 0.25882354, b: 0.31764707, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 0}
|
||||||
|
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!1 &3027864839275049844
|
--- !u!1 &3027864839275049844
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1258,11 +1332,11 @@ RectTransform:
|
|||||||
m_Father: {fileID: 9114115754477968003}
|
m_Father: {fileID: 9114115754477968003}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 499.1, y: -29.5}
|
m_AnchoredPosition: {x: 459.5, y: 0}
|
||||||
m_SizeDelta: {x: 82, y: 20}
|
m_SizeDelta: {x: 82, y: 20}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &4393121095389363787
|
--- !u!222 &4393121095389363787
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1769,6 +1843,7 @@ RectTransform:
|
|||||||
- {fileID: 1317140530939097917}
|
- {fileID: 1317140530939097917}
|
||||||
- {fileID: 1786430169159750715}
|
- {fileID: 1786430169159750715}
|
||||||
- {fileID: 1128690593457696285}
|
- {fileID: 1128690593457696285}
|
||||||
|
- {fileID: 7052195156892582935}
|
||||||
m_Father: {fileID: 4408462524766711656}
|
m_Father: {fileID: 4408462524766711656}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -2825,11 +2900,11 @@ RectTransform:
|
|||||||
m_Father: {fileID: 9114115754477968003}
|
m_Father: {fileID: 9114115754477968003}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 90, y: -19.5}
|
m_AnchoredPosition: {x: 90, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 40}
|
m_SizeDelta: {x: 0, y: 40}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &172587720231943750
|
--- !u!222 &172587720231943750
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -2017,7 +2017,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 12, y: 10}
|
m_SizeDelta: {x: 12, y: 12}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6434972829708844357
|
--- !u!222 &6434972829708844357
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -2046,7 +2046,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: ad6805cddf533a043aa10f74590541d7, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 39a817c4ab1138d4dbdb2e1a5b058d77, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
|
|||||||
|
|
||||||
public static class App
|
public static class App
|
||||||
{
|
{
|
||||||
public static string Host = "http://192.168.0.102:5082/";
|
public static string Host = "http://192.168.0.101:5085/";
|
||||||
|
|
||||||
public static string AppVersion = Application.version;
|
public static string AppVersion = Application.version;
|
||||||
|
|
||||||
|
|||||||
@ -62,7 +62,7 @@ public class HomeController : PFUIPanel
|
|||||||
//Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
|
//Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
UIManager.ShowConfirm("Confirm", "Switch to PowerFun Workouts?\nWe will close the Powerfun and start PowerFun Workouts.", () =>
|
UIManager.ShowConfirm("Switch to PowerFun Workouts?", "We will close the Powerfun and start PowerFun Workouts.", () =>
|
||||||
{
|
{
|
||||||
Utils.ExecFile(path);
|
Utils.ExecFile(path);
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
|
|||||||
@ -35,7 +35,7 @@ public class RaceButtonGroupScript : MonoBehaviour
|
|||||||
}
|
}
|
||||||
void GoJoin()
|
void GoJoin()
|
||||||
{
|
{
|
||||||
UIManager.ShowConfirm("Join", "you want to join?", () =>
|
UIManager.ShowConfirm("Join", "Do you want to join?", () =>
|
||||||
{
|
{
|
||||||
if (!map.HasJoin)
|
if (!map.HasJoin)
|
||||||
{
|
{
|
||||||
@ -54,7 +54,7 @@ public class RaceButtonGroupScript : MonoBehaviour
|
|||||||
}
|
}
|
||||||
void GoCancel()
|
void GoCancel()
|
||||||
{
|
{
|
||||||
UIManager.ShowConfirm("Cancel Reservation", "you want to cancel reservation?", () =>
|
UIManager.ShowConfirm("Cancel Reservation", "Do you want to cancel reservation?", () =>
|
||||||
{
|
{
|
||||||
if (map.HasJoin)
|
if (map.HasJoin)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -23,6 +23,10 @@ public class RaceHomeScript : RaceScript
|
|||||||
base.Show();
|
base.Show();
|
||||||
handleAvatar();
|
handleAvatar();
|
||||||
GetData();
|
GetData();
|
||||||
|
if (btnGoList != null)
|
||||||
|
{
|
||||||
|
btnGoList.Find("Panel").GetComponent<CanvasGroup>().alpha = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
@ -68,11 +72,13 @@ public class RaceHomeScript : RaceScript
|
|||||||
rightContainer = transform.Find("RightContainer");
|
rightContainer = transform.Find("RightContainer");
|
||||||
leftContainer = transform.Find("LeftContainer");
|
leftContainer = transform.Find("LeftContainer");
|
||||||
btnGoList = rightContainer.Find("Container-2/BtnGoList");
|
btnGoList = rightContainer.Find("Container-2/BtnGoList");
|
||||||
UIManager.AddEvent(btnGoList.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
if (btnGoList != null)
|
||||||
{
|
{
|
||||||
UIManager.ShowRaceListPanel();
|
UIManager.AddEvent(btnGoList.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||||
});
|
{
|
||||||
|
UIManager.ShowRaceListPanel();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
bool isEnter = false;
|
bool isEnter = false;
|
||||||
|
|
||||||
|
|||||||
@ -42,7 +42,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
|
|||||||
= $"{(mapCompetition.TotalClimb ?? 0.0).ToString(mapCompetition.TotalClimb > 1000 ? "#0" : "#0.00")}M";
|
= $"{(mapCompetition.TotalClimb ?? 0.0).ToString(mapCompetition.TotalClimb > 1000 ? "#0" : "#0.00")}M";
|
||||||
transform.Find("DataContainer/Slope/Text").GetComponent<Text>().text
|
transform.Find("DataContainer/Slope/Text").GetComponent<Text>().text
|
||||||
= $"{mapCompetition.AverageGrade.ToString("#0.00")}%";
|
= $"{mapCompetition.AverageGrade.ToString("#0.00")}%";
|
||||||
transform.Find("InfoContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToString();
|
transform.Find("InfoContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToLocalTime().ToString();
|
||||||
transform.Find("CountContainer/Text").GetComponent<Text>().text = mapCompetition.ApplyCount.ToString();
|
transform.Find("CountContainer/Text").GetComponent<Text>().text = mapCompetition.ApplyCount.ToString();
|
||||||
SetStatus(mapCompetition);
|
SetStatus(mapCompetition);
|
||||||
SetButtonGroup(mapCompetition);
|
SetButtonGroup(mapCompetition);
|
||||||
|
|||||||
@ -80,13 +80,13 @@ public class RaceScript : PFUIPanel
|
|||||||
{
|
{
|
||||||
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start for Registration";
|
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start for Registration";
|
||||||
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
|
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
|
||||||
map.StartApplyTime.ToString("yyyy-MM-dd HH:mm");
|
map.StartApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
|
||||||
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Deadline for Registration";
|
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Deadline for Registration";
|
||||||
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
|
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
|
||||||
map.EndApplyTime.ToString("yyyy-MM-dd HH:mm");
|
map.EndApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
|
||||||
|
|
||||||
if ((map.StartApplyTime - UIManager.Now.GetDateTime()).TotalSeconds < 0 ||
|
if ((map.StartApplyTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds < 0 ||
|
||||||
(map.StartTime - UIManager.Now.GetDateTime()).TotalSeconds < 0)
|
(map.StartTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds < 0)
|
||||||
{
|
{
|
||||||
var res = ConfigHelper.mapCompetitionApi.GetById(map.Id);
|
var res = ConfigHelper.mapCompetitionApi.GetById(map.Id);
|
||||||
if (res.result)
|
if (res.result)
|
||||||
@ -99,7 +99,7 @@ public class RaceScript : PFUIPanel
|
|||||||
{
|
{
|
||||||
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
|
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
|
||||||
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
|
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
|
||||||
map.StartTime.ToString("yyyy-MM-dd HH:mm");
|
map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
|
||||||
}
|
}
|
||||||
//else if (map.Status == 4)
|
//else if (map.Status == 4)
|
||||||
//{
|
//{
|
||||||
@ -127,7 +127,7 @@ public class RaceScript : PFUIPanel
|
|||||||
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
|
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
|
||||||
= map.HasJoin ? "Get Ready" : "Start Time";
|
= map.HasJoin ? "Get Ready" : "Start Time";
|
||||||
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
|
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
|
||||||
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToString("yyyy-MM-dd HH:mm");
|
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,7 @@ public class ResultListController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
{0,"routes" },{1,"competition" }
|
{0,"routes" },{1,"competition" }
|
||||||
};
|
};
|
||||||
void Start()
|
void Awake()
|
||||||
{
|
{
|
||||||
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
|
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
|
||||||
InitialColor();
|
InitialColor();
|
||||||
@ -82,7 +82,7 @@ public class ResultListController : MonoBehaviour
|
|||||||
UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
|
UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
|
||||||
}
|
}
|
||||||
scrolls = new Transform[] { routeScroll, matchScroll };
|
scrolls = new Transform[] { routeScroll, matchScroll };
|
||||||
GetList(0);
|
//GetList(0);
|
||||||
GetList(1);
|
GetList(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ public class DownloadWorkoutsController : PFUIPanel
|
|||||||
public override void Show()
|
public override void Show()
|
||||||
{
|
{
|
||||||
base.Show();
|
base.Show();
|
||||||
|
Initial();
|
||||||
Btn = transform.Find("Panel/BtnConfirm");
|
Btn = transform.Find("Panel/BtnConfirm");
|
||||||
BtnStart = transform.Find("Panel/BtnStart");
|
BtnStart = transform.Find("Panel/BtnStart");
|
||||||
Loading = transform.Find("Panel/LoadingContainer");
|
Loading = transform.Find("Panel/LoadingContainer");
|
||||||
@ -29,6 +30,23 @@ public class DownloadWorkoutsController : PFUIPanel
|
|||||||
BtnStart.GetComponent<Button>().enabled = true;
|
BtnStart.GetComponent<Button>().enabled = true;
|
||||||
BtnStart.GetComponent<Button>().interactable = true;
|
BtnStart.GetComponent<Button>().interactable = true;
|
||||||
SetType(1);
|
SetType(1);
|
||||||
|
|
||||||
|
}
|
||||||
|
private async void Initial()
|
||||||
|
{
|
||||||
|
var res = await ConfigHelper.userApi.GetAppVersion();
|
||||||
|
if (res.result)
|
||||||
|
{
|
||||||
|
wpf = res.data.WPF;
|
||||||
|
}
|
||||||
|
//if (File.Exists(path) && wpf.Version == PlayerPrefs.GetString("exeVersion_w"))
|
||||||
|
//{
|
||||||
|
// BtnStart.Find("Text").GetComponent<Text>().text = "Install";
|
||||||
|
//}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// BtnStart.Find("Text").GetComponent<Text>().text = "Start";
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
@ -66,30 +84,26 @@ public class DownloadWorkoutsController : PFUIPanel
|
|||||||
//Application.Quit();
|
//Application.Quit();
|
||||||
OpenFile(path);
|
OpenFile(path);
|
||||||
});
|
});
|
||||||
|
|
||||||
UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,async (_base) =>
|
UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,async (_base) =>
|
||||||
{
|
{
|
||||||
var res = await ConfigHelper.userApi.GetAppVersion();
|
if (wpf != null)
|
||||||
if (res.result)
|
|
||||||
{
|
{
|
||||||
wpf = res.data.WPF;
|
BtnStart.GetComponent<Button>().enabled = false;
|
||||||
if (wpf != null)
|
BtnStart.GetComponent<Button>().interactable = false;
|
||||||
|
Debug.Log(path);
|
||||||
|
StartCoroutine(DownLoadExe(wpf.Url, path, (p, isComplete) =>
|
||||||
{
|
{
|
||||||
BtnStart.GetComponent<Button>().enabled = false;
|
//Debug.Log($"{a} {b} {isComplete}");
|
||||||
BtnStart.GetComponent<Button>().interactable = false;
|
transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {Math.Round(p * 100, 0)}%";// string.Format(, a, b);
|
||||||
Debug.Log(path);
|
transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)p;
|
||||||
StartCoroutine(DownLoadExe(wpf.Url, path, (p, isComplete) =>
|
if (isComplete)
|
||||||
{
|
{
|
||||||
//Debug.Log($"{a} {b} {isComplete}");
|
SetType(3);
|
||||||
transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {Math.Round(p * 100,0)}%";// string.Format(, a, b);
|
PlayerPrefs.SetString("exeVersion_w", wpf.Version);
|
||||||
transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)p;
|
new FileInfo(path + ".pfdownload").MoveTo(path);
|
||||||
if (isComplete)
|
}
|
||||||
{
|
}));
|
||||||
SetType(3);
|
|
||||||
PlayerPrefs.SetString("exeVersion_w", wpf.Version);
|
|
||||||
new FileInfo(path + ".pfdownload").MoveTo(path);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//if (App.UpdateObject != null)
|
//if (App.UpdateObject != null)
|
||||||
//{
|
//{
|
||||||
@ -242,11 +256,12 @@ public class DownloadWorkoutsController : PFUIPanel
|
|||||||
}
|
}
|
||||||
void OpenFile(string p)
|
void OpenFile(string p)
|
||||||
{
|
{
|
||||||
UIManager.ShowConfirm("Confirm", "Switch to PowerFun Workouts?\nWe will close the Powerfun and start PowerFun Workouts.", () =>
|
Utils.ExecFile(p);
|
||||||
{
|
Application.Quit();
|
||||||
Utils.ExecFile(p);
|
//UIManager.ShowConfirm("Switch to PowerFun Workouts?", "We will close the Powerfun and start PowerFun Workouts.", () =>
|
||||||
Application.Quit();
|
//{
|
||||||
});
|
|
||||||
|
//});
|
||||||
}
|
}
|
||||||
void SetType(int a)
|
void SetType(int a)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -457,7 +457,7 @@ public class UIManager : MonoBehaviour
|
|||||||
|
|
||||||
public static void ShowUserInfoPanel()
|
public static void ShowUserInfoPanel()
|
||||||
{
|
{
|
||||||
UIManager.Instance.UserInfoPanel.Reset();
|
//UIManager.Instance.UserInfoPanel.Reset();
|
||||||
UIManager.Show(UIManager.Instance.UserInfoPanel, UIManager.Instance.MainPanel);
|
UIManager.Show(UIManager.Instance.UserInfoPanel, UIManager.Instance.MainPanel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user