diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 66e44c2c5d..5fe3436c5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -756,8 +756,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 173527053000100168} - - {fileID: 8780209107040953725} + - {fileID: 5343771515146430534} + - {fileID: 4082789365057162291} m_Father: {fileID: 1553045991312230259} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4957,299 +4957,396 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1001 &2011506373053754990 +--- !u!1001 &544384475988264215 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 6126398177057970904} m_Modifications: - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -120 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalScale.x - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalScale.y - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - propertyPath: m_LocalScale.z - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 1838088278565218087, guid: e4e089a61b4a5474694de1035e1458d3, + - target: {fileID: 5595415956229975376, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_Name - value: UI_Effect_ShaiZi_Dan + value: EFFECT_UI_SHaiZi_DanZi objectReference: {fileID: 0} - - target: {fileID: 1838088278565218087, guid: e4e089a61b4a5474694de1035e1458d3, + - target: {fileID: 5595415956229975376, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e4e089a61b4a5474694de1035e1458d3, type: 3} ---- !u!224 &173527053000100168 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1838088278565218086, guid: e4e089a61b4a5474694de1035e1458d3, - type: 3} - m_PrefabInstance: {fileID: 2011506373053754990} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7199940856004549292 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6126398177057970904} - m_Modifications: - - target: {fileID: 1887788510764236752, guid: 5f528ad4fe1865e4e874f4f5a6472364, - type: 3} - propertyPath: m_Name - value: UI_Effect_ShaiZi_Shuang - objectReference: {fileID: 0} - - target: {fileID: 1887788510764236752, guid: 5f528ad4fe1865e4e874f4f5a6472364, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_SizeDelta.x value: 100 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_SizeDelta.y value: 100 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956364847898, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} - propertyPath: m_LocalScale.x - value: 2.5 + propertyPath: m_AnchoredPosition.x + value: -316.3 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956364847898, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} - propertyPath: m_LocalScale.y - value: 2.5 + propertyPath: m_AnchoredPosition.y + value: 17 objectReference: {fileID: 0} - - target: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956364847898, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} - propertyPath: m_LocalScale.z - value: 2.5 + propertyPath: m_SizeDelta.x + value: 181.9 objectReference: {fileID: 0} - - target: {fileID: 1887788512711656140, guid: 5f528ad4fe1865e4e874f4f5a6472364, + - target: {fileID: 5595415956364847898, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SizeDelta.y + value: 176.9 + objectReference: {fileID: 0} + - target: {fileID: 5595415955868589848, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 5595415955995832228, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 5595415956364847899, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a264d23a006cab0489fd3c2fd48f2345, + objectReference: {fileID: 21300000, guid: 6f3f2072fe08b294d86d5db6d3b3292d, type: 3} + - target: {fileID: 5595415956960844845, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 5595415957294094673, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 5595415957644503505, guid: 93c40dc03dccdd140bb4d45a204f0392, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f528ad4fe1865e4e874f4f5a6472364, type: 3} ---- !u!224 &8780209107040953725 stripped + m_SourcePrefab: {fileID: 100100000, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} +--- !u!224 &5343771515146430534 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 1887788510764236753, guid: 5f528ad4fe1865e4e874f4f5a6472364, + m_CorrespondingSourceObject: {fileID: 5595415956229975377, guid: 93c40dc03dccdd140bb4d45a204f0392, type: 3} - m_PrefabInstance: {fileID: 7199940856004549292} + m_PrefabInstance: {fileID: 544384475988264215} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2504707235299941082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6126398177057970904} + m_Modifications: + - target: {fileID: 1903468749090903784, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_Name + value: EFFECT_UI_SHaiZi_ShuangZi + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903784, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1903468749522138021, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -353.9 + objectReference: {fileID: 0} + - target: {fileID: 1903468749522138021, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1903468749522138021, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.x + value: 160.4 + objectReference: {fileID: 0} + - target: {fileID: 1903468749522138021, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.y + value: 155.9 + objectReference: {fileID: 0} + - target: {fileID: 1903468750760613500, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -104.89999 + objectReference: {fileID: 0} + - target: {fileID: 1903468750760613500, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 1903468750760613500, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.x + value: 160.4 + objectReference: {fileID: 0} + - target: {fileID: 1903468750760613500, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SizeDelta.y + value: 155.9 + objectReference: {fileID: 0} + - target: {fileID: 1903468749132005804, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1903468749479068577, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1903468749522138022, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 53b3c8e9bd46c2f44a4bdbf9a6def7df, + type: 3} + - target: {fileID: 1903468750320128959, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1903468750326884779, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1903468750760613501, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 53b3c8e9bd46c2f44a4bdbf9a6def7df, + type: 3} + - target: {fileID: 1903468750789867255, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1903468750966852658, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + propertyPath: m_SortingOrder + value: 420 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, type: 3} +--- !u!224 &4082789365057162291 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1903468749090903785, guid: 6f0bdc50b03b4cf4d85377c20f2205a8, + type: 3} + m_PrefabInstance: {fileID: 2504707235299941082} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 8084e95fb4..97b3dfb801 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -20,7 +20,7 @@ local bossNum=0 local isPlayMove=0 local targetBtn local costNum --每次摇骰子消耗道具数量 -local saiziImage={"i_c_touzi01","i_c_touzi02","i_c_touzi03","i_c_touzi04","i_c_touzi05","i_c_touzi06"} +local saiziImage={"x_xiaoyaoyou_saizi_01","x_xiaoyaoyou_saizi_02","x_xiaoyaoyou_saizi_03","x_xiaoyaoyou_saizi_04","x_xiaoyaoyou_saizi_05","x_xiaoyaoyou_saizi_06"} --初始化组件(用于子类重写) function this:InitComponent() @@ -72,8 +72,8 @@ function this:InitComponent() this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition - this.oneSaiZiEffect = Util.GetGameObject(self.gameObject, "saizi/UI_Effect_ShaiZi_Dan") - this.twoSaiZiEffect = Util.GetGameObject(self.gameObject, "saizi/UI_Effect_ShaiZi_Shuang") + this.oneSaiZiEffect=Util.GetGameObject(self.gameObject, "saizi/EFFECT_UI_SHaiZi_DanZi") + this.twoSaiZiEffect=Util.GetGameObject(self.gameObject, "saizi/EFFECT_UI_SHaiZi_ShuangZi") end @@ -84,7 +84,12 @@ function this:BindEvent() end) Util.AddClick(this.btnBack, function () - -- XiaoYaoManager.OpenMapList() + if isAutoRun then + MsgPanel.ShowTwo("退出后将停止自动游历,确定离开?", nil, function() + self:ClosePanel() + end) + return + end self:ClosePanel() end) --商店点击 @@ -118,6 +123,7 @@ function this:BindEvent() else isAuto=true end + XiaoYaoManager.isAutoYouli=isAuto this.toggle.gameObject:SetActive(isAuto) end) --开始游历 @@ -128,7 +134,7 @@ function this:BindEvent() end if curGridIndex>=#allGridData then MsgPanel.ShowTwo("已到达终点,是否重新云游!", nil, function() - XiaoYaoManager.OpenMapList() + self:ClosePanel() end) return end @@ -211,16 +217,15 @@ function this.PlaySaiziAnim(_data) coroutine.stop(priThread) priThread = nil end - priThread = coroutine.start(function() - coroutine.wait(1) + priThread = coroutine.start(function() Log("当前点数aaaa:".._data.pointes[1]) if #_data.pointes>1 then - Util.GetGameObject(this.twoSaiZiEffect, "GameObject/fx_ui_Effect_ShaiZi/gaizi_1/shaizi"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[1]]) - Util.GetGameObject(this.twoSaiZiEffect, "GameObject (1)/fx_ui_Effect_ShaiZi/gaizi_1/shaizi"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[2]]) + Util.GetGameObject(this.twoSaiZiEffect, "ShaiZi (1)/GameObject/shaizi_Zhong_Zuo"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[1]]) + Util.GetGameObject(this.twoSaiZiEffect, "ShaiZi (1)/GameObject/shaizi_Zhong_You"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[2]]) else - Util.GetGameObject(this.oneSaiZiEffect, "gaizi_1/shaizi"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[1]]) - end - coroutine.wait(1) + Util.GetGameObject(this.oneSaiZiEffect, "ShaiZi/GameObject/shaizi_Zhong"):GetComponent("Image").sprite=Util.LoadSprite(saiziImage[_data.pointes[1]]) + end + coroutine.wait(2) this.oneSaiZiEffect:SetActive(false) this.twoSaiZiEffect:SetActive(false) this.RunMap(_data) @@ -292,10 +297,8 @@ end --取消自动游历 function this.StopAuto() - isAuto=false isAutoRun=false this.youliTag:SetActive(false) - this.toggle.gameObject:SetActive(false) end --事件触发处理 function this.EventTrigger(_data) @@ -605,6 +608,8 @@ function this:OnShow() isAutoRun=false isPlayMove=0 this.startBtn:GetComponent("Button").enabled=true + isAuto=XiaoYaoManager.isAutoYouli + this.toggle.gameObject:SetActive(isAuto) end function this:OnSortingOrderChange()