From a18509067d8bea5f0006a539824049341003fcea Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:56:29 +0800
Subject: [PATCH] 适配
---
Assets/Scenes/LoadingScene.unity | 279 +++++++++++++++++++++++++------------------------------
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 15 +-
2 files changed, 135 insertions(+), 159 deletions(-)
diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity
index 9795621..09a05c1 100644
--- a/Assets/Scenes/LoadingScene.unity
+++ b/Assets/Scenes/LoadingScene.unity
@@ -148,16 +148,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 63699119}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 371.59985, y: 1079.3003}
+ m_AnchoredPosition: {x: -118.40015, y: -20.699707}
m_SizeDelta: {x: 220.91876, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &63699121
@@ -435,10 +435,94 @@
m_EditorClassIdentifier:
nextSprite: {fileID: 21300000, guid: cc5d797972864ce4ea2a203dba620097, type: 3}
bg: {fileID: 494017139}
- other: {fileID: 861800949}
+ other:
+ - {fileID: 1592474032}
+ - {fileID: 809190789}
+ - {fileID: 2019853795}
+ - {fileID: 1761314359}
+ - {fileID: 1569582226}
+ - {fileID: 63699119}
+ - {fileID: 2019698820}
+ - {fileID: 1234802519}
+ - {fileID: 707747088}
imei0:
imei1:
meid:
+--- !u!1 &546629017
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 546629018}
+ - component: {fileID: 546629020}
+ - component: {fileID: 546629019}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &546629018
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 546629017}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1970259399}
+ 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: 9}
+ m_SizeDelta: {x: 203, y: 54}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &546629019
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 546629017}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: de9bb2c4c2028724fbb614af8e4752a8, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &546629020
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 546629017}
+ m_CullTransparentMesh: 0
--- !u!1 &707747088
GameObject:
m_ObjectHideFlags: 0
@@ -455,7 +539,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &707747089
RectTransform:
m_ObjectHideFlags: 0
@@ -469,12 +553,12 @@
m_Children:
- {fileID: 1638253221}
- {fileID: 1773889116}
- m_Father: {fileID: 861800950}
- m_RootOrder: 8
+ m_Father: {fileID: 2142699187}
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: -817.4}
+ m_AnchoredPosition: {x: 0, y: 282.6}
m_SizeDelta: {x: 810, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &707747090
@@ -552,16 +636,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 809190789}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: -1084}
+ m_AnchoredPosition: {x: 0, y: 16}
m_SizeDelta: {x: 1080, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &809190791
@@ -602,50 +686,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 809190789}
m_CullTransparentMesh: 0
---- !u!1 &861800949
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 861800950}
- m_Layer: 5
- m_Name: Other
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &861800950
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 861800949}
- 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:
- - {fileID: 1592474033}
- - {fileID: 809190790}
- - {fileID: 2019853796}
- - {fileID: 1761314360}
- - {fileID: 1569582227}
- - {fileID: 63699120}
- - {fileID: 2019698821}
- - {fileID: 1234802520}
- - {fileID: 707747089}
- m_Father: {fileID: 2142699187}
- m_RootOrder: 1
- 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: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &901340337
GameObject:
m_ObjectHideFlags: 0
@@ -807,16 +847,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1234802519}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -327.43, y: 1048}
+ m_AnchoredPosition: {x: 162.57, y: -52}
m_SizeDelta: {x: 286.04895, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1234802521
@@ -887,16 +927,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1569582226}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 426, y: 832}
+ m_AnchoredPosition: {x: -64, y: -268}
m_SizeDelta: {x: 106, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1569582228
@@ -1071,16 +1111,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592474032}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: -1003.99023}
+ m_AnchoredPosition: {x: 0, y: 96.009766}
m_SizeDelta: {x: 325, y: 81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1592474034
@@ -1229,7 +1269,7 @@
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 65, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1380,16 +1420,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1761314359}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 426, y: 972}
+ m_AnchoredPosition: {x: -64, y: -128}
m_SizeDelta: {x: 106, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1761314361
@@ -1509,81 +1549,6 @@
m_AnchoredPosition: {x: -1.499999, y: 0}
m_SizeDelta: {x: -63, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1962845600
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1962845601}
- - component: {fileID: 1962845603}
- - component: {fileID: 1962845602}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1962845601
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1962845600}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1970259399}
- 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: 10}
- m_SizeDelta: {x: 203, y: 54}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1962845602
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1962845600}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: de9bb2c4c2028724fbb614af8e4752a8, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1962845603
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1962845600}
- m_CullTransparentMesh: 0
--- !u!1 &1970259398
GameObject:
m_ObjectHideFlags: 0
@@ -1610,13 +1575,13 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1970259398}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 1962845601}
+ - {fileID: 546629018}
m_Father: {fileID: 2142699187}
- m_RootOrder: 0
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -1729,16 +1694,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2019698820}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -327.42993, y: 1079.3003}
+ m_AnchoredPosition: {x: 162.57007, y: -20.699707}
m_SizeDelta: {x: 286.04895, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019698822
@@ -1808,16 +1773,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2019853795}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 861800950}
+ m_Father: {fileID: 2142699187}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 24.1, y: 655.40015}
+ m_AnchoredPosition: {x: 24.1, y: -444.6}
m_SizeDelta: {x: 714, y: 446}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019853797
@@ -1887,8 +1852,16 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1592474033}
+ - {fileID: 809190790}
+ - {fileID: 2019853796}
+ - {fileID: 1761314360}
+ - {fileID: 1569582227}
+ - {fileID: 63699120}
+ - {fileID: 2019698821}
+ - {fileID: 1234802520}
- {fileID: 1970259399}
- - {fileID: 861800950}
+ - {fileID: 707747089}
m_Father: {fileID: 501810474}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 9d7168b..8e577d7 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -31,7 +31,7 @@
private Image bg;
[SerializeField]
- private GameObject other;
+ private List<GameObject> other;
// Start is called before the first frame update
void Start()
@@ -41,12 +41,12 @@
isLogining = false;
- repairBtn = transform.Find("Panel/Other/RepairBtn").GetComponent<Button>();
+ repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
- versionTxt = transform.Find("Panel/Other/Version").GetComponent<Text>();
+ versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
- progressSlider = transform.Find("Panel/Other/Progress").GetComponent<Slider>();
+ progressSlider = transform.Find("Panel/Progress").GetComponent<Slider>();
progressSlider.value = 0;
progressSlider.gameObject.SetActive(false);
@@ -75,7 +75,7 @@
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
- transform.Find("Panel/Other/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
+ transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
if (GameConfig.isFirstStart)
@@ -105,7 +105,10 @@
if (GameConfig.GameCompletedCount > 0)
{
- other.SetActive(false);
+ for (int i = 0; i < other.Count; ++i)
+ {
+ other[i].SetActive(false);
+ }
bg.sprite = nextSprite;
bg.SetNativeSize();
}
--
Gitblit v1.9.1