diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index d53b87a86a..4e0e8e2cc3 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -5220,7 +5220,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: c81ca95974650fb49b275d939d597e0b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25164,7 +25164,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: dead159a67940b449867094ebe29fc80, type: 3} + m_Sprite: {fileID: 21300000, guid: 420ba5b69fd0b794187d1b616a94bc40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30110,7 +30110,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: d0aad546b2b231642ba8be3bfd6c423f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -39758,7 +39758,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: dead159a67940b449867094ebe29fc80, type: 3} + m_Sprite: {fileID: 21300000, guid: 420ba5b69fd0b794187d1b616a94bc40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55460,6 +55460,7 @@ GameObject: - component: {fileID: 224158546098438708} - component: {fileID: 222911817612100296} - component: {fileID: 114504882181167608} + - component: {fileID: 3023266485155400888} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -55484,7 +55485,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 56, y: 104} + m_SizeDelta: {x: 80, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222911817612100296 CanvasRenderer: @@ -55514,7 +55515,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: cd2caac5769614540a0a1c99a56fbbf1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55523,6 +55524,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &3023266485155400888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509409260145998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1510154920752530 GameObject: m_ObjectHideFlags: 0 @@ -326426,7 +326442,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 0} - m_SizeDelta: {x: 73, y: 36} + m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8776301246493184396 CanvasRenderer: @@ -326456,7 +326472,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 63513ef86981e1f4f8325ce3dea7c042, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -326572,6 +326588,7 @@ GameObject: - component: {fileID: 8773887651407534236} - component: {fileID: 8775275377859903094} - component: {fileID: 8883849428062076980} + - component: {fileID: 566082538995155102} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -326596,7 +326613,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 56, y: 104} + m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775275377859903094 CanvasRenderer: @@ -326626,7 +326643,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 3374e891d19cf2047846c68c8f918233, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -326635,6 +326652,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &566082538995155102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8852480829553467312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8852513480144206442 GameObject: m_ObjectHideFlags: 0 @@ -326646,6 +326678,7 @@ GameObject: - component: {fileID: 8773970828275836580} - component: {fileID: 8775311787537306746} - component: {fileID: 8884428044457829514} + - component: {fileID: 8803763105948935892} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -326670,7 +326703,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 56, y: 104} + m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775311787537306746 CanvasRenderer: @@ -326700,7 +326733,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 538f287146d7e7e45b44d50a4e5638ca, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -326709,6 +326742,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8803763105948935892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8852513480144206442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8852544476337787638 GameObject: m_ObjectHideFlags: 0 @@ -327109,7 +327157,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 0} - m_SizeDelta: {x: 73, y: 36} + m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775737872356532840 CanvasRenderer: @@ -327139,7 +327187,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 8e41e6714f942b841ba6da0e89553bd5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -327233,6 +327281,7 @@ GameObject: - component: {fileID: 8773833043905852742} - component: {fileID: 8775620895302940090} - component: {fileID: 8883482468753321610} + - component: {fileID: 8762386652599921117} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -327257,7 +327306,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 56, y: 104} + m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775620895302940090 CanvasRenderer: @@ -327287,7 +327336,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 3a8c6caf72d82b24dbdcea3b73e024e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -327296,6 +327345,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8762386652599921117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8852926111584287292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8852928038535112076 GameObject: m_ObjectHideFlags: 0 @@ -337565,6 +337629,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224359105046491170} m_Modifications: + - target: {fileID: 3228300391096871728, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Name + value: c_long_bansheng_lizishan + objectReference: {fileID: 0} - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} propertyPath: m_LocalPosition.x @@ -337670,11 +337739,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3228300391096871728, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Name - value: c_long_bansheng_lizishan - objectReference: {fileID: 0} - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} propertyPath: m_Bones.Array.data[0] @@ -337827,6 +337891,24 @@ PrefabInstance: objectReference: {fileID: 8944061103535072730} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} +--- !u!4 &8944061103535072704 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072706 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907929, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &9048018877149632059 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377568, guid: 4c8639a41d5af934d933d50f22d40218, @@ -337839,6 +337921,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632055 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &9048018877149632049 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218, @@ -337857,96 +337945,90 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072730 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072708 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072722 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &9048018877149632047 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632041 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632043 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!224 &1105523586087243496 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072726 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072720 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072716 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632037 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632033 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632035 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377592, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072718 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072716 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072720 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632037 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072726 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072724 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072730 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &9048018877149632039 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632043 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632035 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377592, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072712 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907923, guid: 4c8639a41d5af934d933d50f22d40218, @@ -337959,45 +338041,27 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072708 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072710 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632029 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, +--- !u!224 &1105523586087243496 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072704 stripped +--- !u!4 &8944061103535072722 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072706 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907929, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072764 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072724 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632055 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 555163a076..1a6f2aedfb 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3249,12 +3249,12 @@ PropertySmallIcon = { } EquipPositionIcon = { - [1] = "r_hero_zhuangbeiguanlikuang_02_zh", - [2] = "r_hero_zhuangbeiguanlikuang_03_zh", - [3] = "r_hero_zhuangbeiguanlikuang_05_zh", - [4] = "r_hero_zhuangbeiguanlikuang_04_zh", - [5] = "b_baowuxitong_hunbao_zh", - [6] = "b_baowuxitong_linbao_zh", + [1] = "team_partiocn03", + [2] = "team_partiocn04", + [3] = "team_partiocn01", + [4] = "team_partiocn06", + [5] = "team_partiocn02", + [6] = "team_partiocn05", [7] = "fx_yin_zh", [8] = "fx_yang_zh", }