Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
IDMhan 2024-02-02 14:02:27 +09:00
commit a46e4dd7b3
40 changed files with 3433 additions and 275177 deletions

View File

@ -3717,6 +3717,135 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4ec6916465379aa4ea3b251f08c1a6fe, type: 3}
--- !u!1001 &19536090
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1598597191}
m_Modifications:
- target: {fileID: -1167329777120027977, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalPosition.z
value: -150.16
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 157.44
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
propertyPath: m_Name
value: RedOrc2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
--- !u!224 &19536091 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
type: 3}
m_PrefabInstance: {fileID: 19536090}
m_PrefabAsset: {fileID: 0}
--- !u!1 &19625194
GameObject:
m_ObjectHideFlags: 0
@ -55624,6 +55753,140 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2017738824}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &250977674
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1598597191}
m_Modifications:
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.z
value: -154.37932
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 143.26
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: gizmoViewMode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Name
value: RedOrc1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3}
--- !u!224 &250977675 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
m_PrefabInstance: {fileID: 250977674}
m_PrefabAsset: {fileID: 0}
--- !u!1 &251370005
GameObject:
m_ObjectHideFlags: 0
@ -177147,6 +177410,30 @@ MonoBehaviour:
BackgroundTexture: {fileID: 0}
IsBackgroundRecursive: 0
IsHidden: 0
- Type: 0
Name:
GameObject: {fileID: 1033584364}
Ordinal: 17
Priority: 0
IconType: 161000
IconTexture: {fileID: 0}
IsIconRecursive: 0
BackgroundType: 0
BackgroundTexture: {fileID: 0}
IsBackgroundRecursive: 0
IsHidden: 0
- Type: 0
Name:
GameObject: {fileID: 2046550838}
Ordinal: 18
Priority: 0
IconType: 161000
IconTexture: {fileID: 0}
IsIconRecursive: 0
BackgroundType: 0
BackgroundTexture: {fileID: 0}
IsBackgroundRecursive: 0
IsHidden: 0
--- !u!4 &823586986
Transform:
m_ObjectHideFlags: 0
@ -240949,6 +241236,140 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2c6daade6bd4ca34a9a8ec6d851074ad, type: 3}
--- !u!1001 &1112475752
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1598597191}
m_Modifications:
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.z
value: -160.46
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 160.82
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: gizmoViewMode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Name
value: RedOrc1 (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3}
--- !u!224 &1112475753 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
m_PrefabInstance: {fileID: 1112475752}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1112540854
GameObject:
m_ObjectHideFlags: 0
@ -263795,6 +264216,140 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1208721358}
m_Mesh: {fileID: 877145102505475392, guid: e6acc74d2dca97b4a9d57fb44c4c52e2, type: 3}
--- !u!1001 &1208805771
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1598597191}
m_Modifications:
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalPosition.z
value: -160.46
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 147.09
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4358268934212833280, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: gizmoViewMode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
propertyPath: m_Name
value: RedOrc1 (2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3}
--- !u!224 &1208805772 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
type: 3}
m_PrefabInstance: {fileID: 1208805771}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1209086918 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8859270084651891637, guid: f6f6d92d1e6b4f24dbf6994287466276,
@ -266171,6 +266726,7 @@ Transform:
- {fileID: 1095906254}
- {fileID: 777427179}
- {fileID: 1695233646}
- {fileID: 1598597191}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1221375644
@ -348960,6 +349516,41 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1253705514}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1598597190
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1598597191}
m_Layer: 0
m_Name: Enemies
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1598597191
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1598597190}
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: 250977675}
- {fileID: 1112475753}
- {fileID: 1208805772}
- {fileID: 19536091}
m_Father: {fileID: 1221037477}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1598735164
PrefabInstance:
m_ObjectHideFlags: 0
@ -445577,6 +446168,107 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 690438670}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2046550838
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2046550842}
- component: {fileID: 2046550841}
- component: {fileID: 2046550840}
- component: {fileID: 2046550839}
m_Layer: 5
m_Name: WorldSpaceCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2046550839
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2046550838}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 2238015
--- !u!114 &2046550840
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2046550838}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!223 &2046550841
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2046550838}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 191889761}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: -1197429611
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &2046550842
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2046550838}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 960, y: 540}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &2046772411
PrefabInstance:
m_ObjectHideFlags: 0
@ -503648,6 +504340,7 @@ SceneRoots:
- {fileID: 1816611989}
- {fileID: 85768103}
- {fileID: 269653247}
- {fileID: 2046550842}
- {fileID: 1033584370}
- {fileID: 1719893244}
- {fileID: 971043561}

File diff suppressed because it is too large Load Diff

View File

@ -4632,12 +4632,11 @@ Transform:
- {fileID: 1638585580}
- {fileID: 1639774619}
- {fileID: 473113075}
- {fileID: 1230105047}
- {fileID: 636390579}
- {fileID: 1803610732}
- {fileID: 249772751}
- {fileID: 2010973907}
- {fileID: 1335279469}
- {fileID: 1393672007}
- {fileID: 1121364024}
- {fileID: 2111173755}
- {fileID: 995543561}
@ -24023,120 +24022,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 631801310}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &636390578
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 141522168}
m_Modifications:
- target: {fileID: 4420851181322816076, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851181366657152, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851181572807375, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4420851182164403215, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851182929519778, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851183224336666, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.682137
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.y
value: -43.621
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.75701237
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.732245
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.0069886153
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.68100035
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0026361747
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0.381
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 274.151
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -0.767
objectReference: {fileID: 0}
- target: {fileID: 7140898464823125404, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_Name
value: Sacks (2)
objectReference: {fileID: 0}
- target: {fileID: 7682244153377283664, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: index
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f2748648a7d931d45b26d2f745da57e0, type: 3}
--- !u!4 &636390579 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
m_PrefabInstance: {fileID: 636390578}
m_PrefabAsset: {fileID: 0}
--- !u!1 &642281550
GameObject:
m_ObjectHideFlags: 0
@ -25541,6 +25426,114 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 691797244}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &695694515
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 695694519}
- component: {fileID: 695694518}
- component: {fileID: 695694517}
- component: {fileID: 695694516}
m_Layer: 0
m_Name: Switch (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &695694516
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695694515}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &695694517
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695694515}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 60782471044ae9347b351f8805ff6d90, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &695694518
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695694515}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &695694519
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695694515}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 14.998, y: 2.002, z: 13.4019985}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &696371914
GameObject:
m_ObjectHideFlags: 0
@ -45810,120 +45803,6 @@ Transform:
- {fileID: 2004963578}
m_Father: {fileID: 2032358007}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1230105046
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 141522168}
m_Modifications:
- target: {fileID: 4420851181322816076, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851181366657152, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4420851181572807375, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851182164403215, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851182929519778, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4420851183224336666, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.65
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.y
value: -43.63
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.39
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.9877857
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.15581842
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 342.07098
objectReference: {fileID: 0}
- target: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7140898464823125404, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: m_Name
value: Sacks (1)
objectReference: {fileID: 0}
- target: {fileID: 7682244153377283664, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
propertyPath: index
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f2748648a7d931d45b26d2f745da57e0, type: 3}
--- !u!4 &1230105047 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7058219360571114150, guid: f2748648a7d931d45b26d2f745da57e0,
type: 3}
m_PrefabInstance: {fileID: 1230105046}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1230145731
GameObject:
m_ObjectHideFlags: 0
@ -48906,6 +48785,114 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1265634667}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1267294073
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1267294077}
- component: {fileID: 1267294076}
- component: {fileID: 1267294075}
- component: {fileID: 1267294074}
m_Layer: 0
m_Name: Switch
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &1267294074
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267294073}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1267294075
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267294073}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 60782471044ae9347b351f8805ff6d90, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1267294076
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267294073}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1267294077
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267294073}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 14.998, y: 2.002, z: 13.152998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1267773334 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3148883418170854414, guid: 376447c4f15207b479f682efadd03d04,
@ -53660,6 +53647,100 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1589744831}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1393672006
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 141522168}
m_Modifications:
- target: {fileID: 5433662010663971086, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_Name
value: CashRegister (1)
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_RootOrder
value: 24
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalScale.x
value: 0.31941
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalScale.y
value: 0.31941
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalScale.z
value: 0.31941
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalPosition.x
value: 11.332
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.068
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalPosition.z
value: -10.737
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.026712872
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.99964315
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 183.06099
objectReference: {fileID: 0}
- target: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1214a71610bca04abacca44337bfd21, type: 3}
--- !u!4 &1393672007 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5433662010664334638, guid: e1214a71610bca04abacca44337bfd21,
type: 3}
m_PrefabInstance: {fileID: 1393672006}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1394771277
PrefabInstance:
m_ObjectHideFlags: 0
@ -77898,6 +77979,114 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2019315467}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2021592753
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2021592757}
- component: {fileID: 2021592756}
- component: {fileID: 2021592755}
- component: {fileID: 2021592754}
m_Layer: 0
m_Name: Switch (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &2021592754
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021592753}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2021592755
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021592753}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3613804db3de58842b9d5b61301dc20f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2021592756
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021592753}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &2021592757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021592753}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 14.998, y: 2.318, z: 13.334}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2022808704
GameObject:
m_ObjectHideFlags: 0
@ -78756,10 +78945,7 @@ MonoBehaviour:
sideSprite: {fileID: 21300000, guid: fa13bcdf7a9c148b3859834bc6efaeb9, type: 3}
backSprite: {fileID: 21300000, guid: dba6626ec18b7497a8cdfe6501394253, type: 3}
frontSprite: {fileID: 21300000, guid: c21e822c2c1ca418fa2695be70e90ddb, type: 3}
foodTransform: {fileID: 0}
foodOnHand: 0
foodVisual: {fileID: 0}
kitchenController: {fileID: 0}
myShip: {fileID: 0}
--- !u!1001 &2046985755
PrefabInstance:
m_ObjectHideFlags: 0
@ -96207,6 +96393,9 @@ SceneRoots:
- {fileID: 1791806670}
- {fileID: 38524432}
- {fileID: 2010417630}
- {fileID: 1267294077}
- {fileID: 695694519}
- {fileID: 2021592757}
- {fileID: 674145943}
- {fileID: 478645707}
- {fileID: 55111070}

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8b2e0d95dfb90854782793a7fd95c4d2
timeCreated: 1496770385
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 32476e0191447f744bc2a1b1100eefe1
timeCreated: 1496770385
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -154,18 +154,18 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""initialStateCheck"": false
},
{
""name"": ""Mouse0"",
""name"": ""ToggleCannon"",
""type"": ""Button"",
""id"": ""36407aa9-c5a9-4654-8452-ac5c52abf32f"",
""id"": ""2d9a2349-b5a2-4926-a6e8-41abf2e24a3a"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Mouse1"",
""name"": ""FireCannon"",
""type"": ""Button"",
""id"": ""2d9a2349-b5a2-4926-a6e8-41abf2e24a3a"",
""id"": ""36407aa9-c5a9-4654-8452-ac5c52abf32f"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
@ -407,18 +407,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""Mouse0"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""9a454696-c796-4188-88db-0c0b82e77c98"",
""path"": ""<Mouse>/rightButton"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""Mouse1"",
""action"": ""FireCannon"",
""isComposite"": false,
""isPartOfComposite"": false
},
@ -443,6 +432,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""action"": ""BuildMode"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""9a454696-c796-4188-88db-0c0b82e77c98"",
""path"": ""<Mouse>/rightButton"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""ToggleCannon"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
@ -620,8 +620,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
m_Player_Attack = m_Player.FindAction("Attack", throwIfNotFound: true);
m_Player_Dash = m_Player.FindAction("Dash", throwIfNotFound: true);
m_Player_ActivateMainSkill = m_Player.FindAction("ActivateMainSkill", throwIfNotFound: true);
m_Player_Mouse0 = m_Player.FindAction("Mouse0", throwIfNotFound: true);
m_Player_Mouse1 = m_Player.FindAction("Mouse1", throwIfNotFound: true);
m_Player_ToggleCannon = m_Player.FindAction("ToggleCannon", throwIfNotFound: true);
m_Player_FireCannon = m_Player.FindAction("FireCannon", throwIfNotFound: true);
m_Player_ShiftKey = m_Player.FindAction("ShiftKey", throwIfNotFound: true);
m_Player_BuildMode = m_Player.FindAction("BuildMode", throwIfNotFound: true);
// Camera
@ -708,8 +708,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
private readonly InputAction m_Player_Attack;
private readonly InputAction m_Player_Dash;
private readonly InputAction m_Player_ActivateMainSkill;
private readonly InputAction m_Player_Mouse0;
private readonly InputAction m_Player_Mouse1;
private readonly InputAction m_Player_ToggleCannon;
private readonly InputAction m_Player_FireCannon;
private readonly InputAction m_Player_ShiftKey;
private readonly InputAction m_Player_BuildMode;
public struct PlayerActions
@ -730,8 +730,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
public InputAction @Attack => m_Wrapper.m_Player_Attack;
public InputAction @Dash => m_Wrapper.m_Player_Dash;
public InputAction @ActivateMainSkill => m_Wrapper.m_Player_ActivateMainSkill;
public InputAction @Mouse0 => m_Wrapper.m_Player_Mouse0;
public InputAction @Mouse1 => m_Wrapper.m_Player_Mouse1;
public InputAction @ToggleCannon => m_Wrapper.m_Player_ToggleCannon;
public InputAction @FireCannon => m_Wrapper.m_Player_FireCannon;
public InputAction @ShiftKey => m_Wrapper.m_Player_ShiftKey;
public InputAction @BuildMode => m_Wrapper.m_Player_BuildMode;
public InputActionMap Get() { return m_Wrapper.m_Player; }
@ -785,12 +785,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@ActivateMainSkill.started += instance.OnActivateMainSkill;
@ActivateMainSkill.performed += instance.OnActivateMainSkill;
@ActivateMainSkill.canceled += instance.OnActivateMainSkill;
@Mouse0.started += instance.OnMouse0;
@Mouse0.performed += instance.OnMouse0;
@Mouse0.canceled += instance.OnMouse0;
@Mouse1.started += instance.OnMouse1;
@Mouse1.performed += instance.OnMouse1;
@Mouse1.canceled += instance.OnMouse1;
@ToggleCannon.started += instance.OnToggleCannon;
@ToggleCannon.performed += instance.OnToggleCannon;
@ToggleCannon.canceled += instance.OnToggleCannon;
@FireCannon.started += instance.OnFireCannon;
@FireCannon.performed += instance.OnFireCannon;
@FireCannon.canceled += instance.OnFireCannon;
@ShiftKey.started += instance.OnShiftKey;
@ShiftKey.performed += instance.OnShiftKey;
@ShiftKey.canceled += instance.OnShiftKey;
@ -843,12 +843,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@ActivateMainSkill.started -= instance.OnActivateMainSkill;
@ActivateMainSkill.performed -= instance.OnActivateMainSkill;
@ActivateMainSkill.canceled -= instance.OnActivateMainSkill;
@Mouse0.started -= instance.OnMouse0;
@Mouse0.performed -= instance.OnMouse0;
@Mouse0.canceled -= instance.OnMouse0;
@Mouse1.started -= instance.OnMouse1;
@Mouse1.performed -= instance.OnMouse1;
@Mouse1.canceled -= instance.OnMouse1;
@ToggleCannon.started -= instance.OnToggleCannon;
@ToggleCannon.performed -= instance.OnToggleCannon;
@ToggleCannon.canceled -= instance.OnToggleCannon;
@FireCannon.started -= instance.OnFireCannon;
@FireCannon.performed -= instance.OnFireCannon;
@FireCannon.canceled -= instance.OnFireCannon;
@ShiftKey.started -= instance.OnShiftKey;
@ShiftKey.performed -= instance.OnShiftKey;
@ShiftKey.canceled -= instance.OnShiftKey;
@ -1022,8 +1022,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
void OnAttack(InputAction.CallbackContext context);
void OnDash(InputAction.CallbackContext context);
void OnActivateMainSkill(InputAction.CallbackContext context);
void OnMouse0(InputAction.CallbackContext context);
void OnMouse1(InputAction.CallbackContext context);
void OnToggleCannon(InputAction.CallbackContext context);
void OnFireCannon(InputAction.CallbackContext context);
void OnShiftKey(InputAction.CallbackContext context);
void OnBuildMode(InputAction.CallbackContext context);
}

View File

@ -132,18 +132,18 @@
"initialStateCheck": false
},
{
"name": "Mouse0",
"name": "ToggleCannon",
"type": "Button",
"id": "36407aa9-c5a9-4654-8452-ac5c52abf32f",
"id": "2d9a2349-b5a2-4926-a6e8-41abf2e24a3a",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Mouse1",
"name": "FireCannon",
"type": "Button",
"id": "2d9a2349-b5a2-4926-a6e8-41abf2e24a3a",
"id": "36407aa9-c5a9-4654-8452-ac5c52abf32f",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@ -385,18 +385,7 @@
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Mouse0",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9a454696-c796-4188-88db-0c0b82e77c98",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Mouse1",
"action": "FireCannon",
"isComposite": false,
"isPartOfComposite": false
},
@ -421,6 +410,17 @@
"action": "BuildMode",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9a454696-c796-4188-88db-0c0b82e77c98",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "ToggleCannon",
"isComposite": false,
"isPartOfComposite": false
}
]
},

View File

@ -1,6 +1,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
using NWH.DWP2.WaterData;
using NWH.DWP2.WaterObjects;
using Sirenix.OdinInspector;
using UnityEngine;
using Random = UnityEngine.Random;
@ -118,9 +120,11 @@ namespace BlueWaterProject
[Tooltip("물 표면 이펙트 기능 여부")]
[SerializeField] private bool showWaterEffect = true;
[Tooltip("물 표면 이펙트 기능 여부")]
[ShowIf("@showWaterEffect")]
[SerializeField] private bool isUsingDynamicHeight;
[ShowIf("@showWaterEffect && !isUsingDynamicHeight")]
[SerializeField] private Vector3 fishSpotOffset = new(0, 0.5f, 0);
[SerializeField] private GameObject contentUiPrefab;
@ -140,6 +144,8 @@ namespace BlueWaterProject
private WaitForSeconds findCoroutineTime;
private ItemUiController contentUi;
private Transform itemsLoot;
private StylizedWaterDataProvider stylizedWaterDataProvider;
private WaterObject waterObject;
private const int MAX_HIT_NUM = 3;
@ -155,7 +161,7 @@ namespace BlueWaterProject
private void OnDrawGizmosSelected()
{
if (!isDrawGizmos) return;
if (!isDrawGizmos || !fishSpot) return;
var centerPos = Vector3.zero;
if (Application.isPlaying)
@ -182,13 +188,7 @@ namespace BlueWaterProject
private void FixedUpdate()
{
if (!showWaterEffect) return;
if (Physics.Raycast(BoundMeshRenderer.transform.position, Vector3.up, out var hit,
float.MaxValue,waterLayer))
{
fishSpot.position = hit.point + fishSpotOffset;
}
ShowFishSpot();
}
public void CreateBoids()
@ -211,15 +211,18 @@ namespace BlueWaterProject
boid.Init(this, Random.Range(RandomSpeedRange.x, RandomSpeedRange.y));
boidList.Add(boid);
}
findTargetCoroutine ??= StartCoroutine(FindTargetCoroutine());
if (showWaterEffect)
if (fishSpot)
{
var screenPos = CameraManager.Inst.MainCam.WorldToScreenPoint(fishSpot.position);
itemsLoot = UiManager.Inst.OceanUi.MainCanvas.transform.Find("ItemsLoot");
contentUi = Instantiate(contentUiPrefab, screenPos, Quaternion.identity, itemsLoot).GetComponent<ItemUiController>();
contentUi.Init(fishSpot);
findTargetCoroutine ??= StartCoroutine(FindTargetCoroutine());
if (showWaterEffect)
{
var screenPos = CameraManager.Inst.MainCam.WorldToScreenPoint(fishSpot.position);
itemsLoot = UiManager.Inst.OceanUi.MainCanvas.transform.Find("ItemsLoot");
contentUi = Instantiate(contentUiPrefab, screenPos, Quaternion.identity, itemsLoot).GetComponent<ItemUiController>();
contentUi.Init(fishSpot);
}
}
}
@ -346,6 +349,32 @@ namespace BlueWaterProject
Destroy(contentUi.gameObject);
}
private void ShowFishSpot()
{
if (!fishSpot || !showWaterEffect) return;
if (Physics.Raycast(BoundMeshRenderer.transform.position, Vector3.up, out var hit,
float.MaxValue,waterLayer))
{
if (stylizedWaterDataProvider == null || waterObject == null)
{
stylizedWaterDataProvider = hit.collider.GetComponent<StylizedWaterDataProvider>();
waterObject = stylizedWaterDataProvider.GetComponent<WaterObject>();
}
if (isUsingDynamicHeight)
{
var newFishSpotPosition = fishSpot.position;
newFishSpotPosition.y = stylizedWaterDataProvider.GetWaterHeightSingle(waterObject, hit.point);;
fishSpot.position = newFishSpotPosition;
}
else
{
fishSpot.position = hit.point + fishSpotOffset;
}
}
}
public FishItem GetBoidInfo() => boidPrefab.FishItem;
}
}

View File

@ -16,7 +16,7 @@ namespace BlueWaterProject
[Tooltip("최대 스피드")]
[SerializeField] private float maxSpeed = 20f;
[DisableIf("@true")]
[SerializeField]private float defaultMaxSpeed;
[SerializeField] private float defaultMaxSpeed;
[Tooltip("가속 수치")]
[SerializeField] private float acceleration = 20f;
[Tooltip("감속 수치")]
@ -30,22 +30,6 @@ namespace BlueWaterProject
[Tooltip("배의 힘(충돌)")]
[field: SerializeField] public int Strength { get; set; } = 500;
[Title("캐논")]
[SerializeField] private Cannon cannon;
[SerializeField] private float cannonCooldown = 1f;
[SerializeField] private float chargingSpeed = 1f;
[DisableIf("@true")]
[SerializeField] private bool isFireMode;
[DisableIf("@true")]
[SerializeField] private bool chargingCannon;
[DisableIf("@true")]
[SerializeField] private bool isReloading;
[DisableIf("@true")]
[SerializeField] private float chargingGauge;
[DisableIf("@true")]
[SerializeField] private float previousGauge;
[Title("부스트")]
[SerializeField] private float boostPower = 2f;
[SerializeField] private float boostMaxTime = 3f;
@ -81,7 +65,6 @@ namespace BlueWaterProject
private PlayerInput playerInput;
private Rigidbody rb;
private GameObject directionIndicator;
private Vector2 movementInput;
@ -91,10 +74,6 @@ namespace BlueWaterProject
playerInput = GetComponent<PlayerInput>();
rb = GetComponent<Rigidbody>();
playerInput = GetComponent<PlayerInput>();
cannon = transform.Find("Cannon").GetComponent<Cannon>();
directionIndicator = transform.Find("DirectionIndicator").gameObject;
directionIndicator.SetActive(false);
waterLayer = LayerMask.GetMask("Water");
@ -123,18 +102,12 @@ namespace BlueWaterProject
private void OnEnable()
{
playerInput.actions.FindAction("Mouse0").started += _ => ChargeCannon();
playerInput.actions.FindAction("Mouse0").canceled += _ => FireCannon();
playerInput.actions.FindAction("Mouse1").started += _ => ToggleFireMode();
playerInput.actions.FindAction("ShiftKey").started += _ => ShipBoost();
playerInput.actions.FindAction("ShiftKey").canceled += _ => ShipStopBoost();
}
private void OnDisable()
{
playerInput.actions.FindAction("Mouse0").started -= _ => ChargeCannon();
playerInput.actions.FindAction("Mouse0").canceled -= _ => FireCannon();
playerInput.actions.FindAction("Mouse1").started -= _ => ToggleFireMode();
playerInput.actions.FindAction("ShiftKey").started -= _ => ShipBoost();
playerInput.actions.FindAction("ShiftKey").canceled -= _ => ShipStopBoost();
}
@ -149,7 +122,6 @@ namespace BlueWaterProject
private void Update()
{
HandleMovement();
HandleFireCannon();
HandleBoost();
}
@ -184,38 +156,6 @@ namespace BlueWaterProject
rb.angularVelocity = Vector3.zero;
}
private void HandleFireCannon()
{
if (!isFireMode) return;
var ray = CameraManager.Inst.MainCam.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out var hit, Mathf.Infinity, waterLayer))
{
var directionToMouse = hit.point - directionIndicator.transform.position;
directionToMouse.y = 0f;
var lookRotation = Quaternion.LookRotation(directionToMouse);
var indicatorRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
var cannonRotationDirection = Quaternion.Euler(cannon.transform.rotation.eulerAngles.x, lookRotation.eulerAngles.y, 0f);
directionIndicator.transform.rotation = indicatorRotationDirection;
cannon.transform.rotation = cannonRotationDirection;
}
if (!chargingCannon) return;
if (chargingGauge < 1f)
{
chargingGauge += chargingSpeed * Time.deltaTime;
chargingGauge = Mathf.Clamp(chargingGauge, 0f, 1f);
}
else
{
chargingGauge = 1f;
}
UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(chargingGauge);
}
private void HandleBoost()
{
if (isBoosting)
@ -323,72 +263,6 @@ namespace BlueWaterProject
}
private void ChargeCannon()
{
if (!isFireMode) return;
if (isReloading)
{
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine());
}
else
{
chargingCannon = true;
chargingGauge = 0f;
}
}
private void FireCannon()
{
if (!isFireMode || !chargingCannon) return;
chargingCannon = false;
previousGauge = chargingGauge;
chargingGauge = 0f;
UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(0f);
UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(previousGauge * -360f);
cannon.Fire(previousGauge * 100);
isReloading = true;
StartCoroutine(CannonCoolDown(cannonCooldown));
}
private void ToggleFireMode()
{
isFireMode = !isFireMode;
directionIndicator.SetActive(isFireMode);
UiManager.Inst.OceanUi.ProcessBar.SetActive(isFireMode);
if (!isFireMode)
{
chargingCannon = false;
chargingGauge = 0f;
previousGauge = chargingGauge;
UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(0f);
UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(previousGauge * -360f);
UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(0f);
UiManager.Inst.OceanUi.ProcessBar.SetSliderValue(0f);
}
}
private IEnumerator CannonCoolDown(float waitTime)
{
var time = 0f;
UiManager.Inst.OceanUi.ProcessBar.SetSliderValue(0f);
UiManager.Inst.OceanUi.ProcessBar.SetActiveReloadSlider(true);
while (time <= waitTime)
{
time += Time.deltaTime;
var sliderValue = time > 0 ? time / waitTime : 0f;
UiManager.Inst.OceanUi.ProcessBar.SetSliderValue(sliderValue);
yield return null;
}
isReloading = false;
UiManager.Inst.OceanUi.ProcessBar.SetActiveReloadSlider(false);
}
private void ShipBoost()
{
if (currentBoostCooldownTime > 0) return;

View File

@ -1,6 +1,9 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using Unity.Mathematics;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
@ -8,25 +11,57 @@ namespace BlueWaterProject
{
public class Cannon : MonoBehaviour
{
/***********************************************************************
* Variables
***********************************************************************/
#region Variables
[Title("초기화 방식")]
[SerializeField] private bool autoInit = true;
[Title("캐논 변수")]
[Title("컴포넌트")]
[SerializeField] private PlayerInput playerInput;
[SerializeField] private GameObject projectileObj;
[SerializeField] private Transform firePos;
[SerializeField] private GameObject directionIndicator;
[SerializeField] private ProcessBar cannonProcessBar;
[Title("대포 변수")]
[SerializeField] private float cannonCooldown = 1f;
[SerializeField] private float chargingSpeed = 1f;
[Range(0f, 0.5f)]
[SerializeField] private float fireAngle = 0.2f;
[SerializeField] private float speed = 75f;
[SerializeField] private float height = 20f;
[SerializeField] private float launchSpeed = 75f;
[SerializeField] private float launchAngle = 30f;
[SerializeField] private Vector2 randomCatch = new(1, 4);
[SerializeField] private LayerMask waterLayer;
[SerializeField] private LayerMask targetLayer;
[Title("캐논 발사 카메라 효과")]
[SerializeField] private float cameraShakePower = 2f;
[SerializeField] private float cameraShakeDuration = 0.3f;
[Title("실시간 상태")]
[DisableIf("@true")]
[SerializeField] private bool isFireMode;
[DisableIf("@true")]
[SerializeField] private bool chargingCannon;
[DisableIf("@true")]
[SerializeField] private bool isReloading;
[DisableIf("@true")]
[SerializeField] private float chargingGauge;
[DisableIf("@true")]
[SerializeField] private float previousGauge;
private float cannonRadius;
private LayerMask boidsLayer;
private Collider[] hitColliders = new Collider[3];
#endregion
/***********************************************************************
* Unity Events
***********************************************************************/
#region Unity Events
private void Awake()
{
@ -36,17 +71,195 @@ namespace BlueWaterProject
}
}
private void Start()
{
cannonProcessBar = UiManager.Inst.OceanUi.ProcessBar;
}
private void OnEnable()
{
playerInput.actions.FindAction("ToggleCannon").started += _ => ToggleCannon();
playerInput.actions.FindAction("FireCannon").started += _ => ChargeCannon();
playerInput.actions.FindAction("FireCannon").canceled += _ => FireCannon();
}
private void OnDisable()
{
playerInput.actions.FindAction("ToggleCannon").started += _ => ToggleCannon();
playerInput.actions.FindAction("FireCannon").started -= _ => ChargeCannon();
playerInput.actions.FindAction("FireCannon").canceled -= _ => FireCannon();
}
private void Update()
{
HandleFireCannon();
}
#endregion
/***********************************************************************
* Init Methods
***********************************************************************/
#region Init Methods
[Button("셋팅 초기화")]
private void Init()
{
playerInput = GetComponentInParent<PlayerInput>();
projectileObj = Utils.LoadFromFolder<GameObject>("Assets/05.Prefabs/Particles/GrenadeFire", "GrenadeFireOBJ", ".prefab");
firePos = transform.Find("FirePos");
directionIndicator = transform.parent.Find("DirectionIndicator").gameObject;
directionIndicator.SetActive(false);
cannonRadius = projectileObj.GetComponent<SphereCollider>()?.radius ??
projectileObj.GetComponent<ParticleWeapon>().colliderRadius;
boidsLayer = LayerMask.GetMask("Boids");
waterLayer = LayerMask.GetMask("Water");
targetLayer = LayerMask.GetMask("Boids");
}
public void Fire(float chargingGauge)
#endregion
/***********************************************************************
* PlayerInput
***********************************************************************/
#region PlayerInput
private void ToggleCannon()
{
isFireMode = !isFireMode;
directionIndicator.SetActive(isFireMode);
cannonProcessBar.SetActive(isFireMode);
if (!isFireMode)
{
chargingCannon = false;
chargingGauge = 0f;
previousGauge = chargingGauge;
cannonProcessBar.SetFillAmount(0f);
cannonProcessBar.SetRotateZ(previousGauge * -360f);
cannonProcessBar.SetRotateZ(0f);
cannonProcessBar.SetSliderValue(0f);
}
}
private void ChargeCannon()
{
if (!isFireMode) return;
if (isReloading)
{
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine());
}
else
{
chargingCannon = true;
chargingGauge = 0f;
}
}
private void FireCannon()
{
if (!isFireMode || !chargingCannon) return;
chargingCannon = false;
// previousGauge = 0f ~ 1f
previousGauge = chargingGauge;
chargingGauge = 0f;
cannonProcessBar.SetFillAmount(0f);
cannonProcessBar.SetRotateZ(previousGauge * -360f);
Fire(previousGauge * 100);
isReloading = true;
StartCoroutine(CannonCoolDown(cannonCooldown));
}
#endregion
/***********************************************************************
* Methods
***********************************************************************/
#region Methods
private void HandleFireCannon()
{
if (!isFireMode) return;
var ray = CameraManager.Inst.MainCam.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out var hit, Mathf.Infinity, waterLayer))
{
var directionToMouse = hit.point - directionIndicator.transform.position;
directionToMouse.y = 0f;
var lookRotation = Quaternion.LookRotation(directionToMouse);
var indicatorRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
var cannonRotationDirection = Quaternion.Euler(transform.rotation.eulerAngles.x, lookRotation.eulerAngles.y, 0f);
directionIndicator.transform.rotation = indicatorRotationDirection;
transform.rotation = cannonRotationDirection;
}
if (!chargingCannon) return;
if (chargingGauge < 1f)
{
chargingGauge += chargingSpeed * Time.deltaTime;
chargingGauge = Mathf.Clamp(chargingGauge, 0f, 1f);
}
else
{
chargingGauge = 1f;
}
cannonProcessBar.SetFillAmount(chargingGauge);
// if (!isFireMode) return;
//
// var ray = CameraManager.Inst.MainCam.ScreenPointToRay(Input.mousePosition);
//
// if (Physics.Raycast(ray, out var hit, Mathf.Infinity, waterLayer))
// {
// var directionToMouse = hit.point - directionIndicator.transform.position;
// directionToMouse.y = 0f;
//
// var lookRotation = Quaternion.LookRotation(directionToMouse);
// var indicatorRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
// var cannonRotationDirection = Quaternion.Euler(cannon.transform.rotation.eulerAngles.x, lookRotation.eulerAngles.y, 0f);
// directionIndicator.transform.rotation = indicatorRotationDirection;
// cannon.transform.rotation = cannonRotationDirection;
// }
//
// if (!chargingCannon) return;
//
// if (chargingGauge < 1f)
// {
// chargingGauge += chargingSpeed * Time.deltaTime;
// chargingGauge = Mathf.Clamp(chargingGauge, 0f, 1f);
// }
// else
// {
// chargingGauge = 1f;
// }
// UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(chargingGauge);
}
private IEnumerator CannonCoolDown(float waitTime)
{
var time = 0f;
cannonProcessBar.SetSliderValue(0f);
cannonProcessBar.SetActiveReloadSlider(true);
while (time <= waitTime)
{
time += Time.deltaTime;
var sliderValue = time > 0 ? time / waitTime : 0f;
cannonProcessBar.SetSliderValue(sliderValue);
yield return null;
}
isReloading = false;
cannonProcessBar.SetActiveReloadSlider(false);
}
private void Fire(float chargingGauge)
{
VisualFeedbackManager.Inst.CameraShake(CameraManager.Inst.OceanCamera.BaseShipCam, cameraShakePower, cameraShakeDuration);
var addAngle = chargingGauge * fireAngle;
@ -55,14 +268,14 @@ namespace BlueWaterProject
var projectile = Instantiate(projectileObj, firePos.position, Quaternion.Euler(firePosRotation));
var particleWeapon = projectile.GetComponent<ParticleWeapon>();
particleWeapon.onHitAction.AddListener(HandleCannonHit);
projectile.GetComponent<Rigidbody>().velocity = projectile.transform.forward * speed;
projectile.GetComponent<Rigidbody>().velocity = projectile.transform.forward * launchSpeed;
}
private void HandleCannonHit(RaycastHit hit, float power)
{
if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water"))
{
var maxSize = Physics.OverlapSphereNonAlloc(hit.point, cannonRadius, hitColliders, boidsLayer,
var maxSize = Physics.OverlapSphereNonAlloc(hit.point, cannonRadius, hitColliders, targetLayer,
QueryTriggerInteraction.Collide);
for (var i = 0; i < maxSize; i++)
@ -77,5 +290,7 @@ namespace BlueWaterProject
hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
}
}
#endregion
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 7faae2ef8e94c0a41ade723cc73688a6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 7fd543d161e4d94439f875e8cd6c998c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -64,7 +64,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: d79cf63ca9e664b6495f4dfe907e50c2, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d79cf63ca9e664b6495f4dfe907e50c2
guid: 50c59d60df14da148b55187a6a6e1a06
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: powerswitch
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: f6f36dca592062a4b9968cf6600bb949, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f6f36dca592062a4b9968cf6600bb949, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8224803765225195096
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 407253dc11ea73c41ae7b5fcac51fbb6
DefaultImporter:
guid: 60782471044ae9347b351f8805ff6d90
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: powerswitch2
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 5277658ef1baf604c948bb94349cac6c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 5277658ef1baf604c948bb94349cac6c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &3463101419148565368
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3613804db3de58842b9d5b61301dc20f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: f6f36dca592062a4b9968cf6600bb949
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 5277658ef1baf604c948bb94349cac6c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,171 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2220482897908591420
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CannonLine
m_Shader: {fileID: 4800000, guid: 6e706d579761e4a4c96317d5b980fd17, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Base_Map:
m_Texture: {fileID: 2800000, guid: b9d479250e7ac0547a32dc79c6ced1de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Normal_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Normal_Blend: 0.5
- PixelSnap: 0
- Vector1_1FFEA4D9: 10
- Vector1_3F7A129E: 10
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
- _DecalMeshViewBias: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DrawOrder: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnableExternalAlpha: 0
- _EnvironmentReflections: 1
- _FADING: 0
- _FoamStrength: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _HeightScale: 1
- _Metallic: 0
- _NormalStrength: 1
- _OcclusionStrength: 1
- _Opacity: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RemapDisplacement: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _AnimationSpeed: {r: 0, g: 0, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _MaskAnimationSpeed: {r: 0, g: 0, b: 0, a: 0}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a0985d39ed51dd1489809fa96824788a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -158,7 +158,7 @@ MonoBehaviour:
showBounds: 1
fishSpot: {fileID: 6023135201199208214}
showWaterEffect: 1
fishSpotOffset: {x: 0, y: 0.3, z: 0}
fishSpotOffset: {x: 0, y: 0, z: 0}
contentUiPrefab: {fileID: 3090447943159425444, guid: ff7dbfdf9bd0ee5499f523f8fafa45f7,
type: 3}
<BoundMeshRenderer>k__BackingField: {fileID: 2486807546603369919}
@ -254,39 +254,8 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5897493926044192973, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
insertIndex: -1
addedObject: {fileID: 2919496038212792137}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0051ffdc4c5db0d439d5d2c880040228, type: 3}
--- !u!1 &2873048866372186192 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5897493926044192973, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
m_PrefabInstance: {fileID: 8504772753982791837}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2919496038212792137
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2873048866372186192}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.5, y: 0.2, z: 0.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!4 &6023135201199208214 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3491382831915159783}
- component: {fileID: 6155795636513818051}
- component: {fileID: 7999436920387167248}
m_Layer: 0
m_Layer: 7
m_Name: SubEmitter
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4859,7 +4859,7 @@ GameObject:
- component: {fileID: 8192062906655507725}
- component: {fileID: 2237500273242662829}
- component: {fileID: 4240233027526712386}
m_Layer: 0
m_Layer: 7
m_Name: JumpingParticles
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -9575,7 +9575,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2707081533079000971}
m_Layer: 0
- component: {fileID: 3990893376361859224}
m_Layer: 15
m_Name: FishSpot
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -9599,6 +9600,27 @@ Transform:
- {fileID: 4617604176008979014}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3990893376361859224
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5897493926044192973}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.5, y: 0.2, z: 0.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6098797059763212541
GameObject:
m_ObjectHideFlags: 0
@ -9610,7 +9632,7 @@ GameObject:
- component: {fileID: 6827309400281788457}
- component: {fileID: 6460988700274662605}
- component: {fileID: 2051619341531369781}
m_Layer: 0
m_Layer: 7
m_Name: WaterfallSoft
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -9640,7 +9662,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6098797059763212541}
serializedVersion: 8
lengthInSec: 1
lengthInSec: 3
simulationSpeed: 1
stopAction: 0
cullingMode: 1
@ -9648,7 +9670,7 @@ ParticleSystem:
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
prewarm: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
@ -9705,7 +9727,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 0
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 0
@ -9715,8 +9737,8 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 3
scalar: 3
minScalar: 3
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
@ -14391,7 +14413,7 @@ GameObject:
- component: {fileID: 4617604176008979014}
- component: {fileID: 7593767599454734846}
- component: {fileID: 1736049952734626669}
m_Layer: 0
m_Layer: 7
m_Name: WaterBoiling
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -14432,7 +14454,7 @@ ParticleSystem:
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
prewarm: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
@ -14489,7 +14511,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 0
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
randomSeed: 0
@ -19202,7 +19224,7 @@ GameObject:
- component: {fileID: 8088591265692502368}
- component: {fileID: 8283098508354130597}
- component: {fileID: 6170076357130512092}
m_Layer: 0
m_Layer: 7
m_Name: Steam
m_TagString: Untagged
m_Icon: {fileID: 0}

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: e793a3de41408ff46a74295559cea7e2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 22e4f6bb275850a4ca36086f523a3a0c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 70790c033d7d0bf419dfa45377591b97
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 4f457a979b0aad5418431cd509f41c0c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -23,6 +23,7 @@ TagManager:
- Boids
- DestructibleObject
- IndestructiveObject
- DestructiveObject
layers:
- Default
- TransparentFX
@ -45,8 +46,8 @@ TagManager:
-
-
-
- CollidableProps
- NonCollidableProps
- Props
-
-
-
- Skill