diff --git a/Assets/ResWork/UI/Image/zTemp.meta b/Assets/ResWork/UI/Image/zTemp.meta new file mode 100644 index 000000000..d953f27a1 --- /dev/null +++ b/Assets/ResWork/UI/Image/zTemp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9998921f2c4811418b0cef638b589e6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 1.png b/Assets/ResWork/UI/Image/zTemp/menu icon 1.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 1.png rename to Assets/ResWork/UI/Image/zTemp/menu icon 1.png diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 1.png.meta b/Assets/ResWork/UI/Image/zTemp/menu icon 1.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 1.png.meta rename to Assets/ResWork/UI/Image/zTemp/menu icon 1.png.meta diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 2.png b/Assets/ResWork/UI/Image/zTemp/menu icon 2.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 2.png rename to Assets/ResWork/UI/Image/zTemp/menu icon 2.png diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 2.png.meta b/Assets/ResWork/UI/Image/zTemp/menu icon 2.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 2.png.meta rename to Assets/ResWork/UI/Image/zTemp/menu icon 2.png.meta diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 3.png b/Assets/ResWork/UI/Image/zTemp/menu icon 3.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 3.png rename to Assets/ResWork/UI/Image/zTemp/menu icon 3.png diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 3.png.meta b/Assets/ResWork/UI/Image/zTemp/menu icon 3.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 3.png.meta rename to Assets/ResWork/UI/Image/zTemp/menu icon 3.png.meta diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 4.png b/Assets/ResWork/UI/Image/zTemp/menu icon 4.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 4.png rename to Assets/ResWork/UI/Image/zTemp/menu icon 4.png diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 4.png.meta b/Assets/ResWork/UI/Image/zTemp/menu icon 4.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 4.png.meta rename to Assets/ResWork/UI/Image/zTemp/menu icon 4.png.meta diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 5.png b/Assets/ResWork/UI/Image/zTemp/menu icon 5.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 5.png rename to Assets/ResWork/UI/Image/zTemp/menu icon 5.png diff --git a/Assets/ResWork/UI/Image/Hero Management/menu icon 5.png.meta b/Assets/ResWork/UI/Image/zTemp/menu icon 5.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/menu icon 5.png.meta rename to Assets/ResWork/UI/Image/zTemp/menu icon 5.png.meta diff --git a/Assets/ResWork/UI/Image/Hero Management/weapon image.png b/Assets/ResWork/UI/Image/zTemp/weapon image.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/weapon image.png rename to Assets/ResWork/UI/Image/zTemp/weapon image.png diff --git a/Assets/ResWork/UI/Image/Hero Management/weapon image.png.meta b/Assets/ResWork/UI/Image/zTemp/weapon image.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/weapon image.png.meta rename to Assets/ResWork/UI/Image/zTemp/weapon image.png.meta diff --git a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoStatCard.prefab b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoStatCard.prefab index cad74fa44..39b87220a 100644 --- a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoStatCard.prefab +++ b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoStatCard.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 435.75, y: 30} + m_SizeDelta: {x: 521.65, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &-438987274890629475 MonoBehaviour: @@ -130,8 +130,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -255,8 +255,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b412eee5e3e07dc4a8ddd3a7e60f9a82, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -333,8 +333,7 @@ MonoBehaviour: m_text: 00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_CollectionCard.prefab b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_CollectionCard.prefab index 0c8cf9f54..06cc03ef0 100644 --- a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_CollectionCard.prefab +++ b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_CollectionCard.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -48.9, y: 8} - m_SizeDelta: {x: 31, y: 40} + m_AnchoredPosition: {x: -562.6, y: 165.4} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2495091097744711778 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9dc009584d77a048b0514af8bbf7b03, type: 3} + m_Sprite: {fileID: 21300000, guid: bffba89387886b949bc6587b7d2195ae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75,6 +75,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &962284838095425957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392993505917863244} + - component: {fileID: 3963323091596759846} + - component: {fileID: 5217005732147135543} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &392993505917863244 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962284838095425957} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7053821865273937612} + 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: 165, y: 0} + m_SizeDelta: {x: 120, y: 15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3963323091596759846 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962284838095425957} + m_CullTransparentMesh: 1 +--- !u!114 &5217005732147135543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962284838095425957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a4c7ce7d3b33b1349874f801b374a418, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1468483631459090262 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +184,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: 63.4, y: 9.3} + m_AnchoredPosition: {x: 171.4, y: 9.3} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7748470331826829342 @@ -143,8 +218,7 @@ MonoBehaviour: m_text: "\uC2A4\uD0EF 000" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -168,14 +242,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -210,6 +284,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1909531652273927377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7725529833306139677} + - component: {fileID: 4420497809057392720} + - component: {fileID: 8676424150017083167} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7725529833306139677 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909531652273927377} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7053821865273937612} + 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: -140.9, y: 0} + m_SizeDelta: {x: 120, y: 15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4420497809057392720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909531652273927377} + m_CullTransparentMesh: 1 +--- !u!114 &8676424150017083167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909531652273927377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a4c7ce7d3b33b1349874f801b374a418, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3178998947688810201 GameObject: m_ObjectHideFlags: 0 @@ -275,7 +424,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f4213f1679e640478b781d492e2283d, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a778e3dae498334589e8eb729d2990e, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -316,11 +465,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3870736129922180048} + m_Father: {fileID: 7602970419427123275} 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.000076293945, y: 0.000012397766} + m_AnchoredPosition: {x: -144.49998, y: 9.3} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6169112177617829720 @@ -361,8 +510,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -386,10 +535,10 @@ MonoBehaviour: m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: -5 + m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -445,7 +594,6 @@ GameObject: - component: {fileID: 1890783693246866740} - component: {fileID: 3871777950150495145} - component: {fileID: 5398888955945469020} - - component: {fileID: 3659975771831732748} m_Layer: 5 m_Name: PCInfoUI_CollectionCard m_TagString: Untagged @@ -474,7 +622,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 564.4, y: 250} + m_SizeDelta: {x: 599, y: 239} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3871777950150495145 MonoBehaviour: @@ -488,14 +636,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7955ec81a1d3f4c48b1c4c15f3d1067e, type: 3} m_Name: m_EditorClassIdentifier: - m_canvasGroup: {fileID: 3659975771831732748} m_Scroll: {fileID: 5398888955945469020} texts: - {fileID: 9010191918086728831} - {fileID: 8236965573256949005} - {fileID: 7183848384912568718} images: - - {fileID: 487408036233570989} + - {fileID: 335671085126589110} gos: - {fileID: 467474617955136873} --- !u!114 &5398888955945469020 @@ -513,94 +660,6 @@ MonoBehaviour: m_ScrollRect: {fileID: 0} m_Content: {fileID: 7968602867542475926} go_card: {fileID: 1253780947347394577, guid: 63099ced842b56f4e82f62678c45301c, type: 3} ---- !u!225 &3659975771831732748 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7336582814339228709} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &7443210056551486193 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3870736129922180048} - - component: {fileID: 3528783463237633897} - - component: {fileID: 487408036233570989} - m_Layer: 5 - m_Name: collection - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3870736129922180048 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443210056551486193} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7021825389546039299} - m_Father: {fileID: 7602970419427123275} - 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: -129.3, y: 9.3} - m_SizeDelta: {x: 157.36, y: 41} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3528783463237633897 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443210056551486193} - m_CullTransparentMesh: 1 ---- !u!114 &487408036233570989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443210056551486193} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 92cae85d17cf004489c522fb2511aab3, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7512269756469281138 GameObject: m_ObjectHideFlags: 0 @@ -610,8 +669,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7053821865273937612} - - component: {fileID: 8298480958198904816} - - component: {fileID: 1783840697634831187} m_Layer: 5 m_Name: top m_TagString: Untagged @@ -632,51 +689,15 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7502211495768668648} + - {fileID: 7725529833306139677} + - {fileID: 392993505917863244} m_Father: {fileID: 1890783693246866740} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -33.5} + m_AnchoredPosition: {x: 0, y: -36.9} m_SizeDelta: {x: 440, y: 48} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8298480958198904816 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7512269756469281138} - m_CullTransparentMesh: 1 ---- !u!114 &1783840697634831187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7512269756469281138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 27d815cb916e1544fb3418dab2c89f49, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7687587983115941987 GameObject: m_ObjectHideFlags: 0 @@ -705,14 +726,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3870736129922180048} + - {fileID: 7021825389546039299} - {fileID: 2129031587887908325} - {fileID: 4530388155552042133} m_Father: {fileID: 1890783693246866740} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: 15.5} m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7810116383072716659 @@ -790,8 +811,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -808,12 +829,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 30 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 @@ -823,8 +844,8 @@ MonoBehaviour: m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -844,7 +865,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -23.20848, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -883,7 +904,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -58.5, y: 3.4} + m_AnchoredPosition: {x: -37.8, y: -1.9} m_SizeDelta: {x: 0, y: 13.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &205231232741550161 diff --git a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_PCListCard.prefab b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_PCListCard.prefab index 7e3244ee9..f471c4e45 100644 --- a/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_PCListCard.prefab +++ b/Assets/ResWork/UIPrefabs/PC/PCInfo/PCInfoUI_PCListCard.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 5413383936966265220} - {fileID: 6114384300480651044} - {fileID: 2882286679358243565} - - {fileID: 5088447832860895682} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -55,87 +54,13 @@ MonoBehaviour: m_EditorClassIdentifier: images: - {fileID: 1765391959543931968} + - {fileID: 5765720303514990173} texts: - {fileID: 1834172833177179526} gos: - - {fileID: 1604959175147932502} + - {fileID: 0} - {fileID: 8407263630244458775} - {fileID: 8416760514361509726} ---- !u!1 &1604959175147932502 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5088447832860895682} - - component: {fileID: 2780230578029878149} - - component: {fileID: 6156903880742047136} - m_Layer: 5 - m_Name: select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5088447832860895682 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604959175147932502} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9149290901262283759} - 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2780230578029878149 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604959175147932502} - m_CullTransparentMesh: 1 ---- !u!114 &6156903880742047136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604959175147932502} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &3370087890631925572 GameObject: m_ObjectHideFlags: 0 @@ -243,10 +168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 9149290901262283759} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3039631351566974023 CanvasRenderer: @@ -276,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: b0873b8b172601d4ca0df501dca3afa8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -319,10 +244,10 @@ RectTransform: - {fileID: 5753756200945158616} m_Father: {fileID: 9149290901262283759} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 20} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 15} + m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8291890699385268835 CanvasRenderer: @@ -345,15 +270,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.019607844, g: 0.015686275, b: 0.039215688, a: 0.78431374} + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 2a328e6a4c5557546bf78786dcd1d497, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -437,8 +362,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -557,15 +482,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3921569, g: 0.3921569, b: 0.3921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 13e407b21..2364279cb 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -3457,8 +3457,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55, y: -30} - m_SizeDelta: {x: 110, y: 60} + m_AnchoredPosition: {x: 95, y: -30} + m_SizeDelta: {x: 190, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5810846165725464258 MonoBehaviour: @@ -3472,9 +3472,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: - m_TabType: 0 - BGImage_on: - BGImage_off: + m_TabType: 1 + BGImage_on: btn yellow + BGImage_off: btn white gos_onoff: [] gos_off: [] m_btn: {fileID: 2310682660049018433} @@ -12840,8 +12840,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 15.3, y: -0.0000063912025} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.0000063912025} + m_SizeDelta: {x: 0, y: 5} m_Pivot: {x: 0, y: 1} --- !u!114 &5522327300080818785 MonoBehaviour: @@ -12870,12 +12870,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 - m_Top: 0 + m_Top: 5 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 10 + m_Spacing: 15 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -30205,10 +30205,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7363841460709327273} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 104, y: 106} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1847124632611016286 CanvasRenderer: @@ -30238,8 +30238,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 75234398cb70d09489b8ae362e59bc57, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 3ea8fcbbe0fc3f94cbe3190c9098a48a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -55454,7 +55454,7 @@ RectTransform: - {fileID: 351039660577574170} - {fileID: 6402432877941551947} - {fileID: 178244858961045637} - - {fileID: 2547393748655425458} + - {fileID: 6460844286923185742} - {fileID: 7671102248493653917} m_Father: {fileID: 7404742651207184332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -55477,7 +55477,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PCInfoUI_Left: {fileID: 3451567074462517527} m_PCInfoUI_Center: {fileID: 4302487034699223143} - m_PCInfoUI_List: {fileID: 228029834813712974} + m_PCInfoUI_List: {fileID: 5456090881559315455} --- !u!114 &7241738141072676215 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57640,6 +57640,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 287 +--- !u!1 &3740931099163141630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3558022629743926982} + m_Layer: 5 + m_Name: WorkerList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3558022629743926982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3740931099163141630} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6460844286923185742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3742172581137630715 GameObject: m_ObjectHideFlags: 0 @@ -58263,7 +58298,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: -37.9} + m_AnchoredPosition: {x: 79, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5750831048060429562 @@ -58297,8 +58332,7 @@ MonoBehaviour: m_text: "\uAE30\uBCF8" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -58322,14 +58356,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -58817,62 +58851,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3804140565224852898 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2547393748655425458} - - component: {fileID: 228029834813712974} - m_Layer: 5 - m_Name: pclist - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2547393748655425458 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3804140565224852898} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4774267840282251133} - - {fileID: 1494326228607932238} - m_Father: {fileID: 8112082934472033055} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 960, y: 0} - m_SizeDelta: {x: -1920, y: -1080} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &228029834813712974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3804140565224852898} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c23b27b04088d024788c056e0e6c1372, type: 3} - m_Name: - m_EditorClassIdentifier: - m_scrollview: - - {fileID: 5809440808760501180} - m_content: [] - go_card: - - {fileID: 7336582814339228709, guid: f938817985797b04abc422ab4a071945, type: 3} - m_Tab: {fileID: 2395146225585624112} --- !u!1 &3806176020087435311 GameObject: m_ObjectHideFlags: 0 @@ -62129,15 +62107,15 @@ RectTransform: m_GameObject: {fileID: 4030323193154295677} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7363841460709327273} 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: 8.1} - m_SizeDelta: {x: 72, y: 67} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 45.3, y: 0} + m_SizeDelta: {x: 60, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &635474343554959316 CanvasRenderer: @@ -62160,14 +62138,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ded6bce31dad29d4a8038458704e53f9, type: 3} + m_Sprite: {fileID: 21300000, guid: aba72a6c135c75b45bd0f1d8b81c4651, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -71723,7 +71701,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1471302394527256632 RectTransform: m_ObjectHideFlags: 0 @@ -74409,7 +74387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1781722594843096213 RectTransform: m_ObjectHideFlags: 0 @@ -84450,17 +84428,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5592757685881129108} - 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, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7363841460709327273} - m_Father: {fileID: 2547393748655425458} + m_Father: {fileID: 6460844286923185742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -527.1992, y: 391.4004} + m_AnchoredPosition: {x: -625, y: -117.8} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2060610113032956309 @@ -84481,7 +84459,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 8 + m_Spacing: 14 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -86385,7 +86363,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 10 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -98921,6 +98899,41 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6635598609834888549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3415427979677609742} + m_Layer: 5 + m_Name: CostumeList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3415427979677609742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6635598609834888549} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6460844286923185742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6654041026865147712 GameObject: m_ObjectHideFlags: 0 @@ -106449,6 +106462,42 @@ MonoBehaviour: TextCol_off: {r: 1, g: 1, b: 1, a: 1} texts: - {fileID: 8258724293587633036} +--- !u!1 &7210880099755918103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6603281089830183606} + m_Layer: 5 + m_Name: CostumeCollection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6603281089830183606 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7210880099755918103} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1494326228607932238} + m_Father: {fileID: 6460844286923185742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7211752150187785495 GameObject: m_ObjectHideFlags: 0 @@ -117220,6 +117269,65 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &7930628889268428083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6460844286923185742} + - component: {fileID: 5456090881559315455} + m_Layer: 5 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6460844286923185742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7930628889268428083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4774267840282251133} + - {fileID: 3415427979677609742} + - {fileID: 3558022629743926982} + - {fileID: 6603281089830183606} + m_Father: {fileID: 8112082934472033055} + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5456090881559315455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7930628889268428083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c23b27b04088d024788c056e0e6c1372, type: 3} + m_Name: + m_EditorClassIdentifier: + m_scrollview: + - {fileID: 5809440808760501180} + m_content: [] + go_card: + - {fileID: 7336582814339228709, guid: f938817985797b04abc422ab4a071945, type: 3} + gos: [] + m_Tab: {fileID: 2395146225585624112} --- !u!1 &7941452666555329717 GameObject: m_ObjectHideFlags: 0 @@ -126608,18 +126716,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8564094185518630953} - 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, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7953772858867825205} - m_Father: {fileID: 2547393748655425458} + m_Father: {fileID: 6603281089830183606} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -282.19922, y: -16.590027} - m_SizeDelta: {x: 564.4, y: 618.85} + m_AnchoredPosition: {x: -322.55, y: 15.969993} + m_SizeDelta: {x: 616.78, y: 683.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1903587635836921722 CanvasRenderer: @@ -134796,8 +134904,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -676.3, y: -17.77} - m_SizeDelta: {x: -1484.25, y: -451.86} + m_AnchoredPosition: {x: -684.79, y: 14.59} + m_SizeDelta: {x: -1501.24, y: -387.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3234198900821740702 CanvasRenderer: diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs index 0874ec1e4..ac9fe1138 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs @@ -17,10 +17,10 @@ public class PCInfoUI_Center : UI3DModel var sdata = ServerInfo.Ins.m_ServerData; if (!DSUtil.CheckNull(SelectCard)) - SelectCard.gos[0].SetActive(false); + SelectCard.Set_Selected(false); SelectCard = choiceCard; - SelectCard.gos[0].SetActive(true); + SelectCard.Set_Selected(true); if (!firstInit) { diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_CollectionCard.cs b/Assets/Script/UI/PC/Info/PCInfoUI_CollectionCard.cs index d062fecb5..389b80a0f 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_CollectionCard.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_CollectionCard.cs @@ -1,13 +1,10 @@ using TMPro; using UnityEngine; -using UnityEngine.UI; public class PCInfoUI_CollectionCard : CardBase { - public CanvasGroup m_canvasGroup; public PCInfoUI_CollectionCard_Scroll m_Scroll; public TextMeshProUGUI[] texts; // 0 이름, 1 능력치, 2 수집효과 - public Image[] images; // 0 수집효과 public GameObject[] gos; // 0 잠금 public override void Set(T _base) @@ -22,24 +19,15 @@ public class PCInfoUI_CollectionCard : CardBase var obtaincount = Get_ObtainCostumeCount(data); if (obtaincount == data.list_CostumeID.Count) { // 모두 가지고 있음 - m_canvasGroup.alpha = 1f; gos[0].SetActive(false); - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite("button unlock"); - texts[2].color = new Color32(73, 41, 23, 255); } else if (obtaincount > 0) { // 일부 가지고 있음 - m_canvasGroup.alpha = 1f; gos[0].SetActive(true); - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite("button lock"); - texts[2].color = Color.white; } else { // 아무것도 없음 - m_canvasGroup.alpha = 0.5f; gos[0].SetActive(true); - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite("button lock"); - texts[2].color = Color.white; } } diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_List.cs b/Assets/Script/UI/PC/Info/PCInfoUI_List.cs index da9e7ff3d..9bc382301 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_List.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_List.cs @@ -1,14 +1,16 @@ using System.Collections.Generic; +using UnityEngine; public class PCInfoUI_List : uScrollViewArrMgr { + public GameObject[] gos; // 0 코스튬 1 짐꾼, 2 코스튬 도감 public TabUIBase m_Tab; List list_TabData = new List { - new TabUIData{ n_btnName = 338, btnImg_on = "costume button 1", btnImg_off = "costume button 1", }, - new TabUIData{ n_btnName = 339, btnImg_on = "costume button 2", btnImg_off = "costume button 2", }, - new TabUIData{ n_btnName = 340, btnImg_on = "costume button 3", btnImg_off = "costume button 3", }, + new TabUIData{ n_btnName = 338, btnImg_on = "menu icon 2", btnImg_off = "menu icon 2" }, + new TabUIData{ n_btnName = 339, btnImg_on = "menu icon 3", btnImg_off = "menu icon 3" }, + new TabUIData{ n_btnName = 340, btnImg_on = "menu icon 4", btnImg_off = "menu icon 4" }, }; public override void Set() diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_PCListCard.cs b/Assets/Script/UI/PC/Info/PCInfoUI_PCListCard.cs index 37b18c319..692d6c0aa 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_PCListCard.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_PCListCard.cs @@ -4,9 +4,9 @@ using UnityEngine.UI; public class PCInfoUI_PCListCard : CardBase { - public Image[] images; // 0 얼굴 + public Image[] images; // 0 얼굴, 1 bg public TextMeshProUGUI[] texts; // 0 상태 - public GameObject[] gos; // 0 선택, 1 미보유중, 2 상태 + public GameObject[] gos; // 0 null, 1 미보유중, 2 상태 ItemListTableData m_Data; @@ -18,10 +18,15 @@ public class PCInfoUI_PCListCard : CardBase images[0].sprite = m_Data.Get_IconSprite(); texts[0].text = Get_Status(sdata.Get_EqiupmentEquip(eItem.PCCostume)); - gos[0].SetActive(false); + Set_Selected(false); gos[1].SetActive(!sdata.IsObtainItem(Get_IntData())); } + public override void Set_Selected(bool active) + { + images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(active ? "slot 2" : "slot 1"); + } + string Get_Status(int equipid) { if (m_Data.n_ItemID == equipid)