意见反馈 修改细节
This commit is contained in:
parent
1c712ff7d5
commit
dd08f916eb
@ -31,6 +31,19 @@ public class ImageWithRoundedCorners : MonoBehaviour {
|
||||
var rect = ((RectTransform)transform).rect;
|
||||
material.SetVector(Props, new Vector4(rect.width, rect.height, radius * 2, 0));
|
||||
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>().sprite = null;
|
||||
|
||||
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:
|
||||
@ -47,7 +47,7 @@ TextureImporter:
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 11, y: 11, z: 11, w: 11}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
spriteGenerateFallbackPhysicsShape: 0
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
@ -83,6 +83,18 @@ TextureImporter:
|
||||
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: []
|
||||
|
||||
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:
|
||||
@ -83,6 +83,18 @@ TextureImporter:
|
||||
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: []
|
||||
|
||||
@ -459,6 +459,8 @@ GameObject:
|
||||
- component: {fileID: 1975648157075935214}
|
||||
- component: {fileID: 2531553338690931336}
|
||||
- component: {fileID: 8832560749054131812}
|
||||
- component: {fileID: 4582666049926171087}
|
||||
- component: {fileID: 8407972822175107971}
|
||||
m_Layer: 5
|
||||
m_Name: PFUIDropdown
|
||||
m_TagString: Untagged
|
||||
@ -509,13 +511,13 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
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_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 7b719bf966c41114ea64e643d76a04b6, type: 3}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -595,6 +597,34 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 81cc4b54765fb63428ca4b88ee884d22, type: 3}
|
||||
m_Name:
|
||||
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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -465,7 +465,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e60e7b809e129404b9dce5d584c9ca57, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a52d3365198fe5046ad9d0aa48ce18a6, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
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:
|
||||
@ -16,22 +16,6 @@ MonoBehaviour:
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
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
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2239,22 +2223,6 @@ MonoBehaviour:
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
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
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4320,6 +4288,11 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 5014623457702002961}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
propertyPath: m_Material
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -4447,21 +4420,9 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!1 &1377157623896305697 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7330312719675194540 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2049799399839608 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
--- !u!224 &6111654188722717914 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -4471,21 +4432,15 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &6111654188722717914 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
--- !u!1 &2049799399839608 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2026860975151450949 stripped
|
||||
--- !u!1 &7330312719675194540 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &859051997198845018 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -4495,9 +4450,9 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4236066551055479381 stripped
|
||||
--- !u!1 &1377157623896305697 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -4507,6 +4462,18 @@ GameObject:
|
||||
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 &859051997198845018 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 146705893016024264}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &726549194336560541
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4626,6 +4593,12 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
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
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
@ -4638,12 +4611,6 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 726549194336560541}
|
||||
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
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4651,6 +4618,11 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 5014623457702002961}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1975648157075935214, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
propertyPath: m_Material
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -4783,21 +4755,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!1 &121617211609223412 stripped
|
||||
--- !u!1 &1619957045781012459 stripped
|
||||
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,
|
||||
--- !u!224 &5278285276573278059 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -4807,6 +4773,18 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1365991255437877356 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, 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 &2835369396092332516 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
@ -4819,27 +4797,15 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2132314977860390089 stripped
|
||||
--- !u!1 &464472969339895077 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1365991255437877356 stripped
|
||||
--- !u!1 &9001619333872210974 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &5278285276573278059 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1619957045781012459 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2277129673863769977}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -360,7 +360,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
||||
@ -12,13 +12,16 @@ GameObject:
|
||||
- component: {fileID: 1964787418795620593}
|
||||
- component: {fileID: 6632529772490108898}
|
||||
- component: {fileID: 4799080841931904395}
|
||||
- component: {fileID: 112077214919202944}
|
||||
- component: {fileID: 5642191199042393389}
|
||||
- component: {fileID: 4905573701901116406}
|
||||
m_Layer: 5
|
||||
m_Name: ToastContainer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1673166913076064936
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -28,17 +31,17 @@ RectTransform:
|
||||
m_GameObject: {fileID: 2550272054721721287}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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:
|
||||
- {fileID: 7121100143298194565}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 267.60803, y: 87.55969}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -317}
|
||||
m_SizeDelta: {x: 200, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1964787418795620593
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -60,13 +63,13 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
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_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -90,6 +93,58 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
toast: {fileID: 2550272054721721287}
|
||||
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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -101,6 +156,7 @@ GameObject:
|
||||
- component: {fileID: 7121100143298194565}
|
||||
- component: {fileID: 3132621560751603177}
|
||||
- component: {fileID: 3146539256596754620}
|
||||
- component: {fileID: 3279600142704954747}
|
||||
m_Layer: 5
|
||||
m_Name: Toast
|
||||
m_TagString: Untagged
|
||||
@ -123,9 +179,9 @@ RectTransform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 0.000061035156, y: 0.00010681152}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 100, y: 0}
|
||||
m_SizeDelta: {x: 200, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3132621560751603177
|
||||
CanvasRenderer:
|
||||
@ -148,15 +204,15 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
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_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 26
|
||||
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
@ -168,3 +224,17 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
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:
|
||||
m_Flags: 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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -293,6 +379,92 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -339,6 +511,178 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -491,6 +835,178 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1678571397}
|
||||
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
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -574,6 +1090,98 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
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
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -592,7 +1200,8 @@ RectTransform:
|
||||
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_Children:
|
||||
- {fileID: 694762571355972147}
|
||||
m_Father: {fileID: 1678571401}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -618,3 +1227,157 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
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}
|
||||
|
||||
@ -106,6 +106,23 @@ namespace Assets.Scripts.Apis
|
||||
//{
|
||||
// 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)
|
||||
{
|
||||
|
||||
@ -56,11 +56,11 @@ namespace Assets.Scripts.Apis
|
||||
/// <param name="sort">hot, distance</param>
|
||||
/// <param name="sortDire">asc</param>
|
||||
/// <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}";
|
||||
|
||||
return Get<JsonResult<List<MapRoute>>>(url);
|
||||
return GetAsync<JsonResult<List<MapRoute>>>(url);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using Assets.Scripts.Apis.Models;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@ -77,7 +78,37 @@ namespace Assets.Scripts.Apis
|
||||
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>
|
||||
@ -95,7 +126,7 @@ namespace Assets.Scripts.Apis
|
||||
|
||||
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
|
||||
{
|
||||
@ -104,18 +135,31 @@ namespace Assets.Scripts.Apis
|
||||
Captcha
|
||||
};
|
||||
|
||||
JsonResult<UserResultModel> ret = null;
|
||||
JsonResult<object> ret = null;
|
||||
try
|
||||
{
|
||||
ret = await PostAsync<JsonResult<UserResultModel>>("NoAuth/v1/Register", param);
|
||||
ret.data.cookie = cookies[0].Value;
|
||||
ret = await PostAsync<JsonResult<object>>("NoAuth/v1/Register", param);
|
||||
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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
|
||||
@ -154,16 +198,25 @@ namespace Assets.Scripts.Apis
|
||||
}
|
||||
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)
|
||||
{
|
||||
var r = await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin",
|
||||
new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password });
|
||||
r.data.cookie = cookies[0].Value;
|
||||
return r;
|
||||
var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLogin",
|
||||
new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Pwd = Password });
|
||||
if (r.result)
|
||||
{
|
||||
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 = "")
|
||||
{
|
||||
//return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
|
||||
@ -223,5 +276,7 @@ namespace Assets.Scripts.Apis
|
||||
{
|
||||
return await GetAsync<JsonResult<JObject>>("/Home/GetNotify");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,9 +23,34 @@ namespace Assets.Scripts
|
||||
return _userApi;
|
||||
}
|
||||
}
|
||||
public static MapApi mapApi = new MapApi();
|
||||
public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
|
||||
public static ThirdPartApi thirdPartApi = new ThirdPartApi();
|
||||
private static MapApi _mapApi;
|
||||
public static MapApi mapApi
|
||||
{
|
||||
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 TcpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11001);
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@ using ZenFulcrum.EmbeddedBrowser;
|
||||
public class QUserInfo
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string Phone { get; set; }
|
||||
public string NickName { get; set; }
|
||||
public string Avatar { get; set; }
|
||||
public string Cookie { get; set; }
|
||||
@ -59,6 +60,8 @@ public class LoginController : MonoBehaviour
|
||||
private Transform quickContainer;
|
||||
private Transform loginContainer;
|
||||
private Transform signContainer;
|
||||
//修改高度
|
||||
Transform LoginBg;
|
||||
/*初始页面*/
|
||||
LoginForm loginForm;
|
||||
[SerializeField] Button loginReturn2;
|
||||
@ -74,11 +77,11 @@ public class LoginController : MonoBehaviour
|
||||
private Transform signScrollBar;
|
||||
private SignForm signForm;
|
||||
private LoginRegOptions regOptions;
|
||||
|
||||
|
||||
private ScrollRect scrollPanel;
|
||||
private ScrollRect scrollSign;
|
||||
private ScrollRect scrollAvatar;
|
||||
private Transform imagexf,imagedf;
|
||||
private Transform imagexf, imagedf;
|
||||
//注册主页面
|
||||
private UserResultModel userResult;
|
||||
/*微信相关*/
|
||||
@ -98,7 +101,10 @@ public class LoginController : MonoBehaviour
|
||||
//其他
|
||||
[SerializeField] RawImage loading;
|
||||
Transform toolContainer;
|
||||
Dictionary<string, Selectable> formDict,signFormDict;
|
||||
|
||||
public string avatarName { get; private set; }
|
||||
public Texture avatar;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
@ -130,6 +136,7 @@ public class LoginController : MonoBehaviour
|
||||
if (loginScrollView != null)
|
||||
{
|
||||
scrollPanel = loginScrollView.GetComponent<ScrollRect>();
|
||||
LoginBg = loginScrollView.transform.Find("Viewport").Find("LoginBg");
|
||||
mainContent = loginScrollView.transform.Find("Viewport").Find("Content");
|
||||
quickContainer = mainContent.Find("Empty").Find("FormContainer-Quick");
|
||||
loginContainer = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer");
|
||||
@ -140,18 +147,30 @@ public class LoginController : MonoBehaviour
|
||||
scrollSign = signScrollView.GetComponent<ScrollRect>();
|
||||
var content = signScrollView.transform.Find("Viewport").Find("Content");
|
||||
signPage1 = content.Find("FirstPage");
|
||||
signPage1.Find("next").GetComponent<Button>().onClick.AddListener(()=> { goRegNext(); });
|
||||
signPage1.Find("Captcha").Find("BtnGet").GetComponent<Button>().onClick.AddListener(GetCaptcha);
|
||||
UIManager.AddEvent(signPage1.Find("next").GetComponent<Button>().gameObject,
|
||||
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 captcha = signPage1.Find("Captcha").GetComponent<InputField>();
|
||||
var password = signPage1.Find("Password").GetComponent<InputField>();
|
||||
var cpassword = signPage1.Find("CPassword").GetComponent<InputField>();
|
||||
//第三方登录要用的按钮
|
||||
signPage1.Find("previousThird").GetComponent<Button>().onClick.AddListener(goThirdPrev);
|
||||
signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { goRegNext(1); });
|
||||
UIManager.AddEvent(signPage1.Find("previousThird").GetComponent<Button>().gameObject,
|
||||
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.Find("previous").GetComponent<Button>().onClick.AddListener(goRegPrev);
|
||||
signPage2.Find("sign").GetComponent<Button>().onClick.AddListener(goRegEnd);
|
||||
UIManager.AddEvent(signPage2.Find("previous").GetComponent<Button>().gameObject,
|
||||
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 字段
|
||||
var years = signPage2.Find("Year").GetComponent<Dropdown>();
|
||||
var months = signPage2.Find("Month").GetComponent<Dropdown>();
|
||||
@ -168,7 +187,7 @@ public class LoginController : MonoBehaviour
|
||||
days.captionText.text = "Day";
|
||||
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.value = 0;
|
||||
@ -213,31 +232,28 @@ public class LoginController : MonoBehaviour
|
||||
{
|
||||
scrollAvatar = avatarScrollView.GetComponent<ScrollRect>();
|
||||
var content = scrollAvatar.transform.Find("Viewport").Find("Content");
|
||||
foreach (var user in userInfos)
|
||||
foreach (var user in userInfos)
|
||||
{
|
||||
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.localScale = new Vector3(1, 1, 1);
|
||||
}
|
||||
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();
|
||||
}
|
||||
if (quickContainer != null)
|
||||
if (quickContainer != null)
|
||||
{
|
||||
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>();
|
||||
UIManager.AddEvent(returnQuick.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
ReturnQuick();
|
||||
});
|
||||
UIManager.AddEvent(returnQuick.gameObject, EventTriggerType.PointerClick, (b) => ReturnQuick());
|
||||
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>();
|
||||
UIManager.AddEvent(remember.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
@ -252,7 +268,7 @@ public class LoginController : MonoBehaviour
|
||||
}
|
||||
});
|
||||
var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
|
||||
wechatLogin.onClick.AddListener(() =>
|
||||
UIManager.AddEvent(wechatLogin.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
if (wxLock) return;
|
||||
wxLock = true;
|
||||
@ -266,8 +282,13 @@ public class LoginController : MonoBehaviour
|
||||
//wx1.GetComponent<CanvasGroup>().DOFade(1, 0.8f).onComplete = () => { wxLock = false; };
|
||||
wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
|
||||
});
|
||||
//wechatLogin.onClick.AddListener(() =>
|
||||
//{
|
||||
|
||||
//});
|
||||
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()
|
||||
{
|
||||
email = loginContainer.Find("phone").GetComponent<InputField>(),
|
||||
@ -278,7 +299,7 @@ public class LoginController : MonoBehaviour
|
||||
//{
|
||||
// loginReturn2.onClick.AddListener(goLoginReturn2);
|
||||
//}
|
||||
if (signContainer != null)
|
||||
if (signContainer != null)
|
||||
{
|
||||
var loginr2 = signContainer.Find("loginr2").GetComponent<Button>();
|
||||
UIManager.AddEvent(loginr2.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
@ -293,14 +314,15 @@ public class LoginController : MonoBehaviour
|
||||
Application.Quit();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
wxLogin1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1");
|
||||
if (wxLogin1 != null)
|
||||
{
|
||||
UIManager.AddEvent(wxLogin1.Find("Image").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
wxLock = true;
|
||||
wxBrowser.Url = "chrome://version/";
|
||||
wxBrowser.LoadHTML("<div/>");
|
||||
//wxBrowser.Url = "chrome://version/";
|
||||
wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
|
||||
{
|
||||
wxLock = false;
|
||||
@ -329,9 +351,9 @@ public class LoginController : MonoBehaviour
|
||||
//browser.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
wxLogin2 = mainContent.Find("FormContainer-wx2");
|
||||
if (wxLogin2!=null)
|
||||
if (wxLogin2 != null)
|
||||
{
|
||||
UIManager.AddEvent(wxLogin2.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
@ -341,7 +363,7 @@ public class LoginController : MonoBehaviour
|
||||
Canvas.ForceUpdateCanvases();
|
||||
StartScrollPanel(1);
|
||||
});
|
||||
wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(()=>
|
||||
wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
this.goSign(false);
|
||||
});
|
||||
@ -368,20 +390,15 @@ public class LoginController : MonoBehaviour
|
||||
var gou = wxLogin3.Find("rememberButton").Find("Gou").gameObject;
|
||||
gou.SetActive(!gou.activeSelf);
|
||||
});
|
||||
//wxLogin3.Find("rememberButton").GetComponent<Button>().onClick.AddListener(()=>
|
||||
//{
|
||||
|
||||
//});
|
||||
wxLogin3.Find("Next").GetComponent<Button>().onClick.AddListener(() =>
|
||||
UIManager.AddEvent(wxLogin3.Find("Next").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
goMain(wxLogin3.Find("rememberButton").Find("Gou"));
|
||||
//goMain
|
||||
});
|
||||
}
|
||||
imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
|
||||
imagedf = transform.Find("Panel").Find("LoginContainer").Find("Imagedf");
|
||||
toolContainer = transform.Find("Panel").Find("ToolContainer");
|
||||
if (toolContainer != null)
|
||||
if (toolContainer != null)
|
||||
{
|
||||
UIManager.AddEvent(toolContainer.Find("Setting").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
{
|
||||
@ -400,19 +417,62 @@ public class LoginController : MonoBehaviour
|
||||
// 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(@"
|
||||
console.log(document.getElementsByClassName('qrcode')[0]);
|
||||
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
|
||||
document.getElementsByClassName('title')[0].style.display = 'none';
|
||||
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';
|
||||
");
|
||||
console.log(439,document.body.style.padding);
|
||||
let time = null;
|
||||
let f = ()=>{
|
||||
console.log(442);
|
||||
|
||||
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
|
||||
document.getElementsByClassName('title')[0].style.display = 'none';
|
||||
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()
|
||||
@ -440,7 +500,7 @@ public class LoginController : MonoBehaviour
|
||||
if (r.result)
|
||||
{
|
||||
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);
|
||||
Utils.DisplayImage(StartCoroutine,
|
||||
@ -500,12 +560,12 @@ public class LoginController : MonoBehaviour
|
||||
{
|
||||
var btn = signPage1.Find("Captcha").Find("BtnGet");
|
||||
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);
|
||||
//Timer t = new Ti
|
||||
if (r.result)
|
||||
{
|
||||
if (r.data.Value<bool>("isExist") && pageNums == 5)
|
||||
if (r.data.Value<bool>("isExist") && pageNums == 5)
|
||||
{
|
||||
HidePassword();
|
||||
}
|
||||
@ -513,6 +573,7 @@ public class LoginController : MonoBehaviour
|
||||
btnText.text = $"Again({time})";
|
||||
System.Timers.Timer timer = new System.Timers.Timer();
|
||||
btn.GetComponent<Button>().enabled = false;
|
||||
btn.GetComponent<Button>().interactable = false;
|
||||
startCaptcha = true;
|
||||
//timer.Interval = 1000;
|
||||
//timer.AutoReset = true;
|
||||
@ -520,7 +581,7 @@ public class LoginController : MonoBehaviour
|
||||
//timer.Enabled = true;
|
||||
//btnGet.
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
Utils.showToast(gameObject, r.errMsg);
|
||||
}
|
||||
@ -537,12 +598,16 @@ public class LoginController : MonoBehaviour
|
||||
|
||||
void ShowPassword()
|
||||
{
|
||||
signForm.email.text = "";
|
||||
signForm.password.text = "";
|
||||
signForm.captcha.text = "";
|
||||
signForm.cpassword.text = "";
|
||||
signPage1.Find("Password").gameObject.SetActive(true);
|
||||
signPage1.Find("CPassword").gameObject.SetActive(true);
|
||||
signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { goRegNext(1); });
|
||||
}
|
||||
void CaptchaTimerTick()
|
||||
void CaptchaTimerTick()
|
||||
{
|
||||
timer -= Time.deltaTime;
|
||||
if (timer <= 0)
|
||||
@ -554,13 +619,14 @@ public class LoginController : MonoBehaviour
|
||||
{
|
||||
btnText.text = "Get";
|
||||
btn.GetComponent<Button>().enabled = true;
|
||||
btn.GetComponent<Button>().interactable = true;
|
||||
startCaptcha = false;
|
||||
//timer.Stop();
|
||||
}
|
||||
timer = 1.0f;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void OnLoginInputDeSelect(BaseEventData arg0, GameObject game)
|
||||
{
|
||||
var image = game.transform.GetComponent<Image>();
|
||||
@ -569,7 +635,7 @@ public class LoginController : MonoBehaviour
|
||||
//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>();
|
||||
image.sprite = Resources.Load<Sprite>("Images/gl");
|
||||
@ -588,13 +654,13 @@ public class LoginController : MonoBehaviour
|
||||
var Captcha = signForm.captcha;
|
||||
var Password = signForm.password;
|
||||
var CPassword = signForm.cpassword;
|
||||
if (Password.text != CPassword.text)
|
||||
if (Password.text != CPassword.text)
|
||||
{
|
||||
Utils.showToast(gameObject,"两次密码输入不一致");
|
||||
Utils.showToast(gameObject, "两次密码输入不一致");
|
||||
return;
|
||||
}
|
||||
//JsonConvert
|
||||
JsonResult<UserResultModel> r = null;
|
||||
JsonResult<object> r = null;
|
||||
if (signType == 0)
|
||||
{
|
||||
r = await ConfigHelper.userApi.Register(Email.text, Password.text, Captcha.text);
|
||||
@ -610,17 +676,38 @@ public class LoginController : MonoBehaviour
|
||||
wxInfoJson.Value<int>("sex"),
|
||||
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();
|
||||
StartScrollSign(1);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
var errorList = JArray.FromObject(r.data);
|
||||
SetValidate(signFormDict, errorList);
|
||||
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()
|
||||
{
|
||||
var Email = signForm.email;
|
||||
@ -635,7 +722,8 @@ public class LoginController : MonoBehaviour
|
||||
"");
|
||||
if (r.result)
|
||||
{
|
||||
RefreshWx3(r.data);
|
||||
var u = JObject.FromObject(r.data).ToObject<UserResultModel>();
|
||||
RefreshWx3(u);
|
||||
StartScrollPanel(4);
|
||||
}
|
||||
else
|
||||
@ -643,7 +731,7 @@ public class LoginController : MonoBehaviour
|
||||
Utils.showToast(gameObject, r.errMsg);
|
||||
}
|
||||
}
|
||||
void RefreshWx3(UserResultModel data)
|
||||
void RefreshWx3(UserResultModel data)
|
||||
{
|
||||
Utils.DisplayImage(StartCoroutine,
|
||||
wxLogin3.Find("Avatar").GetComponent<RawImage>(),
|
||||
@ -653,8 +741,8 @@ public class LoginController : MonoBehaviour
|
||||
}
|
||||
async void goRegEnd()
|
||||
{
|
||||
if(!await UpdateInfo()) return;
|
||||
if (pageNums == 5)
|
||||
if (!await UpdateInfo()) return;
|
||||
if (pageNums == 5)
|
||||
{
|
||||
this.StartScrollPanel(4);
|
||||
}
|
||||
@ -664,7 +752,7 @@ public class LoginController : MonoBehaviour
|
||||
}
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
void LoadInfo()
|
||||
void LoadInfo()
|
||||
{
|
||||
var _days = signForm.days.GetComponent<PFUIDropdown>();
|
||||
var _months = signForm.months.GetComponent<PFUIDropdown>();
|
||||
@ -681,13 +769,13 @@ public class LoginController : MonoBehaviour
|
||||
_months.SelectValue(userResult.Birthday.Value.Month.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));
|
||||
_units.SelectIndex(userResult.Unit);
|
||||
_weight.Text = userResult.Weight.ToString();
|
||||
_height.Text = userResult.Height.ToString();
|
||||
}
|
||||
async Task<bool> UpdateInfo()
|
||||
async Task<bool> UpdateInfo()
|
||||
{
|
||||
if (userResult == null) return false;
|
||||
var _days = signForm.days.GetComponent<PFUIDropdown>();
|
||||
@ -698,16 +786,26 @@ public class LoginController : MonoBehaviour
|
||||
var _units = signForm.units.GetComponent<PFUIDropdown>();
|
||||
var _weight = signForm.weight.GetComponent<PFUIInputField>();
|
||||
var _height = signForm.height.GetComponent<PFUIInputField>();
|
||||
if (signForm.years.value != -1 && signForm.months.value != -1 && signForm.days.value != -1)
|
||||
if (signForm.years.value != -1 && signForm.months.value != -1 && signForm.days.value != -1)
|
||||
{
|
||||
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.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
|
||||
userResult.Unit = _units.SelectedIndex;
|
||||
userResult.Weight = int.Parse(_weight.Text);
|
||||
userResult.Height = int.Parse(_height.Text);
|
||||
if (string.IsNullOrEmpty(userResult.Nickname))
|
||||
if (string.IsNullOrEmpty(userResult.Nickname))
|
||||
{
|
||||
userResult.Nickname = userResult.Phone;
|
||||
}
|
||||
@ -724,7 +822,7 @@ public class LoginController : MonoBehaviour
|
||||
this.StartScrollPanel(1);
|
||||
}
|
||||
|
||||
void ReturnQuick()
|
||||
void ReturnQuick()
|
||||
{
|
||||
if (imagexf != null)
|
||||
{
|
||||
@ -734,11 +832,16 @@ public class LoginController : MonoBehaviour
|
||||
{
|
||||
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);
|
||||
}
|
||||
void goLogin()
|
||||
public void goLogin(bool noReturn = false)
|
||||
{
|
||||
if (imagexf != null)
|
||||
if (imagexf != null)
|
||||
{
|
||||
imagexf.DOLocalMoveY(-669, 0.3f);
|
||||
}
|
||||
@ -746,7 +849,32 @@ public class LoginController : MonoBehaviour
|
||||
{
|
||||
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);
|
||||
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)
|
||||
{
|
||||
@ -818,7 +946,8 @@ public class LoginController : MonoBehaviour
|
||||
Id = data.Id,
|
||||
NickName = data.Nickname,
|
||||
Avatar = data.WxHeadImg,
|
||||
Cookie = data.cookie
|
||||
Cookie = data.cookie,
|
||||
Phone = data.Phone
|
||||
});
|
||||
index = userInfos.Count - 1;
|
||||
}
|
||||
@ -829,6 +958,7 @@ public class LoginController : MonoBehaviour
|
||||
u.NickName = data.Nickname;
|
||||
u.Avatar = data.WxHeadImg;
|
||||
u.Cookie = data.cookie;
|
||||
u.Phone = data.Phone;
|
||||
//userInfos.Insert(0, new QUserInfo
|
||||
//{
|
||||
// Id = data.Id,
|
||||
@ -844,27 +974,30 @@ public class LoginController : MonoBehaviour
|
||||
}
|
||||
async void Submit()
|
||||
{
|
||||
if (loginForm.email == null || loginForm.password == null)
|
||||
{
|
||||
Utils.showToast(gameObject, "未绑定", 1);
|
||||
return;
|
||||
}
|
||||
if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
|
||||
{
|
||||
Utils.showToast(gameObject, "请输入信息", 1);
|
||||
return;
|
||||
}
|
||||
//if (loginForm.email == null || loginForm.password == null)
|
||||
//{
|
||||
// Utils.showToast(gameObject, "未绑定", 1);
|
||||
// return;
|
||||
//}
|
||||
//if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
|
||||
//{
|
||||
// Utils.showToast(gameObject, "请输入信息", 1);
|
||||
// return;
|
||||
//}
|
||||
//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);
|
||||
if (res.result)
|
||||
{
|
||||
userResult = res.data;
|
||||
userResult = JObject.FromObject(res.data).ToObject<UserResultModel>();
|
||||
goMain(remember.transform.Find("Gou"));
|
||||
}
|
||||
else
|
||||
{
|
||||
var errorList = JArray.FromObject(res.data);
|
||||
SetValidate(formDict, errorList);
|
||||
Utils.showToast(gameObject, res.errMsg);
|
||||
}
|
||||
}
|
||||
@ -959,6 +1092,7 @@ public class LoginController : MonoBehaviour
|
||||
private bool startScrollSign = false;
|
||||
private int scrollSignIndex = 0;
|
||||
|
||||
|
||||
private void StartScrollSign(int index)
|
||||
{
|
||||
if (startScrollSign) return;
|
||||
|
||||
@ -58,7 +58,7 @@ namespace Assets.Scripts.UI.Control
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private Outline outline;
|
||||
void Awake()
|
||||
{
|
||||
//this.mSelectedIndex =
|
||||
@ -71,9 +71,18 @@ namespace Assets.Scripts.UI.Control
|
||||
{
|
||||
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)
|
||||
{
|
||||
var image = this.transform.GetComponent<Image>();
|
||||
|
||||
@ -29,7 +29,7 @@ namespace Assets.Scripts.UI.Control
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
string placeHolderText;
|
||||
public void OnSelect(BaseEventData eventData)
|
||||
{
|
||||
if (this.gameObject.activeInHierarchy == false)
|
||||
@ -49,7 +49,7 @@ namespace Assets.Scripts.UI.Control
|
||||
Text = "";
|
||||
}
|
||||
_text.color = Color.white;
|
||||
|
||||
transform.Find("Placeholder").GetComponent<Text>().text = "";
|
||||
outline.enabled = true;
|
||||
ColorUtility.TryParseHtmlString("#F93086", out Color color);
|
||||
|
||||
@ -65,6 +65,7 @@ namespace Assets.Scripts.UI.Control
|
||||
|
||||
isSelected = false;
|
||||
this.mInnerInputField.OnDeselect(eventData);
|
||||
transform.Find("Placeholder").GetComponent<Text>().text = placeHolderText;
|
||||
//var image = this.transform.GetComponent<Image>();
|
||||
//var png1 = Resources.Load<Sprite>("Images/ipt-0");
|
||||
//image.sprite = png1;
|
||||
@ -113,6 +114,7 @@ namespace Assets.Scripts.UI.Control
|
||||
//outline = this.gameObject.AddComponent<Outline>();
|
||||
outline.enabled = false;
|
||||
}));
|
||||
placeHolderText = transform.Find("Placeholder").GetComponent<Text>().text;
|
||||
}
|
||||
|
||||
public void SetValidate(bool value)
|
||||
|
||||
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.Threading;
|
||||
using UnityEngine;
|
||||
@ -8,7 +10,7 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
private ScrollRect scroll;
|
||||
private Transform content;
|
||||
private Transform content,lightbg;
|
||||
private float contentSize;
|
||||
private int count;
|
||||
[SerializeField] Button L, R;
|
||||
@ -16,6 +18,7 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
{
|
||||
scroll = gameObject.GetComponent<ScrollRect>();
|
||||
content = gameObject.transform.Find("Viewport").Find("Content");
|
||||
lightbg = transform.parent.Find("Light");
|
||||
//Initial();
|
||||
if (L != null)
|
||||
{
|
||||
@ -34,6 +37,14 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
//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()
|
||||
{
|
||||
count = content.childCount;
|
||||
@ -55,6 +66,7 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
void goLeft()
|
||||
{
|
||||
if (scroll.horizontalNormalizedPosition <= contentSize) return;
|
||||
doAni();
|
||||
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
||||
start = true;
|
||||
scrollValue = -1 * contentSize / 30;
|
||||
@ -62,6 +74,7 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
void goRight()
|
||||
{
|
||||
if ((scroll.horizontalNormalizedPosition + contentSize) >= 1) return;
|
||||
doAni();
|
||||
if (!start) startPosition = scroll.horizontalNormalizedPosition;
|
||||
start = true;
|
||||
scrollValue = contentSize / 30;
|
||||
@ -78,7 +91,10 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
string c;
|
||||
if (i == index)
|
||||
{
|
||||
lightbg.GetComponent<Image>().gameObject.SetActive(true);
|
||||
lightbg.GetComponent<Image>().DOFade(1, 0.2f);
|
||||
content.GetChild(i).GetComponent<QuickLoginUser>().setActive();
|
||||
//
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -98,7 +114,6 @@ public class QuickLoginScroll : MonoBehaviour
|
||||
start = false;
|
||||
scroll.horizontalNormalizedPosition = startPosition + totalScrollValue;
|
||||
//Debug.Log();
|
||||
|
||||
SetColor();
|
||||
totalScrollValue = 0;
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ public class QuickLoginUser : MonoBehaviour
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
//DOTween.To(()=>)
|
||||
}
|
||||
async void goMain()
|
||||
{
|
||||
@ -75,6 +75,7 @@ public class QuickLoginUser : MonoBehaviour
|
||||
// content.Find("empty1").transform.SetSiblingIndex(0);
|
||||
// content.Find("empty2").transform.SetSiblingIndex(content.childCount - 1);
|
||||
//}
|
||||
UIManager.Instance.userInfoIndex = 0;
|
||||
content.parent.parent.GetComponent<QuickLoginScroll>().Initial();
|
||||
DeleteList(index);
|
||||
}
|
||||
@ -84,7 +85,10 @@ public class QuickLoginUser : MonoBehaviour
|
||||
var userInfos = UIManager.Instance.userInfos;
|
||||
userInfos.RemoveAt(index);
|
||||
UIManager.Instance.userInfos = userInfos;
|
||||
UIManager.Instance.userInfoIndex = 0;
|
||||
if (userInfos.Count == 0)
|
||||
{
|
||||
top.GetComponent<LoginController>().goLogin(true);
|
||||
}
|
||||
}
|
||||
|
||||
public void setActive()
|
||||
@ -93,7 +97,8 @@ public class QuickLoginUser : MonoBehaviour
|
||||
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
||||
transform.Find("Avatar").GetComponent<RawImage>().DOFade(1f, 0.3f);
|
||||
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);
|
||||
}
|
||||
public void setNoActive()
|
||||
@ -102,7 +107,7 @@ public class QuickLoginUser : MonoBehaviour
|
||||
//transform.Find("Avatar").GetComponent<RawImage>().color = color;
|
||||
transform.Find("Avatar").GetComponent<RawImage>().DOFade(0.5f, 0.3f);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,6 +44,10 @@ public class MainNav : MonoBehaviour
|
||||
{
|
||||
UIManager.ShowSettingModal();
|
||||
});
|
||||
UIManager.AddEvent(transform.Find("Support").gameObject, EventTriggerType.PointerClick, x =>
|
||||
{
|
||||
UIManager.ShowFeedBackModal();
|
||||
});
|
||||
}
|
||||
|
||||
// Start is called before the first frame update
|
||||
|
||||
@ -13,6 +13,6 @@ public class RotateBg : MonoBehaviour
|
||||
// Update is called once per frame
|
||||
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
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
void Awake()
|
||||
{
|
||||
content = transform.Find("Main").Find("Inner").Find("Content");
|
||||
exit = transform.Find("Main").Find("Exit");
|
||||
|
||||
@ -39,6 +39,8 @@ public class EditUserController : PFUIPanel
|
||||
private Button mBackButton;
|
||||
private Button mSwitchButton;
|
||||
PfUIButton mChangeAvatar;
|
||||
Transform linkContainer;
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
Debug.Log(Utils.GetIP(Utils.ADDRESSFAM.IPv4));
|
||||
@ -101,7 +103,7 @@ public class EditUserController : PFUIPanel
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
linkContainer = transform.Find("LinkContainer");
|
||||
|
||||
mSexDropdown.ClearOptions();
|
||||
mSexDropdown.AddOptions(new List<string>
|
||||
@ -147,7 +149,8 @@ public class EditUserController : PFUIPanel
|
||||
// new Dropdown.OptionData()
|
||||
//});
|
||||
|
||||
LoadDataSync();
|
||||
LoadDataSync();
|
||||
|
||||
}
|
||||
async Task Login()
|
||||
{
|
||||
@ -199,6 +202,11 @@ public class EditUserController : PFUIPanel
|
||||
mName.Text = currentUser.Contact;
|
||||
mPhone.Text = currentUser.ContactPhone;
|
||||
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
|
||||
protected override void Start()
|
||||
@ -313,6 +321,6 @@ public class EditUserController : PFUIPanel
|
||||
}
|
||||
void Cancel(BaseEventData e)
|
||||
{
|
||||
UIManager.ShowHomePanel();
|
||||
UIManager.ShowUserInfoPanel();
|
||||
}
|
||||
}
|
||||
|
||||
@ -262,10 +262,10 @@ public class MapListController : PFUIPanel
|
||||
string sort = "Hot",sortDire = "desc";
|
||||
//string name = "";
|
||||
//string name = "";
|
||||
public void GetList()
|
||||
async void GetList()
|
||||
{
|
||||
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.data.Count == 0 && pageIndex != 0)
|
||||
|
||||
@ -59,6 +59,8 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
||||
{
|
||||
//btnContinue.gameObject.SetActive(false);
|
||||
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");
|
||||
if (btnReRide)
|
||||
@ -112,7 +114,8 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
||||
{
|
||||
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");
|
||||
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
|
||||
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
|
||||
|
||||
@ -61,6 +61,14 @@ public class UIManager : MonoBehaviour
|
||||
return this.GetPanelInstance("SettingModal", ref this.mSettingContoller);
|
||||
}
|
||||
}
|
||||
private FeedbackController mfeedbackController;
|
||||
public FeedbackController FeedbackModal
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetPanelInstance("FeedbackModal", ref this.mfeedbackController);
|
||||
}
|
||||
}
|
||||
private NewsController mNewsContoller;
|
||||
public NewsController NewsModal
|
||||
{
|
||||
@ -322,6 +330,10 @@ public class UIManager : MonoBehaviour
|
||||
{
|
||||
UIManager.Show(UIManager.Instance.NewsModal, null, true);
|
||||
}
|
||||
public static void ShowFeedBackModal()
|
||||
{
|
||||
UIManager.Show(UIManager.Instance.FeedbackModal, null, true);
|
||||
}
|
||||
public static void ShowEditUserPanel()
|
||||
{
|
||||
UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
|
||||
|
||||
@ -4,9 +4,11 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Net.Sockets;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
@ -169,5 +171,52 @@ namespace Assets.Scripts
|
||||
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);
|
||||
}
|
||||
}
|
||||
/*打开文件*/
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user