From fac697773b8cb65b3ab54569413e15fca03ad1d7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:21:14 +0800
Subject: [PATCH] Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master
---
Assets/Scenes/LoadingScene.unity | 116 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 39 deletions(-)
diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity
index d54e3bf..9795621 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: 2142699187}
+ m_Father: {fileID: 861800950}
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: -118.40015, y: -20.699707}
+ m_AnchoredPosition: {x: 371.59985, y: 1079.3003}
m_SizeDelta: {x: 220.91876, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &63699121
@@ -433,7 +433,9 @@
m_Script: {fileID: 11500000, guid: 5671a738ca063f047a1619ba0c199f45, type: 3}
m_Name:
m_EditorClassIdentifier:
- nextSprite: {fileID: 21300000, guid: c98050c2e2f37b24cb4f9e43acd62964, type: 3}
+ nextSprite: {fileID: 21300000, guid: cc5d797972864ce4ea2a203dba620097, type: 3}
+ bg: {fileID: 494017139}
+ other: {fileID: 861800949}
imei0:
imei1:
meid:
@@ -467,12 +469,12 @@
m_Children:
- {fileID: 1638253221}
- {fileID: 1773889116}
- m_Father: {fileID: 2142699187}
- m_RootOrder: 9
+ m_Father: {fileID: 861800950}
+ 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}
- m_AnchoredPosition: {x: 0, y: 282.6}
+ m_AnchoredPosition: {x: 0, y: -817.4}
m_SizeDelta: {x: 810, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &707747090
@@ -550,16 +552,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: 16}
+ m_AnchoredPosition: {x: 0, y: -1084}
m_SizeDelta: {x: 1080, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &809190791
@@ -600,6 +602,50 @@
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
@@ -761,16 +807,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: 162.57, y: -52}
+ m_AnchoredPosition: {x: -327.43, y: 1048}
m_SizeDelta: {x: 286.04895, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1234802521
@@ -841,16 +887,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: -64, y: -268}
+ m_AnchoredPosition: {x: 426, y: 832}
m_SizeDelta: {x: 106, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1569582228
@@ -1025,16 +1071,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: 96.009766}
+ m_AnchoredPosition: {x: 0, y: -1003.99023}
m_SizeDelta: {x: 325, y: 81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1592474034
@@ -1334,16 +1380,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: -64, y: -128}
+ m_AnchoredPosition: {x: 426, y: 972}
m_SizeDelta: {x: 106, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1761314361
@@ -1564,13 +1610,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}
m_Father: {fileID: 2142699187}
- m_RootOrder: 8
+ 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}
@@ -1683,16 +1729,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: 162.57007, y: -20.699707}
+ m_AnchoredPosition: {x: -327.42993, y: 1079.3003}
m_SizeDelta: {x: 286.04895, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019698822
@@ -1762,16 +1808,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: 2142699187}
+ m_Father: {fileID: 861800950}
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: -444.6}
+ m_AnchoredPosition: {x: 24.1, y: 655.40015}
m_SizeDelta: {x: 714, y: 446}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019853797
@@ -1841,16 +1887,8 @@
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: 707747089}
+ - {fileID: 861800950}
m_Father: {fileID: 501810474}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--
Gitblit v1.9.1