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

Close #19 Ship rocking 1st fix completed

Browse Source
This commit is contained in:
M1_IDMhan 2023-08-17 11:02:18 +09:00
parent 66711e9851
commit 7e3932f30b
29 changed files with 6709 additions and 29754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30323
BlueWater/Assets/01.Scenes/02.Main.unity
View File

File diff suppressed because it is too large Load Diff

4
BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
View File

@ -109,8 +109,8 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
// 비율을 계산 (0 = 같은 위치, 1 = maxDistance만큼나 이상 떨어져 있음)
var ratio = Mathf.Min(distance / maxDistance, 1f);
// SmoothStep 사용하면, 천천히 시작해서 점차 빠르게 변화합니다.
// float의 경우만 사용할 수 있으므로, Vector3의 모든 요소에 일일이 적용해야 합니다.
// SmoothStep 사용하면, 천천히 시작해서 점차 빠르게 변화
// float의 경우만 사용할 수 있으므로, Vector3의 모든 요소에 일일이 적용
var newScale = new Vector3(
Mathf.SmoothStep(originalScale.x, targetScale.x, ratio),
Mathf.SmoothStep(originalScale.y, targetScale.y, ratio),

1
BlueWater/Assets/02.Scripts/DataManager.cs
View File

@ -6,4 +6,5 @@ public class DataManager : Singleton<DataManager>
{
public GameObject mouseSpot;
public GameObject boat;
public GameObject assaultCard;
}

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

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

5899
BlueWater/Assets/05.Prefabs/Ui/AssaultCard.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/Ui/AssaultCard.prefab.meta Normal file
View File

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

7
BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4ff1f29eab234cf4490d9bb383892c44
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 078b8f13a17171b49892ad10426d5af0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 41e59f562b69648719f2424c438758f3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4368c9be31b3c174dbfd80f2caf98889
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 48e08dc33330d11e9d4a1b246c52e4f6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta Normal file
View File

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

29
BlueWater/Assets/Quibli/Example URP Settings/Quibli URP Config.asset
View File

@ -15,7 +15,7 @@ MonoBehaviour:
k_AssetVersion: 11
k_AssetPreviousVersion: 11
m_RendererType: 1
m_RendererData: {fileID: 11400000, guid: 618d298269e66c542b306de85db1faea, type: 2}
m_RendererData: {fileID: 0}
m_RendererDataList:
- {fileID: 11400000, guid: bfebc9a3f978f4e35907ddff38ce0791, type: 2}
- {fileID: 11400000, guid: 5faa69b1fbf014452a2c65a2f748a895, type: 2}
@ -35,6 +35,7 @@ MonoBehaviour:
m_FsrSharpness: 0.92
m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 1024
@ -59,6 +60,7 @@ MonoBehaviour:
m_SoftShadowsSupported: 1
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_SoftShadowQuality: 2
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
@ -73,6 +75,7 @@ MonoBehaviour:
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
@ -82,5 +85,29 @@ MonoBehaviour:
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 3
m_PrefilteringModeAdditionalLightShadows: 2
m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 1
m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1
m_PrefilterSSAODepthNormals: 0
m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 0
m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 0
m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 0
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
m_ShadowCascades: 2

43
BlueWater/Assets/Settings/URP-Balanced.asset
View File

@ -72,6 +72,7 @@ MonoBehaviour:
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
@ -81,29 +82,29 @@ MonoBehaviour:
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_PrefilteringModeMainLightShadows: 1
m_PrefilteringModeAdditionalLight: 4
m_PrefilteringModeAdditionalLightShadows: 1
m_PrefilterXRKeywords: 0
m_PrefilteringModeForwardPlus: 1
m_PrefilteringModeDeferredRendering: 1
m_PrefilteringModeScreenSpaceOcclusion: 1
m_PrefilterDebugKeywords: 0
m_PrefilterWriteRenderingLayers: 0
m_PrefilterHDROutput: 0
m_PrefilterSSAODepthNormals: 0
m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 3
m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 2
m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1
m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 0
m_PrefilterSSAOSourceDepthMedium: 0
m_PrefilterSSAOSourceDepthHigh: 0
m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 0
m_PrefilterSSAOBlueNoise: 0
m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 0
m_PrefilterSSAOSampleCountMedium: 0
m_PrefilterSSAOSampleCountHigh: 0
m_PrefilterDBufferMRT1: 0
m_PrefilterDBufferMRT2: 0
m_PrefilterDBufferMRT3: 0
m_PrefilterScreenCoord: 0
m_PrefilterNativeRenderPass: 0
m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0

17
BlueWater/ProjectSettings/BurstAotSettings_StandaloneOSX.json Normal file
View File

@ -0,0 +1,17 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

2
BlueWater/ProjectSettings/CommonBurstAotSettings.json
View File

@ -1,6 +1,6 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"DisabledWarnings": ""
}
}

4
BlueWater/ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/SampleScene.unity
guid: 99c9720ab356a0642a771bea13969a05
path: Assets/01.Scenes/02.Main.unity
guid: a8c5966c283dd40868b53e826b8a1876
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 52ef95baf252a46f2979b3dff5d5a7fa,
type: 2}