From 7662a5b154989de9d4c2b0321b0242566ebf6b34 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sun, 7 Mar 2021 21:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=80=E8=83=BD=E6=96=87=E5=AD=97=E5=B7=A6?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EFFECT_Casting_LingShou_Shang.prefab | 26 ++-- .../Prefab/EFFECT_Casting_LingShou_Xia.prefab | 26 ++-- .../Prefabs/UI/Battle/BattlePanel.prefab | 147 ------------------ 3 files changed, 26 insertions(+), 173 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Shang.prefab b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Shang.prefab index 0e9471babe..5894346e18 100644 --- a/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Shang.prefab +++ b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Shang.prefab @@ -9475,7 +9475,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4451514801996031141} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1324879, y: 1.132488, z: 1.132488} m_Children: [] @@ -18963,8 +18963,8 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b3c217c7853e2e3428234165f7c93d2d, type: 2} - - {fileID: 2100000, guid: b3c217c7853e2e3428234165f7c93d2d, type: 2} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23802,7 +23802,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 11ab63f71b98a8440b98e136e067a125, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -28631,7 +28631,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4b8683ecf6ef97f4c91c89bf98bfef0d, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -28708,7 +28708,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4b8683ecf6ef97f4c91c89bf98bfef0d, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -28817,7 +28817,7 @@ Animator: m_GameObject: {fileID: 4451514803079460859} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 08be72e0ec0bfd64caaf1d101102d71c, type: 2} + m_Controller: {fileID: 0} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -33754,7 +33754,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 11ab63f71b98a8440b98e136e067a125, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -43370,8 +43370,8 @@ RectTransform: 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: -347, y: 705} - m_SizeDelta: {x: 512, y: 512} + m_AnchoredPosition: {x: -285, y: 705} + m_SizeDelta: {x: 484, y: 636} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4451514803643556222 CanvasRenderer: @@ -43394,14 +43394,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d98d1010e8612414294b004c8622ed17, type: 3} + m_Sprite: {fileID: 21300000, guid: 939310282ce1c2a4d9202a787f0f8407, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -43467,7 +43467,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4b8683ecf6ef97f4c91c89bf98bfef0d, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Xia.prefab b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Xia.prefab index 50328b7063..9f5b61254d 100644 --- a/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Xia.prefab +++ b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab/EFFECT_Casting_LingShou_Xia.prefab @@ -9580,7 +9580,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 669999011b0c75b43b9cf342c5a66ddf, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9649,7 +9649,7 @@ Animator: m_GameObject: {fileID: 2781097021677299815} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0209703db1f0f0f47aad27d900bd90f0, type: 2} + m_Controller: {fileID: 0} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -14515,7 +14515,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 669999011b0c75b43b9cf342c5a66ddf, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14592,7 +14592,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 83b237456cec8e349934b6b3fe629817, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24163,7 +24163,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 83b237456cec8e349934b6b3fe629817, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -33687,8 +33687,8 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b3c217c7853e2e3428234165f7c93d2d, type: 2} - - {fileID: 2100000, guid: b3c217c7853e2e3428234165f7c93d2d, type: 2} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -38544,7 +38544,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 83b237456cec8e349934b6b3fe629817, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -48150,8 +48150,8 @@ RectTransform: 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: 260, y: -653} - m_SizeDelta: {x: 512, y: 512} + m_AnchoredPosition: {x: 289, y: -653} + m_SizeDelta: {x: 484, y: 636} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2781097023052378978 CanvasRenderer: @@ -48174,14 +48174,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c040f8576ae750741b8d549cff5f8e44, type: 3} + m_Sprite: {fileID: 21300000, guid: 939310282ce1c2a4d9202a787f0f8407, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -48247,7 +48247,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 83b237456cec8e349934b6b3fe629817, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 07502dc22c..402da501f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -220668,77 +220668,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2781097021677299813, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097023052378972, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 351 - objectReference: {fileID: 0} - - target: {fileID: 2781097023052378972, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_SizeDelta.x - value: 484 - objectReference: {fileID: 0} - - target: {fileID: 2781097023052378972, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_SizeDelta.y - value: 636 - objectReference: {fileID: 0} - - target: {fileID: 2781097023052378979, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2781097023052378979, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 939310282ce1c2a4d9202a787f0f8407, - type: 3} - - target: {fileID: 2781097022381608995, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097022381608995, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097021935275669, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097022007885973, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097021621740481, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097023076519346, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097022240341448, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 2781097022581590669, guid: 9c72861411653334d98f12e4dbdf4ded, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c72861411653334d98f12e4dbdf4ded, type: 3} --- !u!224 &2781097022139180250 stripped @@ -220864,82 +220793,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 4451514801996031140, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4451514801996031140, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4451514801996031140, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4451514803643556220, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_SizeDelta.x - value: 484 - objectReference: {fileID: 0} - - target: {fileID: 4451514803643556220, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_SizeDelta.y - value: 636 - objectReference: {fileID: 0} - - target: {fileID: 4451514803079460861, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514802406442929, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514802406442929, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514803643556223, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4451514803643556223, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 939310282ce1c2a4d9202a787f0f8407, - type: 3} - - target: {fileID: 4451514803738894792, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514803305270654, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514802737877758, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514802950616901, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 4451514802947698563, guid: de916f6aab438ee4e811cad74ed73a7d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: de916f6aab438ee4e811cad74ed73a7d, type: 3} --- !u!224 &4451514803276425241 stripped