From 52fb8c663b1e74b2a36b79bc70a452ca73db6341 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 12 Nov 2020 17:20:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scenes/LoadingScene.unity | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity
index 694a75e..6828030 100644
--- a/Assets/Scenes/LoadingScene.unity
+++ b/Assets/Scenes/LoadingScene.unity
@@ -243,7 +243,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &494017137
GameObject:
@@ -413,7 +413,7 @@
m_Children:
- {fileID: 2142699187}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -598,6 +598,75 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 809190789}
m_CullTransparentMesh: 0
+--- !u!1001 &826703610
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1417
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 940
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3091314759354326717, guid: 91d321cd869bc0c47808f6fd7d755ae3,
+ type: 3}
+ propertyPath: m_Name
+ value: ClearCamera
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3}
--- !u!1 &901340337
GameObject:
m_ObjectHideFlags: 0
@@ -688,7 +757,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1234802519
GameObject:
@@ -952,7 +1021,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1592474032
GameObject:
@@ -1260,7 +1329,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1761314359
GameObject:
--
Gitblit v1.9.1