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

27
ServerCommon/Entity/Attribute/BeaconShopItemAttribute.cs
View File

@@ -12,7 +12,7 @@ using Amazon.S3.Model;
namespace ServerCommon
{
public class BeaconShopItemAttribute : ItemAttributeBase
public class BeaconShopItemAttribute : ItemAttributeBase, IWithCommonResultFiller
{
[JsonProperty]
public USER_GUID UserGuid { get; set; } = string.Empty;
@@ -26,6 +26,8 @@ namespace ServerCommon
[JsonProperty]
public double PriceForUnit { get; set; } = 0.0;
[JsonProperty]
public bool IsActiveSelling { get; set; } = false;
public BeaconShopItemAttribute(ItemBase owner, EntityBase entityOfOwnerEntityType)
: base(owner, entityOfOwnerEntityType)
@@ -41,6 +43,7 @@ namespace ServerCommon
ItemGuid = string.Empty;
SellingFinishTime = new();
PriceForUnit = 0;
IsActiveSelling = false;
}
public override EntityAttributeBase onCloned()
@@ -59,13 +62,14 @@ namespace ServerCommon
cloned.BeaconGuid = BeaconGuid;
cloned.SellingFinishTime = SellingFinishTime;
cloned.PriceForUnit = PriceForUnit;
cloned.IsActiveSelling = IsActiveSelling;
cloned.ItemGuid = ItemGuid;
cloned.ItemMetaId = ItemMetaId;
cloned.ItemStackCount = ItemStackCount;
cloned.Level = Level;
cloned.Attributes = Attributes.Select(x => x).ToList();
cloned.EquipedIvenType = EquipedIvenType;
cloned.EquipedInvenType = EquipedInvenType;
cloned.EquipedPos = EquipedPos;
return cloned;
@@ -109,13 +113,14 @@ namespace ServerCommon
to_copy_doc_attrib.BeaconGuid = BeaconGuid;
to_copy_doc_attrib.SellingFinishTime = SellingFinishTime;
to_copy_doc_attrib.PriceForUnit = PriceForUnit;
to_copy_doc_attrib.IsActiveSelling = IsActiveSelling;
to_copy_doc_attrib.ItemGuid = ItemGuid;
to_copy_doc_attrib.ItemMetaId = ItemMetaId;
to_copy_doc_attrib.ItemStackCount = ItemStackCount;
to_copy_doc_attrib.Level = Level;
to_copy_doc_attrib.Attributes = Attributes.Select(x => x).ToList();
to_copy_doc_attrib.EquipedIvenType = EquipedIvenType;
to_copy_doc_attrib.EquipedInvenType = EquipedInvenType;
to_copy_doc_attrib.EquipedPos = EquipedPos;
if (false == isForQuery)
@@ -171,18 +176,26 @@ namespace ServerCommon
BeaconGuid = doc_attrib.BeaconGuid;
SellingFinishTime = doc_attrib.SellingFinishTime;
PriceForUnit = doc_attrib.PriceForUnit;
IsActiveSelling = doc_attrib.IsActiveSelling;
ItemGuid = doc_attrib.ItemGuid;
ItemMetaId = doc_attrib.ItemMetaId;
ItemStackCount = doc_attrib.ItemStackCount;
Level = doc_attrib.Level;
Attributes = doc_attrib.Attributes.Select(x => x).ToList();
EquipedIvenType = doc_attrib.EquipedIvenType;
EquipedInvenType = doc_attrib.EquipedInvenType;
EquipedPos = doc_attrib.EquipedPos;
return true;
}
public new void onFillCommonResult( EntityCommonResult commonResult
, EntityAttributeBase origin, QueryBatchBase? queryBatch = null )
{
// commonResult 정보를 채우지 못하게 재정의 하여 그냥 반환 한다.
return;
}
public override Result onMerge(EntityAttributeBase otherEntityAttribute)
{
var owner = getOwner();
@@ -217,13 +230,14 @@ namespace ServerCommon
BeaconGuid = beacon_shop_attribute.BeaconGuid;
SellingFinishTime = beacon_shop_attribute.SellingFinishTime;
PriceForUnit = beacon_shop_attribute.PriceForUnit;
IsActiveSelling = beacon_shop_attribute.IsActiveSelling;
ItemGuid = beacon_shop_attribute.ItemGuid;
ItemMetaId = beacon_shop_attribute.ItemMetaId;
ItemStackCount = beacon_shop_attribute.ItemStackCount;
Level = beacon_shop_attribute.Level;
Attributes = beacon_shop_attribute.Attributes.Select(x => x).ToList();
EquipedIvenType = beacon_shop_attribute.EquipedIvenType;
EquipedInvenType = beacon_shop_attribute.EquipedInvenType;
EquipedPos = beacon_shop_attribute.EquipedPos;
//=====================================================================================
@@ -251,13 +265,14 @@ namespace ServerCommon
beacon_shop_attrib.BeaconGuid = BeaconGuid;
beacon_shop_attrib.SellingFinishTime = SellingFinishTime;
beacon_shop_attrib.PriceForUnit = PriceForUnit;
beacon_shop_attrib.IsActiveSelling = IsActiveSelling;
beacon_shop_attrib.ItemGuid = ItemGuid;
beacon_shop_attrib.ItemMetaId = ItemMetaId;
beacon_shop_attrib.ItemStackCount = ItemStackCount;
beacon_shop_attrib.Level = Level;
beacon_shop_attrib.Attributes = Attributes.Select(x => x).ToList(); ;
beacon_shop_attrib.EquipedIvenType = EquipedIvenType;
beacon_shop_attrib.EquipedInvenType = EquipedInvenType;
beacon_shop_attrib.EquipedPos = EquipedPos;
return result;