diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterInfoNode.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterInfoNode.prefab index 73bb94ae5a0..8b7750f48d5 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterInfoNode.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterInfoNode.prefab @@ -360,7 +360,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1882770446984706472 RectTransform: m_ObjectHideFlags: 0 @@ -733,6 +733,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2382304583187937761} - {fileID: 556980832170776992} - {fileID: 1382066568919958351} - {fileID: 1882770446984706472} @@ -740,8 +741,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: 382.8, y: -31.1} - m_SizeDelta: {x: 747, y: 40.2} + m_AnchoredPosition: {x: 379.2613, y: -98.77676} + m_SizeDelta: {x: 739.9226, y: 182.6308} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2659876671326924899 GameObject: @@ -1588,7 +1589,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1382066568919958351 RectTransform: m_ObjectHideFlags: 0 @@ -1794,8 +1795,7 @@ GameObject: m_Component: - component: {fileID: 7262276039563480368} - component: {fileID: 6404310105489706981} - - component: {fileID: 2850324180481835505} - - component: {fileID: 5556964378668479560} + - component: {fileID: 6677652734355844383} m_Layer: 5 m_Name: ScrollView_Info m_TagString: Untagged @@ -1831,7 +1831,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7855213359483551690} m_CullTransparentMesh: 1 ---- !u!114 &2850324180481835505 +--- !u!114 &6677652734355844383 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1840,7 +1840,7 @@ MonoBehaviour: m_GameObject: {fileID: 7855213359483551690} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Script: {fileID: 11500000, guid: 990bec45166081c4087bc378d32950f1, type: 3} m_Name: m_EditorClassIdentifier: m_Content: {fileID: 7955871375633697108} @@ -1854,39 +1854,154 @@ MonoBehaviour: m_Viewport: {fileID: 7735924259666052599} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &5556964378668479560 + defaultItemSize: {x: 0, y: 0} + itemTemplate: {fileID: 6588299102768441328} + layoutType: 1 + poolSize: 0 + pageSize: 50 +--- !u!1 &7926822633033361948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2382304583187937761} + - component: {fileID: 1731824800654069356} + - component: {fileID: 6073709390250172763} + m_Layer: 5 + m_Name: Text_BasicInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2382304583187937761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7926822633033361948} + 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: 7292223931992107680} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 369.96, y: 2.45} + m_SizeDelta: {x: 739.92, y: 169.68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1731824800654069356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7926822633033361948} + m_CullTransparentMesh: 1 +--- !u!114 &6073709390250172763 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7855213359483551690} + m_GameObject: {fileID: 7926822633033361948} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2afdea96f23d9c24daa7ca2362138277, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - firstArrow: {fileID: 0} - endArrow: {fileID: 0} - dir: 1 - isSort: 0 - isAutoSetDrag: 0 - isShowArrow: 0 - lines: 1 - squareSpacing: 0 - cell: {fileID: 7996715824118841776} - Spacing: {x: 0, y: 0} - row: 0 - col: 0 - paddingTop: 0 - paddingLeft: 0 + m_Material: {fileID: 0} + 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_text: "\u3010\u4F53\u91CD\u3011 49KG\t\t\u518D\u591A\u770B\u5C31\u4E0D\u793C\u8C8C\u4E86\n\u3010\u8EAB\u9AD8\u3011 + 162cm\t\t\u8FD8\u5728\u957F\u8EAB\u4F53\u7684\u9636\u6BB5" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2} + m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 27 + m_fontSizeBase: 27 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7996715824118841776 GameObject: m_ObjectHideFlags: 0 @@ -2016,7 +2131,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &556980832170776992 RectTransform: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterWordNode.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterWordNode.prefab index 398782e8735..e6f911b0651 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterWordNode.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/CharacterWordNode.prefab @@ -25,16 +25,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 619451894331342098} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Father: {fileID: 1394286221512716803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 46.299988, y: 0} + m_AnchoredPosition: {x: 42.350037, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &558913329433420337 @@ -120,6 +120,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5321684586709271835} + - component: {fileID: 8022592927513278125} m_Layer: 5 m_Name: Item m_TagString: Untagged @@ -140,12 +141,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1394286221512716803} - - {fileID: 6333426388861642674} - - {fileID: 7486905240336456022} - - {fileID: 4434627068555608991} - - {fileID: 1175887623709121755} - - {fileID: 6638189960974406809} - - {fileID: 6807295562481583095} - {fileID: 5329239512434049887} m_Father: {fileID: 95784124669840292} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -154,6 +149,32 @@ RectTransform: m_AnchoredPosition: {x: 397.89, y: -58.82} m_SizeDelta: {x: 777.9, y: 92.73} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8022592927513278125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256198277115943141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &2394836905601500457 GameObject: m_ObjectHideFlags: 0 @@ -180,12 +201,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2394836905601500457} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Father: {fileID: 1394286221512716803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -308,11 +329,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 5329239512434049887} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 385.00006, y: -63.995} - m_SizeDelta: {x: 770, y: 90.01} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: 770, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5976094727403450133 CanvasRenderer: m_ObjectHideFlags: 0 @@ -468,7 +489,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1394286221512716803 RectTransform: m_ObjectHideFlags: 0 @@ -480,11 +501,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6333426388861642674} + - {fileID: 4434627068555608991} + - {fileID: 1175887623709121755} + - {fileID: 6638189960974406809} + - {fileID: 6807295562481583095} m_Father: {fileID: 5321684586709271835} 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: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 770, y: 84} m_Pivot: {x: 0.5, y: 0.5} @@ -551,12 +577,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5734288464451860115} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Father: {fileID: 1394286221512716803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -686,12 +712,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6264697313800182922} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Father: {fileID: 6333426388861642674} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -747,8 +773,6 @@ GameObject: - component: {fileID: 5329239512434049887} - component: {fileID: 702326371596809283} - component: {fileID: 4928299448756614292} - - component: {fileID: 3853676069865485239} - - component: {fileID: 2735523656851675387} m_Layer: 5 m_Name: ImageTextBg m_TagString: Untagged @@ -771,9 +795,9 @@ RectTransform: - {fileID: 8214028697514548432} m_Father: {fileID: 5321684586709271835} 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, y: -48} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 770, y: 218} m_Pivot: {x: 0.5, y: 1} --- !u!222 &702326371596809283 @@ -814,46 +838,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3853676069865485239 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6818830487358741661} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &2735523656851675387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6818830487358741661} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 1 - m_ChildScaleHeight: 1 - m_ReverseArrangement: 0 --- !u!1 &7184778618754061337 GameObject: m_ObjectHideFlags: 0 @@ -869,7 +853,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3236778316216094961 RectTransform: m_ObjectHideFlags: 0 @@ -900,8 +884,7 @@ GameObject: m_Component: - component: {fileID: 1635005138777687677} - component: {fileID: 3494716233629193250} - - component: {fileID: 235847497256973239} - - component: {fileID: 6545867974794159105} + - component: {fileID: 5654180927137700799} m_Layer: 5 m_Name: ScrollView_Word m_TagString: Untagged @@ -937,7 +920,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282828310802075309} m_CullTransparentMesh: 1 ---- !u!114 &235847497256973239 +--- !u!114 &5654180927137700799 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -946,7 +929,7 @@ MonoBehaviour: m_GameObject: {fileID: 8282828310802075309} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Script: {fileID: 11500000, guid: 990bec45166081c4087bc378d32950f1, type: 3} m_Name: m_EditorClassIdentifier: m_Content: {fileID: 95784124669840292} @@ -960,39 +943,18 @@ MonoBehaviour: m_Viewport: {fileID: 5794459479434411538} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &6545867974794159105 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8282828310802075309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2afdea96f23d9c24daa7ca2362138277, type: 3} - m_Name: - m_EditorClassIdentifier: - firstArrow: {fileID: 0} - endArrow: {fileID: 0} - dir: 1 - isSort: 0 - isAutoSetDrag: 0 - isShowArrow: 0 - lines: 1 - squareSpacing: 0 - cell: {fileID: 0} - Spacing: {x: 0, y: 10} - row: 0 - col: 0 - paddingTop: 0 - paddingLeft: 0 + defaultItemSize: {x: 0, y: 0} + itemTemplate: {fileID: 5321684586709271835} + layoutType: 1 + poolSize: 0 + pageSize: 50 --- !u!1 &8390149537684680380 GameObject: m_ObjectHideFlags: 0 @@ -1108,16 +1070,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8774331151461010975} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Father: {fileID: 1394286221512716803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 46.299988, y: 0} + m_AnchoredPosition: {x: 42.350037, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6949980681993447996 @@ -1183,12 +1145,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8835760267689437966} - 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: [] - m_Father: {fileID: 5321684586709271835} + m_Children: + - {fileID: 7486905240336456022} + m_Father: {fileID: 1394286221512716803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorCharacter.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorCharacter.prefab index ab91a22c9a7..c9fed21e653 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorCharacter.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorCharacter.prefab @@ -4404,7 +4404,7 @@ PrefabInstance: - target: {fileID: 3507252859088250382, guid: 076a3bf35c6ad44408592a15327b08e5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5556964378668479560, guid: 076a3bf35c6ad44408592a15327b08e5, type: 3} @@ -4414,7 +4414,7 @@ PrefabInstance: - target: {fileID: 6726640701372164762, guid: 076a3bf35c6ad44408592a15327b08e5, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 360.01 objectReference: {fileID: 0} - target: {fileID: 6887453466868267321, guid: 076a3bf35c6ad44408592a15327b08e5, type: 3} @@ -4540,6 +4540,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3313699691512841623} m_Modifications: + - target: {fileID: 1394286221512716803, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1394286221512716803, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1394286221512716803, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1394286221512716803, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3236778316216094961, guid: 4041101a30f8ff448b9b611d0a2a4897, type: 3} propertyPath: m_Pivot.x @@ -4640,11 +4660,36 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4881888357556615226, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7184778618754061337, guid: 4041101a30f8ff448b9b611d0a2a4897, type: 3} propertyPath: m_Name value: CharacterWordNode objectReference: {fileID: 0} + - target: {fileID: 8214028697514548432, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_SizeDelta.x + value: 750 + objectReference: {fileID: 0} + - target: {fileID: 8214028697514548432, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8214028697514548432, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8835760267689437966, guid: 4041101a30f8ff448b9b611d0a2a4897, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/ProjectNLD/Assets/Config/Data/charactercfg_characterlikability.json b/ProjectNLD/Assets/Config/Data/charactercfg_characterlikability.json index 22d2f58b7db..c94819edcd6 100644 --- a/ProjectNLD/Assets/Config/Data/charactercfg_characterlikability.json +++ b/ProjectNLD/Assets/Config/Data/charactercfg_characterlikability.json @@ -21,8 +21,18 @@ "CriticalDamage": 0, "FavorRewardDesc": "", "RewardItems": [], - "ParagraphID": [], - "DialogueID": [] + "ParagraphID": [ + 1 + ], + "DialogueID": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7 + ] }, { "RoleID": 100001, @@ -69,9 +79,13 @@ "DamageToCarrier": 0, "CriticalRatio": 0, "CriticalDamage": 0, - "FavorRewardDesc": "", + "FavorRewardDesc": "角色档案基础人物经历", "RewardItems": [], - "ParagraphID": [], + "ParagraphID": [ + 2, + 3, + 4 + ], "DialogueID": [] }, { @@ -119,9 +133,11 @@ "DamageToCarrier": 0, "CriticalRatio": 0, "CriticalDamage": 0, - "FavorRewardDesc": "", + "FavorRewardDesc": "日常语音", "RewardItems": [], - "ParagraphID": [], + "ParagraphID": [ + 5 + ], "DialogueID": [] }, { @@ -169,7 +185,7 @@ "DamageToCarrier": 0, "CriticalRatio": 0, "CriticalDamage": 0, - "FavorRewardDesc": "", + "FavorRewardDesc": "新立绘", "RewardItems": [], "ParagraphID": [], "DialogueID": [] @@ -219,7 +235,7 @@ "DamageToCarrier": 0, "CriticalRatio": 0, "CriticalDamage": 0, - "FavorRewardDesc": "", + "FavorRewardDesc": "剩余战斗语音", "RewardItems": [], "ParagraphID": [], "DialogueID": [] @@ -269,7 +285,7 @@ "DamageToCarrier": 0, "CriticalRatio": 0, "CriticalDamage": 0, - "FavorRewardDesc": "", + "FavorRewardDesc": "特殊语音", "RewardItems": [], "ParagraphID": [], "DialogueID": [] diff --git a/ProjectNLD/Assets/Config/Data/charactercfg_characterpersonalfiles.json b/ProjectNLD/Assets/Config/Data/charactercfg_characterpersonalfiles.json index 6b1ddd88797..7fac1c1ae62 100644 --- a/ProjectNLD/Assets/Config/Data/charactercfg_characterpersonalfiles.json +++ b/ProjectNLD/Assets/Config/Data/charactercfg_characterpersonalfiles.json @@ -2,6 +2,26 @@ { "RoleID": 100001, "ParagraphID": 1, - "ParagraphText": "这是一段测试文本" + "ParagraphText": "【体重】 49KG \t 再多看就不礼貌了\n【身高】 162cm \t 还在长身体的阶段" + }, + { + "RoleID": 100001, + "ParagraphID": 2, + "ParagraphText": "这是一段个人经历1\n内容可能比较长\n大概有四行内容\n测试显示" + }, + { + "RoleID": 100001, + "ParagraphID": 3, + "ParagraphText": "这是一段个人经历2\n只有两行内容" + }, + { + "RoleID": 100001, + "ParagraphID": 4, + "ParagraphText": "这是一段个人经历3" + }, + { + "RoleID": 100001, + "ParagraphID": 5, + "ParagraphText": "这是一段个人经历4" } ] \ No newline at end of file