diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 7ec99e3c1..30c9875dc 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -86,7 +86,7 @@ messageinfo 엄청 느린 버그 - 포탈, 필드보스, 부활의 성소, 챕터보스 - +농장 바위 부쉈는데 안 나옴 작업 내역 노션에 남겨두기 diff --git a/Assets/Ino_notion.txt b/Assets/Ino_notion.txt index 6cc8cf0d0..7b1ad15c1 100644 --- a/Assets/Ino_notion.txt +++ b/Assets/Ino_notion.txt @@ -22,3 +22,6 @@ https://www.notion.so/devlucas/c4dc5df0d9d64c95963c6e540acdca7c#1e3e9deec171809c 농장 https://www.notion.so/devlucas/2346884289ec4fadb0aa74f7c74660c7#1e3e9deec171802389d8e17f67f77c61 +장비 +https://www.notion.so/devlucas/392510d8df864afea8f5e6c27ddc6af9#1e4e9deec171805ea774cb456c66c940 + diff --git a/Assets/ResWork/Table/Export/FarmShopList.json b/Assets/ResWork/Table/Export/FarmShopList.json index 549403615..47116f2a3 100644 --- a/Assets/ResWork/Table/Export/FarmShopList.json +++ b/Assets/ResWork/Table/Export/FarmShopList.json @@ -1 +1 @@ -[{"n_FarmShopID": "1", "e_ShopType": "AD", "n_DayLimit": "3", "n_GapTime": "600", "n_PayItemID": "0", "n_PayItemAmount": "0", "n_ItemID": "1", "n_ItemAmount": "100"}, {"n_FarmShopID": "2", "e_ShopType": "Free", "n_DayLimit": "2", "n_GapTime": "500", "n_PayItemID": "0", "n_PayItemAmount": "0", "n_ItemID": "2", "n_ItemAmount": "101"}, {"n_FarmShopID": "3", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "100", "n_ItemID": "11", "n_ItemAmount": "102"}, {"n_FarmShopID": "4", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "101", "n_ItemID": "12", "n_ItemAmount": "103"}, {"n_FarmShopID": "5", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "102", "n_ItemID": "13", "n_ItemAmount": "104"}, {"n_FarmShopID": "6", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "103", "n_ItemID": "14", "n_ItemAmount": "105"}, {"n_FarmShopID": "7", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "104", "n_ItemID": "15", "n_ItemAmount": "106"}, {"n_FarmShopID": "8", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "105", "n_ItemID": "101", "n_ItemAmount": "107"}, {"n_FarmShopID": "9", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "106", "n_ItemID": "102", "n_ItemAmount": "108"}, {"n_FarmShopID": "10", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "107", "n_ItemID": "103", "n_ItemAmount": "109"}, {"n_FarmShopID": "11", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "108", "n_ItemID": "451", "n_ItemAmount": "110"}, {"n_FarmShopID": "12", "e_ShopType": "Pay", "n_DayLimit": "3", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "109", "n_ItemID": "452", "n_ItemAmount": "111"}, {"n_FarmShopID": "13", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "110", "n_ItemID": "453", "n_ItemAmount": "112"}, {"n_FarmShopID": "14", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "111", "n_ItemID": "454", "n_ItemAmount": "113"}, {"n_FarmShopID": "15", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "112", "n_ItemID": "455", "n_ItemAmount": "114"}, {"n_FarmShopID": "16", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "113", "n_ItemID": "456", "n_ItemAmount": "115"}, {"n_FarmShopID": "17", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "114", "n_ItemID": "201", "n_ItemAmount": "116"}, {"n_FarmShopID": "18", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "115", "n_ItemID": "202", "n_ItemAmount": "117"}, {"n_FarmShopID": "19", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "116", "n_ItemID": "441", "n_ItemAmount": "118"}, {"n_FarmShopID": "20", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "117", "n_ItemID": "444", "n_ItemAmount": "119"}, {"n_FarmShopID": "21", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "118", "n_ItemID": "445", "n_ItemAmount": "120"}, {"n_FarmShopID": "22", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "119", "n_ItemID": "450", "n_ItemAmount": "121"}] \ No newline at end of file +[{"n_FarmShopID": "1", "e_ShopType": "AD", "n_DayLimit": "3", "n_GapTime": "600", "n_PayItemID": "0", "n_PayItemAmount": "0", "n_ItemID": "1", "n_ItemAmount": "100"}, {"n_FarmShopID": "2", "e_ShopType": "Free", "n_DayLimit": "2", "n_GapTime": "500", "n_PayItemID": "0", "n_PayItemAmount": "0", "n_ItemID": "2", "n_ItemAmount": "101"}, {"n_FarmShopID": "3", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "100", "n_ItemID": "101", "n_ItemAmount": "102"}, {"n_FarmShopID": "4", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "101", "n_ItemID": "102", "n_ItemAmount": "103"}, {"n_FarmShopID": "5", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "102", "n_ItemID": "103", "n_ItemAmount": "104"}, {"n_FarmShopID": "6", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "103", "n_ItemID": "104", "n_ItemAmount": "105"}, {"n_FarmShopID": "7", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "104", "n_ItemID": "105", "n_ItemAmount": "106"}, {"n_FarmShopID": "8", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "105", "n_ItemID": "106", "n_ItemAmount": "107"}, {"n_FarmShopID": "9", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "106", "n_ItemID": "301", "n_ItemAmount": "108"}, {"n_FarmShopID": "10", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "108", "n_ItemID": "451", "n_ItemAmount": "110"}, {"n_FarmShopID": "11", "e_ShopType": "Pay", "n_DayLimit": "3", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "109", "n_ItemID": "452", "n_ItemAmount": "111"}, {"n_FarmShopID": "12", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "110", "n_ItemID": "453", "n_ItemAmount": "112"}, {"n_FarmShopID": "13", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "111", "n_ItemID": "454", "n_ItemAmount": "113"}, {"n_FarmShopID": "14", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "112", "n_ItemID": "455", "n_ItemAmount": "114"}, {"n_FarmShopID": "15", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "113", "n_ItemID": "456", "n_ItemAmount": "115"}, {"n_FarmShopID": "16", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "114", "n_ItemID": "201", "n_ItemAmount": "116"}, {"n_FarmShopID": "17", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "115", "n_ItemID": "202", "n_ItemAmount": "117"}, {"n_FarmShopID": "18", "e_ShopType": "Pay", "n_DayLimit": "2", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "116", "n_ItemID": "441", "n_ItemAmount": "118"}, {"n_FarmShopID": "19", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "117", "n_ItemID": "444", "n_ItemAmount": "119"}, {"n_FarmShopID": "20", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "118", "n_ItemID": "445", "n_ItemAmount": "120"}, {"n_FarmShopID": "21", "e_ShopType": "Pay", "n_DayLimit": "1", "n_GapTime": "0", "n_PayItemID": "2", "n_PayItemAmount": "119", "n_ItemID": "450", "n_ItemAmount": "121"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index e57732c97..44df30c0b 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": "캐쉬 아이템 id"}, {"s_ID": "n_JewelItemID", "n_Value": "3", "exception": "보석 아이템 id"}, {"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": "몬스터 드랍 골드양 범위"}, {"s_ID": "n_Benefit1Count", "n_Value": "10", "exception": "뽑기 혜택1 횟수"}, {"s_ID": "n_Benefit2Count", "n_Value": "50", "exception": "뽑기 혜택2 횟수"}, {"s_ID": "n_Benefit1Grade", "n_Value": "4", "exception": "뽑기 혜택1 등급"}, {"s_ID": "n_Benefit2Grade", "n_Value": "5", "exception": "뽑기 혜택2 등급"}] \ No newline at end of file +[{"s_ID": "n_CashItemID", "n_Value": "1", "exception": "캐쉬 아이템 id"}, {"s_ID": "n_JewelItemID", "n_Value": "3", "exception": "보석 아이템 id"}, {"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": "AWAKEN_GOODS_ALL", "n_Value": "455", "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": "몬스터 드랍 골드양 범위"}, {"s_ID": "n_Benefit1Count", "n_Value": "10", "exception": "뽑기 혜택1 횟수"}, {"s_ID": "n_Benefit2Count", "n_Value": "50", "exception": "뽑기 혜택2 횟수"}, {"s_ID": "n_Benefit1Grade", "n_Value": "4", "exception": "뽑기 혜택1 등급"}, {"s_ID": "n_Benefit2Grade", "n_Value": "5", "exception": "뽑기 혜택2 등급"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/HarvestConfig.json b/Assets/ResWork/Table/Export/HarvestConfig.json index 85746ed64..9489ccb8b 100644 --- a/Assets/ResWork/Table/Export/HarvestConfig.json +++ b/Assets/ResWork/Table/Export/HarvestConfig.json @@ -1 +1 @@ -[{"n_Grade": "1", "f_Rate": "0.14", "n_HarvestTime": "5", "n_MinAmount": "1", "n_MaxAmount": "1", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0", "n_HarvestTime2": "3600"}, {"n_Grade": "2", "f_Rate": "0.13", "n_HarvestTime": "5", "n_MinAmount": "1", "n_MaxAmount": "2", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.001", "n_HarvestTime2": "7200"}, {"n_Grade": "3", "f_Rate": "0.12", "n_HarvestTime": "5", "n_MinAmount": "2", "n_MaxAmount": "2", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.003", "n_HarvestTime2": "10800"}, {"n_Grade": "4", "f_Rate": "0.12", "n_HarvestTime": "5", "n_MinAmount": "2", "n_MaxAmount": "3", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.005", "n_HarvestTime2": "14400"}, {"n_Grade": "5", "f_Rate": "0.11", "n_HarvestTime": "5", "n_MinAmount": "3", "n_MaxAmount": "4", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.007", "n_HarvestTime2": "21600"}, {"n_Grade": "6", "f_Rate": "0.11", "n_HarvestTime": "5", "n_MinAmount": "3", "n_MaxAmount": "5", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.01", "n_HarvestTime2": "28800"}, {"n_Grade": "7", "f_Rate": "0.1", "n_HarvestTime": "5", "n_MinAmount": "4", "n_MaxAmount": "6", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.015", "n_HarvestTime2": "43200"}, {"n_Grade": "8", "f_Rate": "0.09", "n_HarvestTime": "5", "n_MinAmount": "4", "n_MaxAmount": "7", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.02", "n_HarvestTime2": "64800"}, {"n_Grade": "9", "f_Rate": "0.08", "n_HarvestTime": "5", "n_MinAmount": "5", "n_MaxAmount": "8", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.03", "n_HarvestTime2": "86400"}] \ No newline at end of file +[{"n_Grade": "1", "f_Rate": "0.14", "n_HarvestTime": "5", "n_MinAmount": "1", "n_MaxAmount": "1", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0"}, {"n_Grade": "2", "f_Rate": "0.13", "n_HarvestTime": "5", "n_MinAmount": "1", "n_MaxAmount": "2", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.001"}, {"n_Grade": "3", "f_Rate": "0.12", "n_HarvestTime": "5", "n_MinAmount": "2", "n_MaxAmount": "2", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.003"}, {"n_Grade": "4", "f_Rate": "0.12", "n_HarvestTime": "5", "n_MinAmount": "2", "n_MaxAmount": "3", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.005"}, {"n_Grade": "5", "f_Rate": "0.11", "n_HarvestTime": "5", "n_MinAmount": "3", "n_MaxAmount": "4", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.007"}, {"n_Grade": "6", "f_Rate": "0.11", "n_HarvestTime": "5", "n_MinAmount": "3", "n_MaxAmount": "5", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.01"}, {"n_Grade": "7", "f_Rate": "0.1", "n_HarvestTime": "5", "n_MinAmount": "4", "n_MaxAmount": "6", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.015"}, {"n_Grade": "8", "f_Rate": "0.09", "n_HarvestTime": "5", "n_MinAmount": "4", "n_MaxAmount": "7", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.02"}, {"n_Grade": "9", "f_Rate": "0.08", "n_HarvestTime": "5", "n_MinAmount": "5", "n_MaxAmount": "8", "f_StatFruitRate": "0.25", "f_GoldFruitRate": "0.03"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 713ed2bf5..bd41111fc 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 62cbd0038..324b314b5 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -48181,8 +48181,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -64395,8 +64395,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -68019,8 +68019,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -74714,8 +74714,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -89009,8 +89009,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Res_Addr/Map/MyFarm.prefab b/Assets/Res_Addr/Map/MyFarm.prefab index 549918ad9..4857b36a9 100644 --- a/Assets/Res_Addr/Map/MyFarm.prefab +++ b/Assets/Res_Addr/Map/MyFarm.prefab @@ -31,6 +31,124 @@ Transform: m_Children: [] m_Father: {fileID: 2003443393327905189} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2202992994437570521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5017288588006805133} + - component: {fileID: 6741676692006059396} + - component: {fileID: 4865157755591265768} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5017288588006805133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202992994437570521} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2003443393327905189} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!108 &6741676692006059396 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202992994437570521} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &4865157755591265768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202992994437570521} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 --- !u!1 &2286225714508399539 GameObject: m_ObjectHideFlags: 0 @@ -404,6 +522,7 @@ Transform: - {fileID: 7888418856696587965} - {fileID: 78696668571414297} - {fileID: 4893086686651519373} + - {fileID: 5017288588006805133} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4849630529674028950 diff --git a/Assets/Script/UI/Farm/FarmInvenUI.cs b/Assets/Script/UI/Farm/FarmInvenUI.cs index 2981a62b2..62002efb6 100644 --- a/Assets/Script/UI/Farm/FarmInvenUI.cs +++ b/Assets/Script/UI/Farm/FarmInvenUI.cs @@ -23,7 +23,7 @@ public class FarmInvenUI : BotMenuBase list_fruit.Add(table_GlobalValue.Ins.Get_Int("AWAKEN_GOODS_DEX")); list_fruit.Add(table_GlobalValue.Ins.Get_Int("AWAKEN_GOODS_INT")); list_fruit.Add(table_GlobalValue.Ins.Get_Int("AWAKEN_GOODS_LUK")); - list_fruit.Add(455); + list_fruit.Add(table_GlobalValue.Ins.Get_Int("AWAKEN_GOODS_ALL")); } Set_ScrollView(list_fruit);