From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/Prefabs/UI/PropIcon.prefab | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 171 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/UI/PropIcon.prefab b/Assets/Prefabs/UI/PropIcon.prefab
index 23a05b1..0ddf124 100644
--- a/Assets/Prefabs/UI/PropIcon.prefab
+++ b/Assets/Prefabs/UI/PropIcon.prefab
@@ -105,6 +105,7 @@
m_Children:
- {fileID: 9079844722132429016}
- {fileID: 1096365539966205729}
+ - {fileID: 6294946307648062027}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -202,3 +203,173 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &2888816948718307580
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 6677654566162760697}
+ m_Modifications:
+ - target: {fileID: 225098535084566565, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1487484863008227184, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1564618375033694671, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1660097769711779516, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2205539796091058834, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4540520726809085660, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5143196848909417750, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5402212406608974771, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_baoxiangliuguang
+ objectReference: {fileID: 0}
+ - target: {fileID: 5488817991362421910, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5646038450406300724, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5684333037806031723, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6240494657516716312, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7000084856983500232, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8405723799059347027, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 8405723799059347027, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 8405723799059347027, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 8547658018333476940, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_MaskInteraction
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 32
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 32
+ objectReference: {fileID: 0}
+ - target: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 32
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7301e1aed088b084895610fa3d1167d1, type: 3}
+--- !u!4 &6294946307648062027 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9172433746249288375, guid: 7301e1aed088b084895610fa3d1167d1,
+ type: 3}
+ m_PrefabInstance: {fileID: 2888816948718307580}
+ m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1