diff --git a/Assets/Resources/model/SM_AE86.prefab b/Assets/Resources/model/SM_AE86.prefab index 5ad26d52..8a657313 100644 --- a/Assets/Resources/model/SM_AE86.prefab +++ b/Assets/Resources/model/SM_AE86.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 5623774859421007312} - component: {fileID: 8765257102886220405} - component: {fileID: 6791575215690237631} + - component: {fileID: -23267701065524881} m_Layer: 0 m_Name: SM_AE86 m_TagString: Untagged @@ -82,3 +83,20 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!114 &-23267701065524881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4990122376453678954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3} + m_Name: + m_EditorClassIdentifier: + modelequipment: + str: + x: 0 + y: 0 + z: 0 diff --git a/Assets/Resources/model/大众.prefab b/Assets/Resources/model/大众.prefab index 63520507..3889f273 100644 --- a/Assets/Resources/model/大众.prefab +++ b/Assets/Resources/model/大众.prefab @@ -818,6 +818,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4620950573919636985} + - component: {fileID: -5357598988889012512} m_Layer: 0 m_Name: "\u5927\u4F17" m_TagString: Untagged @@ -852,6 +853,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5357598988889012512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5434501958535632707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3} + m_Name: + m_EditorClassIdentifier: + modelequipment: + str: + x: 0 + y: 0 + z: 0 --- !u!1 &5515763617755741891 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Temp/Scripts/Modeldata.cs b/Assets/Temp/Scripts/Modeldata.cs index 7ff83c6d..b4dab0df 100644 --- a/Assets/Temp/Scripts/Modeldata.cs +++ b/Assets/Temp/Scripts/Modeldata.cs @@ -7,7 +7,7 @@ public class Modeldata : MonoBehaviour { private string path = "model/";//获取预设体的值 private string modename = null; - public Modelequipment modelequipment;//对应的模型路径 + public Modelequipment modelequipment;//对应的模型路径 void Start() { modename = transform.name.Replace("(Clone)", "");//消除克隆的物体克隆的名字 diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index 31608b7a..3c7d5fa1 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -1399,14 +1399,15 @@ public class Scenariopage : MonoBehaviour { for (int i = 0; i < DragManager.Instance.deviceimages.Count; i++) { + //Debug.LogError(DragManager.Instance.deviceimages[i].name); if (DragManager.Instance.deviceimages[i] != null)//如果模型没有被删除 { DragManager.Instance.deviceimages[i].GetComponent().SetPos();//初始化获取模型对应位置的值 DragManager.Instance.Addobj1(DragManager.Instance.deviceimages[i]);//就把对应的模型加到链表类里面 } } - } - Passbyvalue();//把场景中天气插件的值传给接口 + } + Passbyvalue();//把场景中天气插件的值传给接口 //Modelitem();//把模型路径和对应的位置值传给接口 if (Id.Length > 1) { diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index 0cf5fb39..a9a378d4 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -5819,6 +5819,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 5793210758962281504, guid: 60372504cb367de4a88ce16862cee73f, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -5933,7 +5938,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ebb68320e827b534eb276594ecc0d464, + objectReference: {fileID: 21300000, guid: e588de89e16d46b4eb9feab18a15207d, type: 3} - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} @@ -5968,30 +5973,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 33894427} m_PrefabAsset: {fileID: 0} ---- !u!1 &33894429 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 33894427} - m_PrefabAsset: {fileID: 0} ---- !u!114 &33894430 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33894429} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 6061462163366925166, guid: 87a7af5a936e53e4c83701bce5b2fdc3, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 671608486} - isDragWRJ: 0 --- !u!1 &35155683 GameObject: m_ObjectHideFlags: 0 @@ -6701,6 +6682,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 3440031206501345430, guid: 36d2563e91adb8d45a5d8902b6d4ddf4, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -6806,6 +6792,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 418b142fd07a9b24aac8fbb549400cae, + type: 3} - target: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_Name @@ -6824,30 +6816,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 44293338} m_PrefabAsset: {fileID: 0} ---- !u!1 &44293340 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 44293338} - m_PrefabAsset: {fileID: 0} ---- !u!114 &44293341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 44293340} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 3440031206501345430, guid: 36d2563e91adb8d45a5d8902b6d4ddf4, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 2049232190} - isDragWRJ: 0 --- !u!1 &45083524 GameObject: m_ObjectHideFlags: 0 @@ -7285,18 +7253,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 51556669} m_CullTransparentMesh: 0 ---- !u!114 &51963442 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1916859549} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &54889097 GameObject: m_ObjectHideFlags: 0 @@ -9659,6 +9615,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 1163328458188600851, guid: 35d31eeaa86d7934caa7405c95dd6570, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -9788,30 +9749,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 133886309} m_PrefabAsset: {fileID: 0} ---- !u!1 &133886311 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 133886309} - m_PrefabAsset: {fileID: 0} ---- !u!114 &133886312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133886311} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 1163328458188600851, guid: 35d31eeaa86d7934caa7405c95dd6570, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1727538687} - isDragWRJ: 0 --- !u!1 &135544787 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, @@ -17524,18 +17461,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237606331} m_CullTransparentMesh: 0 ---- !u!114 &237685070 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 413846102} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &238298913 GameObject: m_ObjectHideFlags: 0 @@ -24367,18 +24292,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!114 &338402445 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1163628839} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &339035070 GameObject: m_ObjectHideFlags: 0 @@ -25144,6 +25057,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 5050371156226701136, guid: f390482b40f308b468f951b4e507588c, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -25298,30 +25216,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 356860784} m_PrefabAsset: {fileID: 0} ---- !u!1 &356860786 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 356860784} - m_PrefabAsset: {fileID: 0} ---- !u!114 &356860787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 356860786} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 5050371156226701136, guid: f390482b40f308b468f951b4e507588c, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 814578930} - isDragWRJ: 0 --- !u!1 &359090931 GameObject: m_ObjectHideFlags: 0 @@ -26297,18 +26191,6 @@ RectTransform: m_AnchoredPosition: {x: -78.07, y: -215} m_SizeDelta: {x: 71.86365, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &399960902 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 429883066} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &402383526 GameObject: m_ObjectHideFlags: 0 @@ -26729,6 +26611,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 3331668122385453770, guid: 83482cde95467cc4d96f31fade3abdda, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -26858,30 +26745,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 413846102} m_PrefabAsset: {fileID: 0} ---- !u!1 &413846104 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 413846102} - m_PrefabAsset: {fileID: 0} ---- !u!114 &413846105 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 413846104} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 3331668122385453770, guid: 83482cde95467cc4d96f31fade3abdda, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 237685070} - isDragWRJ: 0 --- !u!114 &414337187 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4723123646134104044, guid: 2ac9048583d0af747848ea5faaf1843a, @@ -27563,6 +27426,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 3200879299148678642, guid: c0c9c43b08a729e43a7c688e17705488, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -27717,30 +27585,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 429883066} m_PrefabAsset: {fileID: 0} ---- !u!1 &429883068 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 429883066} - m_PrefabAsset: {fileID: 0} ---- !u!114 &429883069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 429883068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 3200879299148678642, guid: c0c9c43b08a729e43a7c688e17705488, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 399960902} - isDragWRJ: 0 --- !u!1 &434690213 GameObject: m_ObjectHideFlags: 0 @@ -28836,18 +28680,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475725658} m_CullTransparentMesh: 0 ---- !u!114 &484948968 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 494574498} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &486115946 GameObject: m_ObjectHideFlags: 0 @@ -34027,6 +33859,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 9137682553976692200, guid: beb711881e9e6a549bf9dc946fe71827, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -34156,30 +33993,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 494574498} m_PrefabAsset: {fileID: 0} ---- !u!1 &494574500 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 494574498} - m_PrefabAsset: {fileID: 0} ---- !u!114 &494574501 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494574500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 9137682553976692200, guid: beb711881e9e6a549bf9dc946fe71827, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 484948968} - isDragWRJ: 0 --- !u!1 &497570270 GameObject: m_ObjectHideFlags: 0 @@ -34715,18 +34528,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &518481110 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1871088652} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &520308009 GameObject: m_ObjectHideFlags: 0 @@ -35059,18 +34860,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526064391} m_CullTransparentMesh: 0 ---- !u!114 &528357149 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2109716423} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &529703596 GameObject: m_ObjectHideFlags: 0 @@ -40609,6 +40398,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 3331668122385453770, guid: 83482cde95467cc4d96f31fade3abdda, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -47439,6 +47233,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 5346679626917615762, guid: 15a7bc353faf3804ca65fb20bdd2e7e8, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -47593,30 +47392,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 623145830} m_PrefabAsset: {fileID: 0} ---- !u!1 &623145832 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 623145830} - m_PrefabAsset: {fileID: 0} ---- !u!114 &623145833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623145832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 5346679626917615762, guid: 15a7bc353faf3804ca65fb20bdd2e7e8, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1962086801} - isDragWRJ: 0 --- !u!1 &628518900 GameObject: m_ObjectHideFlags: 0 @@ -48225,6 +48000,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 6061462163366925166, guid: 87a7af5a936e53e4c83701bce5b2fdc3, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -48339,7 +48119,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 666529160e4a7d34ba9644da5c066765, + objectReference: {fileID: 21300000, guid: ebb68320e827b534eb276594ecc0d464, type: 3} - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} @@ -48374,30 +48154,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 637859748} m_PrefabAsset: {fileID: 0} ---- !u!1 &637859750 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 637859748} - m_PrefabAsset: {fileID: 0} ---- !u!114 &637859751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 637859750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 1163328458188600851, guid: 35d31eeaa86d7934caa7405c95dd6570, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1785445477} - isDragWRJ: 0 --- !u!1 &638510549 GameObject: m_ObjectHideFlags: 0 @@ -49157,18 +48913,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 669150291} m_CullTransparentMesh: 0 ---- !u!114 &671608486 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 33894427} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &673469234 GameObject: m_ObjectHideFlags: 0 @@ -50234,6 +49978,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 4285294750562751955, guid: 7062575ac0eaf2b4abfbd87dad97d1a3, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -50363,30 +50112,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 746004240} m_PrefabAsset: {fileID: 0} ---- !u!1 &746004242 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 746004240} - m_PrefabAsset: {fileID: 0} ---- !u!114 &746004243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 746004242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 4285294750562751955, guid: 7062575ac0eaf2b4abfbd87dad97d1a3, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 797257392} - isDragWRJ: 0 --- !u!1 &747611921 GameObject: m_ObjectHideFlags: 0 @@ -51455,18 +51180,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 792642456} m_CullTransparentMesh: 0 ---- !u!114 &797257392 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 746004240} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &798099568 GameObject: m_ObjectHideFlags: 0 @@ -52286,18 +51999,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 810292159} m_CullTransparentMesh: 0 ---- !u!114 &814578930 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 356860784} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &816881667 GameObject: m_ObjectHideFlags: 0 @@ -52543,6 +52244,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 4285294750562751955, guid: 7062575ac0eaf2b4abfbd87dad97d1a3, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -52657,7 +52363,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e588de89e16d46b4eb9feab18a15207d, + objectReference: {fileID: 21300000, guid: 98f4aaec3dce2d64caaeac613c9813ea, type: 3} - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} @@ -52692,30 +52398,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 824395185} m_PrefabAsset: {fileID: 0} ---- !u!1 &824395187 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 824395185} - m_PrefabAsset: {fileID: 0} ---- !u!114 &824395188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 824395187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 5793210758962281504, guid: 60372504cb367de4a88ce16862cee73f, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 2145413666} - isDragWRJ: 0 --- !u!1 &829726019 GameObject: m_ObjectHideFlags: 0 @@ -54111,18 +53793,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 854547132} m_CullTransparentMesh: 0 ---- !u!114 &861820546 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 870149091} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &863258639 GameObject: m_ObjectHideFlags: 0 @@ -54508,6 +54178,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 1721159809252478914, guid: b9e35880c0836bb46adbe79fbc504c68, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -54662,30 +54337,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 870149091} m_PrefabAsset: {fileID: 0} ---- !u!1 &870149093 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 870149091} - m_PrefabAsset: {fileID: 0} ---- !u!114 &870149094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870149093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 1721159809252478914, guid: b9e35880c0836bb46adbe79fbc504c68, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 861820546} - isDragWRJ: 0 --- !u!1 &872854396 GameObject: m_ObjectHideFlags: 0 @@ -54849,18 +54500,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 ---- !u!114 &888901497 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1083855473} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &898725959 GameObject: m_ObjectHideFlags: 0 @@ -61865,18 +61504,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 980343040} m_CullTransparentMesh: 0 ---- !u!114 &981732799 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1745577169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &982837745 GameObject: m_ObjectHideFlags: 0 @@ -62059,6 +61686,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 4046616580009825335, guid: cb4359850bdc6a24787b8ae98a63056d, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -62213,30 +61845,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 983518125} m_PrefabAsset: {fileID: 0} ---- !u!1 &983518127 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 983518125} - m_PrefabAsset: {fileID: 0} ---- !u!114 &983518128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983518127} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 4046616580009825335, guid: cb4359850bdc6a24787b8ae98a63056d, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1427031791} - isDragWRJ: 0 --- !u!1 &984174849 GameObject: m_ObjectHideFlags: 0 @@ -62618,18 +62226,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &990861044 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1841385963} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &991841822 GameObject: m_ObjectHideFlags: 0 @@ -65487,6 +65083,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 7531427545832157203, guid: 61b63a7660f6b65449eab661dc9adbe4, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -65640,30 +65241,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1083855473} m_PrefabAsset: {fileID: 0} ---- !u!1 &1083855475 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1083855473} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1083855476 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083855475} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 7531427545832157203, guid: 61b63a7660f6b65449eab661dc9adbe4, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 888901497} - isDragWRJ: 0 --- !u!1 &1088122603 GameObject: m_ObjectHideFlags: 0 @@ -67871,6 +67448,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 5793210758962281504, guid: 60372504cb367de4a88ce16862cee73f, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -68000,30 +67582,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1163628839} m_PrefabAsset: {fileID: 0} ---- !u!1 &1163628841 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1163628839} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1163628842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163628841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 5793210758962281504, guid: 60372504cb367de4a88ce16862cee73f, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 338402445} - isDragWRJ: 0 --- !u!1 &1164343908 GameObject: m_ObjectHideFlags: 0 @@ -70689,6 +70247,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 8476122692440285401, guid: 9b2ca7d73f60a6944b1e8e937c318663, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -70818,30 +70381,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1262424829} m_PrefabAsset: {fileID: 0} ---- !u!1 &1262424831 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1262424829} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1262424832 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1262424831} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 8476122692440285401, guid: 9b2ca7d73f60a6944b1e8e937c318663, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1274262289} - isDragWRJ: 0 --- !u!1 &1264004773 GameObject: m_ObjectHideFlags: 0 @@ -71000,18 +70539,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1274262289 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1262424829} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1283012099 GameObject: m_ObjectHideFlags: 0 @@ -75235,18 +74762,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1425144269} m_CullTransparentMesh: 0 ---- !u!114 &1427031791 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 983518125} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1428982741 GameObject: m_ObjectHideFlags: 0 @@ -82269,6 +81784,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1764124070} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 4990122376453678954, guid: 81bb1e99ebc5c0d4c8f5429d6a7f513a, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -91027,6 +90547,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 7531427545832157203, guid: 61b63a7660f6b65449eab661dc9adbe4, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -93534,18 +93059,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726004475} m_CullTransparentMesh: 0 ---- !u!114 &1727538687 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 133886309} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1730451628 GameObject: m_ObjectHideFlags: 0 @@ -94112,6 +93625,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 8476122692440285401, guid: 9b2ca7d73f60a6944b1e8e937c318663, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -94241,30 +93759,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1745577169} m_PrefabAsset: {fileID: 0} ---- !u!1 &1745577171 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1745577169} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1745577172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1745577171} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 8476122692440285401, guid: 9b2ca7d73f60a6944b1e8e937c318663, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 981732799} - isDragWRJ: 0 --- !u!1 &1746513315 GameObject: m_ObjectHideFlags: 0 @@ -95894,18 +95388,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784195236} m_CullTransparentMesh: 0 ---- !u!114 &1785445477 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 637859748} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1786233538 GameObject: m_ObjectHideFlags: 0 @@ -97457,7 +96939,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 106722906 + randSeed: 118629656 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -98044,6 +97526,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 9137682553976692200, guid: beb711881e9e6a549bf9dc946fe71827, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -98173,30 +97660,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1841385963} m_PrefabAsset: {fileID: 0} ---- !u!1 &1841385965 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1841385963} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1841385966 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841385965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 9137682553976692200, guid: beb711881e9e6a549bf9dc946fe71827, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 990861044} - isDragWRJ: 0 --- !u!1 &1842386699 GameObject: m_ObjectHideFlags: 0 @@ -99539,6 +99002,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1823088601} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 1163328458188600851, guid: 35d31eeaa86d7934caa7405c95dd6570, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -99653,7 +99121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 98f4aaec3dce2d64caaeac613c9813ea, + objectReference: {fileID: 21300000, guid: 666529160e4a7d34ba9644da5c066765, type: 3} - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} @@ -99688,30 +99156,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1871088652} m_PrefabAsset: {fileID: 0} ---- !u!1 &1871088654 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1871088652} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1871088655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1871088654} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 4285294750562751955, guid: 7062575ac0eaf2b4abfbd87dad97d1a3, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 518481110} - isDragWRJ: 0 --- !u!1 &1872265826 GameObject: m_ObjectHideFlags: 0 @@ -100612,6 +100056,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 3440031206501345430, guid: 36d2563e91adb8d45a5d8902b6d4ddf4, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -100717,6 +100166,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 7504021917712410617, guid: 45f26f52bed0c2f48980e3679f72d225, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 418b142fd07a9b24aac8fbb549400cae, + type: 3} - target: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_Name @@ -101104,6 +100559,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 5661657103867419842, guid: 9ca0a5d47c1899c42b91af478ff59ea9, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -101258,30 +100718,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1916859549} m_PrefabAsset: {fileID: 0} ---- !u!1 &1916859551 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 1916859549} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1916859552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1916859551} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 5661657103867419842, guid: 9ca0a5d47c1899c42b91af478ff59ea9, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 51963442} - isDragWRJ: 0 --- !u!1 &1917482215 GameObject: m_ObjectHideFlags: 0 @@ -107273,18 +106709,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1961439221} m_CullTransparentMesh: 0 ---- !u!114 &1962086801 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 623145830} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1967363483 GameObject: m_ObjectHideFlags: 0 @@ -112592,18 +112016,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1979731588} m_CullTransparentMesh: 0 ---- !u!114 &1983171679 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2122321109} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1992427616 GameObject: m_ObjectHideFlags: 0 @@ -117775,18 +117187,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2013422404 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2107781178} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2016825594 PrefabInstance: m_ObjectHideFlags: 0 @@ -119104,18 +118504,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 ---- !u!114 &2049232190 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 44293338} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2050731132 GameObject: m_ObjectHideFlags: 0 @@ -120897,6 +120285,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1958044293} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 1163328458188600851, guid: 35d31eeaa86d7934caa7405c95dd6570, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -121026,30 +120419,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2107781178} m_PrefabAsset: {fileID: 0} ---- !u!1 &2107781180 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2107781178} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2107781181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107781180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 6061462163366925166, guid: 87a7af5a936e53e4c83701bce5b2fdc3, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 2013422404} - isDragWRJ: 0 --- !u!1 &2107838936 GameObject: m_ObjectHideFlags: 0 @@ -121176,6 +120545,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 6857164364381362615, guid: 1079ee476e621a14ba91e5d75b723671, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -121330,30 +120704,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2109716423} m_PrefabAsset: {fileID: 0} ---- !u!1 &2109716425 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2109716423} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2109716426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2109716425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 6857164364381362615, guid: 1079ee476e621a14ba91e5d75b723671, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 528357149} - isDragWRJ: 0 --- !u!1 &2112206140 GameObject: m_ObjectHideFlags: 0 @@ -121676,6 +121026,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2126916400} m_Modifications: + - target: {fileID: 150123911, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} + propertyPath: prefabItem + value: + objectReference: {fileID: 6553805073764058552, guid: 06e66389d2f28f041b13c81dd14db799, + type: 3} - target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3} propertyPath: m_LocalPosition.x @@ -121830,30 +121185,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2122321109} m_PrefabAsset: {fileID: 0} ---- !u!1 &2122321111 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7504021917712410623, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 2122321109} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2122321112 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2122321111} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabItem: {fileID: 6553805073764058552, guid: 06e66389d2f28f041b13c81dd14db799, - type: 3} - model: {fileID: 0} - huoPaoCtrls: [] - modelname_text: {fileID: 1983171679} - isDragWRJ: 0 --- !u!1 &2124640850 GameObject: m_ObjectHideFlags: 0 @@ -127619,18 +126950,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2144657141} m_CullTransparentMesh: 0 ---- !u!114 &2145413666 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225, - type: 3} - m_PrefabInstance: {fileID: 824395185} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &670992771508171345 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/Adam/DragController.cs b/Assets/Zion/Scripts/Adam/DragController.cs index 089a9a38..f7081b87 100644 --- a/Assets/Zion/Scripts/Adam/DragController.cs +++ b/Assets/Zion/Scripts/Adam/DragController.cs @@ -48,7 +48,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, { DragManager.Instance.AddObj(model);//把对应模型传入链表 //DragManager.Instance.Addobj1(model);// - //model.GetComponent().SetPos();//重新获取该模型的位置的值 + //model.GetComponent().SetPos();//重新获取该模型的位置的值 DragManager.Instance.Addtext(modelname_text.text);//把对应名字存入链表 } model = null;