diff --git a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab index 0b74165..204feb0 100644 --- a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab @@ -2035,9 +2035,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5530246707204506897} 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: 178.1, y: -21.9} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 178.1, y: -32.7} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6022578978401553566 @@ -2547,6 +2547,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5177864385294466547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763705239131616835} + - component: {fileID: 5022032537542609500} + - component: {fileID: 4905561723868769738} + m_Layer: 5 + m_Name: t_msg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763705239131616835 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177864385294466547} + 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: 5530246707204506897} + 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: -25} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5022032537542609500 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177864385294466547} + m_CullTransparentMesh: 1 +--- !u!114 &4905561723868769738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177864385294466547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} + m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, 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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &5593461439686352843 GameObject: m_ObjectHideFlags: 0 @@ -2881,68 +3017,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5789515768441840515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 739552100766238278} - - component: {fileID: 3509510151619315405} - m_Layer: 5 - m_Name: layout - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &739552100766238278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5789515768441840515} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.37, y: 0.37, z: 0.37} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5530246707204506897} - 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: -125.5, y: -21.8} - m_SizeDelta: {x: 438, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3509510151619315405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5789515768441840515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, 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: 5 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &5854041132478836283 GameObject: m_ObjectHideFlags: 0 @@ -3051,7 +3125,7 @@ RectTransform: m_Children: - {fileID: 64910222073277776} - {fileID: 9131804605588429577} - - {fileID: 739552100766238278} + - {fileID: 3763705239131616835} m_Father: {fileID: 2885025788123905938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} @@ -3106,12 +3180,11 @@ MonoBehaviour: m_GameObject: {fileID: 6191102621354526968} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a41b461c17a1c344a48e15545b9bcb9, type: 3} + m_Script: {fileID: 11500000, guid: 529f9157a92578d4cad65a2ad6dfd66a, type: 3} m_Name: m_EditorClassIdentifier: - m_ScrollRect: {fileID: 0} - m_Content: {fileID: 5789515768441840515} - go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_msg: {fileID: 4905561723868769738} + t_rate: {fileID: 6103003607379031934} --- !u!1 &6277194819688644752 GameObject: m_ObjectHideFlags: 0 @@ -3935,7 +4008,7 @@ GameObject: - component: {fileID: 8802628057108190579} - component: {fileID: 1424041968535582925} - component: {fileID: 3200292659820316740} - - component: {fileID: 4071316716105856251} + - component: {fileID: 1077994391374812257} m_Layer: 5 m_Name: MainMission m_TagString: Untagged @@ -4003,7 +4076,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4071316716105856251 +--- !u!114 &1077994391374812257 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4012,12 +4085,13 @@ MonoBehaviour: m_GameObject: {fileID: 7332673993261995017} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 042c4c0e296acaa47b1ba921857a8eeb, type: 3} + m_Script: {fileID: 11500000, guid: 20c1b070134a6d246bc05b8f385d7cec, type: 3} m_Name: m_EditorClassIdentifier: m_ScrollRect: {fileID: 0} m_Content: {fileID: 5593461439686352843} go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_rate: {fileID: 9078872209456734} --- !u!1 &7384136686623961455 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs deleted file mode 100644 index 8b17836..0000000 --- a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs +++ /dev/null @@ -1,4 +0,0 @@ -public class PreviewUIPopup_MainMission : uScrollViewMgr -{ - -} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta deleted file mode 100644 index a06c5fd..0000000 --- a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_MainMission.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 042c4c0e296acaa47b1ba921857a8eeb \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs deleted file mode 100644 index f60d2c5..0000000 --- a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs +++ /dev/null @@ -1,4 +0,0 @@ -public class PreviewUIPopup_SubMission : uScrollViewMgr -{ - -} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta b/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta deleted file mode 100644 index fe0ef13..0000000 --- a/Assets/Scripts/UI/Popup/PreviewUI/PreviewUIPopup_SubMission.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1a41b461c17a1c344a48e15545b9bcb9 \ No newline at end of file