iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closed #249 드랍 아이템 개선 (동적이게)

Browse Source
This commit is contained in:
NTG_Lenovo 2024-04-30 11:34:03 +09:00
parent 3785c576fa
commit 6c632e344d
4 changed files with 88 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
BlueWater/Assets/01.Scenes/02.Combat_2D.unity
View File

@ -2297,7 +2297,7 @@ GameObject:
- component: {fileID: 746104464}
- component: {fileID: 746104463}
- component: {fileID: 746104462}
m_Layer: 0
m_Layer: 3
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3950,9 +3950,9 @@ MonoBehaviour:
<MainSkillUi>k__BackingField: {fileID: 1049575630}
<FieldBossHpSlider>k__BackingField: {fileID: 259569763562170414}
<DropItemGroupController>k__BackingField: {fileID: 1842100125}
<OceanItemInventoryUi>k__BackingField: {fileID: 6661296397982603977}
<CombatItemInventoryUi>k__BackingField: {fileID: 1906451879}
<DiscardPopupUi>k__BackingField: {fileID: 1644675858}
<OceanItemInventoryUi>k__BackingField: {fileID: 0}
<CombatItemInventoryUi>k__BackingField: {fileID: 0}
<DiscardPopupUi>k__BackingField: {fileID: 0}
--- !u!114 &1033584366
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4182,12 +4182,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
_persistent: 1
<OceanInventory>k__BackingField:
<InventoryItemList>k__BackingField: []
<WeightLimit>k__BackingField: 150
<ItemSlotList>k__BackingField: []
<WeightLimit>k__BackingField: Infinity
<CurrentTotalWeight>k__BackingField: 0
<IsOverWeight>k__BackingField: 0
<CombatInventory>k__BackingField:
<InventoryItemList>k__BackingField: []
<ItemSlotList>k__BackingField: []
<WeightLimit>k__BackingField: Infinity
<CurrentTotalWeight>k__BackingField: 0
<IsOverWeight>k__BackingField: 0
@ -6663,18 +6663,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!114 &1644675858 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2819079776940216040, guid: 69cc62c186ba8fe44af29df72fb672ce,
type: 3}
m_PrefabInstance: {fileID: 5432215145398930727}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff0b44300107a9b4ca017d7805271ac4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &1644675859 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1631593940396857549, guid: 69cc62c186ba8fe44af29df72fb672ce,
@ -7702,18 +7690,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d96bf988529067d4383a3a91281636c7, type: 3}
--- !u!114 &1906451879 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4750452470218991809, guid: d96bf988529067d4383a3a91281636c7,
type: 3}
m_PrefabInstance: {fileID: 1906451878}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b87a52e3ff43cf147b64090e904d8797, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &1906451880 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6057102563371345699, guid: d96bf988529067d4383a3a91281636c7,
@ -18644,18 +18620,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d96bf988529067d4383a3a91281636c7, type: 3}
--- !u!114 &6661296397982603977 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4750452470218991809, guid: d96bf988529067d4383a3a91281636c7,
type: 3}
m_PrefabInstance: {fileID: 6661296397982603976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b87a52e3ff43cf147b64090e904d8797, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6661296397982603978 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6057102563371345699, guid: d96bf988529067d4383a3a91281636c7,

2
BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs
View File

@ -327,7 +327,7 @@ namespace BlueWaterProject
private void DieEvent()
{
ItemManager.Inst.ItemDrop(ItemDropTableIdx, transform.position + Vector3.up * 0.5f);
ItemManager.Inst.ItemDropRandomPosition(ItemDropTableIdx, transform.position + Vector3.up * 0.5f);
Destroy(hpSlider.gameObject);
Destroy(gameObject);

26
BlueWater/Assets/02.Scripts/Item/ItemManager.cs
View File

@ -78,6 +78,32 @@ namespace BlueWaterProject
}
}
public void ItemDropRandomPosition(int idx, Vector3 dropPosition)
{
var itemDropTable = ItemDropTableDictionary[idx];
var droppedItemList = itemDropTable.GetDroppedItemList();
foreach (var element in droppedItemList)
{
GameObject prefab = null;
if (itemDropTable.item_drop_type == ItemDropTable.ItemDropType.OCEAN)
{
prefab = oceanItemDropPrefab;
}
else if (itemDropTable.item_drop_type == ItemDropTable.ItemDropType.FIELD)
{
prefab = fieldItemDropPrefab;
}
var newDropPositionX = Random.Range(dropPosition.x - 1f, dropPosition.x + 1f);
var newDropPositionZ = Random.Range(dropPosition.z - 1f, dropPosition.z + 1f);
var newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ);
var instantiateItem = Instantiate(prefab, newDropPosition, Quaternion.identity);
instantiateItem.GetComponentInChildren<DropItemController>().Init(element);
instantiateItem.GetComponent<Rigidbody>().AddForce(Vector3.up * 20f, ForceMode.Impulse);
}
}
public void Acquire(ItemSlot itemSlot)
{
DataManager.Inst.CurrentInventory.AddItem(itemSlot);

56
BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab
View File

@ -138,7 +138,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 726335702565593345}
m_Layer: 0
- component: {fileID: 1002976204637741028}
- component: {fileID: 1807992347579204990}
m_Layer: 21
m_Name: FieldItemDrop
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -163,6 +165,56 @@ Transform:
- {fileID: 6499268732264954890}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &1002976204637741028
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4185765918994780331}
m_Material: {fileID: 13400000, guid: f6e50b0fef4fad348b69d7c57459b05e, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 2097160
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 512
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Height: 0.5
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &1807992347579204990
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4185765918994780331}
serializedVersion: 4
m_Mass: 10
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 2097160
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 512
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!1 &6718783098392052893
GameObject:
m_ObjectHideFlags: 0
@ -259,7 +311,7 @@ GameObject:
m_Component:
- component: {fileID: 816226554442943762}
- component: {fileID: 1871283123640341369}
m_Layer: 21
m_Layer: 0
m_Name: DropItemController
m_TagString: Untagged
m_Icon: {fileID: 0}