Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction

Assets/Art/Levels/MinigameFortfight/Sprites/GroundTileable2.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 31bf2f6ac0655174d8cf988d9673753a
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 5204863497965271279
+    second: GroundTileable2_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    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: 4
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: GroundTileable2_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 2168
+        height: 688
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: fe8fd9c56c36b3840800000000000000
+      internalID: 5204863497965271279
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      GroundTileable2_0: 5204863497965271279
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_D.prefab

@@ -500,14 +500,6 @@ PrefabInstance:
       propertyPath: anchorEdge
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
-      propertyPath: cameraAdapter
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
-      propertyPath: referenceMarker
-      value: 
-      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
     m_RemovedGameObjects: []

Assets/Prefabs/Minigames/BirdPoop/Targets/Target.prefab

@@ -215,4 +215,16 @@ MonoBehaviour:
   hitColor: {r: 1, g: 0, b: 0, a: 1}
   onTargetHit:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
+        m_MethodName: 
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2

Assets/Scenes/MiniGames/BirdPoop.unity

@@ -820,7 +820,7 @@ Transform:
   m_GameObject: {fileID: 941621855}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -21.326666, y: 0, z: 0}
+  m_LocalPosition: {x: -14.66, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1341,6 +1341,97 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1332000330
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1332000332}
+  - component: {fileID: 1332000331}
+  m_Layer: 0
+  m_Name: GroundVisual
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &1332000331
+SpriteRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332000330}
+  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: 9dfc825aed78fcd4ba02077103263b40, 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: -1132846201
+  m_SortingLayer: 1
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_Sprite: {fileID: -4243092619921533455, guid: 818f5354893d1b24981e4e967d8df9dd, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 21.689016, y: 6.8800006}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_SpriteSortPoint: 0
+--- !u!4 &1332000332
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332000330}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -9.3, y: -18.04, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1403848987
 GameObject:
   m_ObjectHideFlags: 0
@@ -1788,8 +1879,8 @@ Camera:
   m_GameObject: {fileID: 1810521056}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.79607844, g: 0.93333334, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -1897,6 +1988,97 @@ MonoBehaviour:
   - {fileID: 8373178063207716143, guid: 020f7494c613b06479ccad2c4cedde0f, type: 3}
   minTargetSpawnInterval: 9
   maxTargetSpawnInterval: 15
+--- !u!1 &1839632010
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1839632012}
+  - component: {fileID: 1839632011}
+  m_Layer: 0
+  m_Name: GroundVisual (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &1839632011
+SpriteRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1839632010}
+  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: 9dfc825aed78fcd4ba02077103263b40, 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: -1132846201
+  m_SortingLayer: 1
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_Sprite: {fileID: -4243092619921533455, guid: 818f5354893d1b24981e4e967d8df9dd, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 21.689016, y: 6.8800006}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_SpriteSortPoint: 0
+--- !u!4 &1839632012
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1839632010}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 12.1, y: -18.04, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2064126204
 GameObject:
   m_ObjectHideFlags: 0
@@ -2069,3 +2251,5 @@ SceneRoots:
   - {fileID: 1536057440}
   - {fileID: 128829408}
   - {fileID: 1403848991}
+  - {fileID: 1332000332}
+  - {fileID: 1839632012}

Assets/Scenes/MiniGames/DivingForPictures.unity

@@ -420,17 +420,17 @@ LineRenderer:
   m_SortingOrder: 0
   m_MaskInteraction: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.074945, z: 0}
+  - {x: -0.15602553, y: 4.0749445, z: 0}
-  - {x: -0.1566351, y: 3.973638, z: 0}
+  - {x: -0.1566351, y: 3.9736378, z: 0}
-  - {x: -0.1572447, y: 3.8729856, z: 0}
+  - {x: -0.1572447, y: 3.8729858, z: 0}
   - {x: -0.15785426, y: 3.7729874, z: 0}
-  - {x: -0.15846384, y: 3.6736436, z: 0}
+  - {x: -0.15846384, y: 3.6736438, z: 0}
-  - {x: -0.15907341, y: 3.574954, z: 0}
+  - {x: -0.15907341, y: 3.5749543, z: 0}
-  - {x: -0.15968299, y: 3.4769192, z: 0}
+  - {x: -0.15968299, y: 3.4769194, z: 0}
   - {x: -0.16029257, y: 3.3795385, z: 0}
   - {x: -0.16090216, y: 3.2828126, z: 0}
-  - {x: -0.16151173, y: 3.1867409, z: 0}
+  - {x: -0.16151173, y: 3.1867406, z: 0}
-  - {x: -0.16212131, y: 3.0913236, z: 0}
+  - {x: -0.16212131, y: 3.0913231, z: 0}
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1
@@ -763,6 +763,7 @@ MonoBehaviour:
   referenceMarker: {fileID: 1651034645}
   adjustOnStart: 1
   adjustOnScreenResize: 1
+  debugLogging: 0
 --- !u!1 &323864663
 GameObject:
   m_ObjectHideFlags: 0
@@ -1440,7 +1441,7 @@ Transform:
   m_GameObject: {fileID: 747976396}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.197517, z: 0}
+  m_LocalPosition: {x: 0, y: 3.1975174, z: 0}
   m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1998,17 +1999,17 @@ LineRenderer:
   m_SortingOrder: 0
   m_MaskInteraction: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.0749445, z: 0}
+  - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.11662118, y: 3.879622, z: 0}
+  - {x: -0.11662118, y: 3.8796225, z: 0}
   - {x: -0.07721684, y: 3.7057445, z: 0}
   - {x: -0.03781248, y: 3.5533106, z: 0}
   - {x: 0.0015918687, y: 3.4223216, z: 0}
   - {x: 0.040996216, y: 3.3127766, z: 0}
-  - {x: 0.08040057, y: 3.2246761, z: 0}
+  - {x: 0.08040057, y: 3.2246757, z: 0}
-  - {x: 0.11980491, y: 3.15802, z: 0}
+  - {x: 0.11980491, y: 3.1580195, z: 0}
-  - {x: 0.15920927, y: 3.1128082, z: 0}
+  - {x: 0.15920927, y: 3.1128078, z: 0}
-  - {x: 0.1986136, y: 3.0890405, z: 0}
+  - {x: 0.1986136, y: 3.0890403, z: 0}
-  - {x: 0.23801796, y: 3.0867176, z: 0}
+  - {x: 0.23801796, y: 3.0867171, z: 0}
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1
@@ -2719,17 +2720,17 @@ LineRenderer:
   m_SortingOrder: 0
   m_MaskInteraction: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.0749445, z: 0}
+  - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.18956745, y: 3.8764973, z: 0}
+  - {x: -0.18956745, y: 3.8764977, z: 0}
   - {x: -0.22310936, y: 3.7000232, z: 0}
-  - {x: -0.25665125, y: 3.5455203, z: 0}
+  - {x: -0.25665125, y: 3.5455205, z: 0}
-  - {x: -0.29019317, y: 3.412991, z: 0}
+  - {x: -0.29019317, y: 3.4129908, z: 0}
-  - {x: -0.32373506, y: 3.3024335, z: 0}
+  - {x: -0.32373506, y: 3.3024333, z: 0}
-  - {x: -0.35727698, y: 3.2138484, z: 0}
+  - {x: -0.35727698, y: 3.213848, z: 0}
-  - {x: -0.39081886, y: 3.1472359, z: 0}
+  - {x: -0.39081886, y: 3.1472356, z: 0}
-  - {x: -0.4243608, y: 3.1025958, z: 0}
+  - {x: -0.4243608, y: 3.1025953, z: 0}
-  - {x: -0.45790267, y: 3.0799282, z: 0}
+  - {x: -0.45790267, y: 3.0799277, z: 0}
-  - {x: -0.4914446, y: 3.079233, z: 0}
+  - {x: -0.4914446, y: 3.0792325, z: 0}
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1
@@ -2928,7 +2929,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3058fe4801134fea916ad685f924668f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: AppleHillsScripts::AppleHillsCamera.ScreenReferenceMarker
+  scalingMode: 0
   targetWidth: 6.2
+  targetHeight: 5
   topMargin: 0.2
   bottomMargin: 0.2
   leftMargin: 0.2
@@ -3583,7 +3586,7 @@ Transform:
   m_GameObject: {fileID: 2106431001}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.165, y: 2.6975174, z: 0}
+  m_LocalPosition: {x: -0.165, y: 2.697517, z: 0}
   m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Settings/BirdPooperSettings.asset

@@ -12,9 +12,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e7d3f5b948b3454681fa573071bee978, type: 3}
   m_Name: BirdPooperSettings
   m_EditorClassIdentifier: AppleHillsScripts::Core.Settings.BirdPooperSettings
-  gravity: 75
+  gravity: 40
-  flapForce: 25
+  flapForce: 18
-  maxFallSpeed: 120
+  maxFallSpeed: 50
   minY: -15
   maxY: 15
   maxRotationAngle: 40

Assets/Settings/DivingMinigameSettings.asset

@@ -48,8 +48,8 @@ MonoBehaviour:
   smoothMoveSpeed: 8
   blockInputDuringBump: 0
   viewfinderPrefab: {fileID: 3191012273289593430, guid: 99666bddf27a652479c2a3e0007a94dc, type: 3}
-  viewfinderShrinkDuration: 1
+  viewfinderShrinkDuration: 0.8
-  viewfinderMoveSpeed: 3
+  viewfinderMoveSpeed: 2
   viewfinderShrinkCurve:
     serializedVersion: 2
     m_Curve:

Assets/Settings/FortFightSettings.asset

@@ -97,7 +97,7 @@ MonoBehaviour:
   vacuumDestroyBlockCount: 2
   vacuumBlockDamage: 20
   trashBagPieceCount: 6
-  trashBagPieceForce: 10
+  trashBagPieceForce: 20
   trashBagSpreadAngle: 70
   trashPieceDamage: 5
   trashPieceLifetime: 7