diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_ConfirmClaimMedal.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_ConfirmClaimMedal.prefab index 36a9e7e7bf8..d1284ef1faa 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_ConfirmClaimMedal.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_ConfirmClaimMedal.prefab @@ -609,7 +609,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 7, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5683315733193577813 @@ -915,7 +915,7 @@ 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: 21.850098, y: -270.1} + m_AnchoredPosition: {x: 17.5, y: -270.1} m_SizeDelta: {x: 1832.5996, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1646672291282578978 @@ -1431,7 +1431,7 @@ PrefabInstance: - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} propertyPath: m_text - value: 6 + value: 456 objectReference: {fileID: 0} - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalEditorShowPanel.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalEditorShowPanel.prefab index aaf72498419..f5a042d16f7 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalEditorShowPanel.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalEditorShowPanel.prefab @@ -34,7 +34,7 @@ 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: 4.4000244, y: -144.66} + m_AnchoredPosition: {x: 5.5, y: -144.66} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4566814129478537014 @@ -927,7 +927,7 @@ 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: 6.440122, y: -144.66} + m_AnchoredPosition: {x: 5.5, y: -144.66} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4912568607868434133 @@ -1123,7 +1123,7 @@ 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: 4.7800293, y: -144.76001} + m_AnchoredPosition: {x: 5.5, y: -144.76001} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7749418213954407378 @@ -1455,7 +1455,7 @@ 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: 6.579956, y: -144.76001} + m_AnchoredPosition: {x: 5.5, y: -144.76001} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5961039004459130401 @@ -2213,7 +2213,7 @@ 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: 5.487049, y: -144.66} + m_AnchoredPosition: {x: 5.5, y: -144.66} m_SizeDelta: {x: 511.337, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4805200789249954514 @@ -4270,7 +4270,7 @@ 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: 3.52, y: -144.66} + m_AnchoredPosition: {x: 5.5, y: -144.66} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1338724744882119654 @@ -4390,7 +4390,7 @@ 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: 6.471074, y: -149.23073} + m_AnchoredPosition: {x: 5.5, y: -149.23073} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5337328141630473534 @@ -4640,7 +4640,7 @@ 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: 4.7386293, y: -144.76001} + m_AnchoredPosition: {x: 5.5, y: -144.76001} m_SizeDelta: {x: 539.5259, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7453255458917270450 @@ -7603,7 +7603,7 @@ 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: 8.280029, y: -144.76001} + m_AnchoredPosition: {x: 5.5, y: -144.76001} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2415339548586921255 @@ -7648,7 +7648,7 @@ 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: 3.3000488, y: -144.66} + m_AnchoredPosition: {x: 5.5, y: -144.66} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6394015949241292493 @@ -8134,7 +8134,7 @@ 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: 4.380005, y: -144.76001} + m_AnchoredPosition: {x: 5.5, y: -144.76001} m_SizeDelta: {x: 565.9167, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6500545721841421987 @@ -10735,7 +10735,7 @@ PrefabInstance: - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} propertyPath: m_text - value: 6 + value: 456 objectReference: {fileID: 0} - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalInfoPanel.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalInfoPanel.prefab index f29ac34210c..e9d51f52f7b 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalInfoPanel.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalInfoPanel.prefab @@ -1854,7 +1854,7 @@ 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: 23.91, y: -268.9} + m_AnchoredPosition: {x: 18.5, y: -266} m_SizeDelta: {x: 1832.5996, y: 100.9617} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4910249000193509593 @@ -2969,7 +2969,7 @@ PrefabInstance: - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} propertyPath: m_text - value: 7 + value: 456 objectReference: {fileID: 0} - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalMainPanel.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalMainPanel.prefab index 980c2586f76..c816f7d2d19 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalMainPanel.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_MedalMainPanel.prefab @@ -242,6 +242,7 @@ MonoBehaviour: isSort: 0 isAutoSetDrag: 1 isShowArrow: 0 + trailingPadding: 0 lines: 5 squareSpacing: 0 cell: {fileID: 771854015970651726} @@ -432,8 +433,8 @@ RectTransform: - {fileID: 2619673172453382426} - {fileID: 7523866472824678243} - {fileID: 311145005764116952} - - {fileID: 3743809118500990895} - {fileID: 8252037296133044386} + - {fileID: 3743809118500990895} m_Father: {fileID: 8661967514508633355} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1681,6 +1682,7 @@ MonoBehaviour: isSort: 0 isAutoSetDrag: 1 isShowArrow: 0 + trailingPadding: 0 lines: 1 squareSpacing: 0 cell: {fileID: 1513374307009456215} @@ -2532,7 +2534,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6672841818814315222} - 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: 0.18, y: 0.18, z: 0.18} m_ConstrainProportionsScale: 1 @@ -2542,7 +2544,7 @@ 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: 1.6374, y: -102.11} + m_AnchoredPosition: {x: 3.5750122, y: -102.109955} m_SizeDelta: {x: 997.2713, y: 127.5578} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6723688339272364669 @@ -4383,7 +4385,7 @@ PrefabInstance: - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} propertyPath: m_text - value: ' 969' + value: 456 objectReference: {fileID: 0} - target: {fileID: 5066722153560320920, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/PlayerInfo/UI_PlayerInfo.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/PlayerInfo/UI_PlayerInfo.prefab index b3ae8f60c71..ad711db84d0 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/PlayerInfo/UI_PlayerInfo.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/PlayerInfo/UI_PlayerInfo.prefab @@ -1280,7 +1280,7 @@ 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: 0, y: -144.71} + m_AnchoredPosition: {x: 5.5, y: -144.71} m_SizeDelta: {x: 122.533295, y: 42.32312} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1517601669076845744 @@ -2477,7 +2477,7 @@ 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: 0, y: -144.71} + m_AnchoredPosition: {x: 5.5, y: -144.71} m_SizeDelta: {x: 122.533295, y: 42.32312} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8103549037460714763 @@ -3593,7 +3593,7 @@ 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: 0, y: -144.71} + m_AnchoredPosition: {x: 5.5, y: -144.71} m_SizeDelta: {x: 122.533295, y: 42.32312} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4841463840654500189 @@ -4857,7 +4857,7 @@ 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: 0, y: -144.71} + m_AnchoredPosition: {x: 5.5, y: -144.71} m_SizeDelta: {x: 122.533295, y: 42.32312} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6515028388767705975 @@ -6195,7 +6195,7 @@ 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: 0, y: -144.71} + m_AnchoredPosition: {x: 5.5, y: -144.71} m_SizeDelta: {x: 122.533295, y: 42.32312} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7869122097032705085 @@ -6921,6 +6921,11 @@ PrefabInstance: propertyPath: m_Name value: UI_MoralePatchInfo_count objectReference: {fileID: 0} + - target: {fileID: 3946920614596666726, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4961159477550127955, guid: 6cf01a2c3bc636a42ab782408ae1c2d8, type: 3} propertyPath: m_Pivot.x