diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 5aebfec3e2..c9576316eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -569,7 +569,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 91101586839532884} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -16549,7 +16549,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2896651505083611022} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -17544,7 +17544,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3178064539840696329} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -17620,7 +17620,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3204979489964746494} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -31848,7 +31848,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4850747860161844653} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -43134,7 +43134,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7366899945837299405} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -61856,246 +61856,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 17.5 - objectReference: {fileID: 0} - - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -71.92 - objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 34.72 - objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -71.92 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 51.94 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -71.92 - objectReference: {fileID: 0} - - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 69.159996 - objectReference: {fileID: 0} - - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -71.92 - objectReference: {fileID: 0} - - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 86.38 - objectReference: {fileID: 0} - - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -71.92 - objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 111.6 - objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -61.92 - objectReference: {fileID: 0} - - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 149.32 - objectReference: {fileID: 0} - - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -60.92 - objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 191.54 - objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -60.92 - objectReference: {fileID: 0} - - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 233.76 - objectReference: {fileID: 0} - - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -60.92 - objectReference: {fileID: 0} - - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 275.97998 - objectReference: {fileID: 0} - - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -60.92 - objectReference: {fileID: 0} - - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 318.19998 - objectReference: {fileID: 0} - - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -60.92 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 369.91998 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -50.42 - objectReference: {fileID: 0} - target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -62116,26 +61876,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50.42 objectReference: {fileID: 0} - - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 492.36 - objectReference: {fileID: 0} - - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -50.42 - objectReference: {fileID: 0} - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -62156,25 +61896,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50.42 objectReference: {fileID: 0} - - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 614.7999 + value: 318.19998 objectReference: {fileID: 0} - - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y - value: -50.42 + value: -60.92 objectReference: {fileID: 0} - target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} @@ -62196,6 +61936,66 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50.42 objectReference: {fileID: 0} + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 733.58484 + objectReference: {fileID: 0} + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -44.71 + objectReference: {fileID: 0} + - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 805.4647 + objectReference: {fileID: 0} + - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -44.71 + objectReference: {fileID: 0} + - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 275.97998 + objectReference: {fileID: 0} + - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -60.92 + objectReference: {fileID: 0} - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -62216,22 +62016,262 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 733.58484 + value: 149.32 objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -60.92 + objectReference: {fileID: 0} + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 111.600006 + objectReference: {fileID: 0} + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -61.92 + objectReference: {fileID: 0} + - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 86.380005 + objectReference: {fileID: 0} + - target: {fileID: 1553126540119839273, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -71.92 + objectReference: {fileID: 0} + - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 17.5 + objectReference: {fileID: 0} + - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -71.92 + objectReference: {fileID: 0} + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 369.91998 + objectReference: {fileID: 0} + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50.42 + objectReference: {fileID: 0} + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 34.72 + objectReference: {fileID: 0} + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -71.92 + objectReference: {fileID: 0} + - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 69.16 + objectReference: {fileID: 0} + - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -71.92 + objectReference: {fileID: 0} + - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 233.76 + objectReference: {fileID: 0} + - target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -60.92 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 51.940002 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -71.92 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 191.54 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -60.92 + objectReference: {fileID: 0} + - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 614.7999 + objectReference: {fileID: 0} + - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50.42 + objectReference: {fileID: 0} + - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 492.36 + objectReference: {fileID: 0} + - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50.42 + objectReference: {fileID: 0} + - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 769.5248 + objectReference: {fileID: 0} + - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y value: -44.71 @@ -62256,26 +62296,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 769.5248 - objectReference: {fileID: 0} - - target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.71 - objectReference: {fileID: 0} - target: {fileID: 632629919765873551, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -62296,26 +62316,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 805.4647 - objectReference: {fileID: 0} - - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.71 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} --- !u!224 &1190898430827306704 stripped @@ -62441,11 +62441,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -62806,11 +62811,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -63521,11 +63521,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -63881,11 +63886,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -65311,11 +65321,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -66031,11 +66036,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -66396,11 +66396,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -66756,11 +66751,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -68181,11 +68181,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -68546,11 +68551,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -69621,11 +69621,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -70336,11 +70331,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua index f3be61bea4..19d5a9c90f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua @@ -206,9 +206,9 @@ function this.SetCardSingleData(o,monsterId, _pos) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") - bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[monsterconfig.Star]) + -- bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[monsterconfig.Star]) local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") - fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterconfig.Star]) + -- fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterconfig.Star]) -- local live=Util.GetGameObject(o,"Mask/Live") local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")