diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 9f99acebb4..8a7e7054e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -780,10 +780,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5759458907260581076} - - component: {fileID: 2268112297203187335} - component: {fileID: 3141451647582073682} - component: {fileID: 5600276639709997912} - component: {fileID: 5138165610675945150} + - component: {fileID: 1473550282977014420} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -811,19 +811,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2268112297203187335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2479383142512665533} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &3141451647582073682 CanvasRenderer: m_ObjectHideFlags: 0 @@ -893,6 +880,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &1473550282977014420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2479383142512665533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2658533052818541386 GameObject: m_ObjectHideFlags: 0 @@ -1498,7 +1497,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 CanvasRenderer: @@ -2920,7 +2919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8608652293910191374 RectTransform: m_ObjectHideFlags: 0 @@ -3538,10 +3537,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7679809175275777088} - - component: {fileID: 3698492846638881566} - component: {fileID: 4875746903694999264} - component: {fileID: 5725152609552433708} - component: {fileID: 860553753996015348} + - component: {fileID: 228282531681914892} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -3569,19 +3568,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3698492846638881566 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7941768748633467235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &4875746903694999264 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3651,6 +3637,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &228282531681914892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941768748633467235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7947261403598486277 GameObject: m_ObjectHideFlags: 0 @@ -4410,7 +4408,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3433503071718014541 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index b8f455d4b8..49931dadc3 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -409,10 +409,6 @@ function GetStarOrGodSoulLv(index,data) return data.star,index end -function SetOriScale() - -end - --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)