NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

미션 수치 적용 중

This commit is contained in:
Ino 2025-03-18 15:04:31 +09:00
parent 46987d894e
commit 57871bb8e0
9 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/EquipCrafting.json
View File

@ -1 +1 @@
[{"n_CraftingItemID": "10101001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "1", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "201", "n_MaterialCount2": "10", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010101", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "2", "n_MaterialValue1": "10100001", "n_MaterialCount1": "10", "n_MaterialValue2": "201", "n_MaterialCount2": "999", "n_MaterialValue3": "202", "n_MaterialCount3": "99", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "201", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10300001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "10100002", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "1010104", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "101", "n_MaterialCount3": "100", "n_LinkPointID1": "1010103", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10004", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "101", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "102", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}] [{"n_CraftingItemID": "10101001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "1", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "201", "n_MaterialCount2": "10", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010101", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10101002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "2", "n_MaterialValue1": "10101001", "n_MaterialCount1": "1", "n_MaterialValue2": "201", "n_MaterialCount2": "20", "n_MaterialValue3": "202", "n_MaterialCount3": "10", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10101003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "201", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10301001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "10100002", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "1010104", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "101", "n_MaterialCount3": "100", "n_LinkPointID1": "1010103", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10004", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "101", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "102", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}]

2
Assets/ResWork/Table/Export/Localization.json
View File

File diff suppressed because one or more lines are too long

2
Assets/ResWork/Table/Export/MissionList.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

2
Assets/Script/Server/ServerClass.cs
View File

@ -1053,7 +1053,7 @@ public partial class ServerData
var lst = table_missionlist.Ins.Get_DataList(purpose); var lst = table_missionlist.Ins.Get_DataList(purpose);
for (int i = 0; i < lst.Count; i++) for (int i = 0; i < lst.Count; i++)
{ {
if (conditionvalue == lst[i].n_MissionConditionValue) if (lst[i].n_MissionConditionValue == 0 || conditionvalue == lst[i].n_MissionConditionValue)
{ {
var key1 = Get_Key(lst[i].n_MissionGroupId); var key1 = Get_Key(lst[i].n_MissionGroupId);
var key2 = Get_Key(lst[i].n_MissionIndex); var key2 = Get_Key(lst[i].n_MissionIndex);

2
Assets/Script/UI/Collection/Equipment_Monster/Equipment/CollectionEquipmentUI.cs
View File

@ -1,10 +1,12 @@
public class CollectionEquipmentUI : CollectionEMUIBase public class CollectionEquipmentUI : CollectionEMUIBase
{ {
public static bool isIns;
public static CollectionEquipmentUI Ins; public static CollectionEquipmentUI Ins;
public override void Set() public override void Set()
{ {
Ins = this; Ins = this;
isIns = true;
base.Set(); base.Set();
} }
} }

2
Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs
View File

@ -120,7 +120,7 @@ public class EquipmentMakePopup : uScrollViewMgr
PopupMgr.Ins.m_EquipmentPopup.Set_UI(); PopupMgr.Ins.m_EquipmentPopup.Set_UI();
if (NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.isActiveAndEnabled) if (NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.isActiveAndEnabled)
NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.Set_UI(); NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.Set_UI();
if (CollectionEquipmentUI.Ins.isActiveAndEnabled) if (CollectionEquipmentUI.isIns && CollectionEquipmentUI.Ins.isActiveAndEnabled)
CollectionEquipmentUI.Ins.Set(); CollectionEquipmentUI.Ins.Set();
ToastUI.Ins.Set(174, $"{Tdata.n_CraftingItemID} 제작 성공!!"); ToastUI.Ins.Set(174, $"{Tdata.n_CraftingItemID} 제작 성공!!");
} }

11
Assets/Script/UI/Eqiupment/EquipmentPopup_Obtain.cs
View File

@ -82,6 +82,8 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
if (m_Data.e_EquipParts == eItem.Weapon) if (m_Data.e_EquipParts == eItem.Weapon)
MyValue.MyPC.Change_Weapon(); MyValue.MyPC.Change_Weapon();
MyValue.Get_ActorStatInfoorNull(eRole.PC); MyValue.Get_ActorStatInfoorNull(eRole.PC);
sdata.Add_MissionCount(ePurpose.EQUIPEMENT_MOUNT_ALL);
} }
} }
} }
@ -91,13 +93,20 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
// 장비 제련 처리 // 장비 제련 처리
if (!DSUtil.CheckNull(m_NextSmeltingData)) if (!DSUtil.CheckNull(m_NextSmeltingData))
{ {
ServerInfo.Ins.m_ServerData.Try_SmeltingLvUp(m_SmeltingData, m_Data.n_EquipID, success => var sdata = ServerInfo.Ins.m_ServerData;
sdata.Try_SmeltingLvUp(m_SmeltingData, m_Data.n_EquipID, success =>
{ {
Set_SmeltingUI(); Set_SmeltingUI();
NewGameUI.Ins.m_EquipmentUI.m_equipItems.Set(); NewGameUI.Ins.m_EquipmentUI.m_equipItems.Set();
NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.Set_UI(); NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.Set_UI();
PopupMgr.Ins.m_EquipmentPopup.Set_UI(); PopupMgr.Ins.m_EquipmentPopup.Set_UI();
ToastUI.Ins.Set(174, success ? "제련 성공!!" : "제련 실패..."); ToastUI.Ins.Set(174, success ? "제련 성공!!" : "제련 실패...");
if (success)
{
sdata.Add_MissionCount(ePurpose.EQUIPEMENT_UPGRADE_ALL);
sdata.Add_MissionCount(ePurpose.EQUIPEMENT_UPGRADE_LIMIT_ALL);
}
}); });
} }
} }

1
Assets/Script/UI/Mission/MissionCard.cs
View File

@ -25,6 +25,7 @@ public class MissionCard : CardBase
break; break;
case ePurpose.TAKE_GOODS: case ePurpose.TAKE_GOODS:
case ePurpose.CONSUME_GOODS: case ePurpose.CONSUME_GOODS:
case ePurpose.GET_EQUIPEMENT:
var item = table_itemlist.Ins.Get_Data(m_Data.n_MissionConditionValue); var item = table_itemlist.Ins.Get_Data(m_Data.n_MissionConditionValue);
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, item.Get_Name()); texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, item.Get_Name());
break; break;