pc版首页;安卓google登录;解决fb登录ios问题

This commit is contained in:
Caiyanpeng committed 2022-01-12 16:55:57 +08:00
1 parent f0df68bbda
commit 91fa3cc82d
16 files changed
+3642 -2796

No files matched your search

File diff suppressed because it is too large. Load diff
+229 -189
View File
@@ -488,92 +488,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 313551262}
m_CullTransparentMesh: 0
--- !u!21 &637190723
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: 30, g: 30, b: 30, a: 0}
--- !u!1 &684809389
GameObject:
m_ObjectHideFlags: 0
@@ -972,92 +886,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
--- !u!21 &977285556
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: 273, g: 44, b: 44, a: 0}
--- !u!1 &1378474435
GameObject:
m_ObjectHideFlags: 0
@@ -1155,12 +983,12 @@ PrefabInstance:
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 273
value: 446
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 44
value: 70
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@@ -1200,12 +1028,12 @@ PrefabInstance:
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 1100
value: 1014
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -600
value: -451
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@@ -1222,6 +1050,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875058, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: radius
value: 35
objectReference: {fileID: 0}
- target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_Color2.a
@@ -1245,37 +1078,47 @@ PrefabInstance:
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: -47
value: -76
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 14
value: 20
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 16.5
value: 28
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: -13
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 17
objectReference: {fileID: 0}
- target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_Alignment
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 30
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 30
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 7
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3342506723879539847, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
@@ -1285,33 +1128,58 @@ PrefabInstance:
- target: {fileID: 3342506723879539849, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: radius
value: 15
value: 25
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: -47
value: -76
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 12
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 16.5
value: 28
objectReference: {fileID: 0}
- target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -23
value: -37
objectReference: {fileID: 0}
- target: {fileID: 4864779298271313415, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 17
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, type: 3}
--- !u!224 &1426339559 stripped
@@ -1320,6 +1188,92 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1426339558}
m_PrefabAsset: {fileID: 0}
--- !u!21 &1469391097
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: 50, g: 50, b: 50, a: 0}
--- !u!1 &1565405865 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
@@ -1334,7 +1288,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565405865}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
@@ -1502,6 +1456,92 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1726804851}
m_CullTransparentMesh: 0
--- !u!21 &1729208821
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: 446, g: 70, b: 70, a: 0}
--- !u!1 &1962586925
GameObject:
m_ObjectHideFlags: 0