From 38c000e2fd4705b197b5d587f081fd775667182a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 13:57:04 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Resources/UI/Guide/GuidePanel.prefab | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 6f48820..9402cfe 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -17220,6 +17220,7 @@
- {fileID: 1725281817447037252}
- {fileID: 5284319985334853514}
- {fileID: 6734668191369589492}
+ - {fileID: 767591575309379950}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -17673,6 +17674,121 @@
type: 3}
m_PrefabInstance: {fileID: 2300011441008667441}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2311656066066081264
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 5529930024907350475}
+ m_Modifications:
+ - target: {fileID: 1335499092167296360, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2449791801456558011, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075780154458313392, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523167, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_UI_YinDaoJieShu
+ objectReference: {fileID: 0}
+ - target: {fileID: 3076994875172523167, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6275672227110818141, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 052c2c582cb1908499d0454aefab6a68, type: 3}
+--- !u!4 &767591575309379950 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
+ type: 3}
+ m_PrefabInstance: {fileID: 2311656066066081264}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4785850214538834053
PrefabInstance:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1