From af3535d31e2499c3aadda1c6b039c63da1a9d519 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 7 Mar 2025 11:28:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EA=BE=BC=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=A4=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 2 + .../Worker_BundledAssetGroupSchema.asset | 45 +++++++ .../Worker_BundledAssetGroupSchema.asset.meta | 8 ++ .../Worker_ContentUpdateGroupSchema.asset | 16 +++ ...Worker_ContentUpdateGroupSchema.asset.meta | 8 ++ .../AssetGroups/Worker.asset | 31 +++++ .../AssetGroups/Worker.asset.meta | 8 ++ Assets/Ino_nerdnavis.txt | 2 +- Assets/Res_Addr/Worker.meta | 8 ++ Assets/Scenes/Title.unity | 4 +- Assets/Script/Character/WorkerActor.cs | 126 ++++++++++++++++++ Assets/Script/Character/WorkerActor.cs.meta | 11 ++ 12 files changed, 266 insertions(+), 3 deletions(-) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Worker.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Worker.asset.meta create mode 100644 Assets/Res_Addr/Worker.meta create mode 100644 Assets/Script/Character/WorkerActor.cs create mode 100644 Assets/Script/Character/WorkerActor.cs.meta diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 11b4e5cee..ba4cf276f 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -61,6 +61,7 @@ MonoBehaviour: - {fileID: 11400000, guid: d169dbd6a1aa0644da778535cf44ffb3, type: 2} - {fileID: 11400000, guid: 048b438add221ab4c833393f3adb681e, type: 2} - {fileID: 11400000, guid: 460adb80895222d42b24c46f8382e59b, type: 2} + - {fileID: 11400000, guid: 9e3a67f80692e2c4faa406ae617a486a, type: 2} - {fileID: 11400000, guid: 11f4e8312285aae4f97ec09e0f4fbfed, type: 2} - {fileID: 11400000, guid: 2367bdf86d6f55448a8dffb5de3cbb97, type: 2} - {fileID: 11400000, guid: 3d7a76316cccd664d8bae7fcff35ead8, type: 2} @@ -147,6 +148,7 @@ MonoBehaviour: - animations - pccostumeimage - loading + - worker m_SchemaTemplates: [] m_GroupTemplateObjects: - {fileID: 11400000, guid: 99f009c9d7563914794bb14a5598a6a6, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..aac27d448 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: Worker_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 9e3a67f80692e2c4faa406ae617a486a, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: d1689830cd7e8a54ea1f8cff5aa5b5b1 + m_LoadPath: + m_Id: 3476497c96ca65b44a5079af3813b590 + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..26a597230 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82c89ae86e237bd40983fd1d73bc618d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..53f66cf46 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Worker_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 9e3a67f80692e2c4faa406ae617a486a, type: 2} + m_StaticContent: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..7e131de71 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Worker_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b099f7330a494c142bf6bb9aef3d0d1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Worker.asset b/Assets/AddressableAssetsData/AssetGroups/Worker.asset new file mode 100644 index 000000000..3e61b0b7c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Worker.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Worker + m_EditorClassIdentifier: + m_GroupName: Worker + m_Data: + m_SerializedData: [] + m_GUID: 940cddc326a4f8f49a813e1b6a92fdbe + m_SerializeEntries: + - m_GUID: 80dde3c583999f54dbead77d5d4ac523 + m_Address: Assets/Res_Addr/Worker + m_ReadOnly: 0 + m_SerializedLabels: + - worker + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: b271e3853bc8b3047b1a44f27d61ca63, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 82c89ae86e237bd40983fd1d73bc618d, type: 2} + - {fileID: 11400000, guid: b099f7330a494c142bf6bb9aef3d0d1f, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Worker.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Worker.asset.meta new file mode 100644 index 000000000..140e8f3a8 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Worker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e3a67f80692e2c4faa406ae617a486a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index e296f8ae4..d2ae51da6 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -33,6 +33,7 @@ classconfig 에 의해 정해짐 messageinfo 엄청 느린 버그 화살의 경우 화살 궤적 추가하자 +몬스터 아이템 드랍 (랜덤백 id와 등급 2개 필요) 미믹 던전 - 결과 화면 (승리 보상 지급) @@ -62,4 +63,3 @@ messageinfo 엄청 느린 버그 일꾼 추가 -몬스터 아이템 드랍 diff --git a/Assets/Res_Addr/Worker.meta b/Assets/Res_Addr/Worker.meta new file mode 100644 index 000000000..acb254bc1 --- /dev/null +++ b/Assets/Res_Addr/Worker.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80dde3c583999f54dbead77d5d4ac523 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index 76b574452..bdeae423f 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -767,7 +767,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01d734a0ae085284eb82b59533011c90, type: 3} m_Name: m_EditorClassIdentifier: - go_Camera: {fileID: 0} --- !u!4 &868229579 Transform: m_ObjectHideFlags: 0 @@ -1282,6 +1281,8 @@ MonoBehaviour: - m_LabelString: mainui - m_LabelString: animations - m_LabelString: pccostumeimage + - m_LabelString: loading + - m_LabelString: worker --- !u!1 &1668733658 GameObject: m_ObjectHideFlags: 0 @@ -1537,7 +1538,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 205e9f58da95dca43bcd6f29f4cc3b41, type: 3} m_Name: m_EditorClassIdentifier: - go_Camera: {fileID: 0} --- !u!1 &1902488690 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/WorkerActor.cs b/Assets/Script/Character/WorkerActor.cs new file mode 100644 index 000000000..bbfb860e2 --- /dev/null +++ b/Assets/Script/Character/WorkerActor.cs @@ -0,0 +1,126 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WorkerActor : Actor +{ + EquipmentTableBase m_FairyTableData; + DropItem go_finditem; + float SeekTime = 5f, t; + + byte Status = 0; // 0 아이들, 1 캐릭터 뒤로 이동 중, 2 아이템으로 이동 중 + + protected override void Awake() + { + base.Awake(); + m_Stat = new ActorStatInfo(eRole.Fairy, ServerInfo.Ins.m_ServerData, null); + } + + public override void Set(bool isEnemy, Actor owner, ServerData sdata, int _id, bool _stop, bool _ui = false) + { + base.Set(isEnemy, owner, sdata, _id, _stop); + + m_FairyTableData = table_fairy.Ins.Get_Data(_id); + if (!_ui) + { + int lv = sdata.Get_SmeltingLv(_id); + m_NavMeshAgent.speed = m_NavSpeed = 6f; // TODO 정인호 : 요정은 날개로 변경될 예정 m_FairyTableData.Get_StatValue(eStat.FairyMoveSpeed, lv); + t = SeekTime = 2f; //m_FairyTableData.Get_StatValue(eStat.FairySeek, lv); + Set_Warp(Get_Pos()); + if (!m_NavMeshAgent.isOnNavMesh) + Set_Warp(Get_Pos()); + Status = 0; + } + } + + Vector3 Get_Pos() + { + return DSUtil.Get_RandomPos_onNavMesh(MyValue.MyPC.Get_position(), 0f, 1f); + } + + protected override void Update() + { + t -= Time.deltaTime; + switch (Status) + { + case 0: // 대기 중 + if (DSUtil.CheckNull(go_finditem) || !go_finditem.gameObject.activeInHierarchy) + go_finditem = DropItemInfo.Ins.Get_NearestDropItem(Get_position()); + + if (t > 0f) + { + if (go_finditem) + { // 다음 아이템으로 미리 가서 대기 + Play_Run(); + Set_Path(go_finditem.transform.position); + Status = 3; + } + } + else + { + if (go_finditem && Set_Path(go_finditem.transform.position)) + { + Play_Run(); + Status = 2; + } + } + + if (Status == 0 && Vector3.Distance(MyValue.MyPC.Get_position(), Get_position()) > 3f) + { // 캐릭터 근처로 옴 + Play_Run(); + Set_Path(Get_Pos()); + Status = 1; + } + break; + case 1: // 캐릭터 뒤로 가는 중 + if (Complete_Destination()) + { + Play_Idle(); + Status = 0; + } + break; + case 2: // 아이템으로 뛰어가는 중 + if (CurAnim >= eAnim.Attack) + { + if (!isPlaying()) + { + Play_Idle(); + Status = 0; + t = SeekTime; + } + } + else if (Complete_Destination()) + { + if (!DSUtil.CheckNull(go_finditem)) + { + if (go_finditem.gameObject.activeInHierarchy) + { + Play_Attack(Random.Range(0, 2), 1f); + if (go_finditem.ItemTouch(this)) + ServerInfo.Ins.m_ServerData.Add_TitleCondition(46, 47); // 칭호 : 요정은 내 친구, 요정은 내 노예 + } + else + { + Play_Idle(); + Status = 0; + t = SeekTime; + } + go_finditem = null; + } + else + { + Play_Idle(); + Status = 0; + t = SeekTime; + } + } + break; + case 3: // 아무것도 안함 + if (CurAnim != eAnim.Idle && Complete_Destination()) + Play_Idle(); + if (t <= 0f) + Status = 0; + break; + } + } +} \ No newline at end of file diff --git a/Assets/Script/Character/WorkerActor.cs.meta b/Assets/Script/Character/WorkerActor.cs.meta new file mode 100644 index 000000000..d9b7d7837 --- /dev/null +++ b/Assets/Script/Character/WorkerActor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 370b98fa1864f0e4396762b0ab53f9a9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: