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

1
ServerCommon/1. Define/BusinessLog/Battle/BattleInstancesObjects.cs
View File

@@ -31,7 +31,6 @@ public class BattleInstancesObject
public class BattleObjectPodStorage : BattleInstancesObject
{
//private ECombatPodType m_combat_pod_type { get; } = ECombatPodType.Storage;
public Int32 m_reward_cnt { get; set; } = 0;
public BattleObjectPodStorage(string anchorGuid) : base(EBattleObjectType.Pod_Combat, anchorGuid)

3
ServerCommon/1. Define/BusinessLog/Domain/BeaconShopData.cs
View File

@@ -45,6 +45,8 @@ public class BeaconShopLogData : ILogInvoker.IInfo
public DateTime SellingFinishTime { get; set; } = new();
[JsonProperty]
public string BuyerGuid { get; set; } = string.Empty;
[JsonProperty]
public bool IsActiveSelling { get; set; } = false;
//=====================================================================================
// 로그 생성용 객체 정의
@@ -64,6 +66,7 @@ public class BeaconShopLogData : ILogInvoker.IInfo
BeaconMyHomeGuid = logData.BeaconMyHomeGuid;
SellingFinishTime = logData.SellingFinishTime;
BuyerGuid = logData.BuyerGuid;
IsActiveSelling = logData.IsActiveSelling;
}
//=====================================================================================

2
ServerCommon/1. Define/BusinessLog/Domain/PlanetItemExchangeLogData.cs
View File

@@ -5,7 +5,7 @@ using ServerBase;
using ServerCommon;
namespace BrokerCore.BrokerBusinessLog;
namespace ServerCommon.BusinessLogDomain;
public class PlanetItemExchangeLogData : ILogInvoker.IInfo

2
ServerCommon/1. Define/BusinessLog/Domain/PlanetProviderAuthLogData.cs
View File

@@ -5,7 +5,7 @@ using ServerBase;
using ServerCommon;
namespace BrokerCore.BrokerBusinessLog;
namespace ServerCommon.BusinessLogDomain;
//=========================================================================================
// Planet 컨텐츠 제공 업체 인증 로그

2
ServerCommon/1. Define/BusinessLog/Domain/PlanetUserAuthLogData.cs
View File

@@ -6,7 +6,7 @@ using ServerCommon;
namespace BrokerCore.BrokerBusinessLog;
namespace ServerCommon.BusinessLogDomain;
//=====================================================================================
// 플래닛 유저 인증 비즈니스 로그

2
ServerCommon/1. Define/BusinessLog/Enum/LogEnum.cs
View File

@@ -933,6 +933,8 @@ namespace ServerCommon
BeaconShopUpdateDailyCount,
[BusinessLogEnum("비컨 상점 기록 영수증 제거", LogCategoryType.BeaconShop, LogSubCategoryType.None, "Game")]
BeaconShopDeleteRecord,
[BusinessLogEnum("비컨 상점 아이템 비활성화", LogCategoryType.BeaconShop, LogSubCategoryType.None, "Game")]
BeaconShopDeactiveItems,
BeaconShopEnd,
#endregion

20
ServerCommon/1. Define/TypeDefine.cs
View File

@@ -421,6 +421,26 @@ public enum StageMoveType
Leave = 2,
}
public enum GameGenreType
{
None = 0,
TPS = 1,
Running = 2,
//Dance = 3,
}
public enum GameModeType
{
None = 0,
TPS_FFA = 1,
TPS_TDM = 2,
RUN_ADV = 3,
RUN_RACE = 4,
//DANCE_ = 5,
}
//=============================================================================================
// Broker Api 에서 사용하는 아이템 교환 Type
//=============================================================================================

3
ServerCommon/Doc/OwnerContents/BeaconShopItemDoc.cs
View File

@@ -23,6 +23,9 @@ namespace ServerCommon
[JsonProperty("price_for_unit")]
public double PriceForUnit { get; set; } = 0;
[JsonProperty("is_active_selling")]
public bool IsActiveSelling { get; set; } = false;
public BeaconShopItemAttrib()
: base(typeof(BeaconShopItemAttrib).Name, false)
{ }

5
ServerCommon/Doc/OwnerContents/ItemDoc.cs
View File

@@ -52,7 +52,7 @@ public class ItemAttrib : AttribBase
public List<UInt16> Attributes { get; set; } = new();
[JsonProperty("equiped_inven_type")]
public InvenEquipType EquipedIvenType { get; set; } = InvenEquipType.None;
public InvenEquipType EquipedInvenType { get; set; } = InvenEquipType.None;
[JsonProperty("equiped_pos")]
public UInt16 EquipedPos { get; set; } = 0;
@@ -150,10 +150,9 @@ public class ItemDoc : DynamoDbDocBase, ICopyDocFromEntityAttribute
to_copy_doc_item_attrib.ItemStackCount = item_attribute.ItemStackCount;
to_copy_doc_item_attrib.Level = item_attribute.Level;
to_copy_doc_item_attrib.Attributes = item_attribute.Attributes.Select(x => x).ToList();
to_copy_doc_item_attrib.EquipedIvenType = item_attribute.EquipedIvenType;
to_copy_doc_item_attrib.EquipedInvenType = item_attribute.EquipedInvenType;
to_copy_doc_item_attrib.EquipedPos = item_attribute.EquipedPos;
return true;
}
}

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;

14
ServerCommon/Entity/Attribute/ItemAttributeBase.cs
View File

@@ -71,9 +71,9 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
public List<UInt16> Attributes { get; set; } = new();
// EquipedIvenType.None 일경우 EquipedPos = 0 이다 !!! - kangms
// EquipedInvenType.None 일경우 EquipedPos = 0 이다 !!! - kangms
[JsonProperty]
public InvenEquipType EquipedIvenType { get; set; } = InvenEquipType.None;
public InvenEquipType EquipedInvenType { get; set; } = InvenEquipType.None;
[JsonProperty]
public UInt16 EquipedPos { get; set; } = 0;
@@ -106,7 +106,7 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
ItemStackCount = 0;
Level = 0;
Attributes.Clear();
EquipedIvenType = InvenEquipType.None;
EquipedInvenType = InvenEquipType.None;
EquipedPos = 0;
getAttributeState().reset();
@@ -151,7 +151,7 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
to_copy_doc_item_attrib.ItemStackCount = ItemStackCount;
to_copy_doc_item_attrib.Level = Level;
to_copy_doc_item_attrib.Attributes = Attributes.Select(x => x).ToList();
to_copy_doc_item_attrib.EquipedIvenType = EquipedIvenType;
to_copy_doc_item_attrib.EquipedInvenType = EquipedInvenType;
to_copy_doc_item_attrib.EquipedPos = EquipedPos;
if (false == isForQuery)
@@ -398,7 +398,7 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
ItemStackCount = other_item_attribute.ItemStackCount;
Level = other_item_attribute.Level;
Attributes = other_item_attribute.Attributes.Select(x => x).ToList();
EquipedIvenType = other_item_attribute.EquipedIvenType;
EquipedInvenType = other_item_attribute.EquipedInvenType;
EquipedPos = other_item_attribute.EquipedPos;
//=====================================================================================
@@ -428,7 +428,7 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
item_attrib.ItemStackCount = ItemStackCount;
item_attrib.Level = Level;
item_attrib.Attributes = Attributes.Select(x => x).ToList(); ;
item_attrib.EquipedIvenType = EquipedIvenType;
item_attrib.EquipedInvenType = EquipedInvenType;
item_attrib.EquipedPos = EquipedPos;
return result;
@@ -469,7 +469,7 @@ public abstract class ItemAttributeBase : EntityAttributeBase, ICopyEntityAttrib
ItemStackCount = item_attrib.ItemStackCount;
Level = item_attrib.Level;
Attributes = item_attrib.Attributes.Select(x => x).ToList();
EquipedIvenType = item_attrib.EquipedIvenType;
EquipedInvenType = item_attrib.EquipedInvenType;
EquipedPos = item_attrib.EquipedPos;
return true;

2
ServerCommon/Entity/Attribute/MyhomeItemAttribute.cs
View File

@@ -61,7 +61,7 @@ namespace ServerCommon
cloned.ItemStackCount = ItemStackCount;
cloned.Level = Level;
cloned.Attributes = Attributes.Select(x => x).ToList();
cloned.EquipedIvenType = EquipedIvenType;
cloned.EquipedInvenType = EquipedInvenType;
cloned.EquipedPos = EquipedPos;
return cloned;

2
ServerCommon/Entity/Attribute/UgcNpcItemAttribute.cs
View File

@@ -72,7 +72,7 @@ namespace ServerCommon
cloned.ItemStackCount = ItemStackCount;
cloned.Level = Level;
cloned.Attributes = Attributes.Select(x => x).ToList();
cloned.EquipedIvenType = EquipedIvenType;
cloned.EquipedInvenType = EquipedInvenType;
cloned.EquipedPos = EquipedPos;
return cloned;

4
ServerCommon/Entity/Attribute/UserItemAttribute.cs
View File

@@ -79,7 +79,7 @@ namespace ServerCommon
cloned.ItemStackCount = ItemStackCount;
cloned.Level = Level;
cloned.Attributes = Attributes.Select(x => x).ToList();
cloned.EquipedIvenType = EquipedIvenType;
cloned.EquipedInvenType = EquipedInvenType;
cloned.EquipedPos = EquipedPos;
return cloned;
@@ -105,7 +105,7 @@ namespace ServerCommon
to_copy_doc_item_attrib.ItemStackCount = ItemStackCount;
to_copy_doc_item_attrib.Level = Level;
to_copy_doc_item_attrib.Attributes = Attributes.Select(x => x).ToList();
to_copy_doc_item_attrib.EquipedIvenType = EquipedIvenType;
to_copy_doc_item_attrib.EquipedInvenType = EquipedInvenType;
to_copy_doc_item_attrib.EquipedPos = EquipedPos;
return to_copy_doc;

13
ServerCommon/MetaData/MetaEnums.cs
View File

@@ -577,4 +577,17 @@ public enum EPropSmallType
EXIT = 5,
SHORTCUT = 6,
PLAY = 7,
}
[JsonConverter(typeof(StringEnumConverter))]
public enum EGameObjectType
{
None = 0,
Weapon = 1,
Pod_Combat = 2,
Pod_Box = 3,
Buff = 4,
Save_Point = 5,
}

7
ServerCommon/ProudNet/ProudNetListener.cs
View File

@@ -1,4 +1,6 @@

using System.Diagnostics;
using Nettention.Proud;
@@ -7,9 +9,6 @@ using ServerBase;
using MODULE_ID = System.UInt32;
using ServerControlCenter;
using System.Diagnostics;
using System.Collections.Concurrent;
namespace ServerCommon;