diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index d290548a9..9a380947f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index d6f9f7980..7996b39b4 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -9612,14 +9612,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6924126925575544377} - - component: {fileID: 429291837745490123} + - component: {fileID: 3726005999724488277} m_Layer: 5 - m_Name: AbilityResetUI + m_Name: ResetUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6924126925575544377 RectTransform: m_ObjectHideFlags: 0 @@ -9628,24 +9628,19 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 720635521282164590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 500} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 8161754918599975603} - - {fileID: 1075203365522398990} - - {fileID: 4752717301081698245} - - {fileID: 2247949419106341690} - - {fileID: 1920946220995240206} - - {fileID: 8669735483323832075} - m_Father: {fileID: 8440377234816627102} + - {fileID: 1400636347572059299} + m_Father: {fileID: 4768237605214567188} 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 &429291837745490123 +--- !u!114 &3726005999724488277 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9654,12 +9649,13 @@ MonoBehaviour: m_GameObject: {fileID: 720635521282164590} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c5f7f5a40743ad14abbbafcdc618c0b6, type: 3} + m_Script: {fileID: 11500000, guid: 817f73d93dfaf274090c223062795eeb, type: 3} m_Name: m_EditorClassIdentifier: - m_MoneyForm: {fileID: 952702923377758608} + go_child: {fileID: 6333596348837267538} texts: - - {fileID: 4936142808091995828} + - {fileID: 8748997110021851949} + moneyForm: {fileID: 952702923377758608} --- !u!1 &727752073796967905 GameObject: m_ObjectHideFlags: 0 @@ -13952,13 +13948,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6924126925575544377} + m_Children: + - {fileID: 8109729294108953605} + m_Father: {fileID: 1400636347572059299} 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: 0} - m_SizeDelta: {x: 428, y: 311} + m_SizeDelta: {x: 650, y: 360} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2987696841408393039 CanvasRenderer: @@ -13981,14 +13978,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.24705882, b: 0.34901962, 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: b0873b8b172601d4ca0df501dca3afa8, type: 3} + m_Sprite: {fileID: 21300000, guid: 3bbbab643ca140045be647f9a704144e, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -46928,6 +46925,139 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &2932922549070340696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8109729294108953605} + - component: {fileID: 5861552058698207771} + - component: {fileID: 1140326317131654373} + - component: {fileID: 8554410198120964167} + - component: {fileID: 1457431759872853592} + m_Layer: 5 + m_Name: btn_x + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8109729294108953605 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932922549070340696} + 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: 1075203365522398990} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -49, y: -48} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5861552058698207771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932922549070340696} + m_CullTransparentMesh: 1 +--- !u!114 &1140326317131654373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932922549070340696} + 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: 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: 2eac964d6f23e9b48a4973568a9dad68, 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!114 &8554410198120964167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932922549070340696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1140326317131654373} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1457431759872853592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932922549070340696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2941486212299968613 GameObject: m_ObjectHideFlags: 0 @@ -49121,7 +49251,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6924126925575544377} + m_Father: {fileID: 1400636347572059299} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -49210,7 +49340,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 429291837745490123} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp m_MethodName: OnClick_Back m_Mode: 1 @@ -53712,7 +53842,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: 0, y: -14.3} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3064636324753461129 @@ -53743,11 +53873,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button + m_text: "\uD655\uC778" 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: [] @@ -53771,8 +53900,8 @@ 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 @@ -60617,141 +60746,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3852166057044282242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1920946220995240206} - - component: {fileID: 1676998383793164628} - - component: {fileID: 4936142808091995828} - m_Layer: 0 - m_Name: type - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1920946220995240206 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3852166057044282242} - 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: 6924126925575544377} - 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: 106} - m_SizeDelta: {x: 400, y: 165} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1676998383793164628 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3852166057044282242} - m_CullTransparentMesh: 1 ---- !u!114 &4936142808091995828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3852166057044282242} - 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: "\uD55C\uC190\uBB34\uAE30" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4292194184 - m_fontColor: {r: 0.53333336, g: 0.6862745, b: 0.8352941, 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: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - 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_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 3 - 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 &3856123368221873206 GameObject: m_ObjectHideFlags: 0 @@ -64655,7 +64649,6 @@ RectTransform: - {fileID: 7827080476943083829} - {fileID: 4346660176993972464} - {fileID: 8773029152139749433} - - {fileID: 6924126925575544377} m_Father: {fileID: 7404742651207184332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -64678,7 +64671,6 @@ MonoBehaviour: m_PCAbilityUI_Left: {fileID: 2780550607098880995} m_PCAbilityUI_Scrollview: {fileID: 8281871353756345307} m_PCAbilityLvUpUI: {fileID: 4867133353202892117} - m_AbilityResetUI: {fileID: 429291837745490123} --- !u!114 &8281871353756345307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86337,6 +86329,7 @@ RectTransform: - {fileID: 8100369104258755438} - {fileID: 789809089060598572} - {fileID: 2798508324005988114} + - {fileID: 6924126925575544377} - {fileID: 7568023033280500970} - {fileID: 1950309627796175630} m_Father: {fileID: 5707331028172779298} @@ -96037,6 +96030,45 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6333596348837267538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1400636347572059299} + m_Layer: 5 + m_Name: child + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1400636347572059299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6333596348837267538} + 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: 8161754918599975603} + - {fileID: 1075203365522398990} + - {fileID: 8669735483323832075} + - {fileID: 2247949419106341690} + m_Father: {fileID: 6924126925575544377} + 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!1 &6343377747118078174 GameObject: m_ObjectHideFlags: 0 @@ -110159,11 +110191,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6924126925575544377} + m_Father: {fileID: 1400636347572059299} 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: 68} + m_AnchoredPosition: {x: 0, y: 60.8} m_SizeDelta: {x: 400, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6502575173436750641 @@ -110204,8 +110236,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4292194184 - m_fontColor: {r: 0.53333336, g: 0.6862745, b: 0.8352941, 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: @@ -110222,8 +110254,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -119220,12 +119252,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8844138880038719558} - m_Father: {fileID: 6924126925575544377} + - {fileID: 4752717301081698245} + m_Father: {fileID: 1400636347572059299} 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: -102} - m_SizeDelta: {x: 116, y: 56} + m_AnchoredPosition: {x: 0, y: -48.7} + m_SizeDelta: {x: 220, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8818153178373883152 CanvasRenderer: @@ -119255,7 +119288,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4df9a65b31e645c4dbcd601a240324a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -119309,8 +119342,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 429291837745490123} - m_TargetAssemblyTypeName: AbilityResetUI, Assembly-CSharp + - m_Target: {fileID: 3726005999724488277} + m_TargetAssemblyTypeName: ResetUI, Assembly-CSharp m_MethodName: OnClick_OK m_Mode: 1 m_Arguments: @@ -149194,13 +149227,32 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6924126925575544377} + m_TransformParent: {fileID: 2247949419106341690} m_Modifications: + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 55.4 + objectReference: {fileID: 0} - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Name value: MoneyForm objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Pivot.x @@ -149264,27 +149316,27 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 29.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 17.900002 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -149301,6 +149353,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 1016a328b..cfc3c7527 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -659,6 +659,20 @@ public partial class ServerData } } } + public bool CanInitAbility(eBattleType battleType) + { + var lst = table_abilityconfig.Ins.Get_DataList(battleType); + for (int i = 0; i < lst.Count; i++) + { + var key = Get_Key(lst[i].n_AbilityID); + if (Ability.ContainsKey(key)) + { + if (Ability[key] > 0) + return true; + } + } + return false; + } public int Get_AbilityLv(int id) { var key = Get_Key(id); diff --git a/Assets/Script/UI/Common/ResetUI.cs b/Assets/Script/UI/Common/ResetUI.cs new file mode 100644 index 000000000..29d9bfb95 --- /dev/null +++ b/Assets/Script/UI/Common/ResetUI.cs @@ -0,0 +1,39 @@ +using System; +using TMPro; +using UnityEngine; + +public class ResetUI : BackKeyAdd +{ + public static ResetUI Ins; + private void Start() { Ins = this; go_child.SetActive(false); } + + public GameObject go_child; + public TextMeshProUGUI[] texts; // 0 msg + public MoneyForm moneyForm; + + Action act_OK; + + public void Set(string msg, int needid, int needamount, Action ok) + { + base.Set(); + go_child.SetActive(true); + + act_OK = ok; + + texts[0].text = msg; + moneyForm.icon.sprite = UIAtlasMgr.Ins.Get_Sprite(needid); + moneyForm.amount.text = NumberFormatter.FormatNumber(needamount); + } + + public void OnClick_OK() + { + OnClick_Back(); + act_OK(); + } + + public override void OnClick_Back() + { + go_child.SetActive(false); + Del_BackKey(); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/PC/Ability/AbilityResetUI.cs.meta b/Assets/Script/UI/Common/ResetUI.cs.meta similarity index 83% rename from Assets/Script/UI/PC/Ability/AbilityResetUI.cs.meta rename to Assets/Script/UI/Common/ResetUI.cs.meta index f290a6e11..826b55fc6 100644 --- a/Assets/Script/UI/PC/Ability/AbilityResetUI.cs.meta +++ b/Assets/Script/UI/Common/ResetUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5f7f5a40743ad14abbbafcdc618c0b6 +guid: 817f73d93dfaf274090c223062795eeb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/UI/PC/Ability/AbilityResetUI.cs b/Assets/Script/UI/PC/Ability/AbilityResetUI.cs deleted file mode 100644 index 1f771528a..000000000 --- a/Assets/Script/UI/PC/Ability/AbilityResetUI.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using TMPro; - -public class AbilityResetUI : BackKeyAdd -{ - public MoneyForm m_MoneyForm; - public TextMeshProUGUI[] texts; // 0 타입 - - Action act_OK; - - public void Set(eBattleType battleType, Action ok) - { - base.Set(); - - act_OK = ok; - - texts[0].text = battleType.ToString(); - m_MoneyForm.amount.text = "100"; - } - - public void OnClick_OK() - { - OnClick_Back(); - act_OK(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/PC/Ability/PCAbilityUI.cs b/Assets/Script/UI/PC/Ability/PCAbilityUI.cs index d6a2b3706..9f05132d5 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityUI.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityUI.cs @@ -9,7 +9,6 @@ public class PCAbilityUI : PCUIMenu public PCAbilityUI_Left m_PCAbilityUI_Left; public PCAbilityUI_Scrollview m_PCAbilityUI_Scrollview; public PCAbilityLvUpUI m_PCAbilityLvUpUI; - public AbilityResetUI m_AbilityResetUI; eBattleType CurType = eBattleType.Shield; @@ -34,10 +33,10 @@ public class PCAbilityUI : PCUIMenu public void OnClick_Reset() { - m_AbilityResetUI.Set(CurType, () => + ResetUI.Ins.Set(table_localtext.Ins.Get_Text(237) , 1, 100, () => { var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Check_ItemAmount(1, 100)) + if (sdata.CanInitAbility(CurType) && sdata.Check_ItemAmount(1, 100)) { ServerInfo.Ins.Save_PC_AbilityInit(CurType, () => {