Add booster pack item
This commit is contained in:
Michal Pikulski
@@ -15,7 +15,7 @@ MonoBehaviour:
|
|||||||
m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
|
m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
|
||||||
m_currentHash:
|
m_currentHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 00000000000000000000000000000000
|
Hash: 89cfa2de693303d57eb83bd0f8745338
|
||||||
m_OptimizeCatalogSize: 0
|
m_OptimizeCatalogSize: 0
|
||||||
m_BuildRemoteCatalog: 0
|
m_BuildRemoteCatalog: 0
|
||||||
m_CatalogRequestsTimeout: 0
|
m_CatalogRequestsTimeout: 0
|
||||||
|
|||||||
37
Assets/Data/CinemachineCustomBlends.asset
Normal file
37
Assets/Data/CinemachineCustomBlends.asset
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
%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: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3}
|
||||||
|
m_Name: CinemachineCustomBlends
|
||||||
|
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineBlenderSettings
|
||||||
|
CustomBlends:
|
||||||
|
- From:
|
||||||
|
To:
|
||||||
|
Blend:
|
||||||
|
Style: 1
|
||||||
|
Time: 0
|
||||||
|
CustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 0
|
||||||
|
m_PostInfinity: 0
|
||||||
|
m_RotationOrder: 0
|
||||||
|
- From:
|
||||||
|
To:
|
||||||
|
Blend:
|
||||||
|
Style: 0
|
||||||
|
Time: 0
|
||||||
|
CustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 0
|
||||||
|
m_PostInfinity: 0
|
||||||
|
m_RotationOrder: 0
|
||||||
8
Assets/Data/CinemachineCustomBlends.asset.meta
Normal file
8
Assets/Data/CinemachineCustomBlends.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8100a70d84f65b54a8973ea602cb4bf3
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
20
Assets/Data/Items/BoosterPack.asset
Normal file
20
Assets/Data/Items/BoosterPack.asset
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
%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: 951b5c8af5114086a865d4bb7eae4548, type: 3}
|
||||||
|
m_Name: BoosterPack
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_itemId: chocolate_4f2011c6
|
||||||
|
itemName: BoosterPack
|
||||||
|
description: boostert pack
|
||||||
|
mapSprite: {fileID: 4365544765984126881, guid: 9dac643e78ad86e4988c11a92f9c7a6d, type: 3}
|
||||||
|
pickUpSound: {fileID: 0}
|
||||||
|
dropSound: {fileID: 0}
|
||||||
8
Assets/Data/Items/BoosterPack.asset.meta
Normal file
8
Assets/Data/Items/BoosterPack.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c7fafa07afc3ea44598349d2a4777a8c
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because one or more lines are too long
@@ -434623,6 +434623,81 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
|
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
|
||||||
m_PrefabInstance: {fileID: 404856605}
|
m_PrefabInstance: {fileID: 404856605}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &412581052
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 412581053}
|
||||||
|
- component: {fileID: 412581054}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: CinemachineCamera (1)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &412581053
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 412581052}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: -27.55, y: -37.05, z: -1.4749999}
|
||||||
|
m_LocalScale: {x: 0.59, y: 0.59, z: 0.1475}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &412581054
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 412581052}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera
|
||||||
|
Priority:
|
||||||
|
Enabled: 0
|
||||||
|
m_Value: 0
|
||||||
|
OutputChannel: 1
|
||||||
|
StandbyUpdate: 2
|
||||||
|
m_StreamingVersion: 20241001
|
||||||
|
m_LegacyPriority: 0
|
||||||
|
Target:
|
||||||
|
TrackingTarget: {fileID: 0}
|
||||||
|
LookAtTarget: {fileID: 0}
|
||||||
|
CustomLookAtTarget: 0
|
||||||
|
Lens:
|
||||||
|
FieldOfView: 60
|
||||||
|
OrthographicSize: 7.5
|
||||||
|
NearClipPlane: 0.3
|
||||||
|
FarClipPlane: 1000
|
||||||
|
Dutch: 0
|
||||||
|
ModeOverride: 0
|
||||||
|
PhysicalProperties:
|
||||||
|
GateFit: 2
|
||||||
|
SensorSize: {x: 21.946, y: 16.002}
|
||||||
|
LensShift: {x: 0, y: 0}
|
||||||
|
FocusDistance: 10
|
||||||
|
Iso: 200
|
||||||
|
ShutterSpeed: 0.005
|
||||||
|
Aperture: 16
|
||||||
|
BladeCount: 5
|
||||||
|
Curvature: {x: 2, y: 11}
|
||||||
|
BarrelClipping: 0.25
|
||||||
|
Anamorphism: 0
|
||||||
|
BlendHint: 0
|
||||||
--- !u!1001 &421801946
|
--- !u!1001 &421801946
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -460451,7 +460526,7 @@ MonoBehaviour:
|
|||||||
DefaultMode: 2
|
DefaultMode: 2
|
||||||
DefaultBlend:
|
DefaultBlend:
|
||||||
Style: 1
|
Style: 1
|
||||||
Time: 2
|
Time: 1
|
||||||
CustomCurve:
|
CustomCurve:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Curve: []
|
m_Curve: []
|
||||||
@@ -471204,11 +471279,73 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: f44866deaba5f5c4a90f0330dd9957f0, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: f44866deaba5f5c4a90f0330dd9957f0, type: 3}
|
||||||
|
--- !u!61 &562729168214229371
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 3
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_ForceSendLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_ForceReceiveLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_ContactCaptureLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_CallbackLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_CompositeOperation: 0
|
||||||
|
m_CompositeOrder: 0
|
||||||
|
m_Offset: {x: 0.17629433, y: -0.044074535}
|
||||||
|
m_SpriteTilingProperty:
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
oldSize: {x: 4.11, y: 7.29}
|
||||||
|
newSize: {x: 1.76, y: 0.75}
|
||||||
|
adaptiveTilingThreshold: 0.5
|
||||||
|
drawMode: 0
|
||||||
|
adaptiveTiling: 0
|
||||||
|
m_AutoTiling: 0
|
||||||
|
m_Size: {x: 4.306877, y: 7.860119}
|
||||||
|
m_EdgeRadius: 0
|
||||||
--- !u!4 &1548124686061025688 stripped
|
--- !u!4 &1548124686061025688 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
|
m_CorrespondingSourceObject: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
|
||||||
m_PrefabInstance: {fileID: 3917799031583628180}
|
m_PrefabInstance: {fileID: 3917799031583628180}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &1554702159576081814
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource
|
||||||
|
audioSourceType: 3
|
||||||
|
audioSource: {fileID: 0}
|
||||||
|
clipPriority: 0
|
||||||
|
sourcePriority: 0
|
||||||
--- !u!1001 &2428672463423402429
|
--- !u!1001 &2428672463423402429
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -471294,6 +471431,22 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
|
||||||
|
--- !u!4 &2504621885268752766
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3200818438143536082}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -1.91, y: -0.1, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 8350908121428767421}
|
||||||
|
m_Father: {fileID: 3843529282510246820}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &2558461749605481847
|
--- !u!1001 &2558461749605481847
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -471363,6 +471516,64 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
|
||||||
|
--- !u!212 &2790478272885370935
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6695765450717844540}
|
||||||
|
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_SmallMeshCulling: 1
|
||||||
|
m_ForceMeshLod: -1
|
||||||
|
m_MeshLodSelectionBias: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 0
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_GlobalIlluminationMeshLod: 0
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 1
|
||||||
|
m_Sprite: {fileID: -8520225520565161345, guid: 34bd87b3ddf2a094c8b6e4700837321b, type: 3}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 9.61, y: 8.51}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 0
|
||||||
--- !u!1001 &2926576032425091693
|
--- !u!1001 &2926576032425091693
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -471420,6 +471631,22 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 2bb1b410b1073a74db35790cbdbb3d65, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 2bb1b410b1073a74db35790cbdbb3d65, type: 3}
|
||||||
|
--- !u!1 &3200818438143536082
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2504621885268752766}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: HighlightEffect
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
--- !u!1001 &3634696358937253989
|
--- !u!1001 &3634696358937253989
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -471567,6 +471794,22 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
|
m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
|
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
|
||||||
|
--- !u!4 &3843529282510246820
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -27.55, y: -37.05, z: 0}
|
||||||
|
m_LocalScale: {x: 0.51387, y: 0.51387, z: 0.1284675}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 2504621885268752766}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &3917799031583628180
|
--- !u!1001 &3917799031583628180
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -471844,6 +472087,103 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 3238893659345357084, guid: 65ec1c071829bf649a3393368237ad7f, type: 3}
|
m_CorrespondingSourceObject: {fileID: 3238893659345357084, guid: 65ec1c071829bf649a3393368237ad7f, type: 3}
|
||||||
m_PrefabInstance: {fileID: 4656836127232412646}
|
m_PrefabInstance: {fileID: 4656836127232412646}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!82 &4848152957860830997
|
||||||
|
AudioSource:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
OutputAudioMixerGroup: {fileID: 0}
|
||||||
|
m_audioClip: {fileID: 0}
|
||||||
|
m_Resource: {fileID: 6418180475301049370, guid: ee2166600ebe2b84ea8b22d20e34a691, type: 2}
|
||||||
|
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!1001 &4912039252317080710
|
--- !u!1001 &4912039252317080710
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -472002,6 +472342,64 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 9fba2c868971b20439aaea06a939d8e7, type: 3}
|
m_Script: {fileID: 11500000, guid: 9fba2c868971b20439aaea06a939d8e7, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!212 &4996209826637780837
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
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_SmallMeshCulling: 1
|
||||||
|
m_ForceMeshLod: -1
|
||||||
|
m_MeshLodSelectionBias: 0
|
||||||
|
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_GlobalIlluminationMeshLod: 0
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 2
|
||||||
|
m_Sprite: {fileID: 4365544765984126881, guid: 9dac643e78ad86e4988c11a92f9c7a6d, type: 3}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 1.76, y: 0.75}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 1
|
||||||
--- !u!1001 &5288063114372713135
|
--- !u!1001 &5288063114372713135
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -472137,6 +472535,66 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 5624291602052377355, guid: 2b23896b733c2ae4cba6dcf21193402b, type: 3}
|
m_CorrespondingSourceObject: {fileID: 5624291602052377355, guid: 2b23896b733c2ae4cba6dcf21193402b, type: 3}
|
||||||
m_PrefabInstance: {fileID: 5320929981885366459}
|
m_PrefabInstance: {fileID: 5320929981885366459}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &5336239773106239980
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3843529282510246820}
|
||||||
|
- component: {fileID: 4996209826637780837}
|
||||||
|
- component: {fileID: 562729168214229371}
|
||||||
|
- component: {fileID: 4848152957860830997}
|
||||||
|
- component: {fileID: 1554702159576081814}
|
||||||
|
- component: {fileID: 5336239773106239981}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: BoosterPack
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &5336239773106239981
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5336239773106239980}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 11629418bd2d44fa9da229ad62c04332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: AppleHillsScripts::Interactions.BoosterPackPickup
|
||||||
|
isOneTime: 0
|
||||||
|
cooldown: -1
|
||||||
|
characterToInteract: 2
|
||||||
|
interactionStarted:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
interactionInterrupted:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
characterArrived:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
interactionComplete:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
itemData: {fileID: 11400000, guid: c7fafa07afc3ea44598349d2a4777a8c, type: 2}
|
||||||
|
iconRenderer: {fileID: 4996209826637780837}
|
||||||
|
glowVisualPrefab: {fileID: 3200818438143536082}
|
||||||
|
zoomCamera: {fileID: 412581054}
|
||||||
|
boosterPackCount: 1
|
||||||
|
cameraBlendWait: 0.6
|
||||||
|
growDuration: 0.5
|
||||||
|
pulseDuration: 0.3
|
||||||
|
pulseCount: 3
|
||||||
|
disappearDuration: 0.5
|
||||||
|
growScale: 1.5
|
||||||
|
pulseScale: 1.2
|
||||||
--- !u!1001 &6535840132433368489
|
--- !u!1001 &6535840132433368489
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -472214,6 +472672,46 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
|
||||||
|
--- !u!1 &6695765450717844540
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8350908121428767421}
|
||||||
|
- component: {fileID: 2790478272885370935}
|
||||||
|
- component: {fileID: 7148712646780739740}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: Glow
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!95 &7148712646780739740
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 7
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6695765450717844540}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_StabilizeFeet: 0
|
||||||
|
m_AnimatePhysics: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorStateOnDisable: 0
|
||||||
|
m_WriteDefaultValuesOnDisable: 0
|
||||||
--- !u!1001 &7530821580781571560
|
--- !u!1001 &7530821580781571560
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -472654,6 +473152,21 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
|
||||||
|
--- !u!4 &8350908121428767421
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6695765450717844540}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 2.03, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2504621885268752766}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -472703,3 +473216,5 @@ SceneRoots:
|
|||||||
- {fileID: 519077570}
|
- {fileID: 519077570}
|
||||||
- {fileID: 708284666}
|
- {fileID: 708284666}
|
||||||
- {fileID: 1679697302}
|
- {fileID: 1679697302}
|
||||||
|
- {fileID: 412581053}
|
||||||
|
- {fileID: 3843529282510246820}
|
||||||
|
|||||||
3
Assets/Scripts/Debug.meta
Normal file
3
Assets/Scripts/Debug.meta
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b74b4580a37241779a6995f59d93e304
|
||||||
|
timeCreated: 1763648961
|
||||||
1
Assets/Scripts/Debug/BoosterPackPickupDebugger.cs
Normal file
1
Assets/Scripts/Debug/BoosterPackPickupDebugger.cs
Normal file
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
3
Assets/Scripts/Debug/BoosterPackPickupDebugger.cs.meta
Normal file
3
Assets/Scripts/Debug/BoosterPackPickupDebugger.cs.meta
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 504a790db6b1440aacd1b137f4850461
|
||||||
|
timeCreated: 1763648961
|
||||||
33
Assets/Scripts/Interactions/BoosterGlowEffect.cs
Normal file
33
Assets/Scripts/Interactions/BoosterGlowEffect.cs
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Interactions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Simple glow effect component for booster pack pickups.
|
||||||
|
/// Attach to a GameObject with a SpriteRenderer for basic glow visual.
|
||||||
|
/// The BoosterPackPickup will handle the scale animation.
|
||||||
|
/// </summary>
|
||||||
|
[RequireComponent(typeof(SpriteRenderer))]
|
||||||
|
public class BoosterGlowEffect : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Header("Glow Settings")]
|
||||||
|
[SerializeField] private Color glowColor = Color.yellow;
|
||||||
|
[SerializeField] private float baseAlpha = 0.5f;
|
||||||
|
|
||||||
|
private SpriteRenderer spriteRenderer;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
spriteRenderer = GetComponent<SpriteRenderer>();
|
||||||
|
|
||||||
|
// Apply glow color with alpha
|
||||||
|
Color color = glowColor;
|
||||||
|
color.a = baseAlpha;
|
||||||
|
spriteRenderer.color = color;
|
||||||
|
|
||||||
|
// Set sorting order to be behind the item
|
||||||
|
spriteRenderer.sortingOrder = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
3
Assets/Scripts/Interactions/BoosterGlowEffect.cs.meta
Normal file
3
Assets/Scripts/Interactions/BoosterGlowEffect.cs.meta
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f6488b58253b4e6789103e341090ca2f
|
||||||
|
timeCreated: 1763639769
|
||||||
299
Assets/Scripts/Interactions/BoosterPackPickup.cs
Normal file
299
Assets/Scripts/Interactions/BoosterPackPickup.cs
Normal file
@@ -0,0 +1,299 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using System.Collections;
|
||||||
|
using Unity.Cinemachine;
|
||||||
|
using Data.CardSystem;
|
||||||
|
using Pixelplacement;
|
||||||
|
using Core;
|
||||||
|
using UI;
|
||||||
|
|
||||||
|
namespace Interactions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Special pickup that plays a fancy sequence when collected:
|
||||||
|
/// - Follower picks up normally
|
||||||
|
/// - Pauses follower movement
|
||||||
|
/// - Zooms camera in
|
||||||
|
/// - Grows/pulses the booster pack
|
||||||
|
/// - Animates to backpack icon
|
||||||
|
/// - Gives player a booster pack
|
||||||
|
/// - Restores camera and resumes movement
|
||||||
|
/// </summary>
|
||||||
|
public class BoosterPackPickup : Pickup
|
||||||
|
{
|
||||||
|
[Header("Booster Pack Sequence")]
|
||||||
|
[SerializeField] private GameObject glowVisualPrefab;
|
||||||
|
[SerializeField] private CinemachineCamera zoomCamera;
|
||||||
|
[SerializeField] private int boosterPackCount = 1;
|
||||||
|
|
||||||
|
[Header("Sequence Timing")]
|
||||||
|
[SerializeField] private float cameraBlendWait = 0.3f;
|
||||||
|
[SerializeField] private float growDuration = 0.25f;
|
||||||
|
[SerializeField] private float pulseDuration = 0.3f;
|
||||||
|
[SerializeField] private int pulseCount = 3;
|
||||||
|
[SerializeField] private float disappearDuration = 0.5f;
|
||||||
|
|
||||||
|
[Header("Animation Settings")]
|
||||||
|
[SerializeField] private float growScale = 1.5f;
|
||||||
|
[SerializeField] private float pulseScale = 1.2f;
|
||||||
|
|
||||||
|
private GameObject glowInstance;
|
||||||
|
private bool sequencePlaying;
|
||||||
|
|
||||||
|
protected override bool DoInteraction()
|
||||||
|
{
|
||||||
|
// Let the normal pickup flow happen first
|
||||||
|
bool success = base.DoInteraction();
|
||||||
|
|
||||||
|
// If pickup was successful and we're not already playing the sequence, start it
|
||||||
|
// IMPORTANT: We start the coroutine on the FollowerController, not on this object,
|
||||||
|
// because this object gets disabled immediately after pickup
|
||||||
|
if (success && !sequencePlaying)
|
||||||
|
{
|
||||||
|
var follower = FollowerController.FindInstance();
|
||||||
|
if (follower != null)
|
||||||
|
{
|
||||||
|
follower.StartCoroutine(BoosterSequence(follower));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Logging.Warning("[BoosterPackPickup] No follower found, cannot start sequence");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator BoosterSequence(FollowerController follower)
|
||||||
|
{
|
||||||
|
sequencePlaying = true;
|
||||||
|
|
||||||
|
// IMPORTANT: Disable all children on the original pickup GameObject
|
||||||
|
// This prevents glow effects and other child objects from appearing in Pulver's hand
|
||||||
|
foreach (Transform child in transform)
|
||||||
|
{
|
||||||
|
child.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait one frame to ensure pickup is fully processed
|
||||||
|
yield return null;
|
||||||
|
|
||||||
|
// Verify follower still exists (safety check)
|
||||||
|
if (follower == null)
|
||||||
|
{
|
||||||
|
Logging.Warning("[BoosterPackPickup] Follower destroyed during sequence, aborting");
|
||||||
|
sequencePlaying = false;
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
|
||||||
|
Transform heldItemTransform = follower.GetHeldItemTransform();
|
||||||
|
if (heldItemTransform == null)
|
||||||
|
{
|
||||||
|
Logging.Warning("[BoosterPackPickup] No held item transform found, skipping sequence");
|
||||||
|
sequencePlaying = false;
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Pause follower movement
|
||||||
|
follower.PauseMovement();
|
||||||
|
|
||||||
|
// 2. Activate zoom camera if assigned
|
||||||
|
if (zoomCamera != null)
|
||||||
|
{
|
||||||
|
// Unparent the camera from the booster pack (if it's parented)
|
||||||
|
zoomCamera.transform.SetParent(null);
|
||||||
|
|
||||||
|
// Position camera at follower's location
|
||||||
|
zoomCamera.transform.position = new Vector3(
|
||||||
|
follower.transform.position.x,
|
||||||
|
follower.transform.position.y,
|
||||||
|
zoomCamera.transform.position.z
|
||||||
|
);
|
||||||
|
|
||||||
|
// Make the blend instant by setting a custom blend hint
|
||||||
|
var brain = Camera.main?.GetComponent<CinemachineBrain>();
|
||||||
|
CinemachineBlendDefinition originalBlend = default;
|
||||||
|
if (brain != null)
|
||||||
|
{
|
||||||
|
originalBlend = brain.DefaultBlend;
|
||||||
|
brain.DefaultBlend = new CinemachineBlendDefinition(CinemachineBlendDefinition.Styles.EaseInOut, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
zoomCamera.Priority = 20;
|
||||||
|
zoomCamera.gameObject.SetActive(true);
|
||||||
|
|
||||||
|
// Wait a frame for the cut to take effect
|
||||||
|
yield return null;
|
||||||
|
|
||||||
|
// Restore original blend settings
|
||||||
|
if (brain != null)
|
||||||
|
{
|
||||||
|
brain.DefaultBlend = originalBlend;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Grow animation (no glow during this)
|
||||||
|
Vector3 originalScale = heldItemTransform.localScale;
|
||||||
|
Tween.LocalScale(heldItemTransform, originalScale * growScale, growDuration, 0f, Tween.EaseOutBack);
|
||||||
|
yield return new WaitForSeconds(growDuration);
|
||||||
|
|
||||||
|
// 4. Instantiate and pulse glow
|
||||||
|
if (glowVisualPrefab != null)
|
||||||
|
{
|
||||||
|
glowInstance = Instantiate(glowVisualPrefab, heldItemTransform);
|
||||||
|
glowInstance.transform.localPosition = Vector3.zero;
|
||||||
|
glowInstance.transform.localScale = Vector3.one;
|
||||||
|
|
||||||
|
for (int i = 0; i < pulseCount; i++)
|
||||||
|
{
|
||||||
|
Tween.LocalScale(glowInstance.transform, Vector3.one * pulseScale, pulseDuration, 0f, Tween.EaseIn);
|
||||||
|
yield return new WaitForSeconds(pulseDuration);
|
||||||
|
Tween.LocalScale(glowInstance.transform, Vector3.one, pulseDuration, 0f, Tween.EaseInOut);
|
||||||
|
yield return new WaitForSeconds(pulseDuration);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete glow before flying to button
|
||||||
|
Destroy(glowInstance);
|
||||||
|
glowInstance = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Disappear to scrapbook button (backpack icon) - straight line movement
|
||||||
|
GameObject scrabookButton = PlayerHudManager.Instance?.GetScrabookButton();
|
||||||
|
if (scrabookButton != null)
|
||||||
|
{
|
||||||
|
// Get start position in world space
|
||||||
|
Vector3 startPos = heldItemTransform.position;
|
||||||
|
|
||||||
|
// Convert UI button position to world space
|
||||||
|
RectTransform buttonRect = scrabookButton.GetComponent<RectTransform>();
|
||||||
|
Vector3 targetWorldPos;
|
||||||
|
|
||||||
|
if (buttonRect != null)
|
||||||
|
{
|
||||||
|
// UI element - get screen position correctly
|
||||||
|
Vector3[] corners = new Vector3[4];
|
||||||
|
buttonRect.GetWorldCorners(corners);
|
||||||
|
|
||||||
|
// Get center of the button in screen space
|
||||||
|
Vector3 buttonCenter = (corners[0] + corners[2]) / 2f;
|
||||||
|
|
||||||
|
// For Screen Space Overlay, the corners are already in screen space
|
||||||
|
Canvas canvas = buttonRect.GetComponentInParent<Canvas>();
|
||||||
|
Vector3 buttonScreenPos;
|
||||||
|
|
||||||
|
if (canvas != null && canvas.renderMode == RenderMode.ScreenSpaceOverlay)
|
||||||
|
{
|
||||||
|
// Already in screen space
|
||||||
|
buttonScreenPos = buttonCenter;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Convert from world to screen space
|
||||||
|
buttonScreenPos = RectTransformUtility.WorldToScreenPoint(canvas?.worldCamera ?? Camera.main, buttonCenter);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert screen position to world space at the same Z as the booster pack
|
||||||
|
targetWorldPos = Camera.main.ScreenToWorldPoint(new Vector3(buttonScreenPos.x, buttonScreenPos.y, Mathf.Abs(Camera.main.transform.position.z - startPos.z)));
|
||||||
|
|
||||||
|
Logging.Debug($"[BoosterPackPickup] Button screen pos: {buttonScreenPos}, converted world pos: {targetWorldPos}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Not a UI element, use direct world position
|
||||||
|
targetWorldPos = scrabookButton.transform.position;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logging.Debug($"[BoosterPackPickup] Flying from {startPos} to {targetWorldPos} (button: {scrabookButton.name})");
|
||||||
|
|
||||||
|
// Use custom tween with linear interpolation for straight line
|
||||||
|
float elapsed = 0f;
|
||||||
|
Vector3 startScale = heldItemTransform.localScale;
|
||||||
|
|
||||||
|
while (elapsed < disappearDuration)
|
||||||
|
{
|
||||||
|
elapsed += Time.deltaTime;
|
||||||
|
float t = Mathf.Clamp01(elapsed / disappearDuration);
|
||||||
|
|
||||||
|
// Linear interpolation for straight line movement
|
||||||
|
heldItemTransform.position = Vector3.Lerp(startPos, targetWorldPos, t);
|
||||||
|
|
||||||
|
// Ease in for scale (gets smaller as it approaches)
|
||||||
|
float scaleT = t * t; // Simple ease-in curve
|
||||||
|
heldItemTransform.localScale = Vector3.Lerp(startScale, Vector3.zero, scaleT);
|
||||||
|
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure final position/scale
|
||||||
|
heldItemTransform.position = targetWorldPos;
|
||||||
|
heldItemTransform.localScale = Vector3.zero;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Logging.Warning("[BoosterPackPickup] No scrapbook button found from PlayerHudManager, skipping fly-to animation");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7. Give booster pack to player
|
||||||
|
if (CardSystemManager.Instance != null)
|
||||||
|
{
|
||||||
|
CardSystemManager.Instance.AddBoosterPack(boosterPackCount);
|
||||||
|
Logging.Debug($"[BoosterPackPickup] Gave {boosterPackCount} booster pack(s) to player");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Logging.Warning("[BoosterPackPickup] CardSystemManager not found, cannot give booster pack");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 8. Cleanup glow
|
||||||
|
if (glowInstance != null)
|
||||||
|
{
|
||||||
|
Destroy(glowInstance);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 9. Blend back to main camera and cleanup
|
||||||
|
if (zoomCamera != null)
|
||||||
|
{
|
||||||
|
// Lower priority to blend back to main camera
|
||||||
|
zoomCamera.Priority = 0;
|
||||||
|
|
||||||
|
// Wait for blend back to complete (using default blend settings)
|
||||||
|
var brain = Camera.main?.GetComponent<CinemachineBrain>();
|
||||||
|
if (brain != null && brain.IsBlending)
|
||||||
|
{
|
||||||
|
// Wait for the blend to finish
|
||||||
|
while (brain.IsBlending)
|
||||||
|
{
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// If not blending or no brain, just wait a short moment
|
||||||
|
yield return new WaitForSeconds(0.3f);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Destroy the zoom camera
|
||||||
|
Destroy(zoomCamera.gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 10. Clear the follower's held item since we "consumed" it
|
||||||
|
follower.ClearHeldItem();
|
||||||
|
|
||||||
|
// 11. Resume follower movement
|
||||||
|
follower.ResumeMovement();
|
||||||
|
|
||||||
|
sequencePlaying = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override void OnManagedDestroy()
|
||||||
|
{
|
||||||
|
base.OnManagedDestroy();
|
||||||
|
|
||||||
|
// Cleanup glow if still exists
|
||||||
|
if (glowInstance != null)
|
||||||
|
{
|
||||||
|
Destroy(glowInstance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
3
Assets/Scripts/Interactions/BoosterPackPickup.cs.meta
Normal file
3
Assets/Scripts/Interactions/BoosterPackPickup.cs.meta
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 11629418bd2d44fa9da229ad62c04332
|
||||||
|
timeCreated: 1763639641
|
||||||
@@ -655,6 +655,15 @@ public class FollowerController : ManagedBehaviour
|
|||||||
return _cachedPickupObject;
|
return _cachedPickupObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the transform of the held item's visual representation.
|
||||||
|
/// Used for animating the held item sprite.
|
||||||
|
/// </summary>
|
||||||
|
public Transform GetHeldItemTransform()
|
||||||
|
{
|
||||||
|
return heldObjectRenderer?.transform;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Set held item from a GameObject. Extracts Pickup component and sets up visuals.
|
/// Set held item from a GameObject. Extracts Pickup component and sets up visuals.
|
||||||
/// Centralizes held item state management including animator.
|
/// Centralizes held item state management including animator.
|
||||||
|
|||||||
Reference in New Issue
Block a user