diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 96c94311a..94c54c697 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -71,6 +71,5 @@ messageinfo 엄청 느린 버그 미션 - 가이드 -- 컨텐츠가 없어서 적용안된 미션 있음 - - 모두 받기 일일, 주간 초기화 확인 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 9ffbddc05..e27d30687 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -26703,6 +26703,155 @@ MonoBehaviour: m_EditorClassIdentifier: gos: - {fileID: 4340292384020512647} +--- !u!1 &2084698756835312986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7578492180160569488} + - component: {fileID: 6176726500446572350} + - component: {fileID: 5605677717839198310} + - component: {fileID: 4407952357517458484} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7578492180160569488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084698756835312986} + 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: 3797636194539414636} + 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 &6176726500446572350 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084698756835312986} + m_CullTransparentMesh: 1 +--- !u!114 &5605677717839198310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084698756835312986} + 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: "\uBAA8\uB450 \uBC1B\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: 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: 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: 0 + 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!114 &4407952357517458484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084698756835312986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 296 --- !u!1 &2088811925445685512 GameObject: m_ObjectHideFlags: 0 @@ -58455,6 +58604,7 @@ RectTransform: - {fileID: 8180201768747246641} - {fileID: 7176626439662055994} - {fileID: 7962533988007672671} + - {fileID: 3797636194539414636} m_Father: {fileID: 2975530085048663680} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -64247,6 +64397,152 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &5122418561299485160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3797636194539414636} + - component: {fileID: 9022658374015890787} + - component: {fileID: 1962529920486181599} + - component: {fileID: 6450555840220433570} + - component: {fileID: 5555344595476678263} + m_Layer: 5 + m_Name: btn_getall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3797636194539414636 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122418561299485160} + 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: 7578492180160569488} + m_Father: {fileID: 1065787735305380702} + 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: -494} + m_SizeDelta: {x: 200, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9022658374015890787 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122418561299485160} + m_CullTransparentMesh: 1 +--- !u!114 &1962529920486181599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122418561299485160} + 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: 0, g: 0, b: 0, 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_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 &6450555840220433570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122418561299485160} + 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: 1962529920486181599} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5743882714988958725} + m_TargetAssemblyTypeName: MissionUI, Assembly-CSharp + m_MethodName: OnClick_GetAll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &5555344595476678263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122418561299485160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5129814526763148536 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 83706974b..e6152975b 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -1154,6 +1154,23 @@ public partial class ServerData var condition = table_missionlist.Ins.Get_Data_orNull(group, _id); return Get_MissionLv(group, _id) == 0 && Get_MissionCount(group, _id) >= condition.l_MissionConditionCount; } + public bool Get_MissionReward(MissionListTableData data) + { + if (CanGet_Mission(data.n_MissionGroupId, data.n_MissionIndex)) + { + Add_Item(data.n_RewardValue, data.n_MissionIndex); + Add_MissionLv(data.n_MissionGroupId, data.n_MissionIndex); + Add_MissionCompletCount(data.n_MissionGroupId); + return true; + } + return false; + } + public void Get_MissionRewardAll(int group) + { + var lst = table_missionlist.Ins.Get_DataList(group); + for (int i = 0; i < lst.Count; i++) Get_MissionReward(lst[i]); + Get_MissionReward(table_missionlist.Ins.Get_CompleteData(group)); + } #endregion #region Common @@ -1195,7 +1212,7 @@ public partial class ServerData } public void Init_Month() { - Set_Common(eCommon.DOY_Month, ServerInfo.ServerTime.DayOfYear); + Set_Common(eCommon.DOY_Month, ServerInfo.ServerTime.Month); Init_ShopMonth(); } public int Get_Common(eCommon common, bool _realvalue = false) diff --git a/Assets/Script/UI/Mission/MissionCard.cs b/Assets/Script/UI/Mission/MissionCard.cs index 3bd00b393..803debb35 100644 --- a/Assets/Script/UI/Mission/MissionCard.cs +++ b/Assets/Script/UI/Mission/MissionCard.cs @@ -144,11 +144,8 @@ public class MissionCard : CardBase public virtual void OnClick_GetReward() { var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.CanGet_Mission(m_Data.n_MissionGroupId, m_Data.n_MissionIndex)) + if (sdata.Get_MissionReward(m_Data)) { - sdata.Add_Item(m_Data.n_RewardValue, m_Data.n_RewardCount); - sdata.Add_MissionLv(m_Data.n_MissionGroupId, m_Data.n_MissionIndex); - sdata.Add_MissionCompletCount(m_Data.n_MissionGroupId); NewGameUI.Ins.m_MissionUI.Set_UI(); Set_Complete(); } diff --git a/Assets/Script/UI/Mission/MissionUI.cs b/Assets/Script/UI/Mission/MissionUI.cs index 3ad57bfd7..bef6a0fff 100644 --- a/Assets/Script/UI/Mission/MissionUI.cs +++ b/Assets/Script/UI/Mission/MissionUI.cs @@ -29,6 +29,7 @@ public class MissionUI : uScrollViewMgr public void OnClick_GetAll() { - + ServerInfo.Ins.m_ServerData.Get_MissionRewardAll(m_Tab.Get_Index() + 1); + Set_UI(); } } \ No newline at end of file diff --git a/Assets/Script/Util/DataCheckMgr.cs b/Assets/Script/Util/DataCheckMgr.cs index c674665bd..3df3afc8c 100644 --- a/Assets/Script/Util/DataCheckMgr.cs +++ b/Assets/Script/Util/DataCheckMgr.cs @@ -133,7 +133,6 @@ public class SamplesCalendar { public static int Get_WeekOfYear(DateTime _dt) { - // Gets the Calendar instance associated with a CultureInfo. CultureInfo myCI = new CultureInfo("ko-KR"); Calendar myCal = myCI.Calendar;