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

EQUIP_ITEM_UPGRADE_ALL 

EQUIP_ITEM_UPGRADE_ACC
EQUIP_ITEM_UPGRADE_LIMIT
EQUIP_ITEM_CRAFTING
EQUIP_ITEM_CRAFTING_ACC
EQUIP_ITEM_DISTROY_ALL
EQUIP_ITEM_DISTROY_ACC
EQUIP_ITEM_ENCHANT_ALL
EQUIP_ITEM_ENCHANT_ACC
This commit is contained in:
Ino 2025-03-20 08:45:04 +09:00
parent b4f3ca83df
commit 9627ffa30d
12 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Assets/Editor/Logs/NoItemLogs.txt
View File

@ -1,41 +0,0 @@
2025-03-20 07:38:04
Item ID 0 not found!
at System.Environment.get_StackTrace () [0x00000] in <de920293e401402ab375ad8a2e1b19da>:0
at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103
at EquipmentMakePopup.Set_UI () [0x001a9] in C:\Git\nn_himminji\Assets\Script\UI\Eqiupment\EquipmentMakePopup.cs:66
at EquipmentMakePopup.Set (EquipmentListTableData data) [0x0003e] in C:\Git\nn_himminji\Assets\Script\UI\Eqiupment\EquipmentMakePopup.cs:27
at EquipmentPopupBase.OnClick_Make () [0x00001] in C:\Git\nn_himminji\Assets\Script\UI\Eqiupment\EquipmentPopupBase.cs:18
at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in <c648d86e9013479d818310c5918e31a4>:0
at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in <c648d86e9013479d818310c5918e31a4>:0
at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70
at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114
at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57
at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272
at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534
at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282
at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530
2025-03-20 07:38:05
Item ID 0 not found!
at System.Environment.get_StackTrace () [0x00000] in <de920293e401402ab375ad8a2e1b19da>:0
at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103
at EquipmentMakePopup.Set_UI () [0x001a9] in C:\Git\nn_himminji\Assets\Script\UI\Eqiupment\EquipmentMakePopup.cs:66
at EquipmentMakePopup.OnClick_MakeEquipment () [0x000e3] in C:\Git\nn_himminji\Assets\Script\UI\Eqiupment\EquipmentMakePopup.cs:118
at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in <c648d86e9013479d818310c5918e31a4>:0
at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in <c648d86e9013479d818310c5918e31a4>:0
at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70
at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114
at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57
at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272
at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554
at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534
at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282
at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530

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

@ -1 +1 @@
[{"n_EnchantID": "10001", "n_OptionConfigID1": "1", "n_OptionConfigID2": "2", "n_OptionConfigID3": "3", "n_OptionConfigID4": "4", "n_FruitID": "451"}, {"n_EnchantID": "10002", "n_OptionConfigID1": "5", "n_OptionConfigID2": "6", "n_OptionConfigID3": "7", "n_OptionConfigID4": "8", "n_FruitID": "452"}, {"n_EnchantID": "10003", "n_OptionConfigID1": "9", "n_OptionConfigID2": "10", "n_OptionConfigID3": "11", "n_OptionConfigID4": "12", "n_FruitID": "453"}, {"n_EnchantID": "10004", "n_OptionConfigID1": "13", "n_OptionConfigID2": "14", "n_OptionConfigID3": "15", "n_OptionConfigID4": "16", "n_FruitID": "451"}, {"n_EnchantID": "10005", "n_OptionConfigID1": "17", "n_OptionConfigID2": "18", "n_OptionConfigID3": "19", "n_OptionConfigID4": "20", "n_FruitID": "452"}, {"n_EnchantID": "10006", "n_OptionConfigID1": "21", "n_OptionConfigID2": "22", "n_OptionConfigID3": "23", "n_OptionConfigID4": "24", "n_FruitID": "453"}, {"n_EnchantID": "10007", "n_OptionConfigID1": "25", "n_OptionConfigID2": "26", "n_OptionConfigID3": "27", "n_OptionConfigID4": "28", "n_FruitID": "451"}, {"n_EnchantID": "10008", "n_OptionConfigID1": "29", "n_OptionConfigID2": "30", "n_OptionConfigID3": "31", "n_OptionConfigID4": "32", "n_FruitID": "452"}, {"n_EnchantID": "10009", "n_OptionConfigID1": "33", "n_OptionConfigID2": "34", "n_OptionConfigID3": "35", "n_OptionConfigID4": "36", "n_FruitID": "453"}, {"n_EnchantID": "10010", "n_OptionConfigID1": "37", "n_OptionConfigID2": "38", "n_OptionConfigID3": "39", "n_OptionConfigID4": "40", "n_FruitID": "451"}, {"n_EnchantID": "10011", "n_OptionConfigID1": "41", "n_OptionConfigID2": "42", "n_OptionConfigID3": "43", "n_OptionConfigID4": "44", "n_FruitID": "452"}, {"n_EnchantID": "10012", "n_OptionConfigID1": "45", "n_OptionConfigID2": "46", "n_OptionConfigID3": "47", "n_OptionConfigID4": "48", "n_FruitID": "453"}, {"n_EnchantID": "10013", "n_OptionConfigID1": "49", "n_OptionConfigID2": "50", "n_OptionConfigID3": "51", "n_OptionConfigID4": "52", "n_FruitID": "451"}, {"n_EnchantID": "10014", "n_OptionConfigID1": "53", "n_OptionConfigID2": "54", "n_OptionConfigID3": "55", "n_OptionConfigID4": "56", "n_FruitID": "452"}, {"n_EnchantID": "10015", "n_OptionConfigID1": "53", "n_OptionConfigID2": "54", "n_OptionConfigID3": "55", "n_OptionConfigID4": "56", "n_FruitID": "452"}]
[{"n_EnchantID": "10001", "n_OptionConfigID1": "330001", "n_OptionConfigID2": "330002", "n_OptionConfigID3": "330003", "n_OptionConfigID4": "330004", "n_FruitID": "451"}, {"n_EnchantID": "10002", "n_OptionConfigID1": "330005", "n_OptionConfigID2": "330006", "n_OptionConfigID3": "330007", "n_OptionConfigID4": "330008", "n_FruitID": "452"}, {"n_EnchantID": "10003", "n_OptionConfigID1": "330009", "n_OptionConfigID2": "330101", "n_OptionConfigID3": "330102", "n_OptionConfigID4": "330103", "n_FruitID": "453"}, {"n_EnchantID": "10004", "n_OptionConfigID1": "330104", "n_OptionConfigID2": "330105", "n_OptionConfigID3": "330106", "n_OptionConfigID4": "330107", "n_FruitID": "451"}, {"n_EnchantID": "10005", "n_OptionConfigID1": "330107", "n_OptionConfigID2": "330108", "n_OptionConfigID3": "330109", "n_OptionConfigID4": "330001", "n_FruitID": "452"}, {"n_EnchantID": "10006", "n_OptionConfigID1": "330001", "n_OptionConfigID2": "330002", "n_OptionConfigID3": "330003", "n_OptionConfigID4": "330004", "n_FruitID": "453"}, {"n_EnchantID": "10007", "n_OptionConfigID1": "330005", "n_OptionConfigID2": "330006", "n_OptionConfigID3": "330007", "n_OptionConfigID4": "330008", "n_FruitID": "451"}, {"n_EnchantID": "10008", "n_OptionConfigID1": "330009", "n_OptionConfigID2": "330101", "n_OptionConfigID3": "330102", "n_OptionConfigID4": "330103", "n_FruitID": "452"}, {"n_EnchantID": "10009", "n_OptionConfigID1": "330104", "n_OptionConfigID2": "330105", "n_OptionConfigID3": "330106", "n_OptionConfigID4": "330107", "n_FruitID": "453"}, {"n_EnchantID": "10010", "n_OptionConfigID1": "330107", "n_OptionConfigID2": "330108", "n_OptionConfigID3": "330109", "n_OptionConfigID4": "330001", "n_FruitID": "451"}, {"n_EnchantID": "10011", "n_OptionConfigID1": "330001", "n_OptionConfigID2": "330002", "n_OptionConfigID3": "330003", "n_OptionConfigID4": "330004", "n_FruitID": "452"}, {"n_EnchantID": "10012", "n_OptionConfigID1": "330005", "n_OptionConfigID2": "330006", "n_OptionConfigID3": "330007", "n_OptionConfigID4": "330008", "n_FruitID": "453"}, {"n_EnchantID": "10013", "n_OptionConfigID1": "330009", "n_OptionConfigID2": "330101", "n_OptionConfigID3": "330102", "n_OptionConfigID4": "330103", "n_FruitID": "451"}, {"n_EnchantID": "10014", "n_OptionConfigID1": "330104", "n_OptionConfigID2": "330105", "n_OptionConfigID3": "330106", "n_OptionConfigID4": "330107", "n_FruitID": "452"}, {"n_EnchantID": "10015", "n_OptionConfigID1": "330107", "n_OptionConfigID2": "330108", "n_OptionConfigID3": "330109", "n_OptionConfigID4": "330001", "n_FruitID": "452"}]

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.

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

@ -1065,11 +1065,20 @@ public partial class ServerData
if (!Mission.ContainsKey(key1)) Mission.Add(key1, new Dictionary<string, List<ObscuredInt>>());
if (!Mission[key1].ContainsKey(key2)) Mission[key1].Add(key2, new List<ObscuredInt> { 0, 0 });
if (setValue) Mission[key1][key2][1] = _v;
else Mission[key1][key2][1] += _v;
else Mission[key1][key2][1] += _v;
Mission[key1][key2][1].RandomizeCryptoKey();
}
}
}
public void Add_MissionEquipItem(ePurpose purpose, int itemid, int conditionvalue = 0, int _v = 1)
{
if (purpose == ePurpose.GET_EQUIP_ITEM_ALL || purpose == ePurpose.GET_EQUIP_ITEM_GRADE_ACC)
{
var itemData = table_itemlist.Ins.Get_Data(itemid);
if (!DSUtil.CheckNull(itemData) && itemData.IsEquipItem())
Add_MissionCount(purpose, conditionvalue, _v);
}
}
public void Add_MissionCompletCount(int group)
{
var completeData = table_missionlist.Ins.Get_CompleteData(group);
@ -1863,8 +1872,8 @@ public partial class ServerData
Add_MissionCount(ePurpose.TAKE_GOODS, id, (int)amount);
Add_MissionCount(ePurpose.TAKE_GOODS_ACC, id, (int)amount);
Add_MissionCount(ePurpose.TAKE_GOODS_LIMIT, id, (int)amount);
Add_MissionCount(ePurpose.GET_EQUIP_ITEM_ALL, id, (int)amount);
Add_MissionCount(ePurpose.GET_EQUIP_ITEM_GRADE_ACC, itemdata.n_ItemGrade, (int)amount);
Add_MissionEquipItem(ePurpose.GET_EQUIP_ITEM_ALL, id, 0, (int)amount);
Add_MissionEquipItem(ePurpose.GET_EQUIP_ITEM_GRADE_ACC, id, itemdata.n_ItemGrade, (int)amount);
}
public void Use_Item(int id, double amount)
{

12
Assets/Script/UI/Base/TabUIBase.cs
View File

@ -61,6 +61,18 @@ public class TabUIBase : uScrollViewMgr
public void Set_Index(int index) { m_Index = index; }
public int Get_Index() { return m_Index; }
public void OnClick_Tab_byScript(int index)
{
for (int i = 0; i < list_CardBase.Count; i++)
{
if (list_CardBase[i].Get_IntData() == index)
{
(list_CardBase[i] as TabCardBase).OnClick_Tab();
break;
}
}
}
void OnClick_Tab(int index)
{
if (list_tabData[index].n_Update > 0)

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

@ -38,7 +38,7 @@ public class EquipItemEnchantOptionCard : CardBase
public void OnClick_Enchant()
{
PopupMgr.Ins.m_EquipmentItemPopup.Set_Position(false); // 팝업을 왼쪽으로 보낸다.
NewGameUI.Ins.m_EquipmentUI.OnClick_Button(); // 인챈트 리스트 표시
NewGameUI.Ins.m_EquipmentUI.m_Tab.OnClick_Tab_byScript(0); // 인챈트 리스트 표시
EquipmentEnchantCard.Select_EnchantCardData = m_EnchantCardData;
}

5
Assets/Script/UI/Eqiupment/EquipmentEnchantCard.cs
View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
@ -67,6 +65,9 @@ public class EquipmentEnchantCard : CardBase
var optionconfigid = m_Data.Get_OptionConfigID(Select_SlotData);
sdata.Set_SlotEnchant(parts, Select_EnchantCardData.Index, optionconfigid, enchantlv);
PopupMgr.Ins.m_EquipmentItemPopup.m_EquipItemEnchantOption.Set_UI();
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_ENCHANT_ACC);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_ENCHANT_ALL);
}
}
}

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

@ -123,6 +123,9 @@ public class EquipmentMakePopup : uScrollViewMgr
if (CollectionEquipmentUI.isIns && CollectionEquipmentUI.Ins.isActiveAndEnabled)
CollectionEquipmentUI.Ins.Set();
ToastUI.Ins.Set(174, $"{Tdata.n_CraftingItemID} 제작 성공!!");
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_CRAFTING);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_CRAFTING_ACC);
}
}
}

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

@ -112,8 +112,9 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
if (success)
{
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_ENCHANT_ALL);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_ENCHANT_ACC);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_UPGRADE_ACC);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_UPGRADE_ALL);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_UPGRADE_LIMIT);
}
});
}
@ -128,10 +129,12 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
sdata.Use_Item(m_Data.n_EquipID, m_DecompAmount);
sdata.Add_Item(m_Data.n_DecompositionReward, m_Data.n_DecompositionCount * m_DecompAmount);
ToastUI.Ins.Set(174, $"분해해서 {m_Data.n_DecompositionReward} 아이템 {m_Data.n_DecompositionCount * m_DecompAmount} 개 획득");
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_DISTROY_ALL, 0, m_DecompAmount);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_DISTROY_ACC, 0, m_DecompAmount);
Set_Decompostion(0);
Set_SmeltingUI();
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_DISTROY_ALL);
sdata.Add_MissionCount(ePurpose.EQUIP_ITEM_DISTROY_ACC);
}
}
public void OnClick_Slider(int add)

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

@ -1,6 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EquipmentUI : BotMenuBase
{