diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 8fe749cda..a8f4e277e 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -21,6 +21,7 @@ Used Assets and files from the Resources folder, sorted by uncompressed size: - 클리어 처리 맵 오브젝트 컨피그 +몬스터 소환은 트리거로 - 트리거 닿으면 그때 소환? (계속 고민) 서버 데이터 @@ -96,7 +97,5 @@ messageinfo 엄청 느린 버그 pc 애님 (캐스팅 추가) -몬스터 소환은 트리거로 - - 트리거 닿으면 그때 소환? 테스트씬 만들기 (모험 버튼 위에 테스트 버튼) 장비 슬롯 UI diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index f687cf2f7..1b7e30dd2 100644 --- a/Assets/ResWork/Table/Export/GlobalValue.json +++ b/Assets/ResWork/Table/Export/GlobalValue.json @@ -1 +1 @@ -[{"s_ID": "n_CashItemID", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK", "n_Value": "1", "exception": "sss"}, {"s_ID": "HP", "n_Value": "100", "exception": "sss"}, {"s_ID": "DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "M_DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "HP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "M_DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "MP", "n_Value": "30", "exception": "sss"}, {"s_ID": "MP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "ATK_FIXED", "n_Value": "0", "exception": ""}, {"s_ID": "ATK_FIXED_DECREASE", "n_Value": "0", "exception": ""}, {"s_ID": "CRI", "n_Value": "0.1", "exception": ""}, {"s_ID": "CRI_DMG_Multiplier", "n_Value": "10", "exception": ""}, {"s_ID": "M_CRI", "n_Value": "100", "exception": ""}, {"s_ID": "M_CRI_DMG_Multiplier", "n_Value": "0.1", "exception": ""}, {"s_ID": "SKILL_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "COOLTIME_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "HERO_ATK_SPD", "n_Value": "0.75", "exception": ""}, {"s_ID": "ATK_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HERO_MOVE_SPD", "n_Value": "3", "exception": ""}, {"s_ID": "MOVE_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HP_REGEN", "n_Value": "1", "exception": ""}, {"s_ID": "MP_REGEN", "n_Value": "3", "exception": ""}, {"s_ID": "HP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "MP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "PIERCING_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "DMG_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_INCREASE", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EXP_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "ITEM_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv1", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv2", "n_Value": "10", "exception": ""}, {"s_ID": "EnchantOpenLv3", "n_Value": "20", "exception": ""}, {"s_ID": "EnchantOpenLv4", "n_Value": "30", "exception": ""}, {"s_ID": "Defense_Coefficient", "n_Value": "6", "exception": ""}, {"s_ID": "f_PC_FindEnemyRange", "n_Value": "6", "exception": ""}, {"s_ID": "f_Pet_FindEnemyRange", "n_Value": "5", "exception": ""}, {"s_ID": "f_AvoidCoolTime", "n_Value": "5", "exception": ""}, {"s_ID": "f_KnockbackTime", "n_Value": "0.02", "exception": ""}, {"s_ID": "f_SkillTeamRange", "n_Value": "15", "exception": ""}, {"s_ID": "n_AbilityMaterialID", "n_Value": "444", "exception": ""}, {"s_ID": "n_JobMaterialID", "n_Value": "445", "exception": ""}, {"s_ID": "AWAKEN_GOODS_UPGRADE", "n_Value": "450", "exception": ""}, {"s_ID": "AWAKEN_GOODS_STR", "n_Value": "451", "exception": ""}, {"s_ID": "AWAKEN_GOODS_DEX", "n_Value": "452", "exception": ""}, {"s_ID": "AWAKEN_GOODS_INT", "n_Value": "453", "exception": ""}, {"s_ID": "AWAKEN_GOODS_LUK", "n_Value": "454", "exception": ""}, {"s_ID": "n_BreakingLimitSlotMaterialID", "n_Value": "461", "exception": ""}, {"s_ID": "n_FirstEquipPet", "n_Value": "50002", "exception": ""}, {"s_ID": "n_PetReinforceMaterialID", "n_Value": "441", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID1", "n_Value": "340001", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID2", "n_Value": "340002", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID3", "n_Value": "340003", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv1", "n_Value": "10", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv2", "n_Value": "20", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv3", "n_Value": "40", "exception": ""}, {"s_ID": "n_EssenceMileageID", "n_Value": "471", "exception": ""}, {"s_ID": "n_EssenceRandomBagID", "n_Value": "9800001", "exception": ""}, {"s_ID": "n_RelicMaxStar", "n_Value": "5", "exception": ""}, {"s_ID": "n_RelicReinforceMaterialID", "n_Value": "472", "exception": ""}, {"s_ID": "n_FarmSeedID", "n_Value": "456", "exception": ""}, {"s_ID": "n_FarmPlantingSeedAmount", "n_Value": "5", "exception": ""}, {"s_ID": "n_FirstClassID", "n_Value": "10501", "exception": "최초 시작 직업"}, {"s_ID": "MazeMapCount", "n_Value": "2", "exception": "미궁 맵 개수"}, {"s_ID": "GoldDropRandomRange", "n_Value": "0.1", "exception": "몬스터 드랍 골드양 범위"}] \ No newline at end of file +[{"s_ID": "n_CashItemID", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK", "n_Value": "1", "exception": "sss"}, {"s_ID": "HP", "n_Value": "100", "exception": "sss"}, {"s_ID": "DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "M_DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "HP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "M_DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "MP", "n_Value": "30", "exception": "sss"}, {"s_ID": "MP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "ATK_FIXED", "n_Value": "0", "exception": ""}, {"s_ID": "ATK_FIXED_DECREASE", "n_Value": "0", "exception": ""}, {"s_ID": "CRI", "n_Value": "0.1", "exception": ""}, {"s_ID": "CRI_DMG_Multiplier", "n_Value": "10", "exception": ""}, {"s_ID": "M_CRI", "n_Value": "100", "exception": ""}, {"s_ID": "M_CRI_DMG_Multiplier", "n_Value": "0.1", "exception": ""}, {"s_ID": "SKILL_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "COOLTIME_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "HERO_ATK_SPD", "n_Value": "0.75", "exception": ""}, {"s_ID": "ATK_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HERO_MOVE_SPD", "n_Value": "3", "exception": ""}, {"s_ID": "MOVE_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HP_REGEN", "n_Value": "1", "exception": ""}, {"s_ID": "MP_REGEN", "n_Value": "3", "exception": ""}, {"s_ID": "HP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "MP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "PIERCING_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "DMG_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_INCREASE", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EXP_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "ITEM_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv1", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv2", "n_Value": "10", "exception": ""}, {"s_ID": "EnchantOpenLv3", "n_Value": "20", "exception": ""}, {"s_ID": "Defense_Coefficient", "n_Value": "6", "exception": ""}, {"s_ID": "f_PC_FindEnemyRange", "n_Value": "6", "exception": ""}, {"s_ID": "f_Pet_FindEnemyRange", "n_Value": "5", "exception": ""}, {"s_ID": "f_AvoidCoolTime", "n_Value": "5", "exception": ""}, {"s_ID": "f_KnockbackTime", "n_Value": "0.02", "exception": ""}, {"s_ID": "f_SkillTeamRange", "n_Value": "15", "exception": ""}, {"s_ID": "n_AbilityMaterialID", "n_Value": "444", "exception": ""}, {"s_ID": "n_JobMaterialID", "n_Value": "445", "exception": ""}, {"s_ID": "AWAKEN_GOODS_UPGRADE", "n_Value": "450", "exception": ""}, {"s_ID": "AWAKEN_GOODS_STR", "n_Value": "451", "exception": ""}, {"s_ID": "AWAKEN_GOODS_DEX", "n_Value": "452", "exception": ""}, {"s_ID": "AWAKEN_GOODS_INT", "n_Value": "453", "exception": ""}, {"s_ID": "AWAKEN_GOODS_LUK", "n_Value": "454", "exception": ""}, {"s_ID": "n_BreakingLimitSlotMaterialID", "n_Value": "461", "exception": ""}, {"s_ID": "n_FirstEquipPet", "n_Value": "50002", "exception": ""}, {"s_ID": "n_PetReinforceMaterialID", "n_Value": "441", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID1", "n_Value": "340001", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID2", "n_Value": "340002", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID3", "n_Value": "340003", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv1", "n_Value": "10", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv2", "n_Value": "20", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv3", "n_Value": "40", "exception": ""}, {"s_ID": "n_EssenceMileageID", "n_Value": "471", "exception": ""}, {"s_ID": "n_EssenceRandomBagID", "n_Value": "9800001", "exception": ""}, {"s_ID": "n_RelicMaxStar", "n_Value": "5", "exception": ""}, {"s_ID": "n_RelicReinforceMaterialID", "n_Value": "472", "exception": ""}, {"s_ID": "n_FarmSeedID", "n_Value": "456", "exception": ""}, {"s_ID": "n_FarmPlantingSeedAmount", "n_Value": "5", "exception": ""}, {"s_ID": "n_FirstClassID", "n_Value": "10501", "exception": "최초 시작 직업"}, {"s_ID": "MazeMapCount", "n_Value": "2", "exception": "미궁 맵 개수"}, {"s_ID": "GoldDropRandomRange", "n_Value": "0.1", "exception": "몬스터 드랍 골드양 범위"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index c1b06586e..c6544a00f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipItemEnchantOptionCard.prefab b/Assets/ResWork/UIPrefabs/Equipment/EquipItemEnchantOptionCard.prefab index 9735437a6..b33947c6f 100644 --- a/Assets/ResWork/UIPrefabs/Equipment/EquipItemEnchantOptionCard.prefab +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipItemEnchantOptionCard.prefab @@ -68,7 +68,8 @@ MonoBehaviour: m_text: "\uC624\uD508 \uC870\uAC74" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -92,8 +93,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -199,17 +200,18 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, 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} + rgba: 4279966522 + m_fontColor: {r: 0.22745098, g: 0.105882354, b: 0.105882354, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -293,17 +295,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2983376409777429952} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3821662640419949668} + m_Father: {fileID: 307427294463408238} 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_SizeDelta: {x: 415.63, y: -45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3562267927888194805 CanvasRenderer: @@ -336,14 +338,15 @@ MonoBehaviour: m_text: "\uACF5\uACA9\uB825 +00%" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4279966522 + m_fontColor: {r: 0.227451, g: 0.10588236, b: 0.10588236, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -427,18 +430,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4488667557726718620} - 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: 4292324032161461894} - m_Father: {fileID: 3821662640419949668} + m_Father: {fileID: 307427294463408238} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: 0} - m_SizeDelta: {x: 50, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -228.6, y: 0} + m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8222762999885745887 CanvasRenderer: @@ -461,15 +464,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7019608, g: 0.098039225, b: 0.6392157, a: 1} + m_Color: {r: 0.22745098, g: 0.105882354, b: 0.105882354, 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_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: db35a1b9e39e4de458c0d57038425cec, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -509,16 +512,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5367750038283865785} - - {fileID: 6659990178012062347} - - {fileID: 4917075413381549133} + - {fileID: 307427294463408238} - {fileID: 1231910565554005067} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 585, y: 50} + m_SizeDelta: {x: 515.63, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6468894467992069189 MonoBehaviour: @@ -532,14 +533,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 91d4965b697c50443aa0a3ee17803553, type: 3} m_Name: m_EditorClassIdentifier: - images: - - {fileID: 1199757943775746256} - - {fileID: 0} + images: [] texts: - {fileID: 1565741600275440652} - {fileID: 7205455428029474132} - {fileID: 6773321670335791206} - go_lock: {fileID: 6679892685379056121} + gos_lock: + - {fileID: 8786575568774668407} + - {fileID: 6679892685379056121} --- !u!222 &2303335469834281870 CanvasRenderer: m_ObjectHideFlags: 0 @@ -555,7 +556,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5507423055242639098} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -605,17 +606,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6076719342723663790} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3821662640419949668} + m_Father: {fileID: 307427294463408238} 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_SizeDelta: {x: 415.63, y: -45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1196222940201370791 CanvasRenderer: @@ -638,15 +639,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.84705883, b: 0.94509804, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: cb358a6ab9168464fb6786d73bde0433, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -782,15 +783,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: db35a1b9e39e4de458c0d57038425cec, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -799,3 +800,41 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8786575568774668407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 307427294463408238} + m_Layer: 5 + m_Name: UnLock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &307427294463408238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8786575568774668407} + 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: 5367750038283865785} + - {fileID: 6659990178012062347} + - {fileID: 4917075413381549133} + m_Father: {fileID: 3821662640419949668} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index bd5a98fe8..3fb61fdf9 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -12037,7 +12037,7 @@ RectTransform: 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: 75.29999, y: 274.2} + m_AnchoredPosition: {x: 60.5, y: 274.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1206899459483852769 @@ -14102,7 +14102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 9.49999, y: 0} + m_AnchoredPosition: {x: 42.9, y: 1.2} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8906532018122385088 @@ -14123,7 +14123,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 5 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -14181,7 +14181,7 @@ RectTransform: 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: 75.100006, y: 151.6} + m_AnchoredPosition: {x: 60.300034, y: 151.6} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7406728587081012930 @@ -27173,8 +27173,8 @@ RectTransform: 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: 545.5001, y: -84.75} - m_SizeDelta: {x: 655, y: 838.81} + m_AnchoredPosition: {x: 561.19, y: -84.75} + m_SizeDelta: {x: 623.62, y: 838.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1023873313136047122 CanvasRenderer: @@ -40730,7 +40730,7 @@ RectTransform: 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: 75.29999, y: 235.7} + m_AnchoredPosition: {x: 60.500015, y: 235.7} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4684179242504002684 @@ -56440,7 +56440,7 @@ RectTransform: 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: 75.29999, y: 194.5} + m_AnchoredPosition: {x: 60.500015, y: 194.5} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2790682029014807953 @@ -111091,7 +111091,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_margin: {x: 43.87891, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index b0a2b16dc..1d6354bdf 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -174,7 +174,7 @@ public partial class ServerData Parts = item.Key, Lv = 0, Use = 0, - Enchant = new List { new SD_Slot_Enchant(), new SD_Slot_Enchant(), new SD_Slot_Enchant(), new SD_Slot_Enchant(), } + Enchant = new List { new SD_Slot_Enchant(), new SD_Slot_Enchant(), new SD_Slot_Enchant() } }); Add_SkillLv(1); // 최초 스킬 하나 지급 diff --git a/Assets/Script/UI/Eqiupment/EquipItemEnchantOption.cs b/Assets/Script/UI/Eqiupment/EquipItemEnchantOption.cs index afc42e5e8..227cc9356 100644 --- a/Assets/Script/UI/Eqiupment/EquipItemEnchantOption.cs +++ b/Assets/Script/UI/Eqiupment/EquipItemEnchantOption.cs @@ -1,13 +1,9 @@ -using System.Collections; using System.Collections.Generic; -using UnityEngine; public class EquipItemEnchantOption : uScrollViewMgr { List list_EnchantCardData = new List - { - new EnchantCardData(), new EnchantCardData(), new EnchantCardData(), new EnchantCardData(), - }; + { new EnchantCardData(), new EnchantCardData(), new EnchantCardData() }; public void Set(SD_Slot slotdata) { diff --git a/Assets/Script/UI/Eqiupment/EquipItemEnchantOptionCard.cs b/Assets/Script/UI/Eqiupment/EquipItemEnchantOptionCard.cs index d087764d8..e0097e5cb 100644 --- a/Assets/Script/UI/Eqiupment/EquipItemEnchantOptionCard.cs +++ b/Assets/Script/UI/Eqiupment/EquipItemEnchantOptionCard.cs @@ -1,12 +1,10 @@ using TMPro; using UnityEngine; -using UnityEngine.UI; public class EquipItemEnchantOptionCard : CardBase { - public Image[] images; // 0 등급, 1 bg public TextMeshProUGUI[] texts; // 0 등급, 1 옵션, 2 오픈 조건 - public GameObject go_lock; + public GameObject[] gos_lock; // 0 언락, 1 락 EnchantCardData m_EnchantCardData; @@ -17,7 +15,7 @@ public class EquipItemEnchantOptionCard : CardBase if (IsOpen()) { - go_lock.SetActive(false); + DSUtil.InActivateGameObjects(gos_lock, 0); if (m_EnchantCardData.EnchantData.Lv > 0) { // 옵션이 존재 var egcData = table_enchantgradeconfig.Ins.Get_Data_bylv(m_EnchantCardData.EnchantData.Lv); @@ -32,7 +30,7 @@ public class EquipItemEnchantOptionCard : CardBase } } else - go_lock.SetActive(true); + DSUtil.InActivateGameObjects(gos_lock, 1); } public void OnClick_Enchant() @@ -55,9 +53,6 @@ public class EquipItemEnchantOptionCard : CardBase case 2: texts[2].text = DSUtil.Format(202, table_GlobalValue.Ins.Get_Int("EnchantOpenLv3")); return m_EnchantCardData.SlotLv >= table_GlobalValue.Ins.Get_Int("EnchantOpenLv3"); - case 3: - texts[2].text = DSUtil.Format(202, table_GlobalValue.Ins.Get_Int("EnchantOpenLv4")); - return m_EnchantCardData.SlotLv >= table_GlobalValue.Ins.Get_Int("EnchantOpenLv4"); } return false; }