From 15331b4e90dfbd9b7db650327d0ffe0136f69ce5 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Thu, 16 Apr 2026 15:37:07 +0700 Subject: [PATCH 1/2] fix ui after merge --- .../Art/Models/models/players/形象/法师女/躯干/法师女.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab b/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab index 71594ace15..feb56d9906 100644 --- a/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab +++ b/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab @@ -5954,7 +5954,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5133661830825835001} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 472c24b873524423f95454131fd11da6, type: 3} m_Name: From c2c546fee0162d328ee6a4301018f56e1191de44 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Thu, 16 Apr 2026 15:40:43 +0700 Subject: [PATCH 2/2] fix mage model --- .../models/players/形象/法师女/躯干/法师女.prefab | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab b/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab index feb56d9906..008a909eaa 100644 --- a/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab +++ b/Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab @@ -4879,7 +4879,6 @@ GameObject: - component: {fileID: 6264607540402582859} - component: {fileID: 2789629435814780223} - component: {fileID: 4504844427513838873} - - component: {fileID: 5130781569853185460} m_Layer: 0 m_Name: "\u6CD5\u5E08\u5973" m_TagString: Untagged @@ -5947,19 +5946,6 @@ MonoBehaviour: - {fileID: 7400000, guid: 3e474cefdc0b2e648aec98c966f26991, type: 2} - {fileID: 7400000, guid: 37c12771675cd69499260a8cadf95621, type: 2} - {fileID: 7400000, guid: f343209405aa0f7469aeb6429b1fc5a5, type: 2} ---- !u!114 &5130781569853185460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5133661830825835001} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 472c24b873524423f95454131fd11da6, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedActionSO: {fileID: 11400000, guid: ccf54ff0e6d1e8542a9183e8defc97e4, type: 2} --- !u!1 &5156671091954275778 GameObject: m_ObjectHideFlags: 0