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

Closes #220 부유물 드랍 기능 추가

Browse Source 
+ 부유물 Barrel, BigBarrel 프리팹 추가
  ㄴ 각각 코인 x50, x100 부여
+ BaseBoids Variant 3종 추가
  (망치머리상어, 금붕어, 가오리)
+ 02.Ocean 씬에 부유물, Boids 배치
+ 02.Ocean water material 옵션 변경
This commit is contained in:
NTG 2024-03-02 16:10:25 +09:00
parent cb66ffa953
commit 35440098e4
29 changed files with 5577 additions and 2065 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6761
BlueWater/Assets/01.Scenes/02.Ocean.unity
View File

File diff suppressed because it is too large Load Diff

32
BlueWater/Assets/02.Scripts/DestructibleObject.cs
View File

@ -7,37 +7,22 @@ namespace BlueWaterProject
{
public class DestructibleObject : MonoBehaviour
{
[Title("초기화 방식")]
[SerializeField] private bool autoInit = true;
[Title("기본 설정")]
[SerializeField] private Item itemInfo;
[field: SerializeField] public int Strength { get; private set; } = 100;
[SerializeField] private float power = 10f;
[SerializeField] private float damageCooldown = 2f;
[SerializeField] private bool isHitting;
[SerializeField] private RayfireRigid rayfire;
[SerializeField] private Rigidbody rb;
private bool isHitting;
[Button("셋팅 초기화")]
private void Init()
{
rayfire = GetComponent<RayfireRigid>();
}
private void Awake()
{
if (autoInit)
{
Init();
}
}
private void Start()
{
rb = GetComponent<Rigidbody>();
//rb.isKinematic = true;
rayfire = GetComponent<RayfireRigid>();
}
private void OnCollisionEnter(Collision other)
@ -49,7 +34,7 @@ namespace BlueWaterProject
if (otherStrength > Strength)
{
DestroyObject();
DestroyObject(other);
}
else if (otherStrength < Strength)
{
@ -59,20 +44,21 @@ namespace BlueWaterProject
}
else
{
DestroyObject();
DestroyObject(other);
Hit(iDestructible);
}
}
else if (other.collider.CompareTag("Missile"))
{
DestroyObject();
DestroyObject(other);
}
}
private void DestroyObject()
private void DestroyObject(Collision other)
{
rb.isKinematic = false;
rayfire.Demolish();
ItemDropManager.Inst.DropItem(itemInfo, other.collider.bounds.center);
}
private void Hit(IDestructible iDestructible)

13
BlueWater/Assets/02.Scripts/Item/ItemManager.cs → BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs
View File

@ -6,9 +6,6 @@ namespace BlueWaterProject
{
public class ItemDropManager : Singleton<ItemDropManager>
{
[Title("초기화 방식")]
[SerializeField] private bool autoInit = true;
[field: Title("아이템")]
[field: SerializeField] public GameObject ItemPrefab { get; private set; }
[SerializeField] private Transform instantiateObjects;
@ -21,16 +18,6 @@ namespace BlueWaterProject
items = instantiateObjects.transform.Find("Items");
}
protected override void OnAwake()
{
base.OnAwake();
if (autoInit)
{
Init();
}
}
public void DropItem(Item item, Vector3 dropPosition)
{
var itemController = Instantiate(ItemPrefab, dropPosition, Quaternion.identity, items).GetComponentInChildren<ItemController>();

0
BlueWater/Assets/02.Scripts/Item/ItemManager.cs.meta → BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs.meta
View File

2
BlueWater/Assets/03.Materials/Tycoon/OceanWater.mat
View File

@ -146,7 +146,7 @@ Material:
- _CausticsOn: 0
- _CausticsSpeed: 0.1
- _CausticsTiling: 0.5
- _ColorAbsorption: 0.002
- _ColorAbsorption: 0.01
- _CrossPan_IntersectionOn: 0
- _Cull: 0
- _Cutoff: 0.5

4
BlueWater/Assets/05.Prefabs/Boids/Boids.prefab → BlueWater/Assets/05.Prefabs/Boids/BaseBoids.prefab
View File

@ -28,7 +28,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 30, y: 10, z: 30}
m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1800824703194841433}
@ -96,7 +96,7 @@ GameObject:
- component: {fileID: 1800824703194841433}
- component: {fileID: 5146900491857106217}
m_Layer: 0
m_Name: Boids
m_Name: BaseBoids
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
BlueWater/Assets/05.Prefabs/Boids/Boids.prefab.meta → BlueWater/Assets/05.Prefabs/Boids/BaseBoids.prefab.meta
View File

8
BlueWater/Assets/05.Prefabs/Boids/Boid.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b513bc74ff22a514ead75cbbfce5baff
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab → BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab
View File

0
BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab.meta → BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab.meta
View File

2
BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab → BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab
View File

@ -47,7 +47,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<FishItem>k__BackingField:
<ItemName>k__BackingField: "\uACE0\uB4F1\uC5B4"
<ItemName>k__BackingField: "\uAE08\uBD95\uC5B4"
<ItemCount>k__BackingField: 0
<ItemIcon>k__BackingField: {fileID: 21300000, guid: 27d2d9a014b4b7e418f48feca49d26c2,
type: 3}

0
BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab.meta → BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab.meta
View File

0
BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab → BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab
View File

0
BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab.meta → BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab.meta
View File

186
BlueWater/Assets/05.Prefabs/Boids/HammerheadSharkBoids.prefab Normal file
View File

@ -0,0 +1,186 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &935872464346041573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.y
value: -30
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.x
value: 50
objectReference: {fileID: 0}
- target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.z
value: 50
objectReference: {fileID: 0}
- target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_Name
value: HammerheadSharkBoids
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: moveSpd
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidCount
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidPrefab
value:
objectReference: {fileID: 5402562142639805275, guid: 1294b74a61e4faa49a0fb449956b4fda,
type: 3}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: escapeMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: spawnRange
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: viewRadius
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: isDirectionChange
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.x
value: 50
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.y
value: 60
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomZigzagAmplitude.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <BoundsWeight>k__BackingField
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <CohesionWeight>k__BackingField
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomDirectionChangeInterval.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <AlignmentWeight>k__BackingField
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <SeparationWeight>k__BackingField
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.y
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.z
value: 20
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3}

7
BlueWater/Assets/05.Prefabs/Boids/HammerheadSharkBoids.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9f878882df46e9c49bb954ab6e64decf
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

96
BlueWater/Assets/05.Prefabs/Boids/SmallFishBoids.prefab Normal file
View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &935872464346041573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_Name
value: SmallFishBoids
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidPrefab
value:
objectReference: {fileID: 5402562142639805275, guid: c6911733874ec6645aa30548164bb1fb,
type: 3}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: viewRadius
value: 25
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.x
value: 25
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.y
value: 7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3}

7
BlueWater/Assets/05.Prefabs/Boids/SmallFishBoids.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1273582fea3eca04189236e1560d400b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

161
BlueWater/Assets/05.Prefabs/Boids/StingrayBoids.prefab Normal file
View File

@ -0,0 +1,161 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &935872464346041573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.y
value: -20
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.z
value: 40
objectReference: {fileID: 0}
- target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_Name
value: StingrayBoids
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: moveSpd
value: 7
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidCount
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidPrefab
value:
objectReference: {fileID: 5402562142639805275, guid: 6469fb143a712d448acc225487805c37,
type: 3}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: viewRadius
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: isDirectionChange
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: randomRespawnTime.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <BoundsWeight>k__BackingField
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <CohesionWeight>k__BackingField
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <AlignmentWeight>k__BackingField
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <SeparationWeight>k__BackingField
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.y
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.x
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.y
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6023135201199208214, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalScale.z
value: 15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3}

7
BlueWater/Assets/05.Prefabs/Boids/StingrayBoids.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b7de7f28cd2734e418367eb0581890e5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

224
BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab Normal file
View File

@ -0,0 +1,224 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1733947209264972765
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6499268732264954890}
- component: {fileID: 8975262077732393561}
m_Layer: 0
m_Name: Audio
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6499268732264954890
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733947209264972765}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 726335702565593345}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &8975262077732393561
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733947209264972765}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
m_Resource: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &4185765918994780331
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 726335702565593345}
m_Layer: 0
m_Name: BarrelItemDrop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &726335702565593345
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4185765918994780331}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 816226554442943762}
- {fileID: 6499268732264954890}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7996128800962867104
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 816226554442943762}
- component: {fileID: 9212167707718790757}
m_Layer: 21
m_Name: ItemController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &816226554442943762
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7996128800962867104}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 726335702565593345}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9212167707718790757
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7996128800962867104}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c3ea0c13f4edde747b6d5eb5d6842905, type: 3}
m_Name:
m_EditorClassIdentifier:
item:
<ItemName>k__BackingField:
<ItemCount>k__BackingField: 0
<ItemIcon>k__BackingField: {fileID: 0}
itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16,
type: 3}
pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59,
type: 3}
useAutoDestroy: 0
autoDestroyTime: 30
drawGizmos: 1
radius: 15
acquisitionTime: 1.5
targetLayer:
serializedVersion: 2
m_Bits: 512

7
BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 540ae6456b3be064d8f6cb8d56ce7f12
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
BlueWater/Assets/05.Prefabs/Items/FishItemDrop.prefab → BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab
View File

@ -139,7 +139,7 @@ GameObject:
m_Component:
- component: {fileID: 726335702565593345}
m_Layer: 0
m_Name: FishItemDrop
m_Name: ItemDrop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
BlueWater/Assets/05.Prefabs/Items/FishItemDrop.prefab.meta → BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab.meta
View File

8
BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f27d7ff2c214d9e49b017bd66f19c84b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

13
BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrel.prefab → BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab
View File

@ -117,7 +117,7 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_Constraints: 32
m_CollisionDetection: 0
--- !u!64 &3787192418197321415
MeshCollider:
@ -162,7 +162,7 @@ MonoBehaviour:
centerOfMass: {x: 0, y: -0.5, z: 0}
combinedCenterOfMass: {x: 0, y: -0.5, z: 0}
useDefaultInertia: 1
inertiaTensor: {x: 188774.38, y: 29978.51, z: 187856.39}
inertiaTensor: {x: 188774.38, y: 0, z: 187856.39}
combinedInertiaTensor: {x: 0, y: 0, z: 0}
--- !u!114 &867154244752756088
MonoBehaviour:
@ -438,10 +438,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3}
m_Name:
m_EditorClassIdentifier:
autoInit: 1
itemInfo:
<ItemName>k__BackingField: Coin
<ItemCount>k__BackingField: 50
<ItemIcon>k__BackingField: {fileID: 21300000, guid: 457ae4f0af7434f8aad6799ba5f881ba,
type: 3}
<Strength>k__BackingField: 50
power: 10
damageCooldown: 2
isHitting: 0
rayfire: {fileID: 1993316141688831608}
rb: {fileID: 0}
rb: {fileID: 8546706925543480376}

0
BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrel.prefab.meta → BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab.meta
View File

95
BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab Normal file
View File

@ -0,0 +1,95 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5578716471755663443
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalScale.x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalScale.y
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalScale.z
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3092057387698527728, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3684384234674372896, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_Name
value: BigBarrel
objectReference: {fileID: 0}
- target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: itemInfo.<ItemCount>k__BackingField
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8546706925543480376, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
type: 3}
propertyPath: m_Mass
value: 35925.93
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, type: 3}

7
BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b6cb2c333d9fadd4aa82a0cf6ebf5db2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: