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

Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg

Browse Source
This commit is contained in:
NTG_Lenovo 2025-02-27 16:21:43 +09:00
commit 0532892e7b
22 changed files with 134805 additions and 163518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138940
Assets/01.Scenes/03.Sail.unity
View File

File diff suppressed because it is too large Load Diff

3
Assets/01.Scenes/99.LMG_TycoonTest.unity.meta → Assets/01.Scenes/99.LMG/Materials.meta
View File

@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: 8d3805a699ba47946a1cbf09fd885278
guid: 732180b157b57f64097959d05406acfe
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:

136
Assets/01.Scenes/99.LMG/Materials/ShipSideRestaurant.mat Normal file
View File

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

5
Assets/01.Scenes/99.LMG_Temp.unity.meta → Assets/01.Scenes/99.LMG/Materials/ShipSideRestaurant.mat.meta
View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 41e5588c32c655b47bdcf244246bbeb1
DefaultImporter:
guid: 347d8fb20f9fe0240971166386a8b4f5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

42
Assets/01.Scenes/99.LMG/Materials/ShipSideView.mat Normal file
View File

@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShipSideView
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 8400000, guid: 88adb7c1602a21b41b465345494fe14a, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 1080
- _StencilWriteMask: 1920
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

5
Assets/01.Scenes/99.LMG_Tycoon.unity.meta → Assets/01.Scenes/99.LMG/Materials/ShipSideView.mat.meta
View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 875b1d38fdf6b3342ab8c8c23fb7cf54
DefaultImporter:
guid: 122a6eba9c639f245ad4a6258927f5cd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

39
Assets/01.Scenes/99.LMG/ShipSideRestaurant.renderTexture Normal file
View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShipSideRestaurant
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_UseDynamicScaleExplicit: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_EnableRandomWrite: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

8
Assets/01.Scenes/99.LMG/ShipSideRestaurant.renderTexture.meta Normal file
View File

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

39
Assets/01.Scenes/99.LMG/ShipSideSlot1.renderTexture Normal file
View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShipSideSlot1
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 1280
m_Height: 720
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_UseDynamicScaleExplicit: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_EnableRandomWrite: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

8
Assets/01.Scenes/99.LMG/ShipSideSlot1.renderTexture.meta Normal file
View File

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

39
Assets/01.Scenes/99.LMG/ShipSideView.renderTexture Normal file
View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShipSideView
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 2000
m_Height: 720
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_UseDynamicScaleExplicit: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_EnableRandomWrite: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

8
Assets/01.Scenes/99.LMG/ShipSideView.renderTexture.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 88adb7c1602a21b41b465345494fe14a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8400000
userData:
assetBundleName:
assetBundleVariant:

6479
Assets/01.Scenes/99.LMG_Temp.unity
View File

File diff suppressed because it is too large Load Diff

41545
Assets/01.Scenes/99.LMG_Tycoon.unity
View File

File diff suppressed because it is too large Load Diff

110892
Assets/01.Scenes/99.LMG_TycoonTest.unity
View File

File diff suppressed because it is too large Load Diff

74
Assets/02.Scripts/BlueWater/Sail/ShipMove.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject;
@ -15,11 +16,37 @@ namespace BlueWater
public float force_add = 0.002f;
[SerializeField]
private ParticleSystem SmokeL;
private ParticleSystem Smoke1;
[SerializeField]
private ParticleSystem SmokeR;
private ParticleSystem Smoke2;
[SerializeField]
private ParticleSystem Smoke3;
[SerializeField]
private ParticleSystem Smoke4;
[SerializeField]
private ParticleSystem Smoke5;
[SerializeField]
private ParticleSystem Smoke6;
[SerializeField]
private ParticleSystem Smoke7;
[SerializeField]
private ParticleSystem Smoke8;
[SerializeField]
private ParticleSystem Rings;
private void Start()
{
Smoke1.Stop();
Smoke2.Stop();
Smoke3.Stop();
Smoke4.Stop();
Smoke5.Stop();
Smoke6.Stop();
Smoke7.Stop();
Smoke8.Stop();
//Rings.Stop();
}
void Update()
{
float rotation_01 = Mathf.Abs(-0.5f + ((obj.transform.eulerAngles.y)/ 180) % 1.0f);
@ -33,8 +60,6 @@ namespace BlueWater
if (Input.GetKey(KeyCode.UpArrow)|| Input.GetKey(KeyCode.W))
{
SmokeL.Play();
SmokeR.Play();
force += force_add;
if (force >= 1.0f) force = 1.0f;
}
@ -53,15 +78,46 @@ namespace BlueWater
// transform.Translate(0, 0, speed * time);
}
else
{ SmokeL.Stop();
SmokeR.Stop();
{
if (force < 0.0f)force += force_add/2.0f;
else if(force > 0.0f)force -= force_add/2.0f;
}
transform.Translate((side_check * move_time * rotation_02)*force, 0.0f, (back_check * move_time * rotation_01)*force);
if (force >= 0.05f)
{
Smoke1.Play();
Smoke2.Play();
Smoke3.Play();
Smoke4.Play();
Smoke5.Play();
Smoke6.Play();
Smoke7.Play();
Smoke8.Play();
//Rings.Play();
}
else
{
Smoke1.Stop();
Smoke2.Stop();
Smoke3.Stop();
Smoke4.Stop();
Smoke5.Stop();
Smoke6.Stop();
Smoke7.Stop();
Smoke8.Stop();
//Rings.Stop();
}
Smoke1.startSize = 0.2f * (force);
Smoke2.startSize = 0.2f * (force);
Smoke3.startSize = 0.2f * (force);
Smoke4.startSize = 0.2f * (force);
Smoke5.startSize = 0.2f * (force);
Smoke6.startSize = 0.2f * (force);
Smoke7.startSize = 0.2f * (force);
Smoke8.startSize = 0.2f * (force);
if (Input.GetKey(KeyCode.RightArrow)|| Input.GetKey(KeyCode.D))
{

7
Assets/02.Scripts/BlueWater/Utility/Singletone.cs
View File

@ -142,11 +142,4 @@ public abstract class Singleton : MonoBehaviour
#region Properties
public static bool Quitting { get; private set; }
#endregion
#region Methods
protected virtual void OnApplicationQuit()
{
Quitting = true;
}
#endregion
}

BIN
Assets/12.Models/Sail/Island_02/Island_02.fbx
View File

Binary file not shown.

2
Assets/AddressableAssetsData/AddressableAssetSettings.asset
View File

@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 8e0a3b4ef79b6b240a41c854861466bc
m_currentHash:
serializedVersion: 2
Hash: 752e2ffa415f639560376d023f23f4fe
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0

2
Assets/AllIn1VfxToolkit/Demo & Assets/Demo/Materials/SmokePuffMesh.mat
View File

@ -233,7 +233,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BackFaceTint: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.6839622, g: 0.8730874, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorGradingDark: {r: 1, g: 1, b: 1, a: 1}
- _ColorGradingLight: {r: 1, g: 1, b: 1, a: 1}
- _ColorGradingMiddle: {r: 1, g: 1, b: 1, a: 1}

10
Assets/Toon Water URP/Curved Toon Water Material 1.mat
View File

@ -8,8 +8,8 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Curved Toon Water Material 1
m_Shader: {fileID: -6465566751694194690, guid: b4a6b41e114133b4d8eb40ab1d879de6, type: 3}
m_Parent: {fileID: 2100000, guid: 7b185aaf7e6e5b544938d7a57979d004, type: 2}
m_Shader: {fileID: -6465566751694194690, guid: 853aeede1e7cd6a469d53fbe66403751, type: 3}
m_Parent: {fileID: 2100000, guid: cd0e9af49e634ec45b9a80f7886b1e9e, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
@ -23,7 +23,11 @@ Material:
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_TexEnvs:
- _SampleTexture2DLOD_53d484e312774f58a9675d9798a6ad2a_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: 4e3951c538fc8a647a4a10a99b480987, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Vector1_20DB7652: 0.636

40
Assets/Toon Water URP/Curved Toon Water Shader.shadergraph
View File

@ -3252,8 +3252,8 @@
"m_ObjectId": "06e054090df1402ea51e9bded04cbb6d",
"m_Title": "Fresnel",
"m_Position": {
"x": -41.9998779296875,
"y": -978.9999389648438
"x": -42.666748046875,
"y": -978.6666870117188
}
}
@ -4508,8 +4508,8 @@
"m_ObjectId": "1bbff5234f2c4b92832f844222e0362f",
"m_Title": "Calculate UVs",
"m_Position": {
"x": -3502.0,
"y": 262.0
"x": -3502.666748046875,
"y": 262.66656494140627
}
}
@ -11542,8 +11542,8 @@
"m_ObjectId": "87e14a641c1d4bc6b7f82422c382e1f0",
"m_Title": "Planar Reflection",
"m_Position": {
"x": -1388.0,
"y": -1991.0
"x": -1388.6666259765625,
"y": -1990.6666259765625
}
}
@ -12014,8 +12014,8 @@
"m_ObjectId": "8f5b78c2c6884f4a9ce7b9c4bcc3d37b",
"m_Title": "Other Lights Specular",
"m_Position": {
"x": -764.0,
"y": 2251.999755859375
"x": -764.6666259765625,
"y": 2252.6669921875
}
}
@ -13066,8 +13066,8 @@
"m_ObjectId": "a61c097103fa45cebe8abbdb292982c7",
"m_Title": "Calculate Foam",
"m_Position": {
"x": -2895.0,
"y": 998.9998779296875
"x": -2895.333251953125,
"y": 999.333251953125
}
}
@ -15566,8 +15566,8 @@
"m_ObjectId": "ca0af7d94af04602a2328fb3cda13141",
"m_Title": "Calculate Foam UVs",
"m_Position": {
"x": -3524.0,
"y": 1660.9998779296875
"x": -3524.666748046875,
"y": 1661.33349609375
}
}
@ -16786,8 +16786,8 @@
"m_ObjectId": "e1d328964827494098160b25dd0e053c",
"m_Title": "Generate Normals",
"m_Position": {
"x": -2487.0,
"y": 347.9999694824219
"x": -2487.333251953125,
"y": 348.66656494140627
}
}
@ -17521,8 +17521,8 @@
"m_ObjectId": "eb30c1030929435f80c1f702bdf64863",
"m_Title": "Refraction",
"m_Position": {
"x": -1357.0,
"y": 151.99998474121095
"x": -1357.3333740234375,
"y": 152.66668701171876
}
}
@ -17959,8 +17959,8 @@
"m_ObjectId": "f2277552366946468919c6cd85bba5a7",
"m_Title": "Calculate Water Color Based On Depth",
"m_Position": {
"x": -1758.0,
"y": -512.0
"x": -1758.6666259765625,
"y": -511.3333740234375
}
}
@ -18287,8 +18287,8 @@
"m_ObjectId": "f73efc0d442d4fea93b236459693b1b6",
"m_Title": "Directional Light Specular",
"m_Position": {
"x": -1391.999755859375,
"y": 1207.9998779296875
"x": -1392.6666259765625,
"y": 1208.66650390625
}
}