diff --git a/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs b/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs new file mode 100644 index 0000000..5fd0e34 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs @@ -0,0 +1,57 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +//public class Union +//{ +// public int id; +// public string name; +// public string iconName; +// public string counts;//公会人数 +//} + +public class TradeDes : MonoBehaviour +{ + //公会属性 + public int id; + public string name; + public string cover; + public string counts;//公会人数 + public int level; + public string slogan; + public int leaderId; + public string leaderUserName; + public string createTime; + public string updateTime; + + //公会相关组件 + + + + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public void SetInfo(UnionDataInPage body) + { + id = body.Id; + name = body.Name; + cover = body.Cover; + level = body.Level; + slogan = body.Slogan; + leaderId = body.LeaderId; + leaderUserName = body.LeaderUserName; + createTime = body.CreateTime; + updateTime = body.UpdateTime; + } + +} diff --git a/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs.meta b/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs.meta new file mode 100644 index 0000000..74c5097 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Trade/TradeDes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc7efc56e13ba64448b1f58f0e5e1e3e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/Scripts/Trade/TradeUnion.cs b/TheStrongestSnail/Assets/Scripts/Trade/TradeUnion.cs index 42f5871..d28b2a5 100644 --- a/TheStrongestSnail/Assets/Scripts/Trade/TradeUnion.cs +++ b/TheStrongestSnail/Assets/Scripts/Trade/TradeUnion.cs @@ -29,6 +29,7 @@ public class TradeUnion : MonoBehaviour GameObject union = GameObject.Instantiate(gonghuiPrefab, content); union.name = "union_" + i; //这里动态挂载公会脚本 + union.AddComponent().SetInfo(unionPage.Data.DataList[i]); } } diff --git a/TheStrongestSnail/Assets/Scripts/Trade/UnionInfo.cs b/TheStrongestSnail/Assets/Scripts/Trade/UnionInfo.cs index 8dc6085..fea42d8 100644 --- a/TheStrongestSnail/Assets/Scripts/Trade/UnionInfo.cs +++ b/TheStrongestSnail/Assets/Scripts/Trade/UnionInfo.cs @@ -11,6 +11,7 @@ public class UnionInfo : MonoBehaviour GetData(); } + //获得数据 public async void GetData() { UnionDetail17 unionDetail = new UnionDetail17(); diff --git a/TheStrongestSnail/Assets/UIScene/TradeUnion_1.unity b/TheStrongestSnail/Assets/UIScene/TradeUnion_1.unity index 67db780..964f047 100644 --- a/TheStrongestSnail/Assets/UIScene/TradeUnion_1.unity +++ b/TheStrongestSnail/Assets/UIScene/TradeUnion_1.unity @@ -679,6 +679,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6454429162222203755, guid: 2f756025e3d87844698c7918a704b5f6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 6454429162222203755, guid: 2f756025e3d87844698c7918a704b5f6, type: 3} + propertyPath: m_AnchoredPosition.y + value: -993 + objectReference: {fileID: 0} - target: {fileID: 8474050971548587741, guid: 2f756025e3d87844698c7918a704b5f6, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/TheStrongestSnail/Assets/UIScene/gonghui.prefab b/TheStrongestSnail/Assets/UIScene/gonghui.prefab index c46df12..5c86a3f 100644 --- a/TheStrongestSnail/Assets/UIScene/gonghui.prefab +++ b/TheStrongestSnail/Assets/UIScene/gonghui.prefab @@ -787,7 +787,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 579ad7a3b78f0fa449217ab3d629bbca, type: 3} + m_Sprite: {fileID: 21300000, guid: 114f00c17b7f3694086199ba89d97649, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/TheStrongestSnail/Assets/UIScene/member.prefab b/TheStrongestSnail/Assets/UIScene/member.prefab index 3c53afd..163e62e 100644 --- a/TheStrongestSnail/Assets/UIScene/member.prefab +++ b/TheStrongestSnail/Assets/UIScene/member.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2389663773616998134} - component: {fileID: 2389663773616998135} m_Layer: 5 - m_Name: icon + m_Name: iconbg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,7 +29,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1545818697500520249} m_Father: {fileID: 2389663774981101044} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -66,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 114f00c17b7f3694086199ba89d97649, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -598,3 +599,79 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6310193063711684139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1545818697500520249} + - component: {fileID: 721142102059874286} + - component: {fileID: 4786301345165586917} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1545818697500520249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6310193063711684139} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2389663773616998128} + m_RootOrder: 0 + 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.6236, y: 0.0398} + m_SizeDelta: {x: 73.1032, y: 69.6832} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &721142102059874286 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6310193063711684139} + m_CullTransparentMesh: 1 +--- !u!114 &4786301345165586917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6310193063711684139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab index ca62fba..41a309f 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab @@ -109,7 +109,7 @@ RectTransform: m_Children: - {fileID: 8474050973043896859} - {fileID: 8474050971800345302} - - {fileID: 2136123719687544452} + - {fileID: 6454429162222203755} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -696,105 +696,105 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1001 &8474050971634087437 +--- !u!1001 &1909044154475152742 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 8474050971548587741} m_Modifications: - - target: {fileID: 7511134750381090952, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792268, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Name - value: backBtn + value: retrun_BTN objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_SizeDelta.x - value: 189.8119 + value: 175 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_SizeDelta.y - value: 183.3855 + value: 155 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchoredPosition.y - value: -978.08154 + value: -1006 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} ---- !u!224 &2136123719687544452 stripped + m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!224 &6454429162222203755 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - m_PrefabInstance: {fileID: 8474050971634087437} + m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 1909044154475152742} m_PrefabAsset: {fileID: 0} diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfox.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab similarity index 92% rename from TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfox.prefab rename to TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab index 4976666..3a99a5a 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfox.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab @@ -346,7 +346,7 @@ GameObject: - component: {fileID: 1001758454214478945} - component: {fileID: 1001758454214478946} m_Layer: 5 - m_Name: icon + m_Name: iconbg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -363,7 +363,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7664695430757997468} m_Father: {fileID: 1001758455310143990} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -400,7 +401,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 1eed766e927d21a47a79f94c15f21e0a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -461,7 +462,7 @@ GameObject: - component: {fileID: 7953962115897863522} - component: {fileID: 1001758454263862280} m_Layer: 5 - m_Name: GongHuiInfox + m_Name: GongHuiInfo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -483,7 +484,7 @@ RectTransform: - {fileID: 1001758454886756559} - {fileID: 1001758455310143990} - {fileID: 1001758454159458742} - - {fileID: 7339212916107911140} + - {fileID: 6615914812882144151} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1907,105 +1908,181 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &1001758454162700141 +--- !u!1 &2442719761139264772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7664695430757997468} + - component: {fileID: 2185180088976338741} + - component: {fileID: 308630741064117800} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7664695430757997468 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2442719761139264772} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001758454214478947} + m_RootOrder: 0 + 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: 1.2209, y: 0} + m_SizeDelta: {x: 162.6716, y: 161.8576} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2185180088976338741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2442719761139264772} + m_CullTransparentMesh: 1 +--- !u!114 &308630741064117800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2442719761139264772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &1746420096831585690 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1001758454263862281} m_Modifications: - - target: {fileID: 7511134750381090952, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792268, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Name - value: backBtn + value: retrun_BTN objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_SizeDelta.x - value: 178.5125 + value: 175 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_SizeDelta.y - value: 185.5972 + value: 155 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_AnchoredPosition.y - value: -769.72034 + value: -788 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} ---- !u!224 &7339212916107911140 stripped + m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!224 &6615914812882144151 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - m_PrefabInstance: {fileID: 1001758454162700141} + m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 1746420096831585690} m_PrefabAsset: {fileID: 0} diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfox.prefab.meta b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab.meta similarity index 100% rename from TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfox.prefab.meta rename to TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab.meta diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab index 451c2cc..61d1e8e 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab @@ -916,7 +916,7 @@ RectTransform: - {fileID: 559402392427747351} - {fileID: 559402393488431396} - {fileID: 559402392979992856} - - {fileID: 8070323820532115495} + - {fileID: 4482109788990016897} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1189,108 +1189,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} m_PrefabInstance: {fileID: 559402392071344133} m_PrefabAsset: {fileID: 0} ---- !u!1001 &559402392605294766 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 559402393922993361} - m_Modifications: - - target: {fileID: 7511134750381090952, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_Name - value: backBtn - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_SizeDelta.x - value: 185.6873 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_SizeDelta.y - value: 183.1673 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchoredPosition.x - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -975.14014 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} ---- !u!224 &8070323820532115495 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7511134750381090953, guid: 2439bd7fdf8568a4ab3e38d0fcf5212d, type: 3} - m_PrefabInstance: {fileID: 559402392605294766} - m_PrefabAsset: {fileID: 0} --- !u!1001 &559402392661485891 PrefabInstance: m_ObjectHideFlags: 0 @@ -2005,3 +1903,105 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} m_PrefabInstance: {fileID: 559402394171811082} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9070060190382373772 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 559402393922993361} + m_Modifications: + - target: {fileID: 4894555910357792268, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_Name + value: retrun_BTN + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_SizeDelta.x + value: 175 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_SizeDelta.y + value: 155 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -984 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!224 &4482109788990016897 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 9070060190382373772} + m_PrefabAsset: {fileID: 0}