diff --git a/BlueWater/Assets/01.Scenes/02.Combat_2D.unity b/BlueWater/Assets/01.Scenes/02.Combat_2D.unity index a4dac16a4..4dcc751d2 100644 --- a/BlueWater/Assets/01.Scenes/02.Combat_2D.unity +++ b/BlueWater/Assets/01.Scenes/02.Combat_2D.unity @@ -2081,6 +2081,135 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &689667138 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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: 0 + 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: 5.57 + 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: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: m_Name + value: RedOrc1 + objectReference: {fileID: 0} + - target: {fileID: 8609741102290131020, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 7fcad3b0fc594ad42b475372772eded3, + type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3} --- !u!1 &704479487 GameObject: m_ObjectHideFlags: 0 @@ -3653,6 +3782,135 @@ Transform: - {fileID: 392992923} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &978376549 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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: -0.31 + 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: -5.14 + 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: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: m_Name + value: RedOrc1 (4) + objectReference: {fileID: 0} + - target: {fileID: 8609741102290131020, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 7fcad3b0fc594ad42b475372772eded3, + type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3} --- !u!1 &1033584364 GameObject: m_ObjectHideFlags: 0 @@ -3688,9 +3946,10 @@ MonoBehaviour: m_EditorClassIdentifier: autoInit: 1 k__BackingField: {fileID: 1033584369} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 2046550841} k__BackingField: {fileID: 1049575630} k__BackingField: {fileID: 259569763562170414} + k__BackingField: {fileID: 1842100125} --- !u!114 &1033584366 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3782,6 +4041,7 @@ RectTransform: - {fileID: 1049575629} - {fileID: 1263289741} - {fileID: 6935276924833861689} + - {fileID: 1842100126} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3916,7 +4176,7 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: - items: [] + inventoryItemList: [] mouseSpot: {fileID: 1347266192824951316, guid: 049de7a77e0534ced92b672937a0f8db, type: 3} boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3} @@ -3994,6 +4254,135 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1244110434 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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: 5.66 + 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: -5.14 + 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: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: m_Name + value: RedOrc1 (3) + objectReference: {fileID: 0} + - target: {fileID: 8609741102290131020, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 7fcad3b0fc594ad42b475372772eded3, + type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3} --- !u!1 &1256709750 GameObject: m_ObjectHideFlags: 0 @@ -5518,6 +5907,135 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1748839488 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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: 5.66 + 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: 0.75 + 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: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: m_Name + value: RedOrc1 (2) + objectReference: {fileID: 0} + - target: {fileID: 8609741102290131020, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 7fcad3b0fc594ad42b475372772eded3, + type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3} --- !u!1 &1816611988 GameObject: m_ObjectHideFlags: 0 @@ -5549,6 +6067,582 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1842100124 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1033584370} + m_Modifications: + - target: {fileID: 731882179135502836, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2289320141709012356, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2340407893565948567, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_Name + value: DropItemGroup + objectReference: {fileID: 0} + - target: {fileID: 2340407893565948567, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2433352474446146705, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2433352474446146705, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2433352474446146705, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2433352474446146705, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2433352474446146705, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2682748110723744995, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2702154626459857400, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4824455801469693689, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.y + value: 158 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5922377284970440154, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.CurrentValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.CurrentValue.y + value: -135 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6027363255301643261, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6638727251556834918, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.ToValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.ToValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.FromValue.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Move.FromValue.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Fade.CurrentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Move.CurrentValue.y + value: -79 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Scale.CurrentValue.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: HideAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7613733418439768649, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: ShowAnimation.Rotate.CurrentValue.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081083082781669234, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9020789568927497442, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9201708978067533897, guid: 46de620c604c02449b960aaea6682273, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46de620c604c02449b960aaea6682273, type: 3} +--- !u!114 &1842100125 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5270051318379233859, guid: 46de620c604c02449b960aaea6682273, + type: 3} + m_PrefabInstance: {fileID: 1842100124} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3eee56b795537aa4aab4e0afcdd738e5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1842100126 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5460895414638055898, guid: 46de620c604c02449b960aaea6682273, + type: 3} + m_PrefabInstance: {fileID: 1842100124} + m_PrefabAsset: {fileID: 0} --- !u!1 &1897782243 GameObject: m_ObjectHideFlags: 0 @@ -5648,6 +6742,166 @@ Transform: - {fileID: 474440006} m_Father: {fileID: 26417292} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2001483464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001483465} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2001483465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001483464} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5541164, y: -2.529393, z: 16.454443} + 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!1001 &2002782310 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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: 5.66 + 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: 5.57 + 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: 6294429197787252722, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: m_Name + value: RedOrc1 (1) + objectReference: {fileID: 0} + - target: {fileID: 8609741102290131020, guid: b82511a1823faf14f97c60a0e6984872, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 7fcad3b0fc594ad42b475372772eded3, + type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b82511a1823faf14f97c60a0e6984872, type: 3} --- !u!1001 &2024072799 PrefabInstance: m_ObjectHideFlags: 0 @@ -6257,6 +7511,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 25 objectReference: {fileID: 0} + - target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef, + type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7845561520605108460, guid: 39cf0016300932947917aaefb2a0c1ef, type: 3} propertyPath: m_LocalPosition.x @@ -16053,3 +17312,9 @@ SceneRoots: - {fileID: 104135926} - {fileID: 1383322271} - {fileID: 1969962454} + - {fileID: 2001483465} + - {fileID: 689667138} + - {fileID: 2002782310} + - {fileID: 1748839488} + - {fileID: 1244110434} + - {fileID: 978376549} diff --git a/BlueWater/Assets/02.Scripts/Boid.cs b/BlueWater/Assets/02.Scripts/Boid.cs index bf877cdec..59dc34ba7 100644 --- a/BlueWater/Assets/02.Scripts/Boid.cs +++ b/BlueWater/Assets/02.Scripts/Boid.cs @@ -9,11 +9,10 @@ using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - public class Boid : MonoBehaviour + public class Boid : MonoBehaviour, IDroppable { [field: Title("FishInfo")] - [field: SerializeField] public FishItem FishItem { get; private set; } - [field: SerializeField] public Vector2 RandomCount { get; private set; } = new(1, 4); + [field: SerializeField] public DropItemTable DropItemTable { get; set; } [Title("개체 설정")] [SerializeField] private float obstacleDistance = 10; @@ -42,7 +41,6 @@ namespace BlueWaterProject myBoids = boids; moveSpeed = speed; hitColliders = new Collider[maxNeighbourCount]; - FishItem.ItemCount = Random.Range((int)RandomCount.x, (int)RandomCount.y); findNeighbourCoroutine ??= StartCoroutine("FindNeighbourCoroutine"); calculateEgoVectorCoroutine ??= StartCoroutine("CalculateEgoVectorCoroutine"); diff --git a/BlueWater/Assets/02.Scripts/Boids.cs b/BlueWater/Assets/02.Scripts/Boids.cs index c5b9ac9a7..8ec35284c 100644 --- a/BlueWater/Assets/02.Scripts/Boids.cs +++ b/BlueWater/Assets/02.Scripts/Boids.cs @@ -331,9 +331,8 @@ namespace BlueWaterProject //var y = Random.Range(bounds.min.y, bounds.max.y); var z = Random.Range(bounds.min.z, bounds.max.z); var randomPos = new Vector3(x, 0, z); - - var catchItem = new FishItem(currentBoid.FishItem.ItemName, currentBoid.FishItem.ItemCount, currentBoid.FishItem.ItemIcon); - ItemDropManager.Inst.DropItem(catchItem, randomPos); + + currentBoid.DropItemTable.ItemDrop(randomPos); boidList.RemoveAt(0); Destroy(currentBoid.gameObject); @@ -374,7 +373,5 @@ namespace BlueWaterProject } } } - - public FishItem GetBoidInfo() => boidPrefab.FishItem; } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index 21b546f10..a9832bac7 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -9,7 +9,7 @@ using UnityEngine.UI; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - public abstract class Enemy : BaseCharacter, IDamageable, IAiView, IHelpCall + public abstract class Enemy : BaseCharacter, IDamageable, IAiView, IHelpCall, IDroppable { #region Properties and variables @@ -96,6 +96,9 @@ namespace BlueWaterProject [DisableIf("@true")] [SerializeField] protected bool beAttacked; + + [field: Title("드롭 아이템")] + [field: SerializeField] public DropItemTable DropItemTable { get; set; } // 일반 변수 protected bool isAttacking; @@ -311,6 +314,7 @@ namespace BlueWaterProject StartCoroutine(nameof(BeAttacked)); } + [Button("Die테스트")] public void Die() { myAnimator?.SetTrigger(DieHash); @@ -318,8 +322,15 @@ namespace BlueWaterProject Agent.isStopped = true; Agent.enabled = false; - Destroy(hpSlider.gameObject, 2f); - Destroy(gameObject, 2f); + Invoke(nameof(DieEvent), 2f); + } + + private void DieEvent() + { + DropItemTable?.ItemDrop(transform.position + Vector3.up * 0.5f); + + Destroy(hpSlider.gameObject); + Destroy(gameObject); } public float GetCurrentHp() => CurrentHp; diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs index 7efc8704f..93793f4bb 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs @@ -8,6 +8,8 @@ namespace BlueWaterProject { #region Properties and variables + public DropItemTable DropItemTable { get; set; } + // Hash protected static readonly int AttackHash = Animator.StringToHash("Attack"); protected static readonly int AttackStateHash = Animator.StringToHash("AttackState"); diff --git a/BlueWater/Assets/02.Scripts/CombatUi.cs b/BlueWater/Assets/02.Scripts/CombatUi.cs index ce5f332bd..ef2e9c6e3 100644 --- a/BlueWater/Assets/02.Scripts/CombatUi.cs +++ b/BlueWater/Assets/02.Scripts/CombatUi.cs @@ -14,6 +14,7 @@ namespace BlueWaterProject [field: SerializeField] public Canvas WorldSpaceCanvas { get; private set; } [field: SerializeField] public SkillUi MainSkillUi { get; private set; } [field: SerializeField] public FieldBossHpSlider FieldBossHpSlider { get; private set; } + [field: SerializeField] public DropItemGroupController DropItemGroupController { get; set; } [Button("셋팅 초기화")] @@ -29,6 +30,7 @@ namespace BlueWaterProject WorldSpaceCanvas = GameObject.Find("WorldSpaceCanvas").GetComponent(); MainSkillUi = MainCanvas.transform.Find("MainSkillUi").GetComponent(); FieldBossHpSlider = MainCanvas.transform.Find("FieldBossHpSlider").GetComponent(); + DropItemGroupController = MainCanvas.transform.Find("DropItemGroup").GetComponent(); } private void Awake() diff --git a/BlueWater/Assets/02.Scripts/DestructibleObject.cs b/BlueWater/Assets/02.Scripts/DestructibleObject.cs index d67113f7a..54597716b 100644 --- a/BlueWater/Assets/02.Scripts/DestructibleObject.cs +++ b/BlueWater/Assets/02.Scripts/DestructibleObject.cs @@ -5,10 +5,10 @@ using UnityEngine; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - public class DestructibleObject : MonoBehaviour + public class DestructibleObject : MonoBehaviour, IDroppable { - [Title("기본 설정")] - [SerializeField] private Item itemInfo; + [field: Title("기본 설정")] + [field: SerializeField] public DropItemTable DropItemTable { get; set; } [field: SerializeField] public int Strength { get; private set; } = 100; [SerializeField] private float power = 10f; [SerializeField] private float damageCooldown = 2f; @@ -58,7 +58,7 @@ namespace BlueWaterProject { rb.isKinematic = false; rayfire.Demolish(); - ItemDropManager.Inst.DropItem(itemInfo, other.collider.bounds.center); + DropItemTable.ItemDrop(other.collider.bounds.center); } private void Hit(IDestructible iDestructible) diff --git a/BlueWater/Assets/02.Scripts/FishItem.cs b/BlueWater/Assets/02.Scripts/FishItem.cs deleted file mode 100644 index 7c1770619..000000000 --- a/BlueWater/Assets/02.Scripts/FishItem.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using UnityEngine; - -// ReSharper disable once CheckNamespace -namespace BlueWaterProject -{ - [Serializable] - public class FishItem : Item - { - public FishItem(string name, int count = 1, Sprite icon = null) : base(name, count, icon) - { - ItemName = name; - ItemCount = count; - ItemIcon = icon; - } - } -} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs b/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs new file mode 100644 index 000000000..6148deac3 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs @@ -0,0 +1,8 @@ +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public interface IDroppable + { + DropItemTable DropItemTable { get; set; } + } +} diff --git a/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs.meta new file mode 100644 index 000000000..e53044dbf --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IDroppable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6854caf0ffda1c442b680972b90386d8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem.meta new file mode 100644 index 000000000..801b07837 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1dc19499282157048bb61ce8c379dd3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs new file mode 100644 index 000000000..305a4174b --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs @@ -0,0 +1,15 @@ +using System; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + [CreateAssetMenu(fileName = "CurrencyItem", menuName = "ScriptableObjects/Item/CurrencyItem")] + public class CurrencyItem : Item + { + public override void Use() + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs.meta new file mode 100644 index 000000000..fe55140f7 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6864b0bdcf8edb441bea59200141b76b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo.meta new file mode 100644 index 000000000..0472eb879 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2b514a8422c5d14ba297dcaf64ebb45 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset new file mode 100644 index 000000000..afde04ad6 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: BigBarrelDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830, + type: 2} + k__BackingField: 50 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d, + type: 3} + - k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba, + type: 2} + k__BackingField: 30 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d, + type: 3} + - k__BackingField: {fileID: 11400000, guid: 53c414221cf3e8b4f851d61aead8fd50, + type: 2} + k__BackingField: 20 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset.meta new file mode 100644 index 000000000..827971812 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0cbd0ef58813bb848a45b92be06ede0a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset new file mode 100644 index 000000000..3ae1b0703 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: OrkDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830, + type: 2} + k__BackingField: 75 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722, + type: 3} + - k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba, + type: 2} + k__BackingField: 25 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset.meta new file mode 100644 index 000000000..e7ba34d9d --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fcad3b0fc594ad42b475372772eded3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset new file mode 100644 index 000000000..2e2b82d42 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: SmallBarrelDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830, + type: 2} + k__BackingField: 75 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d, + type: 3} + - k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba, + type: 2} + k__BackingField: 25 + k__BackingField: {x: 1, y: 1} + prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset.meta new file mode 100644 index 000000000..663c3db99 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05eadc282e9d88f4394eee3679190a71 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So.meta new file mode 100644 index 000000000..49146d391 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3b763a48948d4e409d1fcabc8284225 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset new file mode 100644 index 000000000..fbae014a3 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3} + m_Name: 1000Coin + m_EditorClassIdentifier: + id: Currency003 + name: "1000\uCF54\uC778" + icon: {fileID: 21300000, guid: 42166f232ee914f4997bc503de7c4ab7, type: 3} + description: + price: 1000 + weight: 0 + rarity: 0 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset.meta new file mode 100644 index 000000000..0ff74b252 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/1000Coin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53c414221cf3e8b4f851d61aead8fd50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset new file mode 100644 index 000000000..3ddcc407e --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3} + m_Name: 100Coin + m_EditorClassIdentifier: + id: Currency001 + name: "100\uCF54\uC778" + icon: {fileID: 21300000, guid: 1e68d32ca9d274421aa1325f2e9fc380, type: 3} + description: + price: 100 + weight: 0 + rarity: 0 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset.meta new file mode 100644 index 000000000..e9fd717c3 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/100Coin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6bf3a02ded696840a990636e2151830 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset new file mode 100644 index 000000000..816598c15 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3} + m_Name: 500Coin + m_EditorClassIdentifier: + id: Currency002 + name: "500\uCF54\uC778" + icon: {fileID: 21300000, guid: d06e32d389f004b02b646c7e8967d1e6, type: 3} + description: + price: 500 + weight: 0 + rarity: 0 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset.meta b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset.meta new file mode 100644 index 000000000..7167e1a60 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/CurrencyItem/So/500Coin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b60d264f0506e60469c4ad5cffb8c6ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/ItemController.cs b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs similarity index 70% rename from BlueWater/Assets/02.Scripts/Item/ItemController.cs rename to BlueWater/Assets/02.Scripts/Item/DropItemController.cs index c5856a4a2..4e5976b07 100644 --- a/BlueWater/Assets/02.Scripts/Item/ItemController.cs +++ b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs @@ -6,10 +6,13 @@ using UnityEngine; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - public class ItemController : MonoBehaviour + public class DropItemController : MonoBehaviour { + [Title("컴포넌트")] + [SerializeField] private SpriteRenderer spriteRenderer; + [SerializeField] private AudioSource audioSource; + [Title("아이템")] - [SerializeField] private Item item; [SerializeField] private GameObject itemUiPrefab; [SerializeField] private GameObject pointingArrowUiPrefab; [ShowIf("@pointingArrowUiPrefab")] @@ -26,10 +29,11 @@ namespace BlueWaterProject [SerializeField] private float acquisitionTime = 1f; [SerializeField] private LayerMask targetLayer; + private ItemInstance itemInstance; + private int itemCount; private Collider[] hitColliders = new Collider[1]; private Collider targetCollider; private WaitForSeconds lootCoroutineTime = new(0.5f); - private AudioSource audioSource; private ItemUiController itemLootUi; private Transform pointingArrowUi; @@ -40,24 +44,28 @@ namespace BlueWaterProject Gizmos.DrawWireSphere(transform.position, radius); } - public void Init(Item newItem) + public void Init(ItemInstance newItemInstance, int count) { - item = newItem; + itemInstance = newItemInstance; + itemCount = count; + if (spriteRenderer) + { + spriteRenderer.sprite = itemInstance.Item.icon; + } var myPos = transform.position; var screenPos = CameraManager.Inst.MainCam.WorldToScreenPoint(myPos); - itemLootUi = Instantiate(itemUiPrefab, screenPos, Quaternion.identity, UiManager.Inst.OceanUi.ItemsLoot).GetComponent(); + + if (itemUiPrefab) + { + itemLootUi = Instantiate(itemUiPrefab, screenPos, Quaternion.identity, UiManager.Inst.OceanUi.ItemsLoot).GetComponent(); + itemLootUi.Init(transform); + } if (pointingArrowUiPrefab) { pointingArrowUi = Instantiate(pointingArrowUiPrefab, screenPos, Quaternion.identity, UiManager.Inst.OceanUi.InstantiateUi).transform; pointingArrowUi.gameObject.SetActive(false); } - itemLootUi.Init(transform); - } - - private void Awake() - { - audioSource = transform.parent.Find("Audio").GetComponent(); } private void Start() @@ -84,7 +92,10 @@ namespace BlueWaterProject if (maxSize > 0) { targetCollider = hitColliders[0]; - itemLootUi.ItemAcquisition(); + if (itemLootUi) + { + itemLootUi.ItemAcquisition(); + } break; } @@ -100,13 +111,31 @@ namespace BlueWaterProject var t = elapsedTime / acquisitionTime; t = Mathf.SmoothStep(0f, 1f, t); - transform.position = Vector3.Lerp(startPosition, targetCollider.transform.position, t); + transform.parent.position = Vector3.Lerp(startPosition, targetCollider.bounds.center, t); yield return null; } - item.Acquire(); - itemLootUi.gameObject.SetActive(false); - UiManager.Inst.OceanUi.DropItemGroupController.ShowDropItemInfoUi(item); + itemInstance.Item.Acquire(itemCount); + if (itemLootUi) + { + itemLootUi.gameObject.SetActive(false); + } + + if (spriteRenderer) + { + spriteRenderer.gameObject.SetActive(false); + } + + DropItemGroupController dropItemGroupController = null; + if (UiManager.Inst.OceanUi) + { + dropItemGroupController = UiManager.Inst.OceanUi.DropItemGroupController; + } + else if (UiManager.Inst.CombatUi) + { + dropItemGroupController = UiManager.Inst.CombatUi.DropItemGroupController; + } + dropItemGroupController?.ShowDropItemInfoUi(itemInstance.Item, itemCount); if (audioSource && audioSource.resource) { @@ -116,7 +145,10 @@ namespace BlueWaterProject yield return new WaitForSeconds(audioSource.clip.length); Destroy(transform.parent.gameObject); - Destroy(itemLootUi.gameObject); + if (itemLootUi) + { + Destroy(itemLootUi.gameObject); + } } private void PointingArrowUi() diff --git a/BlueWater/Assets/02.Scripts/Item/DropItemController.cs.meta b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs.meta new file mode 100644 index 000000000..9cdae67b8 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e474579c3021c964cb86b13cbec28e89 diff --git a/BlueWater/Assets/02.Scripts/Item/DropItemGroupController.cs b/BlueWater/Assets/02.Scripts/Item/DropItemGroupController.cs index 7749ed522..57f032d32 100644 --- a/BlueWater/Assets/02.Scripts/Item/DropItemGroupController.cs +++ b/BlueWater/Assets/02.Scripts/Item/DropItemGroupController.cs @@ -11,12 +11,12 @@ namespace BlueWaterProject private WaitForSeconds coroutineRestartTime = new(0.5f); - public void ShowDropItemInfoUi(IItem iItem) + public void ShowDropItemInfoUi(Item item, int count) { - StartCoroutine(ShowDropItemInfoUiCoroutine(iItem)); + StartCoroutine(ShowDropItemInfoUiCoroutine(item, count)); } - private IEnumerator ShowDropItemInfoUiCoroutine(IItem iItem) + private IEnumerator ShowDropItemInfoUiCoroutine(Item item, int count) { while (true) { @@ -24,8 +24,8 @@ namespace BlueWaterProject { if (list.UiView.gameObject.activeSelf) continue; - var itemText = iItem.ItemName + " x" + iItem.ItemCount; - list.SetInfo(iItem.ItemIcon, itemText); + var itemText = item.name + " x" + count; + list.SetInfo(item.icon, itemText); list.ShowUi(); while (list.UiView.gameObject.activeSelf) diff --git a/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs b/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs new file mode 100644 index 000000000..94f463dbe --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + [CreateAssetMenu(fileName = "DropItemTable", menuName = "ScriptableObjects/Item/DropItemTable")] + public class DropItemTable : ScriptableObject + { + public List itemInstanceList = new(); + + private ItemInstance PickItem() + { + var count = itemInstanceList.Count; + + if (count == 0) return null; + + var sumRatio = itemInstanceList.Sum(element => element.Ratio); + var randomRatio = Random.Range(0, sumRatio); + + for (var i = 0; i < count; i++) + { + randomRatio -= itemInstanceList[i].Ratio; + + if (randomRatio < 0) + { + return itemInstanceList[i]; + } + } + + return null; + } + + public void ItemDrop(Vector3 dropPosition) + { + var dropItem = PickItem(); + if (dropItem == null) return; + + var dropCount = Random.Range((int)dropItem.Count.x, (int)dropItem.Count.y + 1); + var instantiateItem = dropItem.Item.InstantiateItem(dropItem.prefab, dropPosition); + instantiateItem.GetComponentInChildren().Init(dropItem, dropCount); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs.meta b/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs.meta new file mode 100644 index 000000000..b0ce8d6d5 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/DropItemTable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 48105e29cecfc3e4581b32f903be682a \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem.meta b/BlueWater/Assets/02.Scripts/Item/FishItem.meta new file mode 100644 index 000000000..a7ddeddce --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e038312b42cc90a4baf47bd5a30f4db5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo.meta new file mode 100644 index 000000000..156bcad0f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60e11d9b2097a16419495aaa7d494a0e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset new file mode 100644 index 000000000..c3e8dc451 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: HammerheadSharkDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: 5adade6dd915b424e8de993bea9e3eb1, + type: 2} + k__BackingField: 1 + k__BackingField: {x: 1, y: 10} + prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset.meta new file mode 100644 index 000000000..97bf640e5 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c51eff58445ec1e46ab8087108f66d18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset new file mode 100644 index 000000000..a6811bd89 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: MackerelDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: e67e7a41d059c6747960d8e91b37b29d, + type: 2} + k__BackingField: 1 + k__BackingField: {x: 1, y: 3} + prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset.meta new file mode 100644 index 000000000..27d797c2f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06a066700640ea048830e1eb2f1881cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset new file mode 100644 index 000000000..9bb8d403b --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48105e29cecfc3e4581b32f903be682a, type: 3} + m_Name: StingrayDropTable + m_EditorClassIdentifier: + itemInstanceList: + - k__BackingField: {fileID: 11400000, guid: 0205e1f648508a547b6cc1a05030c7eb, + type: 2} + k__BackingField: 1 + k__BackingField: {x: 1, y: 5} + prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0, + type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset.meta new file mode 100644 index 000000000..bea36985e --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a526734a70dfd254e8ecb570e1474540 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs b/BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs new file mode 100644 index 000000000..51aa39b20 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs @@ -0,0 +1,15 @@ +using System; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + [CreateAssetMenu(fileName = "FishItem", menuName = "ScriptableObjects/Item/FishItem")] + public class FishItem : Item + { + public override void Use() + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/FishItem.cs.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/FishItem.cs.meta rename to BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/So.meta new file mode 100644 index 000000000..d5eb828b6 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c0827f818961ec40aef0fa01bd0446d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset new file mode 100644 index 000000000..c161cd97d --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3396bf949f48594b8c7bbe40d37dffa, type: 3} + m_Name: HammerheadShark + m_EditorClassIdentifier: + id: Fish002 + name: "\uB9DD\uCE58\uBA38\uB9AC\uC0C1\uC5B4" + icon: {fileID: 21300000, guid: 06d43d70fa65dda4b9fd661589fa76e0, type: 3} + description: "\uB9DD\uCE58\uBA38\uB9AC\uC0C1\uC5B4\uC785\uB2C8\uB2E4." + price: 1000 + weight: 10 + rarity: 2 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset.meta new file mode 100644 index 000000000..968777e85 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/HammerheadShark.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5adade6dd915b424e8de993bea9e3eb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset new file mode 100644 index 000000000..cb758377f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3396bf949f48594b8c7bbe40d37dffa, type: 3} + m_Name: Mackerel + m_EditorClassIdentifier: + id: Fish001 + name: "\uACE0\uB4F1\uC5B4" + icon: {fileID: 21300000, guid: 27d2d9a014b4b7e418f48feca49d26c2, type: 3} + description: "\uACE0\uB4F1\uC5B4\uC785\uB2C8\uB2E4." + price: 100 + weight: 1 + rarity: 0 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset.meta new file mode 100644 index 000000000..b85536668 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Mackerel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e67e7a41d059c6747960d8e91b37b29d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset new file mode 100644 index 000000000..763fdc38f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3396bf949f48594b8c7bbe40d37dffa, type: 3} + m_Name: Stingray + m_EditorClassIdentifier: + id: Fish003 + name: "\uAC00\uC624\uB9AC" + icon: {fileID: 21300000, guid: 95f00a57ff000bd4c9b702268612de6f, type: 3} + description: "\uAC00\uC624\uB9AC\uC785\uB2C8\uB2E4." + price: 500 + weight: 5 + rarity: 1 + prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3} diff --git a/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset.meta b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset.meta new file mode 100644 index 000000000..3f62edba4 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/FishItem/So/Stingray.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0205e1f648508a547b6cc1a05030c7eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs b/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs new file mode 100644 index 000000000..f7c2fe9bd --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs @@ -0,0 +1,22 @@ +using System; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + [Serializable] + public class InventoryItem + { + [field: Tooltip("아이템 데이터")] + [field: SerializeField] public Item Item { get; set; } + + [field: Tooltip("아이템 수량")] + [field: SerializeField] public int Count { get; set; } + + public InventoryItem(Item item, int count) + { + Item = item; + Count = count; + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs.meta b/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs.meta new file mode 100644 index 000000000..c5c77b253 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/InventoryItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9d4fd7f55d96e5e44bee1fca643b87ad \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/Item.cs b/BlueWater/Assets/02.Scripts/Item/Item.cs index 88638ef2e..a6cdfdc9f 100644 --- a/BlueWater/Assets/02.Scripts/Item/Item.cs +++ b/BlueWater/Assets/02.Scripts/Item/Item.cs @@ -1,26 +1,51 @@ -using System; using UnityEngine; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - [Serializable] - public class Item : IItem + public enum ItemRarity { - [field: SerializeField] public string ItemName { get; set; } - [field: SerializeField] public int ItemCount { get; set; } - [field: SerializeField] public Sprite ItemIcon { get; set; } + COMMON, + UNCOMMON, + RARE, + LEGENDARY + } + + [CreateAssetMenu(fileName = "Item", menuName = "ScriptableObjects/Item/BaseItem")] + public abstract class Item : ScriptableObject + { + [Tooltip("고유 식별 ID")] + public string id; + + [Tooltip("이름")] + public string name; + + [Tooltip("아이콘")] + public Sprite icon; + + [Tooltip("설명"), TextArea(3, 10)] + public string description; + + [Tooltip("가격")] + public int price; + + [Tooltip("무게")] + public int weight; + + [Tooltip("등급")] + public ItemRarity rarity; - public Item(string name, int count = 1, Sprite icon = null) + public abstract void Use(); + + public void Acquire(int count) { - ItemName = name; - ItemCount = count; - ItemIcon = icon; + DataManager.Inst.PlayerInventory.AddItem(this, count); } - - public void Acquire() + + public GameObject InstantiateItem(GameObject prefab, Vector3 position, Quaternion rotation = default) { - DataManager.Inst.PlayerInventory.AddItem(this); + var instantiateItem = Instantiate(prefab, position, rotation); + return instantiateItem; } } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/ItemController.cs.meta b/BlueWater/Assets/02.Scripts/Item/ItemController.cs.meta deleted file mode 100644 index 781933bbe..000000000 --- a/BlueWater/Assets/02.Scripts/Item/ItemController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c3ea0c13f4edde747b6d5eb5d6842905 diff --git a/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs b/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs deleted file mode 100644 index 4f55d8593..000000000 --- a/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Sirenix.OdinInspector; -using UnityEngine; - -// ReSharper disable once CheckNamespace -namespace BlueWaterProject -{ - public class ItemDropManager : Singleton - { - [field: Title("아이템")] - [field: SerializeField] public GameObject ItemPrefab { get; private set; } - [SerializeField] private Transform instantiateObjects; - [SerializeField] private Transform items; - - [Button("셋팅 초기화")] - private void Init() - { - instantiateObjects = GameObject.Find("InstantiateObjects").transform; - items = instantiateObjects.transform.Find("Items"); - } - - public void DropItem(Item item, Vector3 dropPosition) - { - var itemController = Instantiate(ItemPrefab, dropPosition, Quaternion.identity, items).GetComponentInChildren(); - itemController.Init(item); - } - } -} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs.meta b/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs.meta deleted file mode 100644 index b69d04f09..000000000 --- a/BlueWater/Assets/02.Scripts/Item/ItemDropManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: bb206c5a6ef8a5c4699d0abf67531d7d diff --git a/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs b/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs new file mode 100644 index 000000000..b5bb7bfa5 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs @@ -0,0 +1,29 @@ +using System; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + [Serializable] + public class ItemInstance + { + [field: Tooltip("아이템 데이터")] + [field: SerializeField] public Item Item { get; set; } + + [field: Tooltip("아이템 드롭 비율")] + [field: SerializeField] public int Ratio { get; set; } + + [field: Tooltip("아이템 랜덤 드롭 갯수")] + [field: SerializeField] public Vector2 Count { get; set; } + + [Tooltip("프리팹")] + public GameObject prefab; + + public ItemInstance(Item item, int ratio, Vector2 count) + { + Item = item; + Ratio = ratio; + Count = count; + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs.meta b/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs.meta new file mode 100644 index 000000000..fff047bc0 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Item/ItemInstance.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ebefd09a780905745be9e291f40dcb9e \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/PlayerInventory.cs b/BlueWater/Assets/02.Scripts/PlayerInventory.cs index 48cc31726..3cd2ffca7 100644 --- a/BlueWater/Assets/02.Scripts/PlayerInventory.cs +++ b/BlueWater/Assets/02.Scripts/PlayerInventory.cs @@ -8,19 +8,19 @@ namespace BlueWaterProject [Serializable] public class PlayerInventory { - [SerializeField] private List items = new(); + [SerializeField] private List inventoryItemList = new(); - public void AddItem(IItem item) + public void AddItem(Item item, int count) { - var existingItem = items.Find(i => i.ItemName == item.ItemName); + var existingItem = inventoryItemList.Find(i => i.Item.name == item.name); if (existingItem != null) { - existingItem.ItemCount += item.ItemCount; + existingItem.Count += count; } else { - items.Add(new Item(item.ItemName, item.ItemCount)); + inventoryItemList.Add(new InventoryItem(item, count)); } } } diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab b/BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab index 4447191f2..5cc7bd54e 100644 --- a/BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab +++ b/BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab @@ -134,11 +134,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: - k__BackingField: "\uB9DD\uCE58\uBA38\uB9AC\uC0C1\uC5B4" - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 06d43d70fa65dda4b9fd661589fa76e0, - type: 3} + k__BackingField: {fileID: 11400000, guid: c51eff58445ec1e46ab8087108f66d18, + type: 2} k__BackingField: {x: 10, y: 1} obstacleDistance: 10 viewAngle: 120 diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab b/BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab similarity index 95% rename from BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab rename to BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab index 9a952aafb..d03b91455 100644 --- a/BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab +++ b/BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5402562142639805275} - component: {fileID: 2102284208022651341} m_Layer: 16 - m_Name: SmallFish + m_Name: Mackerel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -46,11 +46,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: - k__BackingField: "\uAE08\uBD95\uC5B4" - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 27d2d9a014b4b7e418f48feca49d26c2, - type: 3} + k__BackingField: {fileID: 11400000, guid: 06a066700640ea048830e1eb2f1881cd, + type: 2} k__BackingField: {x: 1, y: 4} obstacleDistance: 10 viewAngle: 120 diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab.meta b/BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab.meta similarity index 100% rename from BlueWater/Assets/05.Prefabs/Boids/Boid/SmallFish.prefab.meta rename to BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab.meta diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab b/BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab index 9b9604743..7e57114ac 100644 --- a/BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab +++ b/BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab @@ -46,11 +46,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: - k__BackingField: "\uAC00\uC624\uB9AC" - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 95f00a57ff000bd4c9b702268612de6f, - type: 3} + k__BackingField: {fileID: 11400000, guid: a526734a70dfd254e8ecb570e1474540, + type: 2} k__BackingField: {x: 5, y: 7} obstacleDistance: 10 viewAngle: 120 diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop.meta b/BlueWater/Assets/05.Prefabs/Items/Drop.meta new file mode 100644 index 000000000..2798e4159 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Items/Drop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cebac0aec1b57e0448975a7284bc5691 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab b/BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab similarity index 94% rename from BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab rename to BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab index 10124e9d6..5c2174e17 100644 --- a/BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab @@ -139,7 +139,7 @@ GameObject: m_Component: - component: {fileID: 726335702565593345} m_Layer: 0 - m_Name: ItemDrop + m_Name: DropItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -171,9 +171,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 816226554442943762} - - component: {fileID: 9212167707718790757} + - component: {fileID: 1871283123640341369} m_Layer: 21 - m_Name: ItemController + m_Name: DropItemController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -194,7 +194,7 @@ Transform: m_Children: [] m_Father: {fileID: 726335702565593345} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9212167707718790757 +--- !u!114 &1871283123640341369 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -203,17 +203,16 @@ MonoBehaviour: m_GameObject: {fileID: 7996128800962867104} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c3ea0c13f4edde747b6d5eb5d6842905, type: 3} + m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} m_Name: m_EditorClassIdentifier: - item: - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} + spriteRenderer: {fileID: 0} + audioSource: {fileID: 8975262077732393561} itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16, type: 3} pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59, type: 3} + arrowOffset: 10 useAutoDestroy: 0 autoDestroyTime: 30 drawGizmos: 1 diff --git a/BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab.meta b/BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab.meta similarity index 74% rename from BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab.meta rename to BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab.meta index 874fb3ca8..8e1a4a125 100644 --- a/BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab.meta +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 540ae6456b3be064d8f6cb8d56ce7f12 +guid: cded349812c1d624d9cc649e63d1b868 PrefabImporter: externalObjects: {} userData: diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab new file mode 100644 index 000000000..fd871a637 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab @@ -0,0 +1,308 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1733947209264972765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6499268732264954890} + - component: {fileID: 8975262077732393561} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6499268732264954890 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733947209264972765} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 726335702565593345} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8975262077732393561 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733947209264972765} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3} + m_Resource: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &4185765918994780331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 726335702565593345} + m_Layer: 0 + m_Name: FieldDropItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &726335702565593345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4185765918994780331} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 816226554442943762} + - {fileID: 994959806070393769} + - {fileID: 6499268732264954890} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6718783098392052893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 994959806070393769} + - component: {fileID: 4385550810937580112} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &994959806070393769 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6718783098392052893} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 726335702565593345} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4385550810937580112 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6718783098392052893} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7996128800962867104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 816226554442943762} + - component: {fileID: 1871283123640341369} + m_Layer: 21 + m_Name: DropItemController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &816226554442943762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7996128800962867104} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 726335702565593345} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1871283123640341369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7996128800962867104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteRenderer: {fileID: 4385550810937580112} + audioSource: {fileID: 8975262077732393561} + itemUiPrefab: {fileID: 0} + pointingArrowUiPrefab: {fileID: 0} + arrowOffset: 10 + useAutoDestroy: 0 + autoDestroyTime: 30 + drawGizmos: 1 + radius: 3 + acquisitionTime: 1.5 + targetLayer: + serializedVersion: 2 + m_Bits: 512 diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab.meta b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab.meta new file mode 100644 index 000000000..84725733d --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldDropItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8ab179a0b6cfa1740a787520a9d2c722 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab b/BlueWater/Assets/05.Prefabs/Items/Drop/FishDropItem.prefab similarity index 94% rename from BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab rename to BlueWater/Assets/05.Prefabs/Items/Drop/FishDropItem.prefab index e8aa8c99e..2f6937700 100644 --- a/BlueWater/Assets/05.Prefabs/Items/BarrelItemDrop.prefab +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/FishDropItem.prefab @@ -139,7 +139,7 @@ GameObject: m_Component: - component: {fileID: 726335702565593345} m_Layer: 0 - m_Name: BarrelItemDrop + m_Name: FishDropItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -171,9 +171,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 816226554442943762} - - component: {fileID: 9212167707718790757} + - component: {fileID: 1871283123640341369} m_Layer: 21 - m_Name: ItemController + m_Name: DropItemController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -194,7 +194,7 @@ Transform: m_Children: [] m_Father: {fileID: 726335702565593345} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9212167707718790757 +--- !u!114 &1871283123640341369 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -203,17 +203,16 @@ MonoBehaviour: m_GameObject: {fileID: 7996128800962867104} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c3ea0c13f4edde747b6d5eb5d6842905, type: 3} + m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} m_Name: m_EditorClassIdentifier: - item: - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} + spriteRenderer: {fileID: 0} + audioSource: {fileID: 8975262077732393561} itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16, type: 3} pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59, type: 3} + arrowOffset: 10 useAutoDestroy: 0 autoDestroyTime: 30 drawGizmos: 1 diff --git a/BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab.meta b/BlueWater/Assets/05.Prefabs/Items/Drop/FishDropItem.prefab.meta similarity index 100% rename from BlueWater/Assets/05.Prefabs/Items/ItemDrop.prefab.meta rename to BlueWater/Assets/05.Prefabs/Items/Drop/FishDropItem.prefab.meta diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab b/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab new file mode 100644 index 000000000..388305bed --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab @@ -0,0 +1,223 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1733947209264972765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6499268732264954890} + - component: {fileID: 8975262077732393561} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6499268732264954890 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733947209264972765} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 726335702565593345} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8975262077732393561 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733947209264972765} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3} + m_Resource: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &4185765918994780331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 726335702565593345} + m_Layer: 0 + m_Name: OceanPropsDropItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &726335702565593345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4185765918994780331} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 816226554442943762} + - {fileID: 6499268732264954890} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7996128800962867104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 816226554442943762} + - component: {fileID: 1871283123640341369} + m_Layer: 21 + m_Name: DropItemController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &816226554442943762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7996128800962867104} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 726335702565593345} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1871283123640341369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7996128800962867104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteRenderer: {fileID: 0} + audioSource: {fileID: 8975262077732393561} + itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16, + type: 3} + pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59, + type: 3} + arrowOffset: 10 + useAutoDestroy: 0 + autoDestroyTime: 30 + drawGizmos: 1 + radius: 15 + acquisitionTime: 1.5 + targetLayer: + serializedVersion: 2 + m_Bits: 512 diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab.meta b/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab.meta new file mode 100644 index 000000000..f2aaf98e7 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0bb294b26cbcae54a8508211b077a88d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab index f260471a9..e9640dfcf 100644 --- a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab @@ -162,7 +162,7 @@ MonoBehaviour: centerOfMass: {x: 0, y: -0.5, z: 0} combinedCenterOfMass: {x: 0, y: -0.5, z: 0} useDefaultInertia: 1 - inertiaTensor: {x: 188774.38, y: 0, z: 187856.39} + inertiaTensor: {x: 105004.21, y: 0, z: 104535.86} combinedInertiaTensor: {x: 0, y: 0, z: 0} --- !u!114 &867154244752756088 MonoBehaviour: @@ -438,11 +438,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3} m_Name: m_EditorClassIdentifier: - itemInfo: - k__BackingField: Coin - k__BackingField: 50 - k__BackingField: {fileID: 21300000, guid: 457ae4f0af7434f8aad6799ba5f881ba, - type: 3} + k__BackingField: {fileID: 11400000, guid: 05eadc282e9d88f4394eee3679190a71, + type: 2} k__BackingField: 50 power: 10 damageCooldown: 2 diff --git a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab index 654ca5109..81869d2b0 100644 --- a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab @@ -78,6 +78,33 @@ PrefabInstance: propertyPath: m_Name value: BigBarrel objectReference: {fileID: 0} + - target: {fileID: 5205023087971492808, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, + type: 3} + propertyPath: baseMass + value: 35925.93 + objectReference: {fileID: 0} + - target: {fileID: 5205023087971492808, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, + type: 3} + propertyPath: inertiaTensor.x + value: 566323.2 + objectReference: {fileID: 0} + - target: {fileID: 5205023087971492808, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, + type: 3} + propertyPath: inertiaTensor.z + value: 563569.3 + objectReference: {fileID: 0} + - target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, + type: 3} + propertyPath: dropItemTable + value: + objectReference: {fileID: 11400000, guid: 0cbd0ef58813bb848a45b92be06ede0a, + type: 2} + - target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, + type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 11400000, guid: 0cbd0ef58813bb848a45b92be06ede0a, + type: 2} - target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6, type: 3} propertyPath: itemInfo.k__BackingField diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coin.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coin.psd.meta index 9d72fad0b..d24e1e0a4 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coin.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coin.psd.meta @@ -3,7 +3,7 @@ guid: 1e68d32ca9d274421aa1325f2e9fc380 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins1.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins1.psd.meta index 8cde2ee6e..2c563cada 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins1.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins1.psd.meta @@ -3,7 +3,7 @@ guid: 42166f232ee914f4997bc503de7c4ab7 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins2.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins2.psd.meta index 23f1fa4dc..df58fb113 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins2.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins2.psd.meta @@ -3,7 +3,7 @@ guid: 2c50bc835e9d244b7aeac83a5ca1e6ab TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins3.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins3.psd.meta index ce93b66dd..43065f38a 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins3.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins3.psd.meta @@ -3,7 +3,7 @@ guid: d06e32d389f004b02b646c7e8967d1e6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins4.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins4.psd.meta index f3f8d8a0f..5be37fdd7 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins4.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins4.psd.meta @@ -3,7 +3,7 @@ guid: 457ae4f0af7434f8aad6799ba5f881ba TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins5.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins5.psd.meta index e4b11446f..548e04c57 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins5.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins5.psd.meta @@ -3,7 +3,7 @@ guid: 3e30c2b978a9d4ad1afa9945b2909ad4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins6.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins6.psd.meta index 107f026b8..7b0de70ae 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins6.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins6.psd.meta @@ -3,7 +3,7 @@ guid: 04375687a6f9b4b578964c3e15ae60da TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins7.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins7.psd.meta index 83c25e395..73a66fc6c 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins7.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins7.psd.meta @@ -3,7 +3,7 @@ guid: ac0ce473efe9e4c8eac0798f1fd33018 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins8.psd.meta b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins8.psd.meta index f4d676edf..8ff416a74 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins8.psd.meta +++ b/BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PSD/Coins8.psd.meta @@ -3,7 +3,7 @@ guid: 393428ac28e994789af3645be6f3c0d3 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +20,12 @@ TextureImporter: 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 @@ -31,9 +34,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -45,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,10 +57,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -69,6 +77,46 @@ TextureImporter: 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 + - serializedVersion: 3 + buildTarget: Android + 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: Windows Store Apps + 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: @@ -84,9 +132,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: