Merge remote-tracking branch 'origin/dev' into dev_lishuo
This commit is contained in:
commit
a96d538dc1
@ -31,6 +31,19 @@ public class ImageWithRoundedCorners : MonoBehaviour {
|
|||||||
var rect = ((RectTransform)transform).rect;
|
var rect = ((RectTransform)transform).rect;
|
||||||
material.SetVector(Props, new Vector4(rect.width, rect.height, radius * 2, 0));
|
material.SetVector(Props, new Vector4(rect.width, rect.height, radius * 2, 0));
|
||||||
if (gameObject.GetComponent<Image>() != null)
|
if (gameObject.GetComponent<Image>() != null)
|
||||||
|
{
|
||||||
|
gameObject.GetComponent<Image>().material = material;
|
||||||
|
//gameObject.GetComponent<Image>().sprite = null;
|
||||||
|
}
|
||||||
|
else if (gameObject.GetComponent<RawImage>() != null)
|
||||||
|
{
|
||||||
|
gameObject.GetComponent<RawImage>().material = material;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public void Refresh(Vector2 r)
|
||||||
|
{
|
||||||
|
material.SetVector(Props, new Vector4(r.x, r.y, radius * 2, 0));
|
||||||
|
if (gameObject.GetComponent<Image>() != null)
|
||||||
{
|
{
|
||||||
gameObject.GetComponent<Image>().material = material;
|
gameObject.GetComponent<Image>().material = material;
|
||||||
gameObject.GetComponent<Image>().sprite = null;
|
gameObject.GetComponent<Image>().sprite = null;
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 3.9 KiB |
BIN
Assets/Resources/Images/Config_1.png
Normal file
BIN
Assets/Resources/Images/Config_1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: b05a06daa805be243afe339207cb338c
|
guid: 28c1cc7667df5eb4e8bf360991cc784c
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
BIN
Assets/Resources/Images/Device Connect_BG.png
Normal file
BIN
Assets/Resources/Images/Device Connect_BG.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 246 KiB |
104
Assets/Resources/Images/Device Connect_BG.png.meta
Normal file
104
Assets/Resources/Images/Device Connect_BG.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0aa699974f67fc14391df9d204504c86
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/Smart Trainer Connect _BG.png
Normal file
BIN
Assets/Resources/Images/Smart Trainer Connect _BG.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 244 KiB |
104
Assets/Resources/Images/Smart Trainer Connect _BG.png.meta
Normal file
104
Assets/Resources/Images/Smart Trainer Connect _BG.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bb78a6427b2dd2e468f35d12d18c3945
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/Smart Trainer Connectd _BG.png
Normal file
BIN
Assets/Resources/Images/Smart Trainer Connectd _BG.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
104
Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta
Normal file
104
Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f801cf1a87a735b49890bdb5ab4022d6
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/c-1.png
Normal file
BIN
Assets/Resources/Images/c-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
116
Assets/Resources/Images/c-1.png.meta
Normal file
116
Assets/Resources/Images/c-1.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0707256cf85294645992e14622b35a27
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/c-4.png
Normal file
BIN
Assets/Resources/Images/c-4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
116
Assets/Resources/Images/c-4.png.meta
Normal file
116
Assets/Resources/Images/c-4.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 05aa2629316868449b07d46192ad5208
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/c-5.png
Normal file
BIN
Assets/Resources/Images/c-5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
116
Assets/Resources/Images/c-5.png.meta
Normal file
116
Assets/Resources/Images/c-5.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ee5f7215ddbe5f34bacffde276a037f6
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/c-6.png
Normal file
BIN
Assets/Resources/Images/c-6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
116
Assets/Resources/Images/c-6.png.meta
Normal file
116
Assets/Resources/Images/c-6.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c2ccc8886a56fc2498c13cf4b12bf832
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/close_1.png
Normal file
BIN
Assets/Resources/Images/close_1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
104
Assets/Resources/Images/close_1.png.meta
Normal file
104
Assets/Resources/Images/close_1.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5cbb2a1813e35d143a8939fc60814d38
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/icon-circulo-carga.png
Normal file
BIN
Assets/Resources/Images/icon-circulo-carga.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
104
Assets/Resources/Images/icon-circulo-carga.png.meta
Normal file
104
Assets/Resources/Images/icon-circulo-carga.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 407dc13d102a8d842bbaa773773df936
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/icon-circulo-completo.png
Normal file
BIN
Assets/Resources/Images/icon-circulo-completo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
104
Assets/Resources/Images/icon-circulo-completo.png.meta
Normal file
104
Assets/Resources/Images/icon-circulo-completo.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cd3deb5c5274df94bbb4496fffd50e7c
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -47,7 +47,7 @@ TextureImporter:
|
|||||||
spritePivot: {x: 0.5, y: 0.5}
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
spritePixelsToUnits: 100
|
spritePixelsToUnits: 100
|
||||||
spriteBorder: {x: 11, y: 11, z: 11, w: 11}
|
spriteBorder: {x: 11, y: 11, z: 11, w: 11}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 0
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 1
|
alphaIsTransparency: 1
|
||||||
spriteTessellationDetail: -1
|
spriteTessellationDetail: -1
|
||||||
@ -83,6 +83,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|||||||
BIN
Assets/Resources/Images/login_headlight.png
Normal file
BIN
Assets/Resources/Images/login_headlight.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 45 KiB |
116
Assets/Resources/Images/login_headlight.png.meta
Normal file
116
Assets/Resources/Images/login_headlight.png.meta
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 36c8bb840fb83e44391b1a8b8c86e7c2
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Images/search.png
Normal file
BIN
Assets/Resources/Images/search.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
104
Assets/Resources/Images/search.png.meta
Normal file
104
Assets/Resources/Images/search.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f731243fde8f17842b1b54e8fe2a16d6
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Resources/Images/woman.png
Normal file
BIN
Assets/Resources/Images/woman.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
104
Assets/Resources/Images/woman.png.meta
Normal file
104
Assets/Resources/Images/woman.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e070f035bee8324459f88aef1c594662
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -83,6 +83,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 102e792eaf910f74e9acb0b9a6182219
|
guid: 95a41acefc4f5e04a9a456f8ce06938e
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@ -459,6 +459,8 @@ GameObject:
|
|||||||
- component: {fileID: 1975648157075935214}
|
- component: {fileID: 1975648157075935214}
|
||||||
- component: {fileID: 2531553338690931336}
|
- component: {fileID: 2531553338690931336}
|
||||||
- component: {fileID: 8832560749054131812}
|
- component: {fileID: 8832560749054131812}
|
||||||
|
- component: {fileID: 4582666049926171087}
|
||||||
|
- component: {fileID: 8407972822175107971}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: PFUIDropdown
|
m_Name: PFUIDropdown
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -509,13 +511,13 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 0.27450982, g: 0.2784314, b: 0.34117648, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 7b719bf966c41114ea64e643d76a04b6, type: 3}
|
m_Sprite: {fileID: 0}
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
@ -595,6 +597,34 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 81cc4b54765fb63428ca4b88ee884d22, type: 3}
|
m_Script: {fileID: 11500000, guid: 81cc4b54765fb63428ca4b88ee884d22, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!114 &4582666049926171087
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2173531533974716301}
|
||||||
|
m_Enabled: 0
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_EffectColor: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
|
||||||
|
m_EffectDistance: {x: 2, y: 2}
|
||||||
|
m_UseGraphicAlpha: 1
|
||||||
|
--- !u!114 &8407972822175107971
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2173531533974716301}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
radius: 11
|
||||||
--- !u!1 &3419666652408417437
|
--- !u!1 &3419666652408417437
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -36,7 +36,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 182, y: -50}
|
m_AnchoredPosition: {x: 182, y: -33}
|
||||||
m_SizeDelta: {x: 46, y: 17}
|
m_SizeDelta: {x: 46, y: 17}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &7696400418172266878
|
--- !u!222 &7696400418172266878
|
||||||
@ -133,7 +133,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 12, y: -53}
|
m_AnchoredPosition: {x: 12, y: -36}
|
||||||
m_SizeDelta: {x: 12, y: 12}
|
m_SizeDelta: {x: 12, y: 12}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &5310671687985071753
|
--- !u!222 &5310671687985071753
|
||||||
@ -216,7 +216,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 240, y: 77}
|
m_SizeDelta: {x: 240, y: 60}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &1644731075966996397
|
--- !u!222 &1644731075966996397
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -324,7 +324,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 28, y: -50}
|
m_AnchoredPosition: {x: 28, y: -33}
|
||||||
m_SizeDelta: {x: 60, y: 17}
|
m_SizeDelta: {x: 60, y: 17}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &7879955616901665858
|
--- !u!222 &7879955616901665858
|
||||||
@ -402,7 +402,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 108, y: -50}
|
m_AnchoredPosition: {x: 108, y: -33}
|
||||||
m_SizeDelta: {x: 60, y: 17}
|
m_SizeDelta: {x: 60, y: 17}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &1893774285036630824
|
--- !u!222 &1893774285036630824
|
||||||
@ -480,7 +480,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 92, y: -53}
|
m_AnchoredPosition: {x: 92, y: -36}
|
||||||
m_SizeDelta: {x: 12, y: 12}
|
m_SizeDelta: {x: 12, y: 12}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &8071121334430382672
|
--- !u!222 &8071121334430382672
|
||||||
@ -736,7 +736,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 34
|
value: 17
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@ -866,7 +866,7 @@ MonoBehaviour:
|
|||||||
m_Spacing: 2
|
m_Spacing: 2
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 1
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
m_ChildScaleWidth: 0
|
m_ChildScaleWidth: 0
|
||||||
m_ChildScaleHeight: 0
|
m_ChildScaleHeight: 0
|
||||||
@ -1104,6 +1104,7 @@ RectTransform:
|
|||||||
- {fileID: 5111540946519637648}
|
- {fileID: 5111540946519637648}
|
||||||
- {fileID: 373244018917157862}
|
- {fileID: 373244018917157862}
|
||||||
- {fileID: 4486570865570418447}
|
- {fileID: 4486570865570418447}
|
||||||
|
- {fileID: 9148816495943991969}
|
||||||
m_Father: {fileID: 2357493399953259503}
|
m_Father: {fileID: 2357493399953259503}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -1174,6 +1175,80 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &8699258261893011431
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 9148816495943991969}
|
||||||
|
- component: {fileID: 6682538152067005844}
|
||||||
|
- component: {fileID: 7512890813467725056}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: SearchIcon
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &9148816495943991969
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8699258261893011431}
|
||||||
|
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: 8260988677505792498}
|
||||||
|
m_RootOrder: 6
|
||||||
|
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: 290.3, y: 150.2}
|
||||||
|
m_SizeDelta: {x: 30, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6682538152067005844
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8699258261893011431}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7512890813467725056
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8699258261893011431}
|
||||||
|
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: 21300000, guid: f731243fde8f17842b1b54e8fe2a16d6, 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!1 &8816592783367478648
|
--- !u!1 &8816592783367478648
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -32,10 +32,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 189965521107699628}
|
m_Father: {fileID: 189965521107699628}
|
||||||
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: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 29, y: -44}
|
m_AnchoredPosition: {x: 29, y: -17}
|
||||||
m_SizeDelta: {x: 612, y: 1}
|
m_SizeDelta: {x: -58, y: 1}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &3359272933999016855
|
--- !u!222 &3359272933999016855
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -104,14 +104,15 @@ RectTransform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4347642619387382541}
|
- {fileID: 4347642619387382541}
|
||||||
- {fileID: 5333104648953487716}
|
- {fileID: 5333104648953487716}
|
||||||
|
- {fileID: 4582282901144642708}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 54}
|
m_SizeDelta: {x: 0, y: 54}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &4265028498138876579
|
--- !u!114 &4265028498138876579
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -230,3 +231,81 @@ MonoBehaviour:
|
|||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: New Text
|
m_Text: New Text
|
||||||
|
--- !u!1 &8513862428541677370
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4582282901144642708}
|
||||||
|
- component: {fileID: 828510373746272033}
|
||||||
|
- component: {fileID: 1484798634535886974}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Type
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4582282901144642708
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8513862428541677370}
|
||||||
|
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: 189965521107699628}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -43.46, y: 15}
|
||||||
|
m_SizeDelta: {x: 65.85498, y: 30}
|
||||||
|
m_Pivot: {x: 1, y: 1}
|
||||||
|
--- !u!222 &828510373746272033
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8513862428541677370}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1484798634535886974
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8513862428541677370}
|
||||||
|
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.9764706, g: 0.1882353, b: 0.5254902, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
|
||||||
|
m_FontSize: 16
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 1
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 3
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: ANT+
|
||||||
|
|||||||
@ -538,6 +538,7 @@ GameObject:
|
|||||||
- component: {fileID: 6865488968694474991}
|
- component: {fileID: 6865488968694474991}
|
||||||
- component: {fileID: 9174514640126681443}
|
- component: {fileID: 9174514640126681443}
|
||||||
- component: {fileID: 7187524458426321200}
|
- component: {fileID: 7187524458426321200}
|
||||||
|
- component: {fileID: 8263193341907766823}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ConnectionPanel
|
m_Name: ConnectionPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -627,6 +628,18 @@ MonoBehaviour:
|
|||||||
m_GradientStyle: 0
|
m_GradientStyle: 0
|
||||||
m_ColorSpace: -1
|
m_ColorSpace: -1
|
||||||
m_IgnoreAspectRatio: 1
|
m_IgnoreAspectRatio: 1
|
||||||
|
--- !u!225 &8263193341907766823
|
||||||
|
CanvasGroup:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8089520134167711217}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Alpha: 1
|
||||||
|
m_Interactable: 1
|
||||||
|
m_BlocksRaycasts: 1
|
||||||
|
m_IgnoreParentGroups: 0
|
||||||
--- !u!1 &8191608159360083798
|
--- !u!1 &8191608159360083798
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -540,7 +540,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Tooltips
|
propertyPath: Tooltips
|
||||||
value: "\u963F\u65AF\u987F\u53D1"
|
value: Device
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
|
||||||
@ -707,7 +707,7 @@ PrefabInstance:
|
|||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Sprite
|
propertyPath: m_Sprite
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 21300000, guid: aa45bff1f87f0e24381d66bf33aba1b8,
|
objectReference: {fileID: 21300000, guid: 28c1cc7667df5eb4e8bf360991cc784c,
|
||||||
type: 3}
|
type: 3}
|
||||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@ -314,7 +314,6 @@ GameObject:
|
|||||||
- component: {fileID: 281043391106631963}
|
- component: {fileID: 281043391106631963}
|
||||||
- component: {fileID: 281043391106631957}
|
- component: {fileID: 281043391106631957}
|
||||||
- component: {fileID: 5399473526635801971}
|
- component: {fileID: 5399473526635801971}
|
||||||
- component: {fileID: 2103284423}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: MapItem
|
m_Name: MapItem
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -347,10 +346,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 280, y: 287}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &5262667172184159176
|
--- !u!222 &5262667172184159176
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -444,22 +443,6 @@ MonoBehaviour:
|
|||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!114 &2103284423
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5262667172184159175}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Inverse: 0
|
|
||||||
m_MaskInteraction: 1
|
|
||||||
m_UseStencil: 1
|
|
||||||
m_RaycastFilter: 0
|
|
||||||
--- !u!1 &5307116753058887248
|
--- !u!1 &5307116753058887248
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -789,7 +789,8 @@ Transform:
|
|||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
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: 1728001826856130898}
|
||||||
m_Father: {fileID: 3945718112839240075}
|
m_Father: {fileID: 3945718112839240075}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||||
@ -920,9 +921,9 @@ MonoBehaviour:
|
|||||||
entityPerCoroutine: 20
|
entityPerCoroutine: 20
|
||||||
vectorSubLayers: []
|
vectorSubLayers: []
|
||||||
locationPrefabList: []
|
locationPrefabList: []
|
||||||
_tileProvider: {fileID: 0}
|
_tileProvider: {fileID: 5955187681502729797}
|
||||||
_previewOptions:
|
_previewOptions:
|
||||||
isPreviewEnabled: 0
|
isPreviewEnabled: 1
|
||||||
--- !u!114 &3945718112544175234
|
--- !u!114 &3945718112544175234
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1254,6 +1255,53 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_HorizontalFit: 0
|
m_HorizontalFit: 0
|
||||||
m_VerticalFit: 2
|
m_VerticalFit: 2
|
||||||
|
--- !u!1 &5990552412584580859
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1728001826856130898}
|
||||||
|
- component: {fileID: 5955187681502729797}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: TileProvider
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1728001826856130898
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5990552412584580859}
|
||||||
|
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: 3945718112544175236}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &5955187681502729797
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5990552412584580859}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 756a01a914208439d8d2fc8dcd68b229, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_cbtpOptions:
|
||||||
|
camera: {fileID: 0}
|
||||||
|
visibleBuffer: 0
|
||||||
|
disposeBuffer: 0
|
||||||
--- !u!1 &6307228320602552118
|
--- !u!1 &6307228320602552118
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -100,7 +100,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: b78d80c303a893343a9f1fbad91b258f, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 0aa699974f67fc14391df9d204504c86, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
@ -140,13 +140,14 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 540031521672414432}
|
- {fileID: 540031521672414432}
|
||||||
|
- {fileID: 4177612200037049886}
|
||||||
m_Father: {fileID: 2716191576886074694}
|
m_Father: {fileID: 2716191576886074694}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 100, y: 64}
|
m_SizeDelta: {x: 64, y: 64}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &6268486626046139400
|
--- !u!222 &6268486626046139400
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -249,14 +250,14 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 0}
|
m_Sprite: {fileID: 0}
|
||||||
m_Type: 1
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
m_FillMethod: 4
|
m_FillMethod: 4
|
||||||
@ -361,6 +362,8 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7880067589867523193}
|
- component: {fileID: 7880067589867523193}
|
||||||
|
- component: {fileID: 2300362318542359912}
|
||||||
|
- component: {fileID: 7674521249602453297}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: UnconnectionPanel
|
m_Name: UnconnectionPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -390,6 +393,43 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2300362318542359912
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3922022349098588048}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7674521249602453297
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3922022349098588048}
|
||||||
|
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: bb78a6427b2dd2e468f35d12d18c3945, 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!1 &4032660314221060955
|
--- !u!1 &4032660314221060955
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -428,7 +468,7 @@ RectTransform:
|
|||||||
- {fileID: 3144935909727982048}
|
- {fileID: 3144935909727982048}
|
||||||
- {fileID: 6693457840500217632}
|
- {fileID: 6693457840500217632}
|
||||||
- {fileID: 4318784480111848189}
|
- {fileID: 4318784480111848189}
|
||||||
- {fileID: 6682760290205143075}
|
- {fileID: 3886093058250731124}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -508,6 +548,8 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4987533108072491894}
|
- component: {fileID: 4987533108072491894}
|
||||||
- component: {fileID: 1827267358013476362}
|
- component: {fileID: 1827267358013476362}
|
||||||
|
- component: {fileID: 8976174000101069486}
|
||||||
|
- component: {fileID: 6858275271041851238}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ConnectionPanel
|
m_Name: ConnectionPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -543,6 +585,47 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5023905775086954472}
|
m_GameObject: {fileID: 5023905775086954472}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8976174000101069486
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5023905775086954472}
|
||||||
|
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: f801cf1a87a735b49890bdb5ab4022d6, 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!225 &6858275271041851238
|
||||||
|
CanvasGroup:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5023905775086954472}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Alpha: 1
|
||||||
|
m_Interactable: 1
|
||||||
|
m_BlocksRaycasts: 1
|
||||||
|
m_IgnoreParentGroups: 0
|
||||||
--- !u!1 &5941259351214417460
|
--- !u!1 &5941259351214417460
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -699,6 +782,80 @@ MonoBehaviour:
|
|||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Smart Trainer
|
m_Text: Smart Trainer
|
||||||
|
--- !u!1 &6502171739230510504
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4177612200037049886}
|
||||||
|
- component: {fileID: 4637196965224215020}
|
||||||
|
- component: {fileID: 6835048507788123828}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4177612200037049886
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6502171739230510504}
|
||||||
|
m_LocalRotation: {x: 0.08715578, y: 0, z: 0, w: 0.9961947}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6430829710355291381}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 10, 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: 44, y: 44}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &4637196965224215020
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6502171739230510504}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6835048507788123828
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6502171739230510504}
|
||||||
|
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: 407dc13d102a8d842bbaa773773df936, 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!1 &7066476020851680862
|
--- !u!1 &7066476020851680862
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -773,124 +930,6 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
--- !u!1 &7751583847402098136
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 6682760290205143075}
|
|
||||||
- component: {fileID: 3666476432683473770}
|
|
||||||
- component: {fileID: 8072193673390519755}
|
|
||||||
- component: {fileID: 1279988025458105546}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: CloseBtn
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &6682760290205143075
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7751583847402098136}
|
|
||||||
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: 4032660314221060952}
|
|
||||||
m_RootOrder: 7
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 1506, y: -30}
|
|
||||||
m_SizeDelta: {x: 64, y: 64}
|
|
||||||
m_Pivot: {x: 0, y: 1}
|
|
||||||
--- !u!222 &3666476432683473770
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7751583847402098136}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &8072193673390519755
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7751583847402098136}
|
|
||||||
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: 13eb11ec68556324fb34d28dec570c27, 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 &1279988025458105546
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7751583847402098136}
|
|
||||||
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: 8072193673390519755}
|
|
||||||
m_OnClick:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!1 &7967353091167980053
|
--- !u!1 &7967353091167980053
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1151,17 +1190,17 @@ PrefabInstance:
|
|||||||
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Color.b
|
propertyPath: m_Color.b
|
||||||
value: 0.5254902
|
value: 0.44313726
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Color.g
|
propertyPath: m_Color.g
|
||||||
value: 0.1882353
|
value: 0.105882354
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
- target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Color.r
|
propertyPath: m_Color.r
|
||||||
value: 0.9764706
|
value: 0.89411765
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
- target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -1536,6 +1575,177 @@ RectTransform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 2068211973115863772}
|
m_PrefabInstance: {fileID: 2068211973115863772}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &2186264729535284436
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 4032660314221060952}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Type
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38,
|
||||||
|
type: 3}
|
||||||
|
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Color.b
|
||||||
|
value: 0.7372549
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Color.g
|
||||||
|
value: 0.6862745
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Color.r
|
||||||
|
value: 0.6862745
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 7
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 64
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 64
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 1506
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: CloseBtn
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Colors.m_HighlightedColor.b
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Colors.m_HighlightedColor.g
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: mType
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
|
||||||
|
--- !u!224 &3886093058250731124 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2186264729535284436}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &7779191180664939548
|
--- !u!1001 &7779191180664939548
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -465,7 +465,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: e60e7b809e129404b9dce5d584c9ca57, type: 3}
|
m_Sprite: {fileID: 21300000, guid: a52d3365198fe5046ad9d0aa48ce18a6, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|||||||
3163
Assets/Resources/UI/Prefab/Panel/FeedbackModal.prefab
Normal file
3163
Assets/Resources/UI/Prefab/Panel/FeedbackModal.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 398e1600a74d0804eb372b831254a413
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -192,6 +192,12 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4566599627632401657, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 447fc332cc850f9488caf68a854c7c24,
|
||||||
|
type: 3}
|
||||||
- target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
|
- target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
|
|||||||
@ -16,22 +16,6 @@ MonoBehaviour:
|
|||||||
m_MaskInteraction: 85
|
m_MaskInteraction: 85
|
||||||
m_UseStencil: 1
|
m_UseStencil: 1
|
||||||
m_RaycastFilter: 0
|
m_RaycastFilter: 0
|
||||||
--- !u!114 &8040751762339308588
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 121617211609223412}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Inverse: 0
|
|
||||||
m_MaskInteraction: 85
|
|
||||||
m_UseStencil: 1
|
|
||||||
m_RaycastFilter: 0
|
|
||||||
--- !u!114 &8683970227222651378
|
--- !u!114 &8683970227222651378
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -2239,22 +2223,6 @@ MonoBehaviour:
|
|||||||
m_MaskInteraction: 85
|
m_MaskInteraction: 85
|
||||||
m_UseStencil: 1
|
m_UseStencil: 1
|
||||||
m_RaycastFilter: 0
|
m_RaycastFilter: 0
|
||||||
--- !u!114 &726549196107979791
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2026860975151450949}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Inverse: 0
|
|
||||||
m_MaskInteraction: 85
|
|
||||||
m_UseStencil: 1
|
|
||||||
m_RaycastFilter: 0
|
|
||||||
--- !u!114 &3823374721596886062
|
--- !u!114 &3823374721596886062
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -4063,6 +4031,7 @@ GameObject:
|
|||||||
- component: {fileID: 5692760043962084493}
|
- component: {fileID: 5692760043962084493}
|
||||||
- component: {fileID: 6644751111942277666}
|
- component: {fileID: 6644751111942277666}
|
||||||
- component: {fileID: 1909824527552891219}
|
- component: {fileID: 1909824527552891219}
|
||||||
|
- component: {fileID: 7699048177492648660}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: GoList
|
m_Name: GoList
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -4126,6 +4095,49 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &7699048177492648660
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8296637580613539111}
|
||||||
|
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: 1909824527552891219}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
--- !u!1 &8539777692955277418
|
--- !u!1 &8539777692955277418
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -4320,6 +4332,11 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 5014623457702002961}
|
m_TransformParent: {fileID: 5014623457702002961}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
@ -4447,21 +4464,39 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||||
|
--- !u!1 &4236066551055479381 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2009426565801043604 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &1377157623896305697 stripped
|
--- !u!1 &1377157623896305697 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &859051997198845018 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &7330312719675194540 stripped
|
--- !u!1 &7330312719675194540 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &2049799399839608 stripped
|
--- !u!1 &7024740704437292975 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
@ -4477,33 +4512,9 @@ RectTransform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &2026860975151450949 stripped
|
--- !u!1 &2049799399839608 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &859051997198845018 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &7024740704437292975 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &4236066551055479381 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &2009426565801043604 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 146705893016024264}
|
m_PrefabInstance: {fileID: 146705893016024264}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
@ -4626,6 +4637,12 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
|
--- !u!224 &4035565750273659582 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 726549194336560541}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &1391092986741503221 stripped
|
--- !u!1 &1391092986741503221 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
@ -4638,12 +4655,6 @@ GameObject:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 726549194336560541}
|
m_PrefabInstance: {fileID: 726549194336560541}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!224 &4035565750273659582 stripped
|
|
||||||
RectTransform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 726549194336560541}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1001 &2277129673863769977
|
--- !u!1001 &2277129673863769977
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -4651,6 +4662,11 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 5014623457702002961}
|
m_TransformParent: {fileID: 5014623457702002961}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
@ -4783,51 +4799,9 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||||
--- !u!1 &121617211609223412 stripped
|
--- !u!1 &1619957045781012459 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &464472969339895077 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &9001619333872210974 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &1048332570473065360 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &2835369396092332516 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &8658814530548131613 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &2132314977860390089 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &1365991255437877356 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
@ -4837,9 +4811,45 @@ RectTransform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &1619957045781012459 stripped
|
--- !u!1 &1365991255437877356 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &8658814530548131613 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &1048332570473065360 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &464472969339895077 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2835369396092332516 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &9001619333872210974 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2132314977860390089 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|||||||
@ -360,7 +360,7 @@ MonoBehaviour:
|
|||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||||
m_FontSize: 14
|
m_FontSize: 14
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
|||||||
@ -12,13 +12,16 @@ GameObject:
|
|||||||
- component: {fileID: 1964787418795620593}
|
- component: {fileID: 1964787418795620593}
|
||||||
- component: {fileID: 6632529772490108898}
|
- component: {fileID: 6632529772490108898}
|
||||||
- component: {fileID: 4799080841931904395}
|
- component: {fileID: 4799080841931904395}
|
||||||
|
- component: {fileID: 112077214919202944}
|
||||||
|
- component: {fileID: 5642191199042393389}
|
||||||
|
- component: {fileID: 4905573701901116406}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ToastContainer
|
m_Name: ToastContainer
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1673166913076064936
|
--- !u!224 &1673166913076064936
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -28,17 +31,17 @@ RectTransform:
|
|||||||
m_GameObject: {fileID: 2550272054721721287}
|
m_GameObject: {fileID: 2550272054721721287}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 0.7949125, y: 0.7949125, z: 0.7949125}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7121100143298194565}
|
- {fileID: 7121100143298194565}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: -317}
|
||||||
m_SizeDelta: {x: 267.60803, y: 87.55969}
|
m_SizeDelta: {x: 200, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &1964787418795620593
|
--- !u!222 &1964787418795620593
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -60,13 +63,13 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
m_Sprite: {fileID: 0}
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
@ -90,6 +93,58 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
toast: {fileID: 2550272054721721287}
|
toast: {fileID: 2550272054721721287}
|
||||||
txt: {fileID: 3146539256596754620}
|
txt: {fileID: 3146539256596754620}
|
||||||
|
--- !u!114 &112077214919202944
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2550272054721721287}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
radius: 10
|
||||||
|
--- !u!114 &5642191199042393389
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2550272054721721287}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_HorizontalFit: 0
|
||||||
|
m_VerticalFit: 2
|
||||||
|
--- !u!114 &4905573701901116406
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2550272054721721287}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 10
|
||||||
|
m_Right: 10
|
||||||
|
m_Top: 10
|
||||||
|
m_Bottom: 10
|
||||||
|
m_ChildAlignment: 4
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 1
|
||||||
|
m_ChildForceExpandHeight: 1
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 0
|
||||||
|
m_ChildScaleWidth: 0
|
||||||
|
m_ChildScaleHeight: 0
|
||||||
--- !u!1 &6368655921577635968
|
--- !u!1 &6368655921577635968
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -101,6 +156,7 @@ GameObject:
|
|||||||
- component: {fileID: 7121100143298194565}
|
- component: {fileID: 7121100143298194565}
|
||||||
- component: {fileID: 3132621560751603177}
|
- component: {fileID: 3132621560751603177}
|
||||||
- component: {fileID: 3146539256596754620}
|
- component: {fileID: 3146539256596754620}
|
||||||
|
- component: {fileID: 3279600142704954747}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Toast
|
m_Name: Toast
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -123,9 +179,9 @@ RectTransform:
|
|||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
m_AnchoredPosition: {x: 100, y: 0}
|
||||||
m_SizeDelta: {x: 0.000061035156, y: 0.00010681152}
|
m_SizeDelta: {x: 200, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3132621560751603177
|
--- !u!222 &3132621560751603177
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -148,15 +204,15 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 0.15294118, b: 0.25882354, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||||
m_FontSize: 26
|
m_FontSize: 20
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
@ -168,3 +224,17 @@ MonoBehaviour:
|
|||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Toast
|
m_Text: Toast
|
||||||
|
--- !u!114 &3279600142704954747
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6368655921577635968}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_HorizontalFit: 0
|
||||||
|
m_VerticalFit: 2
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -121,6 +121,92 @@ NavMeshSettings:
|
|||||||
debug:
|
debug:
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
|
--- !u!21 &239487366
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 110, g: 110, b: 22, a: 0}
|
||||||
--- !u!1 &845512357
|
--- !u!1 &845512357
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -293,6 +379,92 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!21 &1029234451
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 110, g: 110, b: 22, a: 0}
|
||||||
--- !u!1 &1079865532
|
--- !u!1 &1079865532
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -339,6 +511,178 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!21 &1095754167
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 350, g: 227, b: 22, a: 0}
|
||||||
|
--- !u!21 &1320279666
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 200, g: 39, b: 22, a: 0}
|
||||||
--- !u!1 &1362042230
|
--- !u!1 &1362042230
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -491,6 +835,178 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1678571397}
|
m_GameObject: {fileID: 1678571397}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!21 &1692638432
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 110, g: 110, b: 22, a: 0}
|
||||||
|
--- !u!21 &1791936228
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 200, g: 39, b: 22, a: 0}
|
||||||
--- !u!1 &1944211662
|
--- !u!1 &1944211662
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -574,6 +1090,98 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
|
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
|
||||||
|
--- !u!21 &1994125925
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: RoundedCornersTextureMaterial(Clone)
|
||||||
|
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 0.5
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _Height: 50
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _Radius: 15
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _UVSec: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _Width: 50
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _WidthHeightRadius: {r: 697, g: 600, b: 60, a: 0}
|
||||||
|
--- !u!224 &694762571355972147 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 9042306398578617225}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!222 &5779676824772088946
|
--- !u!222 &5779676824772088946
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -592,7 +1200,8 @@ RectTransform:
|
|||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
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: 694762571355972147}
|
||||||
m_Father: {fileID: 1678571401}
|
m_Father: {fileID: 1678571401}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -618,3 +1227,157 @@ GameObject:
|
|||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
|
--- !u!1001 &9042306398578617225
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 5779676824772088956}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511738, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746831955511739, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: FeedbackModal
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8419746832695648644, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1994125925}
|
||||||
|
- target: {fileID: 8756065341853148887, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1095754167}
|
||||||
|
- target: {fileID: 9042306397060554531, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1320279666}
|
||||||
|
- target: {fileID: 9042306397874659810, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1692638432}
|
||||||
|
- target: {fileID: 9042306398366161342, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1029234451}
|
||||||
|
- target: {fileID: 9042306398547148850, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1791936228}
|
||||||
|
- target: {fileID: 9042306398982995286, guid: 398e1600a74d0804eb372b831254a413,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Material
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 239487366}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 398e1600a74d0804eb372b831254a413, type: 3}
|
||||||
|
|||||||
@ -156,7 +156,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 1, y: 0}
|
m_AnchorMin: {x: 1, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: -20, y: 20}
|
m_AnchoredPosition: {x: -20, y: 20}
|
||||||
m_SizeDelta: {x: 160, y: 19}
|
m_SizeDelta: {x: 70, y: 19}
|
||||||
m_Pivot: {x: 1, y: 0}
|
m_Pivot: {x: 1, y: 0}
|
||||||
--- !u!114 &154299663
|
--- !u!114 &154299663
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -190,7 +190,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Version:0.0.0
|
m_Text: V0.0.0
|
||||||
--- !u!222 &154299664
|
--- !u!222 &154299664
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -106,6 +106,23 @@ namespace Assets.Scripts.Apis
|
|||||||
//{
|
//{
|
||||||
// return http.Get(ConfigHelper.Host + url, query);
|
// return http.Get(ConfigHelper.Host + url, query);
|
||||||
//}
|
//}
|
||||||
|
protected async Task<string> GetStringAsync(string url)
|
||||||
|
{
|
||||||
|
//var result = await Task.Factory.StartNew(() =>
|
||||||
|
//{
|
||||||
|
// return Get(url, query);
|
||||||
|
//});
|
||||||
|
|
||||||
|
//return result;
|
||||||
|
AddLanguage();
|
||||||
|
var response = await httpClient.GetAsync(ConfigHelper.Host + url, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
|
||||||
|
return await ParseStringAsync(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task<string> ParseStringAsync(HttpResponseMessage response)
|
||||||
|
{
|
||||||
|
return await response.Content.ReadAsStringAsync();
|
||||||
|
}
|
||||||
|
|
||||||
protected async Task<T> GetAsync<T>(string url)
|
protected async Task<T> GetAsync<T>(string url)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -56,11 +56,11 @@ namespace Assets.Scripts.Apis
|
|||||||
/// <param name="sort">hot, distance</param>
|
/// <param name="sort">hot, distance</param>
|
||||||
/// <param name="sortDire">asc</param>
|
/// <param name="sortDire">asc</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
|
public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
|
||||||
{
|
{
|
||||||
var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
|
var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
|
||||||
|
|
||||||
return Get<JsonResult<List<MapRoute>>>(url);
|
return GetAsync<JsonResult<List<MapRoute>>>(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -46,5 +46,7 @@ namespace Assets.Scripts.Apis.Models
|
|||||||
public double CompleteRoute { get; set; }
|
public double CompleteRoute { get; set; }
|
||||||
|
|
||||||
public string Tips { get; set; }
|
public string Tips { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -63,5 +63,11 @@ namespace Assets.Scripts.Apis.Models
|
|||||||
|
|
||||||
public string Unionid { get; set; }
|
public string Unionid { get; set; }
|
||||||
public int Height { get; set; }
|
public int Height { get; set; }
|
||||||
|
|
||||||
|
public DateTime LastUpdateFtpTime { get; set; }
|
||||||
|
|
||||||
|
public DateTime LastUpdateWeightTime { get; set; }
|
||||||
|
|
||||||
|
public DateTime LastUpdateBicycleWeightTime { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using Assets.Scripts.Apis.Models;
|
using Assets.Scripts.Apis.Models;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -66,6 +67,9 @@ namespace Assets.Scripts.Apis
|
|||||||
user.ConnectedToStrava = ret.data.ConnectedToStrava;
|
user.ConnectedToStrava = ret.data.ConnectedToStrava;
|
||||||
}
|
}
|
||||||
user.Birthday = ret.data.Birthday;
|
user.Birthday = ret.data.Birthday;
|
||||||
|
user.LastUpdateFtpTime = ret.data.LastUpdateFtpTime;
|
||||||
|
user.LastUpdateWeightTime = ret.data.LastUpdateWeightTime;
|
||||||
|
user.LastUpdateBicycleWeightTime = ret.data.LastUpdateBicycleWeightTime;
|
||||||
//todo: check local database, insert new user
|
//todo: check local database, insert new user
|
||||||
|
|
||||||
//PubCommData.CurrentUser = user;
|
//PubCommData.CurrentUser = user;
|
||||||
@ -77,7 +81,37 @@ namespace Assets.Scripts.Apis
|
|||||||
return new JsonResult<UserResultModel>() { result = false, data = null, errMsg = ret.errMsg };
|
return new JsonResult<UserResultModel>() { result = false, data = null, errMsg = ret.errMsg };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public async Task<JsonResult<object>> LoginV1(string phone, string pwd, string countryCode)
|
||||||
|
{
|
||||||
|
var param = new
|
||||||
|
{
|
||||||
|
Phone = phone,
|
||||||
|
Pwd = pwd,
|
||||||
|
countryCode
|
||||||
|
};
|
||||||
|
|
||||||
|
JsonResult<object> ret = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ret = await PostAsync<JsonResult<object>>("NoAuth/v1/Login", param);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return new JsonResult<object> { result = false, errMsg = ex.Message };
|
||||||
|
}
|
||||||
|
//ApiBase.cookies = response.Cookies;
|
||||||
|
//var ret = response.DynamicBody;
|
||||||
|
if (ret.result)
|
||||||
|
{
|
||||||
|
var user = JObject.FromObject(ret.data).ToObject<UserResultModel>();
|
||||||
|
user.cookie = cookies[0].Value;
|
||||||
|
return new JsonResult<object>() { result = true, data = user };
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return new JsonResult<object>() { result = false, data = ret.data, errMsg = ret.errMsg };
|
||||||
|
}
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取个人中心的统计信息
|
/// 获取个人中心的统计信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -95,7 +129,7 @@ namespace Assets.Scripts.Apis
|
|||||||
|
|
||||||
return DateTime.Parse(result);
|
return DateTime.Parse(result);
|
||||||
}
|
}
|
||||||
public async Task<JsonResult<UserResultModel>> Register(string Phone, string Pwd, string Captcha)
|
public async Task<JsonResult<object>> Register(string Phone, string Pwd, string Captcha)
|
||||||
{
|
{
|
||||||
var param = new
|
var param = new
|
||||||
{
|
{
|
||||||
@ -104,18 +138,31 @@ namespace Assets.Scripts.Apis
|
|||||||
Captcha
|
Captcha
|
||||||
};
|
};
|
||||||
|
|
||||||
JsonResult<UserResultModel> ret = null;
|
JsonResult<object> ret = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ret = await PostAsync<JsonResult<UserResultModel>>("NoAuth/v1/Register", param);
|
ret = await PostAsync<JsonResult<object>>("NoAuth/v1/Register", param);
|
||||||
ret.data.cookie = cookies[0].Value;
|
if (ret.result)
|
||||||
|
{
|
||||||
|
var u = JObject.FromObject(ret.data).ToObject<UserResultModel>();
|
||||||
|
u.cookie = cookies[0].Value;
|
||||||
|
return new JsonResult<object> { result = true, data = u,errMsg = ret.errMsg};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return new JsonResult<object> { result = false,data = ret.data, errMsg = ret.errMsg };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return new JsonResult<UserResultModel> { result = false, errMsg = ex.Message };
|
return new JsonResult<object> { result = false, errMsg = ex.Message };
|
||||||
}
|
}
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
public async Task<string> GetHeadImg(string phone)
|
||||||
|
{
|
||||||
|
return await GetStringAsync($"noauth/getheadimg?phone={phone}");
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<JsonResult<JObject>> GetCaptcha(string phone)
|
public async Task<JsonResult<JObject>> GetCaptcha(string phone)
|
||||||
{
|
{
|
||||||
return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
|
return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
|
||||||
@ -154,15 +201,24 @@ namespace Assets.Scripts.Apis
|
|||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
public async Task<JsonResult<UserResultModel>> OnWebWxLogin(string Phone, string Captcha
|
public async Task<JsonResult<object>> OnWebWxLogin(string Phone, string Captcha
|
||||||
, string UnionId, string WxWebOpenId, string WxHeadImg, string NickName, int? Sex, string Password)
|
, string UnionId, string WxWebOpenId, string WxHeadImg, string NickName, int? Sex, string Password)
|
||||||
{
|
{
|
||||||
var r = await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin",
|
var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLogin",
|
||||||
new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password });
|
new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Pwd = Password });
|
||||||
r.data.cookie = cookies[0].Value;
|
if (r.result)
|
||||||
return r;
|
{
|
||||||
|
var u = JObject.FromObject(r.data);
|
||||||
|
u.Add("cookie", cookies[0].Value);
|
||||||
|
return new JsonResult<object> { result = true, data = u, errMsg = r.errMsg };
|
||||||
|
}
|
||||||
|
else return r;
|
||||||
|
}
|
||||||
|
public async Task<JsonResult<object>> AddFeedBack(string content, List<string> files)
|
||||||
|
{
|
||||||
|
var res = Upload("feedback/add", new { content } , files);
|
||||||
|
return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<JsonResult<JObject>> Update(UserResultModel currUser, string filePath = "")
|
public async Task<JsonResult<JObject>> Update(UserResultModel currUser, string filePath = "")
|
||||||
{
|
{
|
||||||
@ -223,5 +279,7 @@ namespace Assets.Scripts.Apis
|
|||||||
{
|
{
|
||||||
return await GetAsync<JsonResult<JObject>>("/Home/GetNotify");
|
return await GetAsync<JsonResult<JObject>>("/Home/GetNotify");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,9 +23,34 @@ namespace Assets.Scripts
|
|||||||
return _userApi;
|
return _userApi;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public static MapApi mapApi = new MapApi();
|
private static MapApi _mapApi;
|
||||||
public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
|
public static MapApi mapApi
|
||||||
public static ThirdPartApi thirdPartApi = new ThirdPartApi();
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_mapApi == null) _mapApi = new MapApi();
|
||||||
|
return _mapApi;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private static MapInterruptRecordApi _mapInterruptRecordApi;
|
||||||
|
public static MapInterruptRecordApi mapInterruptRecordApi
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_mapInterruptRecordApi == null) _mapInterruptRecordApi = new MapInterruptRecordApi();
|
||||||
|
return _mapInterruptRecordApi;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ThirdPartApi _thirdPartApi;
|
||||||
|
public static ThirdPartApi thirdPartApi
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_thirdPartApi == null) _thirdPartApi = new ThirdPartApi();
|
||||||
|
return _thirdPartApi;
|
||||||
|
}
|
||||||
|
}
|
||||||
public static IPEndPoint UdpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
|
public static IPEndPoint UdpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
|
||||||
public static IPEndPoint TcpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11001);
|
public static IPEndPoint TcpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11001);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -152,7 +152,7 @@ namespace Assets.Scripts.Devices.Ant
|
|||||||
private void antDevice_serialError(ANT_Device sender, ANT_Device.serialErrorCode error, bool isCritical)
|
private void antDevice_serialError(ANT_Device sender, ANT_Device.serialErrorCode error, bool isCritical)
|
||||||
{
|
{
|
||||||
//throw new NotImplementedException();
|
//throw new NotImplementedException();
|
||||||
Log("出错了");
|
Log("出错了"+ error.ToString());
|
||||||
if (error != ANT_Device.serialErrorCode.DeviceConnectionLost)
|
if (error != ANT_Device.serialErrorCode.DeviceConnectionLost)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@ -26,6 +26,7 @@ using ZenFulcrum.EmbeddedBrowser;
|
|||||||
public class QUserInfo
|
public class QUserInfo
|
||||||
{
|
{
|
||||||
public long Id { get; set; }
|
public long Id { get; set; }
|
||||||
|
public string Phone { get; set; }
|
||||||
public string NickName { get; set; }
|
public string NickName { get; set; }
|
||||||
public string Avatar { get; set; }
|
public string Avatar { get; set; }
|
||||||
public string Cookie { get; set; }
|
public string Cookie { get; set; }
|
||||||
@ -59,6 +60,8 @@ public class LoginController : MonoBehaviour
|
|||||||
private Transform quickContainer;
|
private Transform quickContainer;
|
||||||
private Transform loginContainer;
|
private Transform loginContainer;
|
||||||
private Transform signContainer;
|
private Transform signContainer;
|
||||||
|
//修改高度
|
||||||
|
Transform LoginBg;
|
||||||
/*初始页面*/
|
/*初始页面*/
|
||||||
LoginForm loginForm;
|
LoginForm loginForm;
|
||||||
[SerializeField] Button loginReturn2;
|
[SerializeField] Button loginReturn2;
|
||||||
@ -78,7 +81,7 @@ public class LoginController : MonoBehaviour
|
|||||||
private ScrollRect scrollPanel;
|
private ScrollRect scrollPanel;
|
||||||
private ScrollRect scrollSign;
|
private ScrollRect scrollSign;
|
||||||
private ScrollRect scrollAvatar;
|
private ScrollRect scrollAvatar;
|
||||||
private Transform imagexf,imagedf;
|
private Transform imagexf, imagedf;
|
||||||
//注册主页面
|
//注册主页面
|
||||||
private UserResultModel userResult;
|
private UserResultModel userResult;
|
||||||
/*微信相关*/
|
/*微信相关*/
|
||||||
@ -98,7 +101,10 @@ public class LoginController : MonoBehaviour
|
|||||||
//其他
|
//其他
|
||||||
[SerializeField] RawImage loading;
|
[SerializeField] RawImage loading;
|
||||||
Transform toolContainer;
|
Transform toolContainer;
|
||||||
|
Dictionary<string, Selectable> formDict,signFormDict;
|
||||||
|
|
||||||
|
public string avatarName { get; private set; }
|
||||||
|
public Texture avatar;
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
@ -130,6 +136,7 @@ public class LoginController : MonoBehaviour
|
|||||||
if (loginScrollView != null)
|
if (loginScrollView != null)
|
||||||
{
|
{
|
||||||
scrollPanel = loginScrollView.GetComponent<ScrollRect>();
|
scrollPanel = loginScrollView.GetComponent<ScrollRect>();
|
||||||
|
LoginBg = loginScrollView.transform.Find("Viewport").Find("LoginBg");
|
||||||
mainContent = loginScrollView.transform.Find("Viewport").Find("Content");
|
mainContent = loginScrollView.transform.Find("Viewport").Find("Content");
|
||||||
quickContainer = mainContent.Find("Empty").Find("FormContainer-Quick");
|
quickContainer = mainContent.Find("Empty").Find("FormContainer-Quick");
|
||||||
loginContainer = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer");
|
loginContainer = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer");
|
||||||
@ -140,18 +147,30 @@ public class LoginController : MonoBehaviour
|
|||||||
scrollSign = signScrollView.GetComponent<ScrollRect>();
|
scrollSign = signScrollView.GetComponent<ScrollRect>();
|
||||||
var content = signScrollView.transform.Find("Viewport").Find("Content");
|
var content = signScrollView.transform.Find("Viewport").Find("Content");
|
||||||
signPage1 = content.Find("FirstPage");
|
signPage1 = content.Find("FirstPage");
|
||||||
signPage1.Find("next").GetComponent<Button>().onClick.AddListener(()=> { goRegNext(); });
|
UIManager.AddEvent(signPage1.Find("next").GetComponent<Button>().gameObject,
|
||||||
signPage1.Find("Captcha").Find("BtnGet").GetComponent<Button>().onClick.AddListener(GetCaptcha);
|
EventTriggerType.PointerClick, (b) => goRegNext());
|
||||||
|
//signPage1.Find("next").GetComponent<Button>().onClick.AddListener(() => { goRegNext(); });
|
||||||
|
UIManager.AddEvent(signPage1.Find("Captcha").Find("BtnGet").gameObject,
|
||||||
|
EventTriggerType.PointerClick,(b)=> GetCaptcha());
|
||||||
|
//signPage1.Find("Captcha").Find("BtnGet").GetComponent<Button>().onClick.AddListener(GetCaptcha);
|
||||||
var email = signPage1.Find("Email").GetComponent<InputField>();
|
var email = signPage1.Find("Email").GetComponent<InputField>();
|
||||||
var captcha = signPage1.Find("Captcha").GetComponent<InputField>();
|
var captcha = signPage1.Find("Captcha").GetComponent<InputField>();
|
||||||
var password = signPage1.Find("Password").GetComponent<InputField>();
|
var password = signPage1.Find("Password").GetComponent<InputField>();
|
||||||
var cpassword = signPage1.Find("CPassword").GetComponent<InputField>();
|
var cpassword = signPage1.Find("CPassword").GetComponent<InputField>();
|
||||||
//第三方登录要用的按钮
|
//第三方登录要用的按钮
|
||||||
signPage1.Find("previousThird").GetComponent<Button>().onClick.AddListener(goThirdPrev);
|
UIManager.AddEvent(signPage1.Find("previousThird").GetComponent<Button>().gameObject,
|
||||||
signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { goRegNext(1); });
|
EventTriggerType.PointerClick, (b) => goThirdPrev());
|
||||||
|
//signPage1.Find("previousThird").GetComponent<Button>().onClick.AddListener(goThirdPrev);
|
||||||
|
UIManager.AddEvent(signPage1.Find("signThird").GetComponent<Button>().gameObject,
|
||||||
|
EventTriggerType.PointerClick, (b) => goRegNext(1));
|
||||||
|
//signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { goRegNext(1); });
|
||||||
signPage2 = content.Find("NextPage");
|
signPage2 = content.Find("NextPage");
|
||||||
signPage2.Find("previous").GetComponent<Button>().onClick.AddListener(goRegPrev);
|
UIManager.AddEvent(signPage2.Find("previous").GetComponent<Button>().gameObject,
|
||||||
signPage2.Find("sign").GetComponent<Button>().onClick.AddListener(goRegEnd);
|
EventTriggerType.PointerClick, (b) => goRegPrev());
|
||||||
|
//signPage2.Find("previous").GetComponent<Button>().onClick.AddListener(goRegPrev);
|
||||||
|
UIManager.AddEvent(signPage2.Find("sign").GetComponent<Button>().gameObject,
|
||||||
|
EventTriggerType.PointerClick, (b) => goRegEnd());
|
||||||
|
//signPage2.Find("sign").GetComponent<Button>().onClick.AddListener(goRegEnd);
|
||||||
//注册2 字段
|
//注册2 字段
|
||||||
var years = signPage2.Find("Year").GetComponent<Dropdown>();
|
var years = signPage2.Find("Year").GetComponent<Dropdown>();
|
||||||
var months = signPage2.Find("Month").GetComponent<Dropdown>();
|
var months = signPage2.Find("Month").GetComponent<Dropdown>();
|
||||||
@ -168,7 +187,7 @@ public class LoginController : MonoBehaviour
|
|||||||
days.captionText.text = "Day";
|
days.captionText.text = "Day";
|
||||||
years.onValueChanged.AddListener((int index) =>
|
years.onValueChanged.AddListener((int index) =>
|
||||||
{
|
{
|
||||||
if (index != -1 && months.value!=-1)
|
if (index != -1 && months.value != -1)
|
||||||
{
|
{
|
||||||
days.options = regOptions.GetDayOptions(int.Parse(years.captionText.text), int.Parse(months.captionText.text));
|
days.options = regOptions.GetDayOptions(int.Parse(years.captionText.text), int.Parse(months.captionText.text));
|
||||||
days.value = 0;
|
days.value = 0;
|
||||||
@ -216,28 +235,25 @@ public class LoginController : MonoBehaviour
|
|||||||
foreach (var user in userInfos)
|
foreach (var user in userInfos)
|
||||||
{
|
{
|
||||||
var info = Instantiate(Resources.Load<GameObject>("UI/Prefab/Login/QuickUserInfo")).transform;
|
var info = Instantiate(Resources.Load<GameObject>("UI/Prefab/Login/QuickUserInfo")).transform;
|
||||||
info.GetComponent<QuickLoginUser>().Initial(user,transform);
|
info.GetComponent<QuickLoginUser>().Initial(user, transform);
|
||||||
info.parent = content;
|
info.parent = content;
|
||||||
info.localScale = new Vector3(1, 1, 1);
|
info.localScale = new Vector3(1, 1, 1);
|
||||||
}
|
}
|
||||||
content.Find("empty1").transform.SetSiblingIndex(0);
|
content.Find("empty1").transform.SetSiblingIndex(0);
|
||||||
content.Find("empty2").transform.SetSiblingIndex(content.childCount-1);
|
content.Find("empty2").transform.SetSiblingIndex(content.childCount - 1);
|
||||||
scrollAvatar.GetComponent<QuickLoginScroll>().Initial();
|
scrollAvatar.GetComponent<QuickLoginScroll>().Initial();
|
||||||
}
|
}
|
||||||
if (quickContainer != null)
|
if (quickContainer != null)
|
||||||
{
|
{
|
||||||
var loginNewAccount = quickContainer.Find("loginNewAccount").GetComponent<Button>();
|
var loginNewAccount = quickContainer.Find("loginNewAccount").GetComponent<Button>();
|
||||||
loginNewAccount.onClick.AddListener(goLogin);
|
UIManager.AddEvent(loginNewAccount.gameObject, EventTriggerType.PointerClick, (b) => goLogin());
|
||||||
}
|
}
|
||||||
if (loginContainer != null)
|
if (loginContainer != null)
|
||||||
{
|
{
|
||||||
var returnQuick = loginContainer.Find("returnQuick").GetComponent<Button>();
|
var returnQuick = loginContainer.Find("returnQuick").GetComponent<Button>();
|
||||||
UIManager.AddEvent(returnQuick.gameObject, EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(returnQuick.gameObject, EventTriggerType.PointerClick, (b) => ReturnQuick());
|
||||||
{
|
|
||||||
ReturnQuick();
|
|
||||||
});
|
|
||||||
var sign = loginContainer.Find("reg").GetComponent<Button>();
|
var sign = loginContainer.Find("reg").GetComponent<Button>();
|
||||||
sign.onClick.AddListener(() => goSign());
|
UIManager.AddEvent(sign.gameObject, EventTriggerType.PointerClick, (b) => goSign());
|
||||||
remember = loginContainer.Find("rememberButton").GetComponent<Button>();
|
remember = loginContainer.Find("rememberButton").GetComponent<Button>();
|
||||||
UIManager.AddEvent(remember.gameObject, EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(remember.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
@ -252,7 +268,7 @@ public class LoginController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
|
var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
|
||||||
wechatLogin.onClick.AddListener(() =>
|
UIManager.AddEvent(wechatLogin.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
if (wxLock) return;
|
if (wxLock) return;
|
||||||
wxLock = true;
|
wxLock = true;
|
||||||
@ -266,8 +282,13 @@ public class LoginController : MonoBehaviour
|
|||||||
//wx1.GetComponent<CanvasGroup>().DOFade(1, 0.8f).onComplete = () => { wxLock = false; };
|
//wx1.GetComponent<CanvasGroup>().DOFade(1, 0.8f).onComplete = () => { wxLock = false; };
|
||||||
wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
|
wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
|
||||||
});
|
});
|
||||||
|
//wechatLogin.onClick.AddListener(() =>
|
||||||
|
//{
|
||||||
|
|
||||||
|
//});
|
||||||
var login = loginContainer.Find("login").GetComponent<Button>();
|
var login = loginContainer.Find("login").GetComponent<Button>();
|
||||||
login.onClick.AddListener(Submit);
|
UIManager.AddEvent(login.gameObject, EventTriggerType.PointerClick, (b) => Submit());
|
||||||
|
//login.onClick.AddListener(Submit);
|
||||||
loginForm = new LoginForm()
|
loginForm = new LoginForm()
|
||||||
{
|
{
|
||||||
email = loginContainer.Find("phone").GetComponent<InputField>(),
|
email = loginContainer.Find("phone").GetComponent<InputField>(),
|
||||||
@ -300,7 +321,8 @@ public class LoginController : MonoBehaviour
|
|||||||
UIManager.AddEvent(wxLogin1.Find("Image").gameObject, EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(wxLogin1.Find("Image").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
wxLock = true;
|
wxLock = true;
|
||||||
wxBrowser.Url = "chrome://version/";
|
wxBrowser.LoadHTML("<div/>");
|
||||||
|
//wxBrowser.Url = "chrome://version/";
|
||||||
wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
|
wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
|
||||||
{
|
{
|
||||||
wxLock = false;
|
wxLock = false;
|
||||||
@ -331,7 +353,7 @@ public class LoginController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxLogin2 = mainContent.Find("FormContainer-wx2");
|
wxLogin2 = mainContent.Find("FormContainer-wx2");
|
||||||
if (wxLogin2!=null)
|
if (wxLogin2 != null)
|
||||||
{
|
{
|
||||||
UIManager.AddEvent(wxLogin2.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(wxLogin2.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
@ -341,7 +363,7 @@ public class LoginController : MonoBehaviour
|
|||||||
Canvas.ForceUpdateCanvases();
|
Canvas.ForceUpdateCanvases();
|
||||||
StartScrollPanel(1);
|
StartScrollPanel(1);
|
||||||
});
|
});
|
||||||
wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(()=>
|
wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
this.goSign(false);
|
this.goSign(false);
|
||||||
});
|
});
|
||||||
@ -368,14 +390,9 @@ public class LoginController : MonoBehaviour
|
|||||||
var gou = wxLogin3.Find("rememberButton").Find("Gou").gameObject;
|
var gou = wxLogin3.Find("rememberButton").Find("Gou").gameObject;
|
||||||
gou.SetActive(!gou.activeSelf);
|
gou.SetActive(!gou.activeSelf);
|
||||||
});
|
});
|
||||||
//wxLogin3.Find("rememberButton").GetComponent<Button>().onClick.AddListener(()=>
|
UIManager.AddEvent(wxLogin3.Find("Next").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
//{
|
|
||||||
|
|
||||||
//});
|
|
||||||
wxLogin3.Find("Next").GetComponent<Button>().onClick.AddListener(() =>
|
|
||||||
{
|
{
|
||||||
goMain(wxLogin3.Find("rememberButton").Find("Gou"));
|
goMain(wxLogin3.Find("rememberButton").Find("Gou"));
|
||||||
//goMain
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
|
imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
|
||||||
@ -400,19 +417,62 @@ public class LoginController : MonoBehaviour
|
|||||||
// UIManager.ShowNewsModal();
|
// UIManager.ShowNewsModal();
|
||||||
//});
|
//});
|
||||||
}
|
}
|
||||||
|
if (userInfos.Count == 0) goLoginImmediately();
|
||||||
|
formDict = new Dictionary<string, Selectable>()
|
||||||
|
{
|
||||||
|
{"Phone",loginForm.email },
|
||||||
|
{"Pwd",loginForm.password },
|
||||||
|
};
|
||||||
|
loginForm.email.onEndEdit.AddListener(async (s) =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(s) && avatarName!=s)
|
||||||
|
{
|
||||||
|
var r = await ConfigHelper.userApi.GetHeadImg(s);
|
||||||
|
if (!string.IsNullOrEmpty(r))
|
||||||
|
{
|
||||||
|
Utils.DisplayImage(StartCoroutine, loginContainer.Find("Avatar").GetComponent<RawImage>(), r);
|
||||||
|
avatarName = s;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
loginContainer.Find("Avatar").GetComponent<RawImage>().texture = avatar;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
signFormDict = new Dictionary<string, Selectable>
|
||||||
|
{
|
||||||
|
{ "Phone",signForm.email},
|
||||||
|
{ "Captcha",signForm.captcha},
|
||||||
|
{ "Pwd",signForm.password},
|
||||||
|
{ "Years",signForm.years},
|
||||||
|
{ "Months",signForm.months},
|
||||||
|
{ "Days",signForm.days},
|
||||||
|
};
|
||||||
|
avatar = Resources.Load<Texture>("Images/New Account");
|
||||||
}
|
}
|
||||||
private void AdjustWxQrCode()
|
private void AdjustWxQrCode()
|
||||||
{
|
{
|
||||||
wxBrowser.EvalJS(@"
|
wxBrowser.EvalJS(@"
|
||||||
console.log(document.getElementsByClassName('qrcode')[0]);
|
console.log(439,document.body.style.padding);
|
||||||
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
|
let time = null;
|
||||||
document.getElementsByClassName('title')[0].style.display = 'none';
|
let f = ()=>{
|
||||||
document.body.style.background = '#272732';
|
console.log(442);
|
||||||
document.body.style.overflow = 'hidden';
|
|
||||||
document.body.style.transformOrigin = 'top left';
|
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
|
||||||
document.body.style.transform = 'scale(0.85106382978)';
|
document.getElementsByClassName('title')[0].style.display = 'none';
|
||||||
document.body.style.padding = '0';
|
document.body.style.background = '#272732';
|
||||||
");
|
document.body.style.overflow = 'hidden';
|
||||||
|
document.body.style.transformOrigin = 'top left';
|
||||||
|
document.body.style.transform = 'scale(0.85106382978)';
|
||||||
|
document.body.style.padding = '0';
|
||||||
|
if(document.body.style.padding === '0px' && time!=null){
|
||||||
|
clearInterval(time);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f();
|
||||||
|
if(document.body.style.padding !== '0px'){
|
||||||
|
time = setInterval(f,500);
|
||||||
|
}");
|
||||||
}
|
}
|
||||||
//浏览器加载回调
|
//浏览器加载回调
|
||||||
private async void OnUserScan()
|
private async void OnUserScan()
|
||||||
@ -440,7 +500,7 @@ public class LoginController : MonoBehaviour
|
|||||||
if (r.result)
|
if (r.result)
|
||||||
{
|
{
|
||||||
JObject data = JObject.FromObject(r.data);
|
JObject data = JObject.FromObject(r.data);
|
||||||
if (data.Value<string>("success")!=null && data.Value<string>("success") == "False")
|
if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
|
||||||
{
|
{
|
||||||
wxLogin2.gameObject.SetActive(true);
|
wxLogin2.gameObject.SetActive(true);
|
||||||
Utils.DisplayImage(StartCoroutine,
|
Utils.DisplayImage(StartCoroutine,
|
||||||
@ -500,7 +560,7 @@ public class LoginController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
var btn = signPage1.Find("Captcha").Find("BtnGet");
|
var btn = signPage1.Find("Captcha").Find("BtnGet");
|
||||||
var btnText = signPage1.Find("Captcha").Find("BtnGet").Find("Text").GetComponent<Text>();
|
var btnText = signPage1.Find("Captcha").Find("BtnGet").Find("Text").GetComponent<Text>();
|
||||||
var Email = signForm.email;
|
var Email = signForm.email;
|
||||||
var r = await ConfigHelper.userApi.GetCaptcha(Email.text);
|
var r = await ConfigHelper.userApi.GetCaptcha(Email.text);
|
||||||
//Timer t = new Ti
|
//Timer t = new Ti
|
||||||
if (r.result)
|
if (r.result)
|
||||||
@ -513,6 +573,7 @@ public class LoginController : MonoBehaviour
|
|||||||
btnText.text = $"Again({time})";
|
btnText.text = $"Again({time})";
|
||||||
System.Timers.Timer timer = new System.Timers.Timer();
|
System.Timers.Timer timer = new System.Timers.Timer();
|
||||||
btn.GetComponent<Button>().enabled = false;
|
btn.GetComponent<Button>().enabled = false;
|
||||||
|
btn.GetComponent<Button>().interactable = false;
|
||||||
startCaptcha = true;
|
startCaptcha = true;
|
||||||
//timer.Interval = 1000;
|
//timer.Interval = 1000;
|
||||||
//timer.AutoReset = true;
|
//timer.AutoReset = true;
|
||||||
@ -537,6 +598,10 @@ public class LoginController : MonoBehaviour
|
|||||||
|
|
||||||
void ShowPassword()
|
void ShowPassword()
|
||||||
{
|
{
|
||||||
|
signForm.email.text = "";
|
||||||
|
signForm.password.text = "";
|
||||||
|
signForm.captcha.text = "";
|
||||||
|
signForm.cpassword.text = "";
|
||||||
signPage1.Find("Password").gameObject.SetActive(true);
|
signPage1.Find("Password").gameObject.SetActive(true);
|
||||||
signPage1.Find("CPassword").gameObject.SetActive(true);
|
signPage1.Find("CPassword").gameObject.SetActive(true);
|
||||||
signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
|
signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
|
||||||
@ -554,6 +619,7 @@ public class LoginController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
btnText.text = "Get";
|
btnText.text = "Get";
|
||||||
btn.GetComponent<Button>().enabled = true;
|
btn.GetComponent<Button>().enabled = true;
|
||||||
|
btn.GetComponent<Button>().interactable = true;
|
||||||
startCaptcha = false;
|
startCaptcha = false;
|
||||||
//timer.Stop();
|
//timer.Stop();
|
||||||
}
|
}
|
||||||
@ -569,7 +635,7 @@ public class LoginController : MonoBehaviour
|
|||||||
//rect.SetSiblingIndex(rect.childCount-1);
|
//rect.SetSiblingIndex(rect.childCount-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnLoginInputSelect(BaseEventData arg0,GameObject game)
|
private void OnLoginInputSelect(BaseEventData arg0, GameObject game)
|
||||||
{
|
{
|
||||||
var image = game.transform.GetComponent<Image>();
|
var image = game.transform.GetComponent<Image>();
|
||||||
image.sprite = Resources.Load<Sprite>("Images/gl");
|
image.sprite = Resources.Load<Sprite>("Images/gl");
|
||||||
@ -590,11 +656,11 @@ public class LoginController : MonoBehaviour
|
|||||||
var CPassword = signForm.cpassword;
|
var CPassword = signForm.cpassword;
|
||||||
if (Password.text != CPassword.text)
|
if (Password.text != CPassword.text)
|
||||||
{
|
{
|
||||||
Utils.showToast(gameObject,"两次密码输入不一致");
|
Utils.showToast(gameObject, "两次密码输入不一致");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//JsonConvert
|
//JsonConvert
|
||||||
JsonResult<UserResultModel> r = null;
|
JsonResult<object> r = null;
|
||||||
if (signType == 0)
|
if (signType == 0)
|
||||||
{
|
{
|
||||||
r = await ConfigHelper.userApi.Register(Email.text, Password.text, Captcha.text);
|
r = await ConfigHelper.userApi.Register(Email.text, Password.text, Captcha.text);
|
||||||
@ -610,17 +676,38 @@ public class LoginController : MonoBehaviour
|
|||||||
wxInfoJson.Value<int>("sex"),
|
wxInfoJson.Value<int>("sex"),
|
||||||
Password.text);
|
Password.text);
|
||||||
}
|
}
|
||||||
if (r!=null && r.result)
|
if (r != null && r.result)
|
||||||
{
|
{
|
||||||
RefreshWx3(r.data);
|
var u = JObject.FromObject(r.data).ToObject<UserResultModel>();
|
||||||
|
RefreshWx3(u);
|
||||||
LoadInfo();
|
LoadInfo();
|
||||||
StartScrollSign(1);
|
StartScrollSign(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
var errorList = JArray.FromObject(r.data);
|
||||||
|
SetValidate(signFormDict, errorList);
|
||||||
Utils.showToast(gameObject, r.errMsg, 1);
|
Utils.showToast(gameObject, r.errMsg, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void SetValidate(Dictionary<string,Selectable> dict,JArray errorList)
|
||||||
|
{
|
||||||
|
foreach (var error in errorList)
|
||||||
|
{
|
||||||
|
var className = dict[error.Value<string>("Field")].GetType().Name;
|
||||||
|
if (className == "InputField")
|
||||||
|
{
|
||||||
|
dict[error.Value<string>("Field")].GetComponent<PFUIInputField>()
|
||||||
|
.SetValidate(true);
|
||||||
|
}
|
||||||
|
else if (className == "Dropdown")
|
||||||
|
{
|
||||||
|
dict[error.Value<string>("Field")].GetComponent<PFUIDropdown>()
|
||||||
|
.SetValidate();
|
||||||
|
}
|
||||||
|
//formDict[error.Value<string>("Filed")].error.Value<string>("ErrMsg");
|
||||||
|
}
|
||||||
|
}
|
||||||
async void goRegNextWithoutPass()
|
async void goRegNextWithoutPass()
|
||||||
{
|
{
|
||||||
var Email = signForm.email;
|
var Email = signForm.email;
|
||||||
@ -635,7 +722,8 @@ public class LoginController : MonoBehaviour
|
|||||||
"");
|
"");
|
||||||
if (r.result)
|
if (r.result)
|
||||||
{
|
{
|
||||||
RefreshWx3(r.data);
|
var u = JObject.FromObject(r.data).ToObject<UserResultModel>();
|
||||||
|
RefreshWx3(u);
|
||||||
StartScrollPanel(4);
|
StartScrollPanel(4);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -653,7 +741,7 @@ public class LoginController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
async void goRegEnd()
|
async void goRegEnd()
|
||||||
{
|
{
|
||||||
if(!await UpdateInfo()) return;
|
if (!await UpdateInfo()) return;
|
||||||
if (pageNums == 5)
|
if (pageNums == 5)
|
||||||
{
|
{
|
||||||
this.StartScrollPanel(4);
|
this.StartScrollPanel(4);
|
||||||
@ -681,7 +769,7 @@ public class LoginController : MonoBehaviour
|
|||||||
_months.SelectValue(userResult.Birthday.Value.Month.ToString());
|
_months.SelectValue(userResult.Birthday.Value.Month.ToString());
|
||||||
_years.SelectValue(userResult.Birthday.Value.Year.ToString());
|
_years.SelectValue(userResult.Birthday.Value.Year.ToString());
|
||||||
}
|
}
|
||||||
_genders.SelectIndex(userResult.Sex-1);
|
_genders.SelectIndex(userResult.Sex - 1);
|
||||||
_countrys.SelectIndex(UIManager.Instance.loginRegOptions.GetCountryIndexByName(userResult.Country));
|
_countrys.SelectIndex(UIManager.Instance.loginRegOptions.GetCountryIndexByName(userResult.Country));
|
||||||
_units.SelectIndex(userResult.Unit);
|
_units.SelectIndex(userResult.Unit);
|
||||||
_weight.Text = userResult.Weight.ToString();
|
_weight.Text = userResult.Weight.ToString();
|
||||||
@ -702,6 +790,16 @@ public class LoginController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
userResult.Birthday = new DateTime(int.Parse(_years.SelectedItem), int.Parse(_months.SelectedItem), int.Parse(_days.SelectedItem));
|
userResult.Birthday = new DateTime(int.Parse(_years.SelectedItem), int.Parse(_months.SelectedItem), int.Parse(_days.SelectedItem));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var errorList = new List<object>();
|
||||||
|
errorList.Add(new { Field="Years", ErrMsg="" });
|
||||||
|
errorList.Add(new { Field = "Months", ErrMsg = "" });
|
||||||
|
errorList.Add(new { Field = "Days", ErrMsg = "" });
|
||||||
|
SetValidate(signFormDict, JArray.FromObject(errorList));
|
||||||
|
Utils.showToast(gameObject, "请选择生日");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
userResult.Sex = _genders.SelectedIndex + 1;
|
userResult.Sex = _genders.SelectedIndex + 1;
|
||||||
userResult.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
|
userResult.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
|
||||||
userResult.Unit = _units.SelectedIndex;
|
userResult.Unit = _units.SelectedIndex;
|
||||||
@ -734,9 +832,14 @@ public class LoginController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
imagedf.DOLocalMoveY(-128, 0.3f);
|
imagedf.DOLocalMoveY(-128, 0.3f);
|
||||||
}
|
}
|
||||||
|
if (LoginBg != null)
|
||||||
|
{
|
||||||
|
LoginBg.GetComponent<RectTransform>().DOSizeDelta(new Vector2(360, 385), 0.3f);
|
||||||
|
LoginBg.GetComponent<RectTransform>().DOLocalMoveY(-94, 0.3f);
|
||||||
|
}
|
||||||
this.StartScrollPanel(0);
|
this.StartScrollPanel(0);
|
||||||
}
|
}
|
||||||
void goLogin()
|
public void goLogin(bool noReturn = false)
|
||||||
{
|
{
|
||||||
if (imagexf != null)
|
if (imagexf != null)
|
||||||
{
|
{
|
||||||
@ -746,7 +849,32 @@ public class LoginController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
imagedf.DOLocalMoveY(-34, 0.3f);
|
imagedf.DOLocalMoveY(-34, 0.3f);
|
||||||
}
|
}
|
||||||
|
if (LoginBg != null)
|
||||||
|
{
|
||||||
|
LoginBg.GetComponent<RectTransform>().DOSizeDelta(new Vector2(360, 573), 0.3f);
|
||||||
|
LoginBg.GetComponent<RectTransform>().DOLocalMoveY(0, 0.3f);
|
||||||
|
}
|
||||||
|
//DOTween.To(() => o, x => o = x, t, 0.3f);
|
||||||
this.StartScrollPanel(1);
|
this.StartScrollPanel(1);
|
||||||
|
if (noReturn)
|
||||||
|
{
|
||||||
|
loginContainer.Find("returnQuick").GetComponent<Button>().gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 立刻跳到登录页并且返回按钮强行失效
|
||||||
|
/// </summary>
|
||||||
|
private void goLoginImmediately()
|
||||||
|
{
|
||||||
|
imagedf.localPosition = new Vector3(-580, -34, 0);
|
||||||
|
imagexf.localPosition = new Vector3(0, -669, 0);
|
||||||
|
LoginBg.localPosition = Vector3.zero;
|
||||||
|
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
|
||||||
|
var scrollValue = 1f / (pageNums - 1);
|
||||||
|
var value = 1 * scrollValue;
|
||||||
|
scrollPanel.horizontalNormalizedPosition = value;
|
||||||
|
loginContainer.Find("returnQuick").GetComponent<Button>().gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
void goSign(bool isAccount = true)
|
void goSign(bool isAccount = true)
|
||||||
{
|
{
|
||||||
@ -818,7 +946,8 @@ public class LoginController : MonoBehaviour
|
|||||||
Id = data.Id,
|
Id = data.Id,
|
||||||
NickName = data.Nickname,
|
NickName = data.Nickname,
|
||||||
Avatar = data.WxHeadImg,
|
Avatar = data.WxHeadImg,
|
||||||
Cookie = data.cookie
|
Cookie = data.cookie,
|
||||||
|
Phone = data.Phone
|
||||||
});
|
});
|
||||||
index = userInfos.Count - 1;
|
index = userInfos.Count - 1;
|
||||||
}
|
}
|
||||||
@ -829,6 +958,7 @@ public class LoginController : MonoBehaviour
|
|||||||
u.NickName = data.Nickname;
|
u.NickName = data.Nickname;
|
||||||
u.Avatar = data.WxHeadImg;
|
u.Avatar = data.WxHeadImg;
|
||||||
u.Cookie = data.cookie;
|
u.Cookie = data.cookie;
|
||||||
|
u.Phone = data.Phone;
|
||||||
//userInfos.Insert(0, new QUserInfo
|
//userInfos.Insert(0, new QUserInfo
|
||||||
//{
|
//{
|
||||||
// Id = data.Id,
|
// Id = data.Id,
|
||||||
@ -844,27 +974,30 @@ public class LoginController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
async void Submit()
|
async void Submit()
|
||||||
{
|
{
|
||||||
if (loginForm.email == null || loginForm.password == null)
|
//if (loginForm.email == null || loginForm.password == null)
|
||||||
{
|
//{
|
||||||
Utils.showToast(gameObject, "未绑定", 1);
|
// Utils.showToast(gameObject, "未绑定", 1);
|
||||||
return;
|
// return;
|
||||||
}
|
//}
|
||||||
if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
|
//if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
|
||||||
{
|
//{
|
||||||
Utils.showToast(gameObject, "请输入信息", 1);
|
// Utils.showToast(gameObject, "请输入信息", 1);
|
||||||
return;
|
// return;
|
||||||
}
|
//}
|
||||||
//var res = await Global.userApi.Login(phone.text, pwd.text, "");
|
//var res = await Global.userApi.Login(phone.text, pwd.text, "");
|
||||||
//测试用
|
//测试用
|
||||||
var res = await ConfigHelper.userApi.Login(loginForm.email.text, loginForm.password.text, "");
|
|
||||||
|
var res = await ConfigHelper.userApi.LoginV1(loginForm.email.text, loginForm.password.text, "");
|
||||||
//var res = await NoAuthApi.Login(phone.text, pwd.text);
|
//var res = await NoAuthApi.Login(phone.text, pwd.text);
|
||||||
if (res.result)
|
if (res.result)
|
||||||
{
|
{
|
||||||
userResult = res.data;
|
userResult = JObject.FromObject(res.data).ToObject<UserResultModel>();
|
||||||
goMain(remember.transform.Find("Gou"));
|
goMain(remember.transform.Find("Gou"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
var errorList = JArray.FromObject(res.data);
|
||||||
|
SetValidate(formDict, errorList);
|
||||||
Utils.showToast(gameObject, res.errMsg);
|
Utils.showToast(gameObject, res.errMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -959,6 +1092,7 @@ public class LoginController : MonoBehaviour
|
|||||||
private bool startScrollSign = false;
|
private bool startScrollSign = false;
|
||||||
private int scrollSignIndex = 0;
|
private int scrollSignIndex = 0;
|
||||||
|
|
||||||
|
|
||||||
private void StartScrollSign(int index)
|
private void StartScrollSign(int index)
|
||||||
{
|
{
|
||||||
if (startScrollSign) return;
|
if (startScrollSign) return;
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
using Mapbox.Examples;
|
using Assets.Scripts;
|
||||||
|
using Assets.Scripts.Devices.Ant;
|
||||||
|
using Mapbox.Examples;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
@ -11,17 +14,23 @@ public class MainController : MonoBehaviour
|
|||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
Version = this.transform.Find("GameObject").Find("Version").GetComponent<Text>();
|
Version = this.transform.Find("GameObject").Find("Version").GetComponent<Text>();
|
||||||
Version.text = "Version:"+App.AppVersion;
|
Version.text = "V"+App.AppVersion;
|
||||||
|
|
||||||
|
AntConnector.Instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
async void Start()
|
||||||
{
|
{
|
||||||
UIManager.Instance.Root = root;
|
UIManager.Instance.Root = root;
|
||||||
UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
|
UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
|
||||||
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
|
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
|
||||||
|
|
||||||
|
if (App.CurrentUser == null)
|
||||||
|
{
|
||||||
|
await Login();
|
||||||
|
}
|
||||||
|
|
||||||
//MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
|
//MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
|
||||||
//{
|
//{
|
||||||
// UIManager.ShowHomePanel();
|
// UIManager.ShowHomePanel();
|
||||||
@ -52,4 +61,15 @@ public class MainController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task Login()
|
||||||
|
{
|
||||||
|
var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", "");
|
||||||
|
App.CurrentUser = result.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnApplicationQuit()
|
||||||
|
{
|
||||||
|
AntConnector.Instance().Dispose();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,14 +9,14 @@ public class ButtonHoverScript : MonoBehaviour, IPointerExitHandler, IPointerEnt
|
|||||||
public void OnPointerEnter(PointerEventData eventData)
|
public void OnPointerEnter(PointerEventData eventData)
|
||||||
{
|
{
|
||||||
//transform.DOMove
|
//transform.DOMove
|
||||||
Debug.Log("鼠标悬浮");
|
//Debug.Log("鼠标悬浮");
|
||||||
//gameObject.transform.localScale = new Vector3(1.01f, 1.01f, 1f);
|
//gameObject.transform.localScale = new Vector3(1.01f, 1.01f, 1f);
|
||||||
transform.DOScale(new Vector3(1.01f, 1.01f, 1f),0.2f);
|
transform.DOScale(new Vector3(1.01f, 1.01f, 1f),0.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnPointerExit(PointerEventData eventData)
|
public void OnPointerExit(PointerEventData eventData)
|
||||||
{
|
{
|
||||||
Debug.Log("鼠标松开");
|
//Debug.Log("鼠标松开");
|
||||||
transform.DOScale(new Vector3(1f, 1f, 1f), 0.2f);
|
transform.DOScale(new Vector3(1f, 1f, 1f), 0.2f);
|
||||||
//gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
|
//gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -58,7 +58,7 @@ namespace Assets.Scripts.UI.Control
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private Outline outline;
|
||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
//this.mSelectedIndex =
|
//this.mSelectedIndex =
|
||||||
@ -71,9 +71,18 @@ namespace Assets.Scripts.UI.Control
|
|||||||
{
|
{
|
||||||
mOnValueChange(i);
|
mOnValueChange(i);
|
||||||
}
|
}
|
||||||
|
outline.enabled = false;
|
||||||
});
|
});
|
||||||
|
outline = transform.GetComponent<Outline>();
|
||||||
}
|
}
|
||||||
|
public void SetValidate()
|
||||||
|
{
|
||||||
|
outline.enabled = true;
|
||||||
|
}
|
||||||
|
//public void SetValidate(string s)
|
||||||
|
//{
|
||||||
|
// outline.gameObject.SetActive(true);
|
||||||
|
//}
|
||||||
public void OnSelect(BaseEventData eventData)
|
public void OnSelect(BaseEventData eventData)
|
||||||
{
|
{
|
||||||
var image = this.transform.GetComponent<Image>();
|
var image = this.transform.GetComponent<Image>();
|
||||||
|
|||||||
@ -29,7 +29,7 @@ namespace Assets.Scripts.UI.Control
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string placeHolderText;
|
||||||
public void OnSelect(BaseEventData eventData)
|
public void OnSelect(BaseEventData eventData)
|
||||||
{
|
{
|
||||||
if (this.gameObject.activeInHierarchy == false)
|
if (this.gameObject.activeInHierarchy == false)
|
||||||
@ -49,7 +49,7 @@ namespace Assets.Scripts.UI.Control
|
|||||||
Text = "";
|
Text = "";
|
||||||
}
|
}
|
||||||
_text.color = Color.white;
|
_text.color = Color.white;
|
||||||
|
transform.Find("Placeholder").GetComponent<Text>().text = "";
|
||||||
outline.enabled = true;
|
outline.enabled = true;
|
||||||
ColorUtility.TryParseHtmlString("#F93086", out Color color);
|
ColorUtility.TryParseHtmlString("#F93086", out Color color);
|
||||||
|
|
||||||
@ -65,6 +65,7 @@ namespace Assets.Scripts.UI.Control
|
|||||||
|
|
||||||
isSelected = false;
|
isSelected = false;
|
||||||
this.mInnerInputField.OnDeselect(eventData);
|
this.mInnerInputField.OnDeselect(eventData);
|
||||||
|
transform.Find("Placeholder").GetComponent<Text>().text = placeHolderText;
|
||||||
//var image = this.transform.GetComponent<Image>();
|
//var image = this.transform.GetComponent<Image>();
|
||||||
//var png1 = Resources.Load<Sprite>("Images/ipt-0");
|
//var png1 = Resources.Load<Sprite>("Images/ipt-0");
|
||||||
//image.sprite = png1;
|
//image.sprite = png1;
|
||||||
@ -113,6 +114,7 @@ namespace Assets.Scripts.UI.Control
|
|||||||
//outline = this.gameObject.AddComponent<Outline>();
|
//outline = this.gameObject.AddComponent<Outline>();
|
||||||
outline.enabled = false;
|
outline.enabled = false;
|
||||||
}));
|
}));
|
||||||
|
placeHolderText = transform.Find("Placeholder").GetComponent<Text>().text;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetValidate(bool value)
|
public void SetValidate(bool value)
|
||||||
|
|||||||
@ -111,7 +111,7 @@ public class Item : PFUIPanel //, IPointerClickHandler
|
|||||||
this.Text = model.Name;
|
this.Text = model.Name;
|
||||||
this.Distance = model.Distance.ToString("0.0") + "KM";
|
this.Distance = model.Distance.ToString("0.0") + "KM";
|
||||||
this.Count = model.TheHeat.ToString();
|
this.Count = model.TheHeat.ToString();
|
||||||
|
hot.gameObject.SetActive(model.IsFire);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
|
|||||||
@ -29,6 +29,8 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
private VerticalLayoutGroup content;
|
private VerticalLayoutGroup content;
|
||||||
private PfUIButton connectBtn;
|
private PfUIButton connectBtn;
|
||||||
private Dictionary<ushort, DeviceItem> deviceList;
|
private Dictionary<ushort, DeviceItem> deviceList;
|
||||||
|
private Text noDevice;
|
||||||
|
private RectTransform searchIconRect;
|
||||||
|
|
||||||
protected override void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
@ -42,13 +44,12 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
var panel = container.Find("Panel");
|
var panel = container.Find("Panel");
|
||||||
content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent<VerticalLayoutGroup>();
|
content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent<VerticalLayoutGroup>();
|
||||||
|
|
||||||
//Material material = null;
|
noDevice = container.Find("NoDevice").GetComponent<Text>();
|
||||||
//if (material == null)
|
|
||||||
//{
|
searchIconRect = container.Find("SearchIcon").GetComponent<RectTransform>();
|
||||||
// material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
|
_x = searchIconRect.localPosition.x;
|
||||||
//}
|
_y = searchIconRect.localPosition.y;
|
||||||
//var rect = ((RectTransform)panel.transform).rect;
|
|
||||||
//material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 20f, 0));
|
|
||||||
base.SetRounded(panel.GetComponent<Image>().transform, 20f);
|
base.SetRounded(panel.GetComponent<Image>().transform, 20f);
|
||||||
|
|
||||||
UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
||||||
@ -88,7 +89,6 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
protected override void Start()
|
protected override void Start()
|
||||||
{
|
{
|
||||||
SearchDevice();
|
SearchDevice();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -101,6 +101,8 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
SearchDevice();
|
SearchDevice();
|
||||||
timer = 1.0f;
|
timer = 1.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Move();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SearchDevice()
|
private void SearchDevice()
|
||||||
@ -145,31 +147,18 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
var deviceItemObj = gameObject.GetComponent<DeviceItem>();
|
var deviceItemObj = gameObject.GetComponent<DeviceItem>();
|
||||||
deviceItemObj.DeviceInfo = device;
|
deviceItemObj.DeviceInfo = device;
|
||||||
|
|
||||||
|
|
||||||
UIManager.AddEvent(deviceItemObj.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
UIManager.AddEvent(deviceItemObj.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
||||||
{
|
{
|
||||||
////deviceItemObj.Select();
|
|
||||||
//if(deviceItemObj.DeviceInfo.Sensor == SensorType)
|
|
||||||
//{
|
|
||||||
// deviceItemObj.DeviceInfo.Connect();
|
|
||||||
//}
|
|
||||||
deviceItemObj.Set(true);
|
deviceItemObj.Set(true);
|
||||||
foreach (var item in deviceList)
|
foreach (var item in deviceList)
|
||||||
{
|
{
|
||||||
if (item.Key != deviceItemObj.DeviceInfo.DeviceNumber)
|
if (item.Key != deviceItemObj.DeviceInfo.DeviceNumber)
|
||||||
{
|
{
|
||||||
item.Value.Set(false);
|
item.Value.Set(false);
|
||||||
//if (item.Value.DeviceInfo.Sensor == SensorType)
|
|
||||||
//{
|
|
||||||
// item.Value.DeviceInfo.Disconnect();
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Close();
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//UIManager.AddEvent(deviceItemObj.gameObject, EventTriggerType.Deselect, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
//UIManager.AddEvent(deviceItemObj.gameObject, EventTriggerType.Deselect, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
||||||
//{
|
//{
|
||||||
// //Debug.Log("de select");
|
// //Debug.Log("de select");
|
||||||
@ -190,6 +179,7 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
firstDevice.Set(true);
|
firstDevice.Set(true);
|
||||||
|
|
||||||
//connectBtn.text.text = "DISCOUNECT";
|
//connectBtn.text.text = "DISCOUNECT";
|
||||||
|
noDevice.text = firstDevice.DeviceInfo.Name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -200,4 +190,29 @@ public class ConnectDeviceModal : PFUIPanel
|
|||||||
base.Close();
|
base.Close();
|
||||||
DestroyImmediate(this.gameObject);
|
DestroyImmediate(this.gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
float time = 0;
|
||||||
|
float _x = 0;
|
||||||
|
float _y = 0;
|
||||||
|
void Move()
|
||||||
|
{
|
||||||
|
var hudu = (2 * Mathf.PI / 360) * 1 * time;
|
||||||
|
|
||||||
|
var x = _x + Mathf.Sin(hudu) * 8f;
|
||||||
|
var y = _y + Mathf.Cos(hudu) * 8f;
|
||||||
|
|
||||||
|
var rect = searchIconRect.localPosition;
|
||||||
|
//rect.x = x;
|
||||||
|
//rect.y = y;
|
||||||
|
rect.x = x;
|
||||||
|
rect.y = y;
|
||||||
|
searchIconRect.localPosition = rect;
|
||||||
|
|
||||||
|
time += 1.8f;
|
||||||
|
|
||||||
|
//Debug.Log(x + ", " + y);
|
||||||
|
|
||||||
|
//yield return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ using UnityEngine.Events;
|
|||||||
using Assets.Scripts.Devices.Ant.Interfaces;
|
using Assets.Scripts.Devices.Ant.Interfaces;
|
||||||
using Assets.Scripts.UI.UIEffect;
|
using Assets.Scripts.UI.UIEffect;
|
||||||
using Assets.Scripts;
|
using Assets.Scripts;
|
||||||
|
using DG.Tweening;
|
||||||
|
|
||||||
public class DeviceView : MonoBehaviour
|
public class DeviceView : MonoBehaviour
|
||||||
{
|
{
|
||||||
@ -36,6 +37,7 @@ public class DeviceView : MonoBehaviour
|
|||||||
private Text title;
|
private Text title;
|
||||||
private Text noDevice;
|
private Text noDevice;
|
||||||
private Text powerValue;
|
private Text powerValue;
|
||||||
|
private Text powerUnit;
|
||||||
//private Text cadenceValue;
|
//private Text cadenceValue;
|
||||||
//private Text speedValue;
|
//private Text speedValue;
|
||||||
//private Text heartRateValue;
|
//private Text heartRateValue;
|
||||||
@ -82,8 +84,6 @@ public class DeviceView : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var img2 = connectionPanel.GetComponent<Image>();
|
var img2 = connectionPanel.GetComponent<Image>();
|
||||||
if(img2 != null)
|
if(img2 != null)
|
||||||
{
|
{
|
||||||
@ -98,7 +98,7 @@ public class DeviceView : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
logo = this.transform.Find("Logo").GetComponent<Image>();
|
logo = this.transform.Find("Logo").GetComponent<Image>();
|
||||||
InitLogo();
|
|
||||||
|
|
||||||
mDisconnectButton = connectionPanel.transform.Find("DisconnectBtn").gameObject;
|
mDisconnectButton = connectionPanel.transform.Find("DisconnectBtn").gameObject;
|
||||||
var powerValueObj = connectionPanel.transform.Find("PowerValue");
|
var powerValueObj = connectionPanel.transform.Find("PowerValue");
|
||||||
@ -106,21 +106,14 @@ public class DeviceView : MonoBehaviour
|
|||||||
{
|
{
|
||||||
powerValue = powerValueObj.gameObject.GetComponent<Text>();
|
powerValue = powerValueObj.gameObject.GetComponent<Text>();
|
||||||
}
|
}
|
||||||
//var cadenceValueObj = connectionPanel.transform.Find("CadenceValue");
|
|
||||||
//if (cadenceValueObj != null) {
|
|
||||||
// cadenceValue = cadenceValueObj.gameObject.GetComponent<Text>();
|
|
||||||
//}
|
|
||||||
//var speedValueObj = connectionPanel.transform.Find("SpeedValue");
|
|
||||||
//if (speedValueObj != null)
|
|
||||||
//{
|
|
||||||
// speedValue = speedValueObj.gameObject.GetComponent<Text>();
|
|
||||||
//}
|
|
||||||
|
|
||||||
//var heartRateValueObj = connectionPanel.transform.Find("HeartRateValue");
|
var powerUnitObj = connectionPanel.transform.Find("PowerUnit");
|
||||||
//if(heartRateValueObj != null)
|
if(powerUnitObj != null)
|
||||||
//{
|
{
|
||||||
// heartRateValue = heartRateValueObj.gameObject.GetComponent<Text>();
|
powerUnit = powerUnitObj.gameObject.GetComponent<Text>();
|
||||||
//}
|
}
|
||||||
|
|
||||||
|
InitLogo();
|
||||||
|
|
||||||
connectionPanel.SetActive(false);
|
connectionPanel.SetActive(false);
|
||||||
|
|
||||||
@ -159,26 +152,34 @@ public class DeviceView : MonoBehaviour
|
|||||||
sprite0 = Resources.Load<Sprite>("Images/Devices/Power_0");
|
sprite0 = Resources.Load<Sprite>("Images/Devices/Power_0");
|
||||||
sprite1 = Resources.Load<Sprite>("Images/Devices/Power_1");
|
sprite1 = Resources.Load<Sprite>("Images/Devices/Power_1");
|
||||||
sprite3 = Resources.Load<Sprite>("Images/Devices/Power_3");
|
sprite3 = Resources.Load<Sprite>("Images/Devices/Power_3");
|
||||||
|
|
||||||
|
powerUnit.text = "W";
|
||||||
}
|
}
|
||||||
else if (SensorType == SensorType.SpeedCadence)
|
else if (SensorType == SensorType.SpeedCadence)
|
||||||
{
|
{
|
||||||
sprite0 = Resources.Load<Sprite>("Images/Devices/Speed_0");
|
sprite0 = Resources.Load<Sprite>("Images/Devices/Speed_0");
|
||||||
sprite1 = Resources.Load<Sprite>("Images/Devices/Speed_1");
|
sprite1 = Resources.Load<Sprite>("Images/Devices/Speed_1");
|
||||||
sprite3 = Resources.Load<Sprite>("Images/Devices/Speed_3");
|
sprite3 = Resources.Load<Sprite>("Images/Devices/Speed_3");
|
||||||
|
|
||||||
|
powerUnit.text = "KPH";
|
||||||
}
|
}
|
||||||
else if (SensorType == SensorType.Cadence)
|
else if (SensorType == SensorType.Cadence)
|
||||||
{
|
{
|
||||||
sprite0 = Resources.Load<Sprite>("Images/Devices/Cadence_0");
|
sprite0 = Resources.Load<Sprite>("Images/Devices/Cadence_0");
|
||||||
sprite1 = Resources.Load<Sprite>("Images/Devices/Cadence_1");
|
sprite1 = Resources.Load<Sprite>("Images/Devices/Cadence_1");
|
||||||
sprite3 = Resources.Load<Sprite>("Images/Devices/Cadence_3");
|
sprite3 = Resources.Load<Sprite>("Images/Devices/Cadence_3");
|
||||||
|
|
||||||
|
powerUnit.text = "RPM";
|
||||||
}
|
}
|
||||||
else if (SensorType == SensorType.HeartRate)
|
else if (SensorType == SensorType.HeartRate)
|
||||||
{
|
{
|
||||||
sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_0");
|
sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_0");
|
||||||
sprite1 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
|
sprite1 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
|
||||||
sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_3");
|
sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_3");
|
||||||
|
|
||||||
|
powerUnit.text = "BPM";
|
||||||
}
|
}
|
||||||
else
|
else if(SensorType == SensorType.Trainer)
|
||||||
{
|
{
|
||||||
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_0");
|
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_0");
|
||||||
sprite1 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
|
sprite1 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
|
||||||
@ -220,33 +221,8 @@ public class DeviceView : MonoBehaviour
|
|||||||
noDevice.text = "NO DEVICE";
|
noDevice.text = "NO DEVICE";
|
||||||
searchState.text = "Searching...";
|
searchState.text = "Searching...";
|
||||||
|
|
||||||
switch (SensorType)
|
title.text = GetTitle();
|
||||||
{
|
|
||||||
case SensorType.None:
|
|
||||||
break;
|
|
||||||
case SensorType.Cadence:
|
|
||||||
title.text = "Cadence Sensor";
|
|
||||||
break;
|
|
||||||
case SensorType.HeartRate:
|
|
||||||
title.text = "Heart Rate Monitor";
|
|
||||||
break;
|
|
||||||
case SensorType.Power:
|
|
||||||
title.text = "Power Meter";
|
|
||||||
break;
|
|
||||||
case SensorType.Speed:
|
|
||||||
break;
|
|
||||||
case SensorType.SpeedCadence:
|
|
||||||
title.text = "Speed Meter";
|
|
||||||
break;
|
|
||||||
case SensorType.Trainer:
|
|
||||||
title.text = "Smart Trainer";
|
|
||||||
|
|
||||||
break;
|
|
||||||
case SensorType.VirtualPower:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
var hasDevice = AntConnector.Instance().discoveredDevices.Any(d => d.Sensor == SensorType);
|
var hasDevice = AntConnector.Instance().discoveredDevices.Any(d => d.Sensor == SensorType);
|
||||||
if (hasDevice)
|
if (hasDevice)
|
||||||
{
|
{
|
||||||
@ -273,45 +249,90 @@ public class DeviceView : MonoBehaviour
|
|||||||
else if (connectedDevice.State == DeviceState.Connected)
|
else if (connectedDevice.State == DeviceState.Connected)
|
||||||
{
|
{
|
||||||
unconnectionPanel.SetActive(false);
|
unconnectionPanel.SetActive(false);
|
||||||
connectionPanel.SetActive(true);
|
|
||||||
|
if (connectionPanel.activeInHierarchy == false)
|
||||||
|
{
|
||||||
|
var connectionCanvasGroup = connectionPanel.GetComponent<CanvasGroup>();
|
||||||
|
connectionCanvasGroup.alpha = 0;
|
||||||
|
connectionPanel.SetActive(true);
|
||||||
|
connectionCanvasGroup.DOFade(1f, .3f);
|
||||||
|
}
|
||||||
logo.sprite = sprite3;
|
logo.sprite = sprite3;
|
||||||
|
|
||||||
title.text = connectedDevice.Name;
|
title.text = connectedDevice.Name;
|
||||||
noDevice.text = connectedDevice.DeviceNumber.ToString();
|
noDevice.text = connectedDevice.DeviceNumber.ToString();
|
||||||
noDevice.color = Color.white;
|
noDevice.color = Color.white;
|
||||||
switch (SensorType)
|
|
||||||
|
if (powerValue != null)
|
||||||
{
|
{
|
||||||
case SensorType.None:
|
powerValue.text = GetValue(connectedDevice);
|
||||||
break;
|
|
||||||
case SensorType.Cadence:
|
|
||||||
//cadenceValue.text = (connectedDevice as ICadenceDevice).Cadence.ToString();
|
|
||||||
powerValue.text = (connectedDevice as ICadenceDevice).Cadence.ToString();
|
|
||||||
break;
|
|
||||||
case SensorType.HeartRate:
|
|
||||||
powerValue.text = (connectedDevice as IHeartRateDevice).HeartRate.ToString();
|
|
||||||
break;
|
|
||||||
case SensorType.Power:
|
|
||||||
powerValue.text = (connectedDevice as IPowerDevice).Power.ToString();
|
|
||||||
break;
|
|
||||||
case SensorType.Speed:
|
|
||||||
break;
|
|
||||||
case SensorType.SpeedCadence:
|
|
||||||
powerValue.text = (connectedDevice as ISpeedDevice).Speed.ToString();
|
|
||||||
break;
|
|
||||||
case SensorType.Trainer:
|
|
||||||
//powerValue.text = (connectedDevice as IPowerDevice).Power.ToString();
|
|
||||||
//cadenceValue.GetComponent<Text>().text = (connectedDevice as ICadenceDevice).Cadence.ToString();
|
|
||||||
//speedValue.GetComponent<Text>().text = (connectedDevice as ISpeedDevice).Speed.ToString();
|
|
||||||
break;
|
|
||||||
case SensorType.VirtualPower:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string GetTitle()
|
||||||
|
{
|
||||||
|
switch (SensorType)
|
||||||
|
{
|
||||||
|
case SensorType.None:
|
||||||
|
break;
|
||||||
|
case SensorType.Cadence:
|
||||||
|
return "Cadence Sensor";
|
||||||
|
break;
|
||||||
|
case SensorType.HeartRate:
|
||||||
|
return "Heart Rate Monitor";
|
||||||
|
break;
|
||||||
|
case SensorType.Power:
|
||||||
|
return "Power Meter";
|
||||||
|
break;
|
||||||
|
case SensorType.Speed:
|
||||||
|
break;
|
||||||
|
case SensorType.SpeedCadence:
|
||||||
|
return "Speed Meter";
|
||||||
|
break;
|
||||||
|
case SensorType.Trainer:
|
||||||
|
return "Smart Trainer";
|
||||||
|
|
||||||
|
break;
|
||||||
|
case SensorType.VirtualPower:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
string GetValue(AbstractAntDevice connectedDevice)
|
||||||
|
{
|
||||||
|
switch (SensorType)
|
||||||
|
{
|
||||||
|
case SensorType.None:
|
||||||
|
break;
|
||||||
|
case SensorType.Cadence:
|
||||||
|
//cadenceValue.text = (connectedDevice as ICadenceDevice).Cadence.ToString();
|
||||||
|
return (connectedDevice as ICadenceDevice).Cadence.ToString();
|
||||||
|
case SensorType.HeartRate:
|
||||||
|
return (connectedDevice as IHeartRateDevice).HeartRate.ToString();
|
||||||
|
case SensorType.Power:
|
||||||
|
return (connectedDevice as IPowerDevice).Power.ToString();
|
||||||
|
case SensorType.Speed:
|
||||||
|
break;
|
||||||
|
case SensorType.SpeedCadence:
|
||||||
|
return (connectedDevice as ISpeedDevice).Speed.ToString();
|
||||||
|
case SensorType.Trainer:
|
||||||
|
//powerValue.text = (connectedDevice as IPowerDevice).Power.ToString();
|
||||||
|
//cadenceValue.GetComponent<Text>().text = (connectedDevice as ICadenceDevice).Cadence.ToString();
|
||||||
|
//speedValue.GetComponent<Text>().text = (connectedDevice as ISpeedDevice).Speed.ToString();
|
||||||
|
break;
|
||||||
|
case SensorType.VirtualPower:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
AbstractAntDevice GetCurrentDevice()
|
AbstractAntDevice GetCurrentDevice()
|
||||||
{
|
{
|
||||||
return AntConnector.Instance().discoveredDevices.FirstOrDefault(d => (d.State == DeviceState.Connected || d.State == DeviceState.Connecting) && d.Sensor == SensorType);
|
return AntConnector.Instance().discoveredDevices.FirstOrDefault(d => (d.State == DeviceState.Connected || d.State == DeviceState.Connecting) && d.Sensor == SensorType);
|
||||||
|
|||||||
121
Assets/Scripts/UI/Prefab/FeedbackController.cs
Normal file
121
Assets/Scripts/UI/Prefab/FeedbackController.cs
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
using Assets.Scripts;
|
||||||
|
using Assets.Scripts.Apis;
|
||||||
|
using Assets.Scripts.UI.Control;
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class FeedbackController : PFUIPanel
|
||||||
|
{
|
||||||
|
// Start is called before the first frame update
|
||||||
|
Transform main,images;
|
||||||
|
PFUIInputField content;
|
||||||
|
Dictionary<string, string> paths;
|
||||||
|
Sprite plus;
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
ApiBase.SetCookie("3B7C1A274805FBB658A16F7B658F7FC3B01599154A952C20011B0F207A9F7B9709CAB23AD8B62FF5F85806DD0AD5059223FD6A582EF79B3F211E64572290202D2821928E824BA6C5313C32C4291763A3797304AE193B272DB9907F7D5AB46D53");
|
||||||
|
main = transform.Find("Main");
|
||||||
|
images = main.Find("Images");
|
||||||
|
paths = new Dictionary<string, string>();
|
||||||
|
plus = Resources.Load<Sprite>("Images/c-1");
|
||||||
|
for (int i = 0; i < images.childCount; i++)
|
||||||
|
{
|
||||||
|
var img = images.GetChild(i);
|
||||||
|
int index = i;
|
||||||
|
UIManager.AddEvent(img.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||||
|
(e)=> AddImage(e,index));
|
||||||
|
UIManager.AddEvent(img.Find("close").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,
|
||||||
|
(e) => { DelImage(e, img,index); });
|
||||||
|
img.Find("close").gameObject.SetActive(false);
|
||||||
|
img.GetComponent<Image>().sprite = plus;
|
||||||
|
//if (i > 0) SetImageActive(img, false);
|
||||||
|
}
|
||||||
|
UIManager.AddEvent(main.Find("BtnSubmit").gameObject, EventTriggerType.PointerClick, (b) => Submit());
|
||||||
|
UIManager.AddEvent(main.Find("BtnCancel").gameObject, EventTriggerType.PointerClick, (b) => Close());
|
||||||
|
UIManager.AddEvent(main.Find("Exit").gameObject, EventTriggerType.PointerClick, (b) => Close());
|
||||||
|
content = main.Find("Content").Find("input").GetComponent<PFUIInputField>();
|
||||||
|
content.GetComponent<InputField>().onValueChanged.AddListener((s) =>
|
||||||
|
{
|
||||||
|
content.transform.Find("Number").GetComponent<Text>().text = $"<color=#9e9ead>{s.Length}</color>/200";
|
||||||
|
});
|
||||||
|
content.transform.Find("Number").GetComponent<Text>().text = $"<color=#9e9ead>0</color>/200";
|
||||||
|
|
||||||
|
LoadUserInfo();
|
||||||
|
}
|
||||||
|
public override void Show()
|
||||||
|
{
|
||||||
|
base.Show();
|
||||||
|
paths.Clear();
|
||||||
|
for (int i = 0; i < images.childCount; i++)
|
||||||
|
{
|
||||||
|
images.GetChild(i).GetComponent<Image>().sprite = plus;
|
||||||
|
//if (i > 0) SetImageActive(img, false);
|
||||||
|
}
|
||||||
|
content.Text = "";
|
||||||
|
LoadUserInfo();
|
||||||
|
}
|
||||||
|
void SetImageActive(Transform img, bool b)
|
||||||
|
{
|
||||||
|
img.GetComponent<Button>().interactable = b;
|
||||||
|
img.GetComponent<Button>().enabled = b;
|
||||||
|
img.GetComponent<CanvasGroup>().alpha = Convert.ToInt32(b);
|
||||||
|
}
|
||||||
|
void LoadUserInfo()
|
||||||
|
{
|
||||||
|
if (App.CurrentUser == null) return;
|
||||||
|
main.Find("Email").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Phone;
|
||||||
|
main.Find("ID").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Id.ToString();
|
||||||
|
main.Find("Version").Find("Value").Find("Text").GetComponent<Text>().text = App.AppVersion;
|
||||||
|
main.Find("Time").Find("Value").Find("Text").GetComponent<Text>().text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
}
|
||||||
|
|
||||||
|
void AddImage(BaseEventData e,int index)
|
||||||
|
{
|
||||||
|
var self = ((PointerEventData)e).pointerEnter;
|
||||||
|
Utils.OpenFile((path) =>
|
||||||
|
{
|
||||||
|
self.GetComponent<Image>().sprite = Utils.PngToSprite(path, 110, 110);
|
||||||
|
self.transform.Find("close").gameObject.SetActive(true);
|
||||||
|
paths[self.name] = path;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
void DelImage(BaseEventData e,Transform self,int index)
|
||||||
|
{
|
||||||
|
self.GetComponent<Image>().sprite = plus;
|
||||||
|
paths.Remove(self.name);
|
||||||
|
self.Find("close").gameObject.SetActive(false);
|
||||||
|
//self.SetSiblingIndex(paths.Count);
|
||||||
|
//if (paths.Count < 2)
|
||||||
|
//{
|
||||||
|
// SetImageActive(images.GetChild(paths.Count+1), false);
|
||||||
|
//}
|
||||||
|
|
||||||
|
//for(int i = index)
|
||||||
|
//if (index < 2) SetImageActive(images.GetChild(index + 1), false);
|
||||||
|
//SetImageActive(images.GetChild(index), false);
|
||||||
|
}
|
||||||
|
async void Submit()
|
||||||
|
{
|
||||||
|
var list = paths.OrderBy(x => x.Key).Select(x => x.Value).ToList();
|
||||||
|
//var list = images.GetComponents<Transform>().Where(x => x.tag != null && x.tag != "Untagged").Select(x=>x.tag).ToList();
|
||||||
|
var r = await ConfigHelper.userApi.AddFeedBack(content.Text, list);
|
||||||
|
if (!r.result)
|
||||||
|
{
|
||||||
|
Utils.showToast(gameObject, r.errMsg);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Utils.showToast(gameObject, "已提交");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/UI/Prefab/FeedbackController.cs.meta
Normal file
11
Assets/Scripts/UI/Prefab/FeedbackController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1206c94b4f7d4f642ad5c7eedf233386
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -1,4 +1,6 @@
|
|||||||
using System.Collections;
|
using Assets.Scripts;
|
||||||
|
using DG.Tweening;
|
||||||
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@ -8,7 +10,7 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
{
|
{
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
private ScrollRect scroll;
|
private ScrollRect scroll;
|
||||||
private Transform content;
|
private Transform content,lightbg;
|
||||||
private float contentSize;
|
private float contentSize;
|
||||||
private int count;
|
private int count;
|
||||||
[SerializeField] Button L, R;
|
[SerializeField] Button L, R;
|
||||||
@ -16,6 +18,7 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
{
|
{
|
||||||
scroll = gameObject.GetComponent<ScrollRect>();
|
scroll = gameObject.GetComponent<ScrollRect>();
|
||||||
content = gameObject.transform.Find("Viewport").Find("Content");
|
content = gameObject.transform.Find("Viewport").Find("Content");
|
||||||
|
lightbg = transform.parent.Find("Light");
|
||||||
//Initial();
|
//Initial();
|
||||||
if (L != null)
|
if (L != null)
|
||||||
{
|
{
|
||||||
@ -34,6 +37,14 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
//R.onClick.AddListener(goRight);
|
//R.onClick.AddListener(goRight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void doAni()
|
||||||
|
{
|
||||||
|
lightbg.GetComponent<Image>().color = Utils.HexToColorHtml("#ffffff00");
|
||||||
|
lightbg.GetComponent<Image>().gameObject.SetActive(false);
|
||||||
|
//lightbg.GetComponent<Image>().DOFade(0, 0.15f);
|
||||||
|
}
|
||||||
|
|
||||||
public void Initial()
|
public void Initial()
|
||||||
{
|
{
|
||||||
count = content.childCount;
|
count = content.childCount;
|
||||||
@ -55,6 +66,7 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
void goLeft()
|
void goLeft()
|
||||||
{
|
{
|
||||||
if (scroll.horizontalNormalizedPosition <= contentSize) return;
|
if (scroll.horizontalNormalizedPosition <= contentSize) return;
|
||||||
|
doAni();
|
||||||
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
||||||
start = true;
|
start = true;
|
||||||
scrollValue = -1 * contentSize / 30;
|
scrollValue = -1 * contentSize / 30;
|
||||||
@ -62,6 +74,7 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
void goRight()
|
void goRight()
|
||||||
{
|
{
|
||||||
if ((scroll.horizontalNormalizedPosition + contentSize) >= 1) return;
|
if ((scroll.horizontalNormalizedPosition + contentSize) >= 1) return;
|
||||||
|
doAni();
|
||||||
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
||||||
start = true;
|
start = true;
|
||||||
scrollValue = contentSize / 30;
|
scrollValue = contentSize / 30;
|
||||||
@ -78,7 +91,10 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
string c;
|
string c;
|
||||||
if (i == index)
|
if (i == index)
|
||||||
{
|
{
|
||||||
|
lightbg.GetComponent<Image>().gameObject.SetActive(true);
|
||||||
|
lightbg.GetComponent<Image>().DOFade(1, 0.2f);
|
||||||
content.GetChild(i).GetComponent<QuickLoginUser>().setActive();
|
content.GetChild(i).GetComponent<QuickLoginUser>().setActive();
|
||||||
|
//
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -98,7 +114,6 @@ public class QuickLoginScroll : MonoBehaviour
|
|||||||
start = false;
|
start = false;
|
||||||
scroll.horizontalNormalizedPosition = startPosition + totalScrollValue;
|
scroll.horizontalNormalizedPosition = startPosition + totalScrollValue;
|
||||||
//Debug.Log();
|
//Debug.Log();
|
||||||
|
|
||||||
SetColor();
|
SetColor();
|
||||||
totalScrollValue = 0;
|
totalScrollValue = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,7 +40,7 @@ public class QuickLoginUser : MonoBehaviour
|
|||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
//DOTween.To(()=>)
|
||||||
}
|
}
|
||||||
async void goMain()
|
async void goMain()
|
||||||
{
|
{
|
||||||
@ -75,6 +75,7 @@ public class QuickLoginUser : MonoBehaviour
|
|||||||
// content.Find("empty1").transform.SetSiblingIndex(0);
|
// content.Find("empty1").transform.SetSiblingIndex(0);
|
||||||
// content.Find("empty2").transform.SetSiblingIndex(content.childCount - 1);
|
// content.Find("empty2").transform.SetSiblingIndex(content.childCount - 1);
|
||||||
//}
|
//}
|
||||||
|
UIManager.Instance.userInfoIndex = 0;
|
||||||
content.parent.parent.GetComponent<QuickLoginScroll>().Initial();
|
content.parent.parent.GetComponent<QuickLoginScroll>().Initial();
|
||||||
DeleteList(index);
|
DeleteList(index);
|
||||||
}
|
}
|
||||||
@ -84,7 +85,10 @@ public class QuickLoginUser : MonoBehaviour
|
|||||||
var userInfos = UIManager.Instance.userInfos;
|
var userInfos = UIManager.Instance.userInfos;
|
||||||
userInfos.RemoveAt(index);
|
userInfos.RemoveAt(index);
|
||||||
UIManager.Instance.userInfos = userInfos;
|
UIManager.Instance.userInfos = userInfos;
|
||||||
UIManager.Instance.userInfoIndex = 0;
|
if (userInfos.Count == 0)
|
||||||
|
{
|
||||||
|
top.GetComponent<LoginController>().goLogin(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setActive()
|
public void setActive()
|
||||||
@ -93,7 +97,8 @@ public class QuickLoginUser : MonoBehaviour
|
|||||||
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
||||||
transform.Find("Avatar").GetComponent<RawImage>().DOFade(1f, 0.3f);
|
transform.Find("Avatar").GetComponent<RawImage>().DOFade(1f, 0.3f);
|
||||||
transform.GetComponent<Button>().enabled = true;
|
transform.GetComponent<Button>().enabled = true;
|
||||||
transform.Find("NickNameText").GetComponent<Text>().enabled = true;
|
transform.Find("NickNameText").GetComponent<Text>().DOFade(1f, 0.3f);
|
||||||
|
//transform.Find("NickNameText").GetComponent<Text>().enabled = true;
|
||||||
transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(true);
|
transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(true);
|
||||||
}
|
}
|
||||||
public void setNoActive()
|
public void setNoActive()
|
||||||
@ -102,7 +107,7 @@ public class QuickLoginUser : MonoBehaviour
|
|||||||
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
||||||
transform.Find("Avatar").GetComponent<RawImage>().DOFade(0.5f, 0.3f);
|
transform.Find("Avatar").GetComponent<RawImage>().DOFade(0.5f, 0.3f);
|
||||||
transform.GetComponent<Button>().enabled = false;
|
transform.GetComponent<Button>().enabled = false;
|
||||||
transform.Find("NickNameText").GetComponent<Text>().enabled = false;
|
transform.Find("NickNameText").GetComponent<Text>().DOFade(0, 0.3f);//.enabled = false;
|
||||||
transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(false);
|
transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,6 +44,10 @@ public class MainNav : MonoBehaviour
|
|||||||
{
|
{
|
||||||
UIManager.ShowSettingModal();
|
UIManager.ShowSettingModal();
|
||||||
});
|
});
|
||||||
|
UIManager.AddEvent(transform.Find("Support").gameObject, EventTriggerType.PointerClick, x =>
|
||||||
|
{
|
||||||
|
UIManager.ShowFeedBackModal();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
|
|||||||
@ -20,6 +20,14 @@ public class PropNames
|
|||||||
}
|
}
|
||||||
public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
|
public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
|
||||||
{
|
{
|
||||||
|
float width;
|
||||||
|
float height;
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
width = this.GetComponent<RectTransform>().rect.width;
|
||||||
|
height = this.GetComponent<RectTransform>().rect.height;
|
||||||
|
}
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
//[SerializeField] Text text;
|
//[SerializeField] Text text;
|
||||||
//[SerializeField] GameObject panel;
|
//[SerializeField] GameObject panel;
|
||||||
@ -166,4 +174,69 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
|
|||||||
UIManager.ShowAlert(r.errMsg);
|
UIManager.ShowAlert(r.errMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void Show(Vector3 position, NearRouteModel model)
|
||||||
|
{
|
||||||
|
//if(position.y > position.z)
|
||||||
|
//{
|
||||||
|
// position.y = position.z;
|
||||||
|
//}
|
||||||
|
this.Move(position);
|
||||||
|
|
||||||
|
this.gameObject.SetActive(true);
|
||||||
|
|
||||||
|
//this.SetModel(model);
|
||||||
|
Initial(new MapRoute
|
||||||
|
{
|
||||||
|
Id = model.Id,
|
||||||
|
Name = model.Name,
|
||||||
|
Hard = model.Hard,
|
||||||
|
CoverImage = model.CoverImage,
|
||||||
|
Enable3D = model.Enable3D,
|
||||||
|
TheHeat = model.TheHeat,
|
||||||
|
TotalClimb = model.TotalClimb,
|
||||||
|
AverageGrade = model.AverageGrade,
|
||||||
|
CountryCode = model.CountryCode,
|
||||||
|
AltitudeGraph = model.AltitudeGraph,
|
||||||
|
Distance = model.Distance
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Move(Vector3 position)
|
||||||
|
{
|
||||||
|
this.transform.position = position;
|
||||||
|
|
||||||
|
var localPosition = this.transform.localPosition;
|
||||||
|
Debug.Log(localPosition.y);
|
||||||
|
|
||||||
|
//localPosition.y = localPosition.y + (287 * 2);
|
||||||
|
//localPosition.x = localPosition.x - 280;
|
||||||
|
|
||||||
|
localPosition.y = localPosition.y + (width * 2);
|
||||||
|
localPosition.x = localPosition.x - height;
|
||||||
|
|
||||||
|
//if (localPosition.y > 128)
|
||||||
|
//{
|
||||||
|
// localPosition.y = 128;
|
||||||
|
//}
|
||||||
|
//if (localPosition.x < -465)
|
||||||
|
//{
|
||||||
|
// localPosition.x = -465f;
|
||||||
|
//}
|
||||||
|
//if (localPosition.x > 1080)
|
||||||
|
//{
|
||||||
|
// localPosition.x = 1080;
|
||||||
|
//}
|
||||||
|
|
||||||
|
this.transform.localPosition = localPosition;
|
||||||
|
this.transform.localScale = new Vector2(2, 2);
|
||||||
|
|
||||||
|
Debug.Log($"{ this.transform.localPosition.y }, { this.transform.localPosition.y }");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Hide()
|
||||||
|
{
|
||||||
|
DestroyImmediate(this.gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,6 @@ public class RotateBg : MonoBehaviour
|
|||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
transform.Rotate(new Vector3(0,0,-0.01f*1/3));
|
transform.Rotate(new Vector3(0,0,-Time.deltaTime * 1/3));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,7 +8,7 @@ using UnityEngine.UI;
|
|||||||
public class NewsController : PFUIPanel
|
public class NewsController : PFUIPanel
|
||||||
{
|
{
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Awake()
|
||||||
{
|
{
|
||||||
content = transform.Find("Main").Find("Inner").Find("Content");
|
content = transform.Find("Main").Find("Inner").Find("Content");
|
||||||
exit = transform.Find("Main").Find("Exit");
|
exit = transform.Find("Main").Find("Exit");
|
||||||
|
|||||||
@ -31,14 +31,14 @@ public class BigMapController : PFUIPanel
|
|||||||
Sprite end;
|
Sprite end;
|
||||||
private Dictionary<int, LineItem> linesCache = new Dictionary<int, LineItem>();
|
private Dictionary<int, LineItem> linesCache = new Dictionary<int, LineItem>();
|
||||||
UnityEngine.Object tipsObject;
|
UnityEngine.Object tipsObject;
|
||||||
private Tips _tips;
|
private MapItem _tips;
|
||||||
private Tips tips
|
private MapItem tips
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (_tips == null)
|
if (_tips == null)
|
||||||
{
|
{
|
||||||
_tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
|
_tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<MapItem>();
|
||||||
}
|
}
|
||||||
return _tips;
|
return _tips;
|
||||||
}
|
}
|
||||||
@ -74,7 +74,7 @@ public class BigMapController : PFUIPanel
|
|||||||
canvas.GetComponent<Canvas>().worldCamera = Camera.main;
|
canvas.GetComponent<Canvas>().worldCamera = Camera.main;
|
||||||
var goList = canvas.transform.Find("SwitchMode");
|
var goList = canvas.transform.Find("SwitchMode");
|
||||||
SetRounded(goList, 64);
|
SetRounded(goList, 64);
|
||||||
UIManager.AddEvent(goList.gameObject, EventTriggerType.PointerClick, (e) =>
|
UIManager.AddEvent(goList.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) =>
|
||||||
{
|
{
|
||||||
mapManager.Destroy();
|
mapManager.Destroy();
|
||||||
UIManager.ShowMapListPanel();
|
UIManager.ShowMapListPanel();
|
||||||
@ -92,11 +92,13 @@ public class BigMapController : PFUIPanel
|
|||||||
var searchBtn = input.Find("Search").gameObject;
|
var searchBtn = input.Find("Search").gameObject;
|
||||||
UIManager.AddEvent(searchBtn, EventTriggerType.PointerClick, Search);
|
UIManager.AddEvent(searchBtn, EventTriggerType.PointerClick, Search);
|
||||||
|
|
||||||
tipsObject = Resources.Load("UI/Prefab/BigMap/Tips");
|
tipsObject = Resources.Load("UI/Prefab/MapList/MapItem");
|
||||||
//tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
|
//tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
|
||||||
//tips.Hide();
|
//tips.Hide();
|
||||||
|
|
||||||
BindHeadImage();
|
BindHeadImage();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 绑定头像
|
/// 绑定头像
|
||||||
@ -276,7 +278,7 @@ public class BigMapController : PFUIPanel
|
|||||||
lineRender.material = new Material(Shader.Find("Sprites/Default"));
|
lineRender.material = new Material(Shader.Find("Sprites/Default"));
|
||||||
line.LineObject = direct;
|
line.LineObject = direct;
|
||||||
|
|
||||||
lineRender.startColor = lineRender.endColor = Utils.HexToColor("F93086");
|
lineRender.startColor = lineRender.endColor = Color.white; //Utils.HexToColor("F93086");
|
||||||
|
|
||||||
//设置宽度
|
//设置宽度
|
||||||
lineRender.startWidth = 1.2f;
|
lineRender.startWidth = 1.2f;
|
||||||
@ -307,10 +309,10 @@ public class BigMapController : PFUIPanel
|
|||||||
line.Item = iii;
|
line.Item = iii;
|
||||||
iii.onClick = () =>
|
iii.onClick = () =>
|
||||||
{
|
{
|
||||||
if(tips != null)
|
if(_tips != null)
|
||||||
{
|
{
|
||||||
tips.Hide();
|
_tips.Hide();
|
||||||
tips = null;
|
_tips = null;
|
||||||
}
|
}
|
||||||
if (line.Selected)
|
if (line.Selected)
|
||||||
{
|
{
|
||||||
@ -411,6 +413,21 @@ public class BigMapController : PFUIPanel
|
|||||||
{
|
{
|
||||||
//Debug.Log(Input.mousePosition.x + "," + Input.mousePosition.y + "," + Input.mousePosition.z);
|
//Debug.Log(Input.mousePosition.x + "," + Input.mousePosition.y + "," + Input.mousePosition.z);
|
||||||
//timer += Time.deltaTime;
|
//timer += Time.deltaTime;
|
||||||
|
|
||||||
|
//鼠标点击空白处，清除选择的路线
|
||||||
|
if (Input.GetMouseButtonDown(0) && EventSystem.current.IsPointerOverGameObject() == false)
|
||||||
|
{
|
||||||
|
var line = linesCache.Select(d=>d.Value).FirstOrDefault(l => l.Selected);
|
||||||
|
if(line != null)
|
||||||
|
{
|
||||||
|
line.Selected = false;
|
||||||
|
if (_tips != null)
|
||||||
|
{
|
||||||
|
_tips.Hide();
|
||||||
|
_tips = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Show()
|
public override void Show()
|
||||||
@ -454,11 +471,11 @@ public class BigMapController : PFUIPanel
|
|||||||
var lineRender = LineObject.GetComponent<LineRenderer>();
|
var lineRender = LineObject.GetComponent<LineRenderer>();
|
||||||
if (value)
|
if (value)
|
||||||
{
|
{
|
||||||
lineRender.startColor = lineRender.endColor = Color.white;
|
lineRender.startColor = lineRender.endColor = Utils.HexToColor("F93086");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
lineRender.startColor = lineRender.endColor = Utils.HexToColor("F93086");
|
lineRender.startColor = lineRender.endColor = Color.white;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,10 +16,41 @@ public class DeviceController : PFUIPanel
|
|||||||
private Image antStatus;
|
private Image antStatus;
|
||||||
private Sprite ant0;
|
private Sprite ant0;
|
||||||
private Sprite ant1;
|
private Sprite ant1;
|
||||||
|
private Sprite circuloCarga;
|
||||||
|
private Sprite circuloCompleto;
|
||||||
|
RectTransform circulo;
|
||||||
|
private bool _available = false;
|
||||||
|
private bool Available
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return _available;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (value == _available)
|
||||||
|
return;
|
||||||
|
_available = value;
|
||||||
|
if (_available)
|
||||||
|
{
|
||||||
|
antStatus.sprite = ant1;
|
||||||
|
//circulo.gameObject.SetActive(false);
|
||||||
|
DOTween.Kill(circulo, false);
|
||||||
|
circulo.GetComponent<Image>().sprite = circuloCompleto;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
antStatus.sprite = ant0;
|
||||||
|
//circulo.gameObject.SetActive(true);
|
||||||
|
circulo.GetComponent<Image>().sprite = circuloCarga;
|
||||||
|
circulo.DOLocalRotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360).SetEase(Ease.Linear).SetLoops(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
base.Awake();
|
base.Awake();
|
||||||
AntConnector.Instance();
|
|
||||||
|
|
||||||
Debug.Log("device awake");
|
Debug.Log("device awake");
|
||||||
}
|
}
|
||||||
@ -49,9 +80,14 @@ public class DeviceController : PFUIPanel
|
|||||||
var bg = this.transform.Find("Status").Find("Bg");
|
var bg = this.transform.Find("Status").Find("Bg");
|
||||||
antStatus = bg.Find("Ant+").GetComponent<Image>();
|
antStatus = bg.Find("Ant+").GetComponent<Image>();
|
||||||
|
|
||||||
|
circulo = bg.Find("Image").GetComponent<RectTransform>();
|
||||||
|
//circulo.DORotate(new Vector3(0, 0, 360), 1.5f, RotateMode.Fast).SetLoops(-1);
|
||||||
|
circulo.DOLocalRotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360).SetEase(Ease.Linear).SetLoops(-1);
|
||||||
|
|
||||||
ant0 = Resources.Load<Sprite>("Images/ANT+_0");
|
ant0 = Resources.Load<Sprite>("Images/ANT+_0");
|
||||||
ant1 = Resources.Load<Sprite>("Images/ANT+_2");
|
ant1 = Resources.Load<Sprite>("Images/ANT+_2");
|
||||||
|
circuloCarga = Resources.Load<Sprite>("Images/icon-circulo-carga");
|
||||||
|
circuloCompleto = Resources.Load<Sprite>("Images/icon-circulo-completo");
|
||||||
|
|
||||||
base.SetRounded(bg, 64);
|
base.SetRounded(bg, 64);
|
||||||
}
|
}
|
||||||
@ -63,27 +99,14 @@ public class DeviceController : PFUIPanel
|
|||||||
timer -= Time.deltaTime;
|
timer -= Time.deltaTime;
|
||||||
if (timer <= 0)
|
if (timer <= 0)
|
||||||
{
|
{
|
||||||
if (AntConnector.Instance().IsAvailable)
|
Available = AntConnector.Instance().IsAvailable;
|
||||||
{
|
//if (AntConnector.Instance().IsAvailable)
|
||||||
antStatus.sprite = ant1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
antStatus.sprite = ant0;
|
|
||||||
}
|
|
||||||
//this.toggle.isOn = AntConnector.Instance().IsAvailable;
|
|
||||||
|
|
||||||
//foreach (var item in AntConnector.Instance().discoveredDevices)
|
|
||||||
//{
|
//{
|
||||||
// if (!devices.ContainsKey(item.DeviceNumber))
|
// antStatus.sprite = ant1;
|
||||||
// {
|
//}
|
||||||
// var dev1 = Instantiate(device);
|
//else
|
||||||
// dev1.transform.SetParent(this.grid.transform);
|
//{
|
||||||
// var s1 = dev1.GetComponent<Assets.Scripts.UI.Devicea>();
|
// antStatus.sprite = ant0;
|
||||||
// s1.Device = item;
|
|
||||||
|
|
||||||
// devices.Add(item.DeviceNumber, dev1);
|
|
||||||
// }
|
|
||||||
//}
|
//}
|
||||||
|
|
||||||
timer = 1.0f;
|
timer = 1.0f;
|
||||||
@ -99,8 +122,8 @@ public class DeviceController : PFUIPanel
|
|||||||
cg.DOFade(1f, 0.3f);
|
cg.DOFade(1f, 0.3f);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnApplicationQuit()
|
protected override void OnDisable()
|
||||||
{
|
{
|
||||||
AntConnector.Instance().Dispose();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,6 +39,8 @@ public class EditUserController : PFUIPanel
|
|||||||
private Button mBackButton;
|
private Button mBackButton;
|
||||||
private Button mSwitchButton;
|
private Button mSwitchButton;
|
||||||
PfUIButton mChangeAvatar;
|
PfUIButton mChangeAvatar;
|
||||||
|
Transform linkContainer;
|
||||||
|
|
||||||
protected override void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
Debug.Log(Utils.GetIP(Utils.ADDRESSFAM.IPv4));
|
Debug.Log(Utils.GetIP(Utils.ADDRESSFAM.IPv4));
|
||||||
@ -101,7 +103,7 @@ public class EditUserController : PFUIPanel
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
linkContainer = transform.Find("LinkContainer");
|
||||||
|
|
||||||
mSexDropdown.ClearOptions();
|
mSexDropdown.ClearOptions();
|
||||||
mSexDropdown.AddOptions(new List<string>
|
mSexDropdown.AddOptions(new List<string>
|
||||||
@ -148,6 +150,7 @@ public class EditUserController : PFUIPanel
|
|||||||
//});
|
//});
|
||||||
|
|
||||||
LoadDataSync();
|
LoadDataSync();
|
||||||
|
|
||||||
}
|
}
|
||||||
async Task Login()
|
async Task Login()
|
||||||
{
|
{
|
||||||
@ -199,6 +202,11 @@ public class EditUserController : PFUIPanel
|
|||||||
mName.Text = currentUser.Contact;
|
mName.Text = currentUser.Contact;
|
||||||
mPhone.Text = currentUser.ContactPhone;
|
mPhone.Text = currentUser.ContactPhone;
|
||||||
mAddr.Text = currentUser.ContactAddress;
|
mAddr.Text = currentUser.ContactAddress;
|
||||||
|
//string.IsNullOrEmpty(currentUser.Unionid)
|
||||||
|
linkContainer.Find("Wx").GetComponent<Image>().sprite =
|
||||||
|
string.IsNullOrEmpty(currentUser.Unionid)
|
||||||
|
? Resources.Load<Sprite>("Images/Wechat_person_0")
|
||||||
|
: Resources.Load<Sprite>("Images/Wechat_person_1");
|
||||||
}
|
}
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
protected override void Start()
|
protected override void Start()
|
||||||
@ -313,6 +321,6 @@ public class EditUserController : PFUIPanel
|
|||||||
}
|
}
|
||||||
void Cancel(BaseEventData e)
|
void Cancel(BaseEventData e)
|
||||||
{
|
{
|
||||||
UIManager.ShowHomePanel();
|
UIManager.ShowUserInfoPanel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,20 +35,8 @@ public class HomeController : PFUIPanel
|
|||||||
|
|
||||||
mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
|
mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
|
||||||
mainNav.ShowExit();
|
mainNav.ShowExit();
|
||||||
//var parent = Utils.FindUpParent(gameObject.transform);
|
|
||||||
//if (parent.Find("ToastContainer") == null)
|
|
||||||
//{
|
|
||||||
// var toast = Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
|
|
||||||
// toast.name = "ToastContainer";
|
|
||||||
// toast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
|
|
||||||
// toast.transform.parent = parent;
|
|
||||||
//}
|
|
||||||
|
|
||||||
//if (More != null)
|
UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerClick, GoRide);
|
||||||
//{
|
|
||||||
// More.onClick.AddListener(MoreFunc);
|
|
||||||
//}
|
|
||||||
BtnRide.onClick.AddListener(GoRide);
|
|
||||||
|
|
||||||
var avatar = userInfo.Find("Avatar").GetComponent<RawImage>();
|
var avatar = userInfo.Find("Avatar").GetComponent<RawImage>();
|
||||||
var rect = ((RectTransform)avatar.transform).rect;
|
var rect = ((RectTransform)avatar.transform).rect;
|
||||||
@ -58,33 +46,18 @@ public class HomeController : PFUIPanel
|
|||||||
{
|
{
|
||||||
UIManager.ShowUserInfoPanel();
|
UIManager.ShowUserInfoPanel();
|
||||||
});
|
});
|
||||||
userInfo.Find("BtnMore").GetComponent<PfUIButton>().SetEnabled(false);
|
|
||||||
UIManager.AddEvent(userInfo.Find("BtnMore").gameObject, EventTriggerType.PointerClick, x =>
|
UIManager.AddEvent(userInfo.Find("BtnMore").gameObject, EventTriggerType.PointerClick, x =>
|
||||||
{
|
{
|
||||||
UIManager.ShowAlert("test");
|
UIManager.ShowUserInfoPanel();
|
||||||
//UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null);
|
//UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null);
|
||||||
});
|
});
|
||||||
GetSummary();
|
GetSummary();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task Login()
|
private void GoRide(BaseEventData e)
|
||||||
{
|
|
||||||
var result = await new UserApi().Login("13115011550", "laozhong", "");
|
|
||||||
App.CurrentUser = result.data;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void GoRide()
|
|
||||||
{
|
{
|
||||||
UIManager.ShowMapListPanel();
|
UIManager.ShowMapListPanel();
|
||||||
//SceneManager.LoadScene("3-MapList");
|
|
||||||
//DOTween.To()
|
|
||||||
//this.transform.DOLocalMove(new Vector2(1000, 0), 2.0f).SetEase(Ease.InOutExpo).OnComplete(() =>
|
|
||||||
//{
|
|
||||||
//Loom.QueueOnMainThread(() =>
|
|
||||||
//{
|
|
||||||
// Debug.Log("ddddddddddddddddddddddddddd");
|
|
||||||
//});
|
|
||||||
//});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MoreFunc()
|
void MoreFunc()
|
||||||
@ -92,7 +65,6 @@ public class HomeController : PFUIPanel
|
|||||||
//Utils.showToast(gameObject, "更多信息", 1);
|
//Utils.showToast(gameObject, "更多信息", 1);
|
||||||
|
|
||||||
//DOTween.ToAlpha(() => )
|
//DOTween.ToAlpha(() => )
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetCurrentUser(SummaryResultModel summary)
|
void SetCurrentUser(SummaryResultModel summary)
|
||||||
@ -101,25 +73,29 @@ public class HomeController : PFUIPanel
|
|||||||
userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent<Text>().text = App.CurrentUser.FTP.ToString();
|
userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent<Text>().text = App.CurrentUser.FTP.ToString();
|
||||||
userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent<Text>().text = App.CurrentUser.Weight.ToString();
|
userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent<Text>().text = App.CurrentUser.Weight.ToString();
|
||||||
userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent<Text>().text = $"{ (App.CurrentUser.FTP/ App.CurrentUser.Weight).ToString("0.0") }";
|
userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent<Text>().text = $"{ (App.CurrentUser.FTP/ App.CurrentUser.Weight).ToString("0.0") }";
|
||||||
userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = summary.Kcal +" KCAL";
|
userInfo.Find("IDText").GetComponent<Text>().text = "ID:" + App.CurrentUser.Id.ToString("000000");
|
||||||
|
if (!string.IsNullOrWhiteSpace(App.CurrentUser.Unionid))
|
||||||
|
{
|
||||||
|
userInfo.Find("Wx").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/Wechat_person_1");
|
||||||
|
}
|
||||||
|
if (App.CurrentUser.Sex == 2)
|
||||||
|
{
|
||||||
|
userInfo.Find("SexIcon").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/woman");
|
||||||
|
}
|
||||||
|
Utils.DisplayImage(StartCoroutine, userInfo.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
|
||||||
|
|
||||||
|
|
||||||
|
userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = double.Parse(summary.Kcal).ToString("0") +" KCAL";
|
||||||
userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString("0") +" KM";
|
userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString("0") +" KM";
|
||||||
userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent<Text>().text = summary.TotalClimb +" M";
|
userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent<Text>().text = summary.TotalClimb +" M";
|
||||||
userInfo.Find("IDText").GetComponent<Text>().text = "ID:"+App.CurrentUser.Id.ToString("000000");
|
|
||||||
//var user = ConfigHelper.CurrentUser;
|
|
||||||
//Ftp.text = summary.Ftp.ToString();
|
|
||||||
//Weight.text = user.Weight.ToString();
|
|
||||||
//WKG.text = $"{user.Weight}KG/{user.BicycleWeight}KG";
|
|
||||||
//NickName.text = user.Nickname;
|
|
||||||
|
|
||||||
Utils.DisplayImage(StartCoroutine, userInfo.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
|
userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpTime").GetComponent<Text>().text = App.CurrentUser.LastUpdateFtpTime.ToString("yyyy.MM.dd");
|
||||||
|
userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightTime").GetComponent<Text>().text = App.CurrentUser.LastUpdateWeightTime.ToString("yyyy.MM.dd");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
async void GetSummary()
|
void GetSummary()
|
||||||
{
|
{
|
||||||
if (App.CurrentUser == null)
|
|
||||||
{
|
|
||||||
await Login();
|
|
||||||
}
|
|
||||||
|
|
||||||
var res = ConfigHelper.userApi.GetSummary();
|
var res = ConfigHelper.userApi.GetSummary();
|
||||||
if (res.result)
|
if (res.result)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -50,7 +50,7 @@ public class MapListController : PFUIPanel
|
|||||||
//ApiBase.SetCookie("15A37DF28842CBA8E4E550BFA24186C8222D392F3EE18D9E95A49CC32796D2E3F6E40385C6A114942546EE1DD793DF34880DE48090B91AD2460EB887B59664BB3965F3371DDA1F1401EC7F27C5A1084566E47069F12CB6BBC0BC7A84ADC5582B");
|
//ApiBase.SetCookie("15A37DF28842CBA8E4E550BFA24186C8222D392F3EE18D9E95A49CC32796D2E3F6E40385C6A114942546EE1DD793DF34880DE48090B91AD2460EB887B59664BB3965F3371DDA1F1401EC7F27C5A1084566E47069F12CB6BBC0BC7A84ADC5582B");
|
||||||
btnMapMode = this.transform.Find("SwitchMode").gameObject;
|
btnMapMode = this.transform.Find("SwitchMode").gameObject;
|
||||||
SetRounded(btnMapMode.transform, 64);
|
SetRounded(btnMapMode.transform, 64);
|
||||||
UIManager.AddEvent(btnMapMode, EventTriggerType.PointerClick, (e) =>
|
UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) =>
|
||||||
{
|
{
|
||||||
UIManager.ShowBigMapPanel();
|
UIManager.ShowBigMapPanel();
|
||||||
});
|
});
|
||||||
@ -262,10 +262,10 @@ public class MapListController : PFUIPanel
|
|||||||
string sort = "Hot",sortDire = "desc";
|
string sort = "Hot",sortDire = "desc";
|
||||||
//string name = "";
|
//string name = "";
|
||||||
//string name = "";
|
//string name = "";
|
||||||
public void GetList()
|
async void GetList()
|
||||||
{
|
{
|
||||||
if (isEnd) return;
|
if (isEnd) return;
|
||||||
var res = ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname,distance,string.Join(",",hands),is3d,sort,sortDire,isFav);
|
var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname,distance,string.Join(",",hands),is3d,sort,sortDire,isFav);
|
||||||
if (res.result)
|
if (res.result)
|
||||||
{
|
{
|
||||||
if (res.data.Count == 0 && pageIndex != 0)
|
if (res.data.Count == 0 && pageIndex != 0)
|
||||||
|
|||||||
@ -5,6 +5,7 @@ using System.Collections.Generic;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
|
||||||
public class UserInfoController : PFUIPanel
|
public class UserInfoController : PFUIPanel
|
||||||
{
|
{
|
||||||
@ -17,7 +18,7 @@ public class UserInfoController : PFUIPanel
|
|||||||
|
|
||||||
Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
|
Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
|
||||||
|
|
||||||
UIManager.AddEvent(exitBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(exitBtn.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
UIManager.ShowHomePanel();
|
UIManager.ShowHomePanel();
|
||||||
});
|
});
|
||||||
@ -26,13 +27,13 @@ public class UserInfoController : PFUIPanel
|
|||||||
// UIManager.ShowHomePanel();
|
// UIManager.ShowHomePanel();
|
||||||
//});
|
//});
|
||||||
UIManager.AddEvent(transform.Find("InfoPanel").Find("SwitchAccountButton").gameObject,
|
UIManager.AddEvent(transform.Find("InfoPanel").Find("SwitchAccountButton").gameObject,
|
||||||
UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
|
EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
SceneManager.LoadScene("1-Login");
|
SceneManager.LoadScene("1-Login");
|
||||||
});
|
});
|
||||||
infoPanel = transform.Find("InfoPanel").Find("P");
|
infoPanel = transform.Find("InfoPanel").Find("P");
|
||||||
Button editBtn = infoPanel.Find("EditButton").GetComponent<Button>();
|
Button editBtn = infoPanel.Find("EditButton").GetComponent<Button>();
|
||||||
UIManager.AddEvent(editBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
|
UIManager.AddEvent(editBtn.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||||
{
|
{
|
||||||
UIManager.ShowEditUserPanel();
|
UIManager.ShowEditUserPanel();
|
||||||
});
|
});
|
||||||
@ -64,7 +65,7 @@ public class UserInfoController : PFUIPanel
|
|||||||
= UIManager.Instance.loginRegOptions.GetCountryImageByName(user.Country);
|
= UIManager.Instance.loginRegOptions.GetCountryImageByName(user.Country);
|
||||||
infoPanel.Find("Status").Find("Wx").gameObject.SetActive(
|
infoPanel.Find("Status").Find("Wx").gameObject.SetActive(
|
||||||
!string.IsNullOrEmpty(user.Unionid));
|
!string.IsNullOrEmpty(user.Unionid));
|
||||||
infoPanel.Find("IdText").GetComponent<Text>().text = $"ID:{user.Id}";
|
infoPanel.Find("IdText").GetComponent<Text>().text = $"ID:{user.Id.ToString("000000")}";
|
||||||
infoPanel.Find("NameText").GetComponent<Text>().text = $"{user.Nickname}";
|
infoPanel.Find("NameText").GetComponent<Text>().text = $"{user.Nickname}";
|
||||||
infoPanel.Find("EmailText").GetComponent<Text>().text = $"{user.Phone}";
|
infoPanel.Find("EmailText").GetComponent<Text>().text = $"{user.Phone}";
|
||||||
|
|
||||||
|
|||||||
@ -59,6 +59,8 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
|||||||
{
|
{
|
||||||
//btnContinue.gameObject.SetActive(false);
|
//btnContinue.gameObject.SetActive(false);
|
||||||
btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
|
btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
|
||||||
|
btnContinue.GetComponent<Button>().interactable = !(result.Progress == 1.0);
|
||||||
|
btnContinue.GetComponent<Button>().enabled = !(result.Progress == 1.0);
|
||||||
}
|
}
|
||||||
btnReRide = right.Find("BtnReRide");
|
btnReRide = right.Find("BtnReRide");
|
||||||
if (btnReRide)
|
if (btnReRide)
|
||||||
@ -112,7 +114,8 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
|||||||
{
|
{
|
||||||
if (f)
|
if (f)
|
||||||
{
|
{
|
||||||
btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
|
btnContinue.GetComponent<Image>().color =
|
||||||
|
routeResult.Progress == 1? Utils.HexToColorHtml("#c8c8c880"): Utils.HexToColorHtml("#F93086");
|
||||||
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
|
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
|
||||||
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
|
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
|
||||||
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
|
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
|
||||||
|
|||||||
@ -61,6 +61,14 @@ public class UIManager : MonoBehaviour
|
|||||||
return this.GetPanelInstance("SettingModal", ref this.mSettingContoller);
|
return this.GetPanelInstance("SettingModal", ref this.mSettingContoller);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private FeedbackController mfeedbackController;
|
||||||
|
public FeedbackController FeedbackModal
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this.GetPanelInstance("FeedbackModal", ref this.mfeedbackController);
|
||||||
|
}
|
||||||
|
}
|
||||||
private NewsController mNewsContoller;
|
private NewsController mNewsContoller;
|
||||||
public NewsController NewsModal
|
public NewsController NewsModal
|
||||||
{
|
{
|
||||||
@ -322,6 +330,10 @@ public class UIManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
UIManager.Show(UIManager.Instance.NewsModal, null, true);
|
UIManager.Show(UIManager.Instance.NewsModal, null, true);
|
||||||
}
|
}
|
||||||
|
public static void ShowFeedBackModal()
|
||||||
|
{
|
||||||
|
UIManager.Show(UIManager.Instance.FeedbackModal, null, true);
|
||||||
|
}
|
||||||
public static void ShowEditUserPanel()
|
public static void ShowEditUserPanel()
|
||||||
{
|
{
|
||||||
UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
|
UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
|
||||||
|
|||||||
@ -4,9 +4,11 @@ using System;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.NetworkInformation;
|
using System.Net.NetworkInformation;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@ -169,5 +171,52 @@ namespace Assets.Scripts
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*文件转精灵*/
|
||||||
|
public static Sprite PngToSprite(string fullPath, int x, int y)
|
||||||
|
{
|
||||||
|
using (FileStream fs = new FileStream(fullPath, FileMode.Open, FileAccess.Read)) //自动双清
|
||||||
|
{
|
||||||
|
fs.Seek(0, SeekOrigin.Begin); //设定当前流的位置
|
||||||
|
byte[] bytes = new byte[fs.Length]; //创建文件长度缓冲区
|
||||||
|
fs.Read(bytes, 0, (int)fs.Length); //读取文件
|
||||||
|
Texture2D texture = new Texture2D(x, y); //创建Texture
|
||||||
|
texture.LoadImage(bytes);
|
||||||
|
return Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.one / 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*文件转精灵*/
|
||||||
|
/*打开文件*/
|
||||||
|
public delegate void OpenFileCallBack(string path);
|
||||||
|
public static void OpenFile(OpenFileCallBack callBack,string filter = null)
|
||||||
|
{
|
||||||
|
OpenFileName ofn = new OpenFileName();
|
||||||
|
|
||||||
|
ofn.structSize = Marshal.SizeOf(ofn);
|
||||||
|
|
||||||
|
ofn.filter = "Image Files(*.jpg;*.jpeg;*.png;*.bmp)\0*.jpg;*.png;*.jpeg;*.bmp\0";
|
||||||
|
if (filter != null) ofn.filter = filter;
|
||||||
|
ofn.file = new string(new char[256]);
|
||||||
|
|
||||||
|
ofn.maxFile = ofn.file.Length;
|
||||||
|
|
||||||
|
ofn.fileTitle = new string(new char[64]);
|
||||||
|
|
||||||
|
ofn.maxFileTitle = ofn.fileTitle.Length;
|
||||||
|
|
||||||
|
ofn.initialDir = UnityEngine.Application.dataPath;//默认路径
|
||||||
|
|
||||||
|
ofn.title = "Open Project";
|
||||||
|
|
||||||
|
ofn.defExt = "JPG";//显示文件的类型
|
||||||
|
//注意 一下项目不一定要全选 但是0x00000008项不要缺少
|
||||||
|
ofn.flags = 0x00080000 | 0x00001000 | 0x00000800 | 0x00000200 | 0x00000008;//OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_PATHMUSTEXIST| OFN_ALLOWMULTISELECT|OFN_NOCHANGEDIR
|
||||||
|
|
||||||
|
|
||||||
|
if (Win32.GetOpenFileName(ofn))
|
||||||
|
{
|
||||||
|
callBack(ofn.file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*打开文件*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
8
Assets/StreamingAssets.meta
Normal file
8
Assets/StreamingAssets.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9a0a7989900f2c34abeee17c663d08dc
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Loading…
x
Reference in New Issue
Block a user