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

빌드 테스트용 버전 업데이트 03

Browse Source
This commit is contained in:
NTG 2024-05-13 15:41:35 +09:00
parent ff95d25283
commit 6d72198a34
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BlueWater/Assets/02.Scripts/Item/DropItemController.cs
View File

@ -9,7 +9,7 @@ namespace BlueWaterProject
{ {
[Title("컴포넌트")] [Title("컴포넌트")]
[SerializeField] private Rigidbody rb; [SerializeField] private Rigidbody rb;
[SerializeField] private Collider collider; [SerializeField] private Collider col;
[SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private SpriteRenderer spriteRenderer;
[SerializeField] private AudioSource audioSource; [SerializeField] private AudioSource audioSource;
@ -106,9 +106,9 @@ namespace BlueWaterProject
rb.isKinematic = true; rb.isKinematic = true;
rb.useGravity = false; rb.useGravity = false;
} }
if (collider) if (col)
{ {
collider.enabled = false; col.enabled = false;
} }
var startPosition = transform.position; var startPosition = transform.position;

2
BlueWater/Assets/02.Scripts/Player/Cannon.cs
View File

@ -127,7 +127,6 @@ namespace BlueWaterProject
[Button("셋팅 초기화")] [Button("셋팅 초기화")]
private void Init() private void Init()
{ {
projectileObject = Utils.LoadFromFolder<GameObject>("Assets/05.Prefabs/Particles/GrenadeFire", "GrenadeFireOBJ", ".prefab");
visualLook = transform.Find("VisualLook"); visualLook = transform.Find("VisualLook");
launchTransform = transform.Find("LaunchPosition"); launchTransform = transform.Find("LaunchPosition");
predictedLine = transform.Find("CannonLineRenderer").GetComponent<LineRenderer>(); predictedLine = transform.Find("CannonLineRenderer").GetComponent<LineRenderer>();
@ -135,7 +134,6 @@ namespace BlueWaterProject
{ {
predictedLine.gameObject.SetActive(false); predictedLine.gameObject.SetActive(false);
} }
hitMarker = Utils.LoadFromFolder<GameObject>("Assets/05.Prefabs", "HitMarker", ".prefab");
} }
private void InitStart() private void InitStart()

9
BlueWater/Assets/02.Scripts/Utility/Utils.cs
View File

@ -148,14 +148,5 @@ namespace BlueWaterProject
var sharedVariable = behaviorTreeComponent.GetVariable(behaviorVariableName); var sharedVariable = behaviorTreeComponent.GetVariable(behaviorVariableName);
sharedVariable?.SetValue(value); sharedVariable?.SetValue(value);
} }
#if UNITY_EDITOR
public static T LoadFromFolder<T>(string folderPath, string name, string extension) where T : Object
{
var fullPath = System.IO.Path.Combine(folderPath, name + extension);
var t = AssetDatabase.LoadAssetAtPath<T>(fullPath);
return t;
}
#endif
} }
} }

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

@ -345,8 +345,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
collider: {fileID: 1002976204637741028}
rb: {fileID: 1807992347579204990} rb: {fileID: 1807992347579204990}
col: {fileID: 1002976204637741028}
spriteRenderer: {fileID: 4385550810937580112} spriteRenderer: {fileID: 4385550810937580112}
audioSource: {fileID: 8975262077732393561} audioSource: {fileID: 8975262077732393561}
itemUiPrefab: {fileID: 0} itemUiPrefab: {fileID: 0}

5
BlueWater/Assets/link.xml Normal file
View File

@ -0,0 +1,5 @@
<linker>
<assembly fullname="Unity.MuseLab.Graph" ignoreIfUnreferenced="1"/>
<assembly fullname="Unity.Muse.Behavior" ignoreIfUnreferenced="1"/>
</linker>

7
BlueWater/Assets/link.xml.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 41d2cb15daede3b48ab863a603d976e6
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: