diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 418ac0a8f..62b38400f 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -68,7 +68,9 @@ messageinfo 엄청 느린 버그 몬스터 웨이브 - 맵 최적화 - - 점수 (기본 1점만 주는 중) - - 특정 오브젝트와 상호 작용 시 즉시 몬스터 생성 - 몬스터 패트롤 거리 조절 - - 결과 (점수 주고 점수가 일정 이상이면 보상 지급) + - 점수와 골드 (기본 1점, 10골드만 주는 중(밸런스 필요)) + - 특정 오브젝트와 상호 작용 시 즉시 몬스터 생성 + - 점수 일정 이상 보상 지급 + +최초 한 번 랭킹 등록이 안됨 \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/WaveRewardList.json b/Assets/ResWork/Table/Export/WaveRewardList.json index fd0497327..1d32342ae 100644 --- a/Assets/ResWork/Table/Export/WaveRewardList.json +++ b/Assets/ResWork/Table/Export/WaveRewardList.json @@ -1 +1 @@ -[{"n_Difficult": "난이도", "n_Score": "필요 점수", "n_RewardID": "달성 보상 ID", "n_RewardAmount": "달성 보상 수량"}, {"n_Difficult": "1", "n_Score": "50", "n_RewardID": "1", "n_RewardAmount": "1"}, {"n_Difficult": "1", "n_Score": "100", "n_RewardID": "1", "n_RewardAmount": "2"}, {"n_Difficult": "1", "n_Score": "150", "n_RewardID": "1", "n_RewardAmount": "3"}, {"n_Difficult": "1", "n_Score": "200", "n_RewardID": "1", "n_RewardAmount": "4"}, {"n_Difficult": "1", "n_Score": "250", "n_RewardID": "1", "n_RewardAmount": "5"}, {"n_Difficult": "1", "n_Score": "300", "n_RewardID": "1", "n_RewardAmount": "6"}, {"n_Difficult": "2", "n_Score": "350", "n_RewardID": "1", "n_RewardAmount": "7"}, {"n_Difficult": "2", "n_Score": "400", "n_RewardID": "1", "n_RewardAmount": "8"}, {"n_Difficult": "2", "n_Score": "450", "n_RewardID": "1", "n_RewardAmount": "9"}, {"n_Difficult": "2", "n_Score": "500", "n_RewardID": "1", "n_RewardAmount": "10"}, {"n_Difficult": "2", "n_Score": "550", "n_RewardID": "1", "n_RewardAmount": "11"}, {"n_Difficult": "2", "n_Score": "600", "n_RewardID": "1", "n_RewardAmount": "12"}, {"n_Difficult": "3", "n_Score": "650", "n_RewardID": "1", "n_RewardAmount": "13"}, {"n_Difficult": "3", "n_Score": "700", "n_RewardID": "1", "n_RewardAmount": "14"}, {"n_Difficult": "3", "n_Score": "750", "n_RewardID": "1", "n_RewardAmount": "15"}, {"n_Difficult": "3", "n_Score": "800", "n_RewardID": "1", "n_RewardAmount": "16"}, {"n_Difficult": "3", "n_Score": "850", "n_RewardID": "1", "n_RewardAmount": "17"}, {"n_Difficult": "3", "n_Score": "900", "n_RewardID": "1", "n_RewardAmount": "18"}, {"n_Difficult": "3", "n_Score": "950", "n_RewardID": "1", "n_RewardAmount": "19"}, {"n_Difficult": "3", "n_Score": "1000", "n_RewardID": "1", "n_RewardAmount": "20"}, {"n_Difficult": "4", "n_Score": "1050", "n_RewardID": "1", "n_RewardAmount": "21"}, {"n_Difficult": "4", "n_Score": "1100", "n_RewardID": "1", "n_RewardAmount": "22"}, {"n_Difficult": "4", "n_Score": "1150", "n_RewardID": "1", "n_RewardAmount": "23"}, {"n_Difficult": "4", "n_Score": "1200", "n_RewardID": "1", "n_RewardAmount": "24"}, {"n_Difficult": "4", "n_Score": "1250", "n_RewardID": "1", "n_RewardAmount": "25"}, {"n_Difficult": "4", "n_Score": "1300", "n_RewardID": "1", "n_RewardAmount": "26"}, {"n_Difficult": "4", "n_Score": "1350", "n_RewardID": "1", "n_RewardAmount": "27"}, {"n_Difficult": "5", "n_Score": "1400", "n_RewardID": "1", "n_RewardAmount": "28"}, {"n_Difficult": "5", "n_Score": "1450", "n_RewardID": "1", "n_RewardAmount": "29"}, {"n_Difficult": "5", "n_Score": "1500", "n_RewardID": "1", "n_RewardAmount": "30"}, {"n_Difficult": "5", "n_Score": "1550", "n_RewardID": "1", "n_RewardAmount": "31"}, {"n_Difficult": "5", "n_Score": "1600", "n_RewardID": "1", "n_RewardAmount": "32"}, {"n_Difficult": "5", "n_Score": "1650", "n_RewardID": "1", "n_RewardAmount": "33"}, {"n_Difficult": "5", "n_Score": "1700", "n_RewardID": "1", "n_RewardAmount": "34"}, {"n_Difficult": "6", "n_Score": "1750", "n_RewardID": "1", "n_RewardAmount": "35"}, {"n_Difficult": "6", "n_Score": "1800", "n_RewardID": "1", "n_RewardAmount": "36"}, {"n_Difficult": "6", "n_Score": "1850", "n_RewardID": "1", "n_RewardAmount": "37"}, {"n_Difficult": "6", "n_Score": "1900", "n_RewardID": "1", "n_RewardAmount": "38"}, {"n_Difficult": "6", "n_Score": "1950", "n_RewardID": "1", "n_RewardAmount": "39"}, {"n_Difficult": "6", "n_Score": "2000", "n_RewardID": "1", "n_RewardAmount": "40"}, {"n_Difficult": "6", "n_Score": "2050", "n_RewardID": "1", "n_RewardAmount": "41"}, {"n_Difficult": "6", "n_Score": "2100", "n_RewardID": "1", "n_RewardAmount": "42"}] \ No newline at end of file +[{"n_Index": "보상획득순서", "n_Difficult": "난이도", "n_Score": "필요 점수", "n_RewardID": "달성 보상 ID", "n_RewardAmount": "달성 보상 수량"}, {"n_Index": "1", "n_Difficult": "1", "n_Score": "50", "n_RewardID": "1", "n_RewardAmount": "1"}, {"n_Index": "2", "n_Difficult": "1", "n_Score": "100", "n_RewardID": "1", "n_RewardAmount": "2"}, {"n_Index": "3", "n_Difficult": "1", "n_Score": "150", "n_RewardID": "1", "n_RewardAmount": "3"}, {"n_Index": "4", "n_Difficult": "1", "n_Score": "200", "n_RewardID": "1", "n_RewardAmount": "4"}, {"n_Index": "5", "n_Difficult": "1", "n_Score": "250", "n_RewardID": "1", "n_RewardAmount": "5"}, {"n_Index": "6", "n_Difficult": "1", "n_Score": "300", "n_RewardID": "1", "n_RewardAmount": "6"}, {"n_Index": "7", "n_Difficult": "2", "n_Score": "350", "n_RewardID": "1", "n_RewardAmount": "7"}, {"n_Index": "8", "n_Difficult": "2", "n_Score": "400", "n_RewardID": "1", "n_RewardAmount": "8"}, {"n_Index": "9", "n_Difficult": "2", "n_Score": "450", "n_RewardID": "1", "n_RewardAmount": "9"}, {"n_Index": "10", "n_Difficult": "2", "n_Score": "500", "n_RewardID": "1", "n_RewardAmount": "10"}, {"n_Index": "11", "n_Difficult": "2", "n_Score": "550", "n_RewardID": "1", "n_RewardAmount": "11"}, {"n_Index": "12", "n_Difficult": "2", "n_Score": "600", "n_RewardID": "1", "n_RewardAmount": "12"}, {"n_Index": "13", "n_Difficult": "3", "n_Score": "650", "n_RewardID": "1", "n_RewardAmount": "13"}, {"n_Index": "14", "n_Difficult": "3", "n_Score": "700", "n_RewardID": "1", "n_RewardAmount": "14"}, {"n_Index": "15", "n_Difficult": "3", "n_Score": "750", "n_RewardID": "1", "n_RewardAmount": "15"}, {"n_Index": "16", "n_Difficult": "3", "n_Score": "800", "n_RewardID": "1", "n_RewardAmount": "16"}, {"n_Index": "17", "n_Difficult": "3", "n_Score": "850", "n_RewardID": "1", "n_RewardAmount": "17"}, {"n_Index": "18", "n_Difficult": "3", "n_Score": "900", "n_RewardID": "1", "n_RewardAmount": "18"}, {"n_Index": "19", "n_Difficult": "3", "n_Score": "950", "n_RewardID": "1", "n_RewardAmount": "19"}, {"n_Index": "20", "n_Difficult": "3", "n_Score": "1000", "n_RewardID": "1", "n_RewardAmount": "20"}, {"n_Index": "21", "n_Difficult": "4", "n_Score": "1050", "n_RewardID": "1", "n_RewardAmount": "21"}, {"n_Index": "22", "n_Difficult": "4", "n_Score": "1100", "n_RewardID": "1", "n_RewardAmount": "22"}, {"n_Index": "23", "n_Difficult": "4", "n_Score": "1150", "n_RewardID": "1", "n_RewardAmount": "23"}, {"n_Index": "24", "n_Difficult": "4", "n_Score": "1200", "n_RewardID": "1", "n_RewardAmount": "24"}, {"n_Index": "25", "n_Difficult": "4", "n_Score": "1250", "n_RewardID": "1", "n_RewardAmount": "25"}, {"n_Index": "26", "n_Difficult": "4", "n_Score": "1300", "n_RewardID": "1", "n_RewardAmount": "26"}, {"n_Index": "27", "n_Difficult": "4", "n_Score": "1350", "n_RewardID": "1", "n_RewardAmount": "27"}, {"n_Index": "28", "n_Difficult": "5", "n_Score": "1400", "n_RewardID": "1", "n_RewardAmount": "28"}, {"n_Index": "29", "n_Difficult": "5", "n_Score": "1450", "n_RewardID": "1", "n_RewardAmount": "29"}, {"n_Index": "30", "n_Difficult": "5", "n_Score": "1500", "n_RewardID": "1", "n_RewardAmount": "30"}, {"n_Index": "31", "n_Difficult": "5", "n_Score": "1550", "n_RewardID": "1", "n_RewardAmount": "31"}, {"n_Index": "32", "n_Difficult": "5", "n_Score": "1600", "n_RewardID": "1", "n_RewardAmount": "32"}, {"n_Index": "33", "n_Difficult": "5", "n_Score": "1650", "n_RewardID": "1", "n_RewardAmount": "33"}, {"n_Index": "34", "n_Difficult": "5", "n_Score": "1700", "n_RewardID": "1", "n_RewardAmount": "34"}, {"n_Index": "35", "n_Difficult": "6", "n_Score": "1750", "n_RewardID": "1", "n_RewardAmount": "35"}, {"n_Index": "36", "n_Difficult": "6", "n_Score": "1800", "n_RewardID": "1", "n_RewardAmount": "36"}, {"n_Index": "37", "n_Difficult": "6", "n_Score": "1850", "n_RewardID": "1", "n_RewardAmount": "37"}, {"n_Index": "38", "n_Difficult": "6", "n_Score": "1900", "n_RewardID": "1", "n_RewardAmount": "38"}, {"n_Index": "39", "n_Difficult": "6", "n_Score": "1950", "n_RewardID": "1", "n_RewardAmount": "39"}, {"n_Index": "40", "n_Difficult": "6", "n_Score": "2000", "n_RewardID": "1", "n_RewardAmount": "40"}, {"n_Index": "41", "n_Difficult": "6", "n_Score": "2050", "n_RewardID": "1", "n_RewardAmount": "41"}, {"n_Index": "42", "n_Difficult": "6", "n_Score": "2100", "n_RewardID": "1", "n_RewardAmount": "42"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 814c99016..5bde88604 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Dungeon/WaveRewardCard.cs b/Assets/ResWork/UIPrefabs/Dungeon/WaveRewardCard.cs index 9852ee0bb..edd9d5495 100644 --- a/Assets/ResWork/UIPrefabs/Dungeon/WaveRewardCard.cs +++ b/Assets/ResWork/UIPrefabs/Dungeon/WaveRewardCard.cs @@ -15,9 +15,15 @@ public class WaveRewardCard : CardBase base.Set(_base); m_Data = _base as WaveRewardListTableData; var sdata = ServerInfo.Ins.m_ServerData; + var rewardindex = sdata.Get_DungeonValue(eDungeon.d4_Wave, 3); texts[0].text = m_Data.n_Score.ToString(); - slider_score.value = (float)sdata.Get_DungeonValue(eDungeon.d4_Wave, 1) / m_Data.n_Score; + if (rewardindex > m_Data.n_Index) + slider_score.value = 1f; + else if (rewardindex + 1 == m_Data.n_Index) + slider_score.value = (float)sdata.Get_DungeonValue(eDungeon.d4_Wave, 2) / m_Data.n_Score; + else + slider_score.value = 0f; RewardData.itemid = m_Data.n_RewardID; RewardData.amount = m_Data.n_RewardAmount; rewardCard.Set(RewardData); diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 35dc0a2d1..ee44254b7 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -2016,8 +2016,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5601256889859448277} - m_TargetAssemblyTypeName: MapChoiceUI_Dungeon, Assembly-CSharp + - m_Target: {fileID: 2526252935473026452} + m_TargetAssemblyTypeName: MapChoiceUI_DungeonBase, Assembly-CSharp m_MethodName: OnClick_Ranking m_Mode: 1 m_Arguments: @@ -6670,6 +6670,155 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &654831556351062065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3125190343729378211} + - component: {fileID: 9203895378424212779} + - component: {fileID: 5230685977138472692} + - component: {fileID: 7428427384922195557} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3125190343729378211 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654831556351062065} + 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: 5539316130783275871} + 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 &9203895378424212779 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654831556351062065} + m_CullTransparentMesh: 1 +--- !u!114 &5230685977138472692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654831556351062065} + 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: "\uC989\uC2DC \uC774\uB3D9" + 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: 50 + m_fontSizeBase: 50 + 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 &7428427384922195557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654831556351062065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 320 --- !u!1 &682272053263058069 GameObject: m_ObjectHideFlags: 0 @@ -7763,6 +7912,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9114737150787530329} + - component: {fileID: 2220263757621558073} m_Layer: 5 m_Name: Mimic m_TagString: Untagged @@ -7783,6 +7933,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2819497699184699550} + - {fileID: 1530509777072174400} m_Father: {fileID: 3456383120591884671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -7790,6 +7941,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2220263757621558073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762969654386943866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26e9d31732fd2a34e8bf0fafadcca586, type: 3} + m_Name: + m_EditorClassIdentifier: + SelectMapID: 1001 + m_ArrowUI: {fileID: 550472041806731591} --- !u!1 &777278367519131233 GameObject: m_ObjectHideFlags: 0 @@ -25351,13 +25516,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2217829848941847260} - 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: 6846762435921063468} - m_Father: {fileID: 3456383120591884671} + m_Father: {fileID: 9114737150787530329} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -25446,8 +25611,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5601256889859448277} - m_TargetAssemblyTypeName: MapChoiceUI_Dungeon, Assembly-CSharp + - m_Target: {fileID: 2220263757621558073} + m_TargetAssemblyTypeName: MapChoiceUI_Dungeon_Mimic, Assembly-CSharp m_MethodName: OnClick_GoDungeon m_Mode: 1 m_Arguments: @@ -28915,7 +29080,8 @@ 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: 3321074507536080752} m_Father: {fileID: 3981901099563870773} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} @@ -29005,8 +29171,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5601256889859448277} - m_TargetAssemblyTypeName: MapChoiceUI_Dungeon, Assembly-CSharp + - m_Target: {fileID: 2794429696635918067} + m_TargetAssemblyTypeName: MapChoiceUI_Dungeon_Wave, Assembly-CSharp m_MethodName: OnClick_WaveReward m_Mode: 1 m_Arguments: @@ -41053,6 +41219,152 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3422035159398306501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1947557100849348790} + - component: {fileID: 1495867777602246902} + - component: {fileID: 6461894170155370225} + - component: {fileID: 6601267993499709742} + - component: {fileID: 7547542080275935904} + m_Layer: 5 + m_Name: btn_go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1947557100849348790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422035159398306501} + 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: 5959704843110144766} + m_Father: {fileID: 3981901099563870773} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 127} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1495867777602246902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422035159398306501} + m_CullTransparentMesh: 1 +--- !u!114 &6461894170155370225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422035159398306501} + 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.9960785, g: 0.7411765, b: 0.2509804, 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 &6601267993499709742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422035159398306501} + 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: 6461894170155370225} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2794429696635918067} + m_TargetAssemblyTypeName: MapChoiceUI_Dungeon_Wave, Assembly-CSharp + m_MethodName: OnClick_GoDungeon + 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 &7547542080275935904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422035159398306501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3425753977039102381 GameObject: m_ObjectHideFlags: 0 @@ -43806,6 +44118,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1359527207984642862} + - component: {fileID: 5455599452416665173} m_Layer: 5 m_Name: Maze m_TagString: Untagged @@ -43828,6 +44141,7 @@ RectTransform: - {fileID: 1919780657983490151} - {fileID: 7641658770371297334} - {fileID: 5405983417966001397} + - {fileID: 8093299387608807993} m_Father: {fileID: 3456383120591884671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -43835,6 +44149,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5455599452416665173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3742785345755231042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a146ffcbbaf5464f87ba1df0c734888, type: 3} + m_Name: + m_EditorClassIdentifier: + SelectMapID: 1002 + texts_maze: + - {fileID: 2206291501861922666} + - {fileID: 6092863833640395447} --- !u!1 &3751178671897854767 GameObject: m_ObjectHideFlags: 0 @@ -46717,7 +47047,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 8047385068592147203} m_TargetAssemblyTypeName: DungeonResultBase, Assembly-CSharp m_MethodName: OnClick_Back m_Mode: 1 @@ -46741,6 +47071,155 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3953702340625544544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5959704843110144766} + - component: {fileID: 6890949631030725132} + - component: {fileID: 721758810614843} + - component: {fileID: 4784780880544429302} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5959704843110144766 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3953702340625544544} + 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: 1947557100849348790} + 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 &6890949631030725132 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3953702340625544544} + m_CullTransparentMesh: 1 +--- !u!114 &721758810614843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3953702340625544544} + 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: "\uC989\uC2DC \uC774\uB3D9" + 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: 50 + m_fontSizeBase: 50 + 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 &4784780880544429302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3953702340625544544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 320 --- !u!1 &3964303375285263472 GameObject: m_ObjectHideFlags: 0 @@ -58456,8 +58935,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5601256889859448277} - m_TargetAssemblyTypeName: MapChoiceUI_Dungeon, Assembly-CSharp + - m_Target: {fileID: 5455599452416665173} + m_TargetAssemblyTypeName: MapChoiceUI_DungeonBase, Assembly-CSharp m_MethodName: OnClick_Ranking m_Mode: 1 m_Arguments: @@ -61883,7 +62362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5366708532861094367 RectTransform: m_ObjectHideFlags: 0 @@ -61922,22 +62401,13 @@ MonoBehaviour: m_Content: {fileID: 0} go_card: {fileID: 6812196077140225535, guid: addb3980a64d43045be5386b3f735ac3, type: 3} MoneyForm_Ticket: {fileID: 833754818585651238} - gos: - - {fileID: 762969654386943866} - - {fileID: 3742785345755231042} - - {fileID: 6941203715344707434} - - {fileID: 7362506375805396958} + DungeonInfos: + - {fileID: 2220263757621558073} + - {fileID: 5455599452416665173} + - {fileID: 2526252935473026452} + - {fileID: 2794429696635918067} texts: - {fileID: 1134907645997091294} - m_ArrowUI: {fileID: 550472041806731591} - texts_maze: - - {fileID: 2206291501861922666} - - {fileID: 6092863833640395447} - tab_NightmareDiff: {fileID: 4245379008130289418} - texts_wave: - - {fileID: 5401675138850796186} - - {fileID: 3945758652106317450} - m_WaveRewardUI: {fileID: 7647748021735860847} --- !u!1 &5415595708530692618 GameObject: m_ObjectHideFlags: 0 @@ -62781,6 +63251,155 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &5468279678303216785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4474125993314627876} + - component: {fileID: 2104873901065390130} + - component: {fileID: 3828710278927293735} + - component: {fileID: 3954000695579053983} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4474125993314627876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468279678303216785} + 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: 8093299387608807993} + 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 &2104873901065390130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468279678303216785} + m_CullTransparentMesh: 1 +--- !u!114 &3828710278927293735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468279678303216785} + 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: "\uC989\uC2DC \uC774\uB3D9" + 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: 50 + m_fontSizeBase: 50 + 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 &3954000695579053983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468279678303216785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 320 --- !u!1 &5478308799325891379 GameObject: m_ObjectHideFlags: 0 @@ -67800,6 +68419,152 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5934531968484519467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5539316130783275871} + - component: {fileID: 3364996656528061482} + - component: {fileID: 6809875479403325047} + - component: {fileID: 3028096046806519297} + - component: {fileID: 5563283156040961665} + m_Layer: 5 + m_Name: btn_go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5539316130783275871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934531968484519467} + 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: 3125190343729378211} + m_Father: {fileID: 4748765245146073342} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 127} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3364996656528061482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934531968484519467} + m_CullTransparentMesh: 1 +--- !u!114 &6809875479403325047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934531968484519467} + 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.9960785, g: 0.7411765, b: 0.2509804, 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 &3028096046806519297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934531968484519467} + 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: 6809875479403325047} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2526252935473026452} + m_TargetAssemblyTypeName: MapChoiceUI_Dungeon_Nightmare, Assembly-CSharp + m_MethodName: OnClick_GoDungeon + 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 &5563283156040961665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934531968484519467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5946588418270315245 GameObject: m_ObjectHideFlags: 0 @@ -78721,6 +79486,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4748765245146073342} + - component: {fileID: 2526252935473026452} m_Layer: 5 m_Name: Nightmare m_TagString: Untagged @@ -78743,6 +79509,7 @@ RectTransform: - {fileID: 1781542717939471544} - {fileID: 2426533098240102448} - {fileID: 6011700325819932039} + - {fileID: 5539316130783275871} m_Father: {fileID: 3456383120591884671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -78750,6 +79517,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2526252935473026452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6941203715344707434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c0987692ecd2fb438010f07d9ae127e, type: 3} + m_Name: + m_EditorClassIdentifier: + SelectMapID: 1003 + tab_NightmareDiff: {fileID: 4245379008130289418} --- !u!1 &6958295754450759796 GameObject: m_ObjectHideFlags: 0 @@ -83447,13 +84228,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3981901099563870773} + - component: {fileID: 2794429696635918067} m_Layer: 5 m_Name: Wave m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3981901099563870773 RectTransform: m_ObjectHideFlags: 0 @@ -83469,6 +84251,7 @@ RectTransform: - {fileID: 6180083058104677379} - {fileID: 7831961461278641690} - {fileID: 6625786640412937442} + - {fileID: 1947557100849348790} m_Father: {fileID: 3456383120591884671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -83476,6 +84259,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2794429696635918067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7362506375805396958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 782e55a1749491c4582f9517d8b52fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + SelectMapID: 1004 + texts_wave: + - {fileID: 5401675138850796186} + - {fileID: 3945758652106317450} + m_WaveRewardUI: {fileID: 7647748021735860847} + go_WaveRewardNoti: {fileID: 4745014273615907461} --- !u!1 &7377223270044694114 GameObject: m_ObjectHideFlags: 0 @@ -86688,6 +87489,152 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7605048129781372705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8093299387608807993} + - component: {fileID: 1049206760734944786} + - component: {fileID: 1496375053566107517} + - component: {fileID: 3229814569511656267} + - component: {fileID: 3415862014420995393} + m_Layer: 5 + m_Name: btn_go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8093299387608807993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7605048129781372705} + 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: 4474125993314627876} + m_Father: {fileID: 1359527207984642862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 127} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1049206760734944786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7605048129781372705} + m_CullTransparentMesh: 1 +--- !u!114 &1496375053566107517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7605048129781372705} + 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.9960785, g: 0.7411765, b: 0.2509804, 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 &3229814569511656267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7605048129781372705} + 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: 1496375053566107517} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5455599452416665173} + m_TargetAssemblyTypeName: MapChoiceUI_Dungeon_Maze, Assembly-CSharp + m_MethodName: OnClick_GoDungeon + 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 &3415862014420995393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7605048129781372705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7623900610801114420 GameObject: m_ObjectHideFlags: 0 @@ -101685,7 +102632,6 @@ RectTransform: - {fileID: 2560577325283151973} - {fileID: 1438474692404572917} - {fileID: 4928543301605757870} - - {fileID: 1530509777072174400} - {fileID: 5143025981118404211} - {fileID: 9114737150787530329} - {fileID: 1359527207984642862} @@ -128760,6 +129706,136 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef32cae282589c64b9a6812fdf7574a3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7828934711137435988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6625786640412937442} + m_Modifications: + - target: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Name + value: Noti + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -24 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -29 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a00dadd9f440a9140a4635e892b7d8c3, type: 3} +--- !u!224 &3321074507536080752 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + m_PrefabInstance: {fileID: 7828934711137435988} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4745014273615907461 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + m_PrefabInstance: {fileID: 7828934711137435988} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7894342126215516003 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index ef8723a75..a3b542641 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -985,6 +985,18 @@ public partial class ServerData Dungeon[dic_dungeonkey[dungeon]][index] = val; Dungeon[dic_dungeonkey[dungeon]][index].RandomizeCryptoKey(); } + public bool CanGetWaveReward() + { + var lst = table_waverewardlist.Ins.Get_DataList(); + var rewardindex = Get_DungeonValue(eDungeon.d4_Wave, 3); + var score = Get_DungeonValue(eDungeon.d4_Wave, 2); + for (int i = 0; i < lst.Count; i++) + { + if (lst[i].n_Index - 1 == rewardindex && lst[i].n_Score <= score) + return true; + } + return false; + } #endregion #region Common diff --git a/Assets/Script/Table/Dungeon/table_waverewardlist.cs b/Assets/Script/Table/Dungeon/table_waverewardlist.cs index af117472a..ad0420faa 100644 --- a/Assets/Script/Table/Dungeon/table_waverewardlist.cs +++ b/Assets/Script/Table/Dungeon/table_waverewardlist.cs @@ -4,6 +4,13 @@ using System.Collections.Generic; public class WaveRewardListTableData : TableDataBase { + protected ObscuredInt _Index; + public int n_Index + { + get { return _Index; } + set { _Index = value; _Index.RandomizeCryptoKey(); } + } + protected ObscuredInt _Difficult; public int n_Difficult { diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs index 3e5637f3b..5bff31eb5 100644 --- a/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs @@ -1,39 +1,17 @@ using CodeStage.AntiCheat.ObscuredTypes; using System.Collections.Generic; using TMPro; -using UnityEngine; -using static Koenigz.PerfectCulling.PerfectCullingVolumeBakeData; public class MapChoiceUI_Dungeon : uScrollViewMgr { public static MapChoiceUI_Dungeon Ins; public MoneyForm MoneyForm_Ticket; - public GameObject[] gos; // 0 1 2 3 던전 정보 + public MapChoiceUI_DungeonBase[] DungeonInfos; // 0 미믹, 1미궁, 2 악몽, 3 웨이브 public TextMeshProUGUI[] texts; // 0 던전이름 - public ArrowUI m_ArrowUI; // 미믹 단계 설정 - public TextMeshProUGUI[] texts_maze; // 0 랭킹, 1 최고 층수 - public TabUIBase tab_NightmareDiff; // 악몽의 시련 난이도 - public TextMeshProUGUI[] texts_wave; // 0 웨이브 난이도, 1 웨이브 최고 점수 - public WaveRewardUI m_WaveRewardUI; // 웨이브 보상 정보 List dungeons = new List { eDungeon.d1_Mimic, eDungeon.d2_Maze, eDungeon.d3_Nightmare, eDungeon.d4_Wave }; - List list_NightmareTabData = new List - { new TabUIData{ btnName = "1" }, new TabUIData{ btnName = "2" }, new TabUIData{ btnName = "3" } }; - - protected ObscuredInt _SelectMapID = 1001; - public int SelectMapID - { - get { return _SelectMapID; } - set { _SelectMapID = value; _SelectMapID.RandomizeCryptoKey(); } - } - - protected ObscuredInt _SelectLv; - public int SelectLv - { - get { return _SelectLv; } - set { _SelectLv = value; _SelectLv.RandomizeCryptoKey(); } - } + int SelectMapID = 1001; private void OnEnable() { @@ -48,121 +26,15 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr public void Select_Dungeon(int mapid) { - var sdata = ServerInfo.Ins.m_ServerData; SelectMapID = mapid; - var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID); - SelectLv = sdata.Get_DungeonLv(mapData.e_Dungeon) + 1; - var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, SelectLv); - if (DSUtil.CheckNull(dungeonData)) - { - for (int i = 0; i < SelectLv; i++) - { - --SelectLv; - dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, SelectLv); - if (!DSUtil.CheckNull(dungeonData)) - break; - } - } - DSUtil.InActivateGameObjects(gos, dungeonData.Get_DungeonIndex()); + var mapData = table_battlemapconfig.Ins.Get_Data(mapid); texts[0].text = mapData.Get_Name(); MoneyForm_Ticket.Set(mapData.n_TicketID); MoneyForm_Ticket.gameObject.SetActive(mapData.e_Dungeon != eDungeon.d4_Wave); - switch (mapData.e_Dungeon) - { - case eDungeon.d1_Mimic: - MyValue.MyChoiceMapData.n_Difficult = 1; - m_ArrowUI.Set(totalcount => { Select_Lv(totalcount); }, SelectLv, true, 1); - break; - case eDungeon.d2_Maze: - MyValue.MyChoiceMapData.n_Difficult = 1; - SelectLv = Mathf.Max(1, SelectLv - 1); - texts_maze[0].text = texts_maze[1].text = ""; - ServerInfo.Ins.Get_MyRank(MyValue.dic_Leaderboard[mapData.e_Dungeon], - my => - { - if (DSUtil.CheckNull(my)) - { - texts_maze[0].text = DSUtil.Format(323, 99999); - } - else - { - texts_maze[0].text = DSUtil.Format(323, my.Rank); - //texts_maze[1].text = DSUtil.Format(324, my.Scores[0]); - } - texts_maze[1].text = DSUtil.Format(324, SelectLv); - }); - break; - case eDungeon.d3_Nightmare: - list_NightmareTabData.ForEach(f => f.onClick = OnClick_NightmareTab); - tab_NightmareDiff.Set(list_NightmareTabData); - OnClick_NightmareTab(); - ServerInfo.Ins.Get_MyRank(MyValue.dic_Leaderboard[mapData.e_Dungeon], - my => - { - MyValue.MyChoiceMapData.d_NightmareBeforeDmg = DSUtil.CheckNull(my) ? 0d : double.Parse(my.Scores[0]); - }); - break; - case eDungeon.d4_Wave: - texts_wave[0].text = DSUtil.Format(334, MyValue.MyChoiceMapData.n_Difficult); - texts_wave[1].text = DSUtil.Format(335, sdata.Get_DungeonValue(eDungeon.d4_Wave, 1)); - break; - } - } - public void Select_Lv(int lv) - { - SelectLv = lv; - } - - public void OnClick_GoDungeon() - { - var sdata = ServerInfo.Ins.m_ServerData; - var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID); - // 웨이브는 무한 입장 가능 - if (mapData.n_TicketID == 0 || sdata.Check_ItemAmount(mapData.n_TicketID, 1)) - { - NewGameUI.Ins.m_MapChoiceUI.OnClick_Back(); - - MyValue.MyChoiceMapData.n_Difficult = 1; // TODO 정인호 : 나중에 선택한 난이도 넣어줄 것 - MyValue.MyChoiceMapData.n_MapID = SelectMapID; - MyValue.MyChoiceMapData.n_PortalIndex = 0; - MyValue.MyChoiceMapData.n_DungeonLv = SelectLv; - - switch (mapData.e_Dungeon) - { - case eDungeon.d2_Maze: - Use_Ticket(sdata, mapData); - MyValue.MyChoiceMapData.Set_MazeMapIndex(); - break; - case eDungeon.d3_Nightmare: - Use_Ticket(sdata, mapData); - break; - } - - InGameInfo.Ins.Load_Map(SelectMapID); - } - } - - void Use_Ticket(ServerData sdata, BattleMapConfigTableData mapData) - { - sdata.Use_Item(mapData.n_TicketID, 1); - ServerInfo.Ins.Write(null, false); - } - - public void OnClick_Ranking() - { - var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID); - RankingMgr.Ins.Show_Rank(mapData.e_Dungeon); - } - - void OnClick_NightmareTab() - { - MyValue.MyChoiceMapData.n_Difficult = tab_NightmareDiff.Get_Index() + 1; - } - - public void OnClick_WaveReward() - { - m_WaveRewardUI.Set(); + for (int i = 0; i < DungeonInfos.Length; i++) + DungeonInfos[i].Set(false); + DungeonInfos[MyEnumToInt.Ins.Get_Int(mapData.e_Dungeon) - 1].Set(); } } \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs b/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs new file mode 100644 index 000000000..19d5fdc9b --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs @@ -0,0 +1,61 @@ +using CodeStage.AntiCheat.ObscuredTypes; +using UnityEngine; + +public class MapChoiceUI_DungeonBase : MonoBehaviour +{ + public int SelectMapID = 1001; + + protected BattleMapConfigTableData m_mapData; + + protected ObscuredInt _SelectLv; + public int SelectLv + { + get { return _SelectLv; } + set { _SelectLv = value; _SelectLv.RandomizeCryptoKey(); } + } + + public void Set(bool active) { gameObject.SetActive(active); } + public virtual void Set() + { + Set(true); + var sdata = ServerInfo.Ins.m_ServerData; + m_mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID); + SelectLv = sdata.Get_DungeonLv(m_mapData.e_Dungeon) + 1; + var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(m_mapData.e_Dungeon, SelectLv); + if (DSUtil.CheckNull(dungeonData)) + { + for (int i = 0; i < SelectLv; i++) + { + --SelectLv; + dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(m_mapData.e_Dungeon, SelectLv); + if (!DSUtil.CheckNull(dungeonData)) + break; + } + } + } + + public virtual void OnClick_GoDungeon() { } + protected void Go_Dungeon() + { + NewGameUI.Ins.m_MapChoiceUI.OnClick_Back(); + + MyValue.MyChoiceMapData.n_Difficult = 1; // TODO 정인호 : 나중에 선택한 난이도 넣어줄 것 + MyValue.MyChoiceMapData.n_MapID = SelectMapID; + MyValue.MyChoiceMapData.n_PortalIndex = 0; + MyValue.MyChoiceMapData.n_DungeonLv = SelectLv; + + InGameInfo.Ins.Load_Map(SelectMapID); + } + + protected void Use_Ticket() + { + ServerInfo.Ins.m_ServerData.Use_Item(m_mapData.n_TicketID, 1); + ServerInfo.Ins.Write(null, false); + } + + public virtual void OnClick_Ranking() + { + var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID); + RankingMgr.Ins.Show_Rank(mapData.e_Dungeon); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs.meta new file mode 100644 index 000000000..336326707 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_DungeonBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 253651f03478e614ca0cb73c51ae7799 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs new file mode 100644 index 000000000..dae475d20 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs @@ -0,0 +1,40 @@ +using TMPro; +using UnityEngine; + +public class MapChoiceUI_Dungeon_Maze : MapChoiceUI_DungeonBase +{ + public TextMeshProUGUI[] texts_maze; // 0 랭킹, 1 최고 층수 + + public override void Set() + { + base.Set(); + + MyValue.MyChoiceMapData.n_Difficult = 1; + SelectLv = Mathf.Max(1, SelectLv - 1); + texts_maze[0].text = texts_maze[1].text = ""; + ServerInfo.Ins.Get_MyRank(MyValue.dic_Leaderboard[m_mapData.e_Dungeon], + my => + { + if (DSUtil.CheckNull(my)) + { + texts_maze[0].text = DSUtil.Format(323, 99999); + } + else + { + texts_maze[0].text = DSUtil.Format(323, my.Rank); + //texts_maze[1].text = DSUtil.Format(324, my.Scores[0]); + } + texts_maze[1].text = DSUtil.Format(324, SelectLv); + }); + } + + public override void OnClick_GoDungeon() + { + if (ServerInfo.Ins.m_ServerData.Check_ItemAmount(m_mapData.n_TicketID, 1)) + { + Use_Ticket(); + MyValue.MyChoiceMapData.Set_MazeMapIndex(); + Go_Dungeon(); + } + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs.meta new file mode 100644 index 000000000..b0b1fc64d --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Maze.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7a146ffcbbaf5464f87ba1df0c734888 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs new file mode 100644 index 000000000..f337a4516 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs @@ -0,0 +1,19 @@ +public class MapChoiceUI_Dungeon_Mimic : MapChoiceUI_DungeonBase +{ + public ArrowUI m_ArrowUI; // 미믹 단계 설정 + + public override void Set() + { + base.Set(); + MyValue.MyChoiceMapData.n_Difficult = 1; + m_ArrowUI.Set(totalcount => { Select_Lv(totalcount); }, SelectLv, true, 1); + } + + public void Select_Lv(int lv) { SelectLv = lv; } + + public override void OnClick_GoDungeon() + { + if (ServerInfo.Ins.m_ServerData.Check_ItemAmount(m_mapData.n_TicketID, 1)) + Go_Dungeon(); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs.meta new file mode 100644 index 000000000..1f5a1f973 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Mimic.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26e9d31732fd2a34e8bf0fafadcca586 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs new file mode 100644 index 000000000..cc2085edc --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; + +public class MapChoiceUI_Dungeon_Nightmare : MapChoiceUI_DungeonBase +{ + public TabUIBase tab_NightmareDiff; // 악몽의 시련 난이도 + + List list_NightmareTabData = new List + { new TabUIData{ btnName = "1" }, new TabUIData{ btnName = "2" }, new TabUIData{ btnName = "3" } }; + + public override void Set() + { + base.Set(); + + list_NightmareTabData.ForEach(f => f.onClick = OnClick_NightmareTab); + tab_NightmareDiff.Set(list_NightmareTabData); + OnClick_NightmareTab(); + ServerInfo.Ins.Get_MyRank(MyValue.dic_Leaderboard[m_mapData.e_Dungeon], + my => + { + MyValue.MyChoiceMapData.d_NightmareBeforeDmg = DSUtil.CheckNull(my) ? 0d : double.Parse(my.Scores[0]); + }); + } + + void OnClick_NightmareTab() + { + MyValue.MyChoiceMapData.n_Difficult = tab_NightmareDiff.Get_Index() + 1; + } + + public override void OnClick_GoDungeon() + { + if (ServerInfo.Ins.m_ServerData.Check_ItemAmount(m_mapData.n_TicketID, 1)) + { + Use_Ticket(); + Go_Dungeon(); + } + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs.meta new file mode 100644 index 000000000..c7e6969f3 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Nightmare.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0c0987692ecd2fb438010f07d9ae127e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs new file mode 100644 index 000000000..1a9c0634b --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs @@ -0,0 +1,29 @@ +using TMPro; +using UnityEngine; + +public class MapChoiceUI_Dungeon_Wave : MapChoiceUI_DungeonBase +{ + public TextMeshProUGUI[] texts_wave; // 0 웨이브 난이도, 1 웨이브 최고 점수 + public WaveRewardUI m_WaveRewardUI; // 웨이브 보상 정보 + public GameObject go_WaveRewardNoti; + + public override void Set() + { + base.Set(); + var sdata = ServerInfo.Ins.m_ServerData; + + texts_wave[0].text = "";// DSUtil.Format(334, MyValue.MyChoiceMapData.n_Difficult); + texts_wave[1].text = DSUtil.Format(335, sdata.Get_DungeonValue(eDungeon.d4_Wave, 2)); + go_WaveRewardNoti.SetActive(sdata.CanGetWaveReward()); + } + + public void OnClick_WaveReward() + { + m_WaveRewardUI.Set(); + } + + public override void OnClick_GoDungeon() + { + Go_Dungeon(); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs.meta new file mode 100644 index 000000000..a44a96a6c --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon_Wave.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 782e55a1749491c4582f9517d8b52fe6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: