bcjang/caliverse_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

250501 커밋

Browse Source
This commit is contained in:
bcjang
2025-05-01 07:23:28 +09:00
parent 98bb2e3c5c
commit 23176551b7
353 changed files with 9972 additions and 6652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
GameServer/Entity/Inventory/Base/Action/InventoryActionBase.cs
View File

@@ -286,7 +286,7 @@ namespace GameServer
NullReferenceCheckHelper.throwIfNull(doc_item_attrib, () => $"doc_item_attrib is null !!! - {owner.toBasicString()}");
// InvenEquipType 비장작 상태인 경우만 허용 한다. !!! - kangms
if (InvenEquipType.None != doc_item_attrib.EquipedIvenType)
if (InvenEquipType.None != doc_item_attrib.EquipedInvenType)
{
err_msg = $"Not found InventoryRule !!! : ItemMetaId:{doc_item_attrib.ItemMetaId}, itemGuid:{doc_item_attrib.OwnerGuid} - {owner.toBasicString()}";
result.setFail(ServerErrorCode.InvenEquipTypeInvalid, err_msg);
@@ -363,7 +363,7 @@ namespace GameServer
NullReferenceCheckHelper.throwIfNull(item_attribute, () => $"item_attribute is null !!! - {owner.toBasicString()}");
// InvenEquipType 장착 상태인 경우만 장착 시켜준다 !!! - kangms
if (InvenEquipType.None != item_attribute.EquipedIvenType)
if (InvenEquipType.None != item_attribute.EquipedInvenType)
{
var equiped_pos = item_attribute.EquipedPos;
result = await tryTakableToEquip(took_in_item, (Int16)equiped_pos);
@@ -372,10 +372,10 @@ namespace GameServer
return (result, took_in_item);
}
if(false == reservedSlotTypes.TryGetValue(item_attribute.EquipedIvenType, out var reserved_slots))
if(false == reservedSlotTypes.TryGetValue(item_attribute.EquipedInvenType, out var reserved_slots))
{
reserved_slots = new HashSet<Int16>();
reservedSlotTypes.Add(item_attribute.EquipedIvenType, reserved_slots);
reservedSlotTypes.Add(item_attribute.EquipedInvenType, reserved_slots);
}
reserved_slots.Add((Int16)equiped_pos);
}
@@ -616,7 +616,7 @@ namespace GameServer
} break;
}
item_attribute.EquipedIvenType = equipRuleBase.InvenEquipType;
item_attribute.EquipedInvenType = equipRuleBase.InvenEquipType;
item_attribute.EquipedPos = (UInt16)to_equip_pos;
item_attribute.modifiedEntityAttribute();
@@ -646,7 +646,7 @@ namespace GameServer
NullReferenceCheckHelper.throwIfNull(item_attribute, () => $"item_attribute is null !!! - {owner.toBasicString()}");
// 2. 장착 인벤으로 설정되어 있는 경우, 장착을 해제 한다.
if (InvenEquipType.None != item_attribute.EquipedIvenType)
if (InvenEquipType.None != item_attribute.EquipedInvenType)
{
(result, var unequiped_item) = await tryTakableOutFromEquip(reserved_item);
if (result.isFail())
@@ -680,7 +680,7 @@ namespace GameServer
NullReferenceCheckHelper.throwIfNull(item_attribute, () => $"item_attribute is null !!! - {owner.toBasicString()}");
// 2. 장착 인벤으로 설정되어 있는 경우, 장착을 해제 한다.
if (InvenEquipType.None != item_attribute.EquipedIvenType)
if (InvenEquipType.None != item_attribute.EquipedInvenType)
{
(result, var unequiped_item) = await tryTakableOutFromEquip(reserved_item);
if (result.isFail())
@@ -884,7 +884,7 @@ namespace GameServer
} break;
}
item_attribute.EquipedIvenType = InvenEquipType.None;
item_attribute.EquipedInvenType = InvenEquipType.None;
item_attribute.EquipedPos = 0;
item_attribute.modifiedEntityAttribute();

2
GameServer/Entity/Npc/UgcNpc/Action/UgcNpcAction.cs
View File

@@ -832,7 +832,7 @@ public class UgcNpcAction : EntityActionBase
{
var beacon_shop_action = masterEntity.getEntityAction<BeaconShopAction>();
if (beacon_shop_action != null)
ugc_summary.HasReceivePayment = beacon_shop_action.hasBeaconShopSoldRecord(ugc_summary.UgcNpcMetaGuid) == true ? BoolType.True : BoolType.False;
ugc_summary.HasReceivePayment = beacon_shop_action.getBeaconShopNumOfReceiptNotReceived(ugc_summary.UgcNpcMetaGuid) == 0 ? BoolType.False : BoolType.True;
}
return ugc_summary;

11
GameServer/Entity/Npc/UgcNpc/Action/UgcNpcBeaconShopAction.cs
View File

@@ -181,5 +181,16 @@ namespace GameServer
{
m_isUpdateBeaconShopItem = true;
}
public void setDeactiveAllItems()
{
foreach(var beaconShopItem in m_beaconShopItems.Values)
{
var beacon_shop_item_attribute = beaconShopItem.getEntityAttribute<BeaconShopItemAttribute>();
NullReferenceCheckHelper.throwIfNull(beacon_shop_item_attribute, () => $"beacon_shop_item_attribute is null !!! - {toBasicString()}");
beacon_shop_item_attribute.IsActiveSelling = false;
beacon_shop_item_attribute.modifiedEntityAttribute();
}
}
}
}