Closed #17 InShipCam

This commit is contained in:
M1_IDMhan 2023-08-12 01:21:26 +09:00
parent 6b7b33dbb3
commit 9e27d0f29f
32 changed files with 2061 additions and 63 deletions

View File

@ -17,7 +17,7 @@ RenderSettings:
m_Fog: 1
m_FogColor: {r: 0.56163496, g: 0.75237745, b: 0.7794118, a: 1}
m_FogMode: 3
m_FogDensity: 0.003
m_FogDensity: 0.007
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
@ -5833,8 +5833,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 168896972}
serializedVersion: 2
m_LocalRotation: {x: 0.19897528, y: 0.00000008940697, z: -0, w: 0.98000455}
m_LocalPosition: {x: -0.0000002384187, y: 10.32, z: -10.000001}
m_LocalRotation: {x: 0.22591954, y: 0.000000029802322, z: -0.000000014901161, w: 0.974146}
m_LocalPosition: {x: -0.0000002384187, y: 11, z: -10.000001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -10909,7 +10909,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 10.32, z: -10}
m_FollowOffset: {x: 0, y: 11, z: -10}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -12063,7 +12063,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.07, y: 3.39, z: -1.81}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 476261175}
@ -18566,7 +18566,7 @@ GameObject:
- component: {fileID: 519038851}
- component: {fileID: 519038852}
m_Layer: 0
m_Name: InBoatCam
m_Name: InShipCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -18580,8 +18580,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519038850}
serializedVersion: 2
m_LocalRotation: {x: 0.3006428, y: -0.6400109, z: 0.30064273, w: 0.640011}
m_LocalPosition: {x: 19.93, y: 27.5, z: -1.8100033}
m_LocalRotation: {x: 0.30631077, y: -0.6373176, z: 0.3063107, w: 0.6373177}
m_LocalPosition: {x: 19.93, y: 28.39, z: -1.8100033}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -18604,12 +18604,12 @@ MonoBehaviour:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 2
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 304932851}
m_Follow: {fileID: 304932851}
m_Lens:
FieldOfView: 10
FieldOfView: 7
OrthographicSize: 5
NearClipPlane: 0.1
FarClipPlane: 300
@ -20055,9 +20055,9 @@ Transform:
m_GameObject: {fileID: 550759579}
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_LocalPosition: {x: 0, y: 0.57, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 551002327}
- {fileID: 550907091}
@ -32019,7 +32019,7 @@ Camera:
height: 1
near clip plane: 0.1
far clip plane: 300
field of view: 10
field of view: 80
orthographic: 0
orthographic size: 5
m_Depth: -1
@ -32045,8 +32045,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776161953}
serializedVersion: 2
m_LocalRotation: {x: 0.42517304, y: 0.000000086318224, z: -0.000000040547665, w: 0.9051121}
m_LocalPosition: {x: -39.110004, y: 25.92, z: -19.929998}
m_LocalRotation: {x: 0.15974922, y: 0.68882525, z: -0.15974924, w: 0.6888252}
m_LocalPosition: {x: -47.3, y: 9.42, z: 0.0000011920929}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -32142,8 +32142,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eba32823f7fae4b7886c2fe6ee08123f, type: 3}
m_Name:
m_EditorClassIdentifier:
dredgeCam: {fileID: 1437521088}
assaultCam: {fileID: 1880081303}
dredgeCam: {fileID: 168896974}
assaultCam: {fileID: 1871370247}
InShipCam: {fileID: 519038852}
--- !u!1001 &776462965
PrefabInstance:
m_ObjectHideFlags: 0
@ -60369,8 +60370,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 1
m_FrequencyGain: 1
m_AmplitudeGain: 0.5
m_FrequencyGain: 0.5
mNoiseOffsets: {x: 0, y: 0, z: 0}
--- !u!114 &1385621424
MonoBehaviour:
@ -60385,7 +60386,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 20, y: 24.11, z: 0}
m_FollowOffset: {x: 20, y: 25, z: 0}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -63134,13 +63135,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1461171523}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
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: 476261175}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &1461171525
MeshRenderer:
m_ObjectHideFlags: 0
@ -70720,7 +70721,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 1, z: 5}
m_LocalScale: {x: 10, y: 1, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}

View File

@ -12,6 +12,9 @@ public class Boat : MonoBehaviour
private GameObject spot;
private Coroutine draw;
public delegate void LandedEventHandler();
public event LandedEventHandler OnLanded;
private void Awake()
{
@ -49,6 +52,8 @@ public class Boat : MonoBehaviour
lineRenderer.enabled = false;
if (draw != null) StopCoroutine(draw);
OnLanded?.Invoke();
}
}

View File

@ -44,6 +44,24 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Interaction"",
""type"": ""Button"",
""id"": ""367e7267-d329-439d-9806-5e960b8114b5"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": ""Tap"",
""initialStateCheck"": false
},
{
""name"": ""InteractionHold"",
""type"": ""Button"",
""id"": ""a28fe5f5-b2a2-4794-8f99-fa2494aedfc3"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": ""Hold(duration=1)"",
""initialStateCheck"": false
}
],
""bindings"": [
@ -112,6 +130,28 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""action"": ""AssaultMode"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""334d8c88-f0ee-43d9-b62d-a1fdbd1bc338"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Interaction"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""df7a5259-c313-4b14-9cca-9e1acfc0a31a"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""InteractionHold"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
@ -198,6 +238,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true);
m_Player_AssaultMode = m_Player.FindAction("AssaultMode", throwIfNotFound: true);
m_Player_Interaction = m_Player.FindAction("Interaction", throwIfNotFound: true);
m_Player_InteractionHold = m_Player.FindAction("InteractionHold", throwIfNotFound: true);
// Camera
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
@ -265,12 +307,16 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
private List<IPlayerActions> m_PlayerActionsCallbackInterfaces = new List<IPlayerActions>();
private readonly InputAction m_Player_Move;
private readonly InputAction m_Player_AssaultMode;
private readonly InputAction m_Player_Interaction;
private readonly InputAction m_Player_InteractionHold;
public struct PlayerActions
{
private @BlueWater m_Wrapper;
public PlayerActions(@BlueWater wrapper) { m_Wrapper = wrapper; }
public InputAction @Move => m_Wrapper.m_Player_Move;
public InputAction @AssaultMode => m_Wrapper.m_Player_AssaultMode;
public InputAction @Interaction => m_Wrapper.m_Player_Interaction;
public InputAction @InteractionHold => m_Wrapper.m_Player_InteractionHold;
public InputActionMap Get() { return m_Wrapper.m_Player; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@ -286,6 +332,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@AssaultMode.started += instance.OnAssaultMode;
@AssaultMode.performed += instance.OnAssaultMode;
@AssaultMode.canceled += instance.OnAssaultMode;
@Interaction.started += instance.OnInteraction;
@Interaction.performed += instance.OnInteraction;
@Interaction.canceled += instance.OnInteraction;
@InteractionHold.started += instance.OnInteractionHold;
@InteractionHold.performed += instance.OnInteractionHold;
@InteractionHold.canceled += instance.OnInteractionHold;
}
private void UnregisterCallbacks(IPlayerActions instance)
@ -296,6 +348,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@AssaultMode.started -= instance.OnAssaultMode;
@AssaultMode.performed -= instance.OnAssaultMode;
@AssaultMode.canceled -= instance.OnAssaultMode;
@Interaction.started -= instance.OnInteraction;
@Interaction.performed -= instance.OnInteraction;
@Interaction.canceled -= instance.OnInteraction;
@InteractionHold.started -= instance.OnInteractionHold;
@InteractionHold.performed -= instance.OnInteractionHold;
@InteractionHold.canceled -= instance.OnInteractionHold;
}
public void RemoveCallbacks(IPlayerActions instance)
@ -380,6 +438,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
{
void OnMove(InputAction.CallbackContext context);
void OnAssaultMode(InputAction.CallbackContext context);
void OnInteraction(InputAction.CallbackContext context);
void OnInteractionHold(InputAction.CallbackContext context);
}
public interface ICameraActions
{

View File

@ -22,6 +22,24 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Interaction",
"type": "Button",
"id": "367e7267-d329-439d-9806-5e960b8114b5",
"expectedControlType": "Button",
"processors": "",
"interactions": "Tap",
"initialStateCheck": false
},
{
"name": "InteractionHold",
"type": "Button",
"id": "a28fe5f5-b2a2-4794-8f99-fa2494aedfc3",
"expectedControlType": "Button",
"processors": "",
"interactions": "Hold(duration=1)",
"initialStateCheck": false
}
],
"bindings": [
@ -90,6 +108,28 @@
"action": "AssaultMode",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "334d8c88-f0ee-43d9-b62d-a1fdbd1bc338",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Interaction",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "df7a5259-c313-4b14-9cca-9e1acfc0a31a",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "InteractionHold",
"isComposite": false,
"isPartOfComposite": false
}
]
},

View File

@ -10,11 +10,13 @@ public class CameraController : MonoBehaviour
public CinemachineVirtualCamera dredgeCam;
[Required("습격모드 카메라를 넣어주세요.")]
public CinemachineVirtualCamera assaultCam;
[Required("보트내부 카메라를 넣어주세요.")]
public CinemachineVirtualCamera InShipCam;
public void CamAssaultMode()
{
dredgeCam.Priority = 0;
assaultCam.Priority = 1;
dredgeCam.Priority = 0;
}
public void CamDredgeMode()
@ -22,4 +24,11 @@ public class CameraController : MonoBehaviour
dredgeCam.Priority = 1;
assaultCam.Priority = 0;
}
public void CamInShipMode()
{
InShipCam.Priority = 1;
dredgeCam.Priority = 0;
assaultCam.Priority = 0;
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 5f244dcf6ceaa485386636610bf0edb8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 0
wrapperCodePath:
wrapperClassName:
wrapperCodeNamespace:

View File

@ -1,16 +1,28 @@
using System.Collections;
using System.Collections.Generic;
using _02.Scripts.WaterAndShip;
using Sirenix.OdinInspector;
using UnityEngine;
public class GameManager : Singleton<GameManager>
{
[Title("Manager")]
public DataManager DataManager { get; private set; }
[Title("Controller")]
public CameraController CameraController { get; private set; }
public UiController UiController { get; private set; }
public Player player;
private void Init()
{
DataManager = FindObjectOfType<DataManager>();
CameraController = FindObjectOfType<CameraController>();
UiController = FindObjectOfType<UiController>();
player = FindObjectOfType<Player>();
}
protected override void OnAwake()
{

View File

@ -1,15 +1,20 @@
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
public class GerstnerWave : MonoBehaviour
{
[InfoBox("파도의 길이를 결정, 값이 클수록 파도 간의 간격이 커짐")]
public float waveLength = 0.1f;
[InfoBox("파도의 높이를 결정, 값이 클수록 파도의 높이가 커짐")]
public float amplitude = 0.1f;
[InfoBox("파도의 속도를 결정, 값이 클수록 파도의 속도가 오름")]
public float speed = 1f;
[InfoBox("파도의 방향을 결정")]
public Vector2 direction = new Vector2(1.0f, 0.0f);
void Update()
private void Update()
{
var mesh = GetComponent<MeshFilter>().mesh;
var vertices = mesh.vertices;

View File

@ -9,6 +9,7 @@ namespace _02.Scripts.WaterAndShip
[RequireComponent(typeof(PlayerInput))]
public class Player : MonoBehaviour
{
[Title("쉽의 기본 설정")]
[InfoBox("최대 스피드")]
public float maxSpeed = 10f;
[InfoBox("가속 수치")]
@ -17,9 +18,12 @@ namespace _02.Scripts.WaterAndShip
public float deceleration = 2f;
[InfoBox("회전 속도")]
public float turnSpeed = 10f;
private Rigidbody rb;
private Vector2 movementInput;
private bool isAssaultMode;
public bool IsAssaultMode { get; set; }
public bool IsInShipMode { get; set; }
public bool IsdredgeMode { get; set; }
private void Awake()
{
@ -31,37 +35,7 @@ namespace _02.Scripts.WaterAndShip
MovePlayer();
RotatePlayer();
}
#region AssaultMode/DreadgeMode Switch
public void OnAssaultMode(InputValue value)
{
if (isAssaultMode)
{
SwitchToDredgeMode();
}
else
{
SwitchToAssaultMode();
}
}
private void SwitchToDredgeMode()
{
GameManager.Inst.CameraController.CamDredgeMode();
GameManager.Inst.UiController.uiAnimator.Reverse();
isAssaultMode = false;
}
private void SwitchToAssaultMode()
{
GameManager.Inst.CameraController.CamAssaultMode();
GameManager.Inst.UiController.uiAnimator.Play();
isAssaultMode = true;
}
#endregion
#region Movement
public void OnMove(InputValue value)
@ -85,5 +59,63 @@ namespace _02.Scripts.WaterAndShip
#endregion
#region AssaultMode/DreadgeMode Switch
private void OnAssaultMode(InputValue value)
{
if (IsAssaultMode)
{
SwitchToDredgeMode();
}
else
{
SwitchToAssaultMode();
}
}
private void SwitchToDredgeMode()
{
GameManager.Inst.CameraController.CamDredgeMode();
GameManager.Inst.UiController.uiAnimator.Reverse();
IsAssaultMode = false;
IsdredgeMode = true;
}
private void SwitchToAssaultMode()
{
GameManager.Inst.CameraController.CamAssaultMode();
GameManager.Inst.UiController.uiAnimator.Play();
IsAssaultMode = true;
IsdredgeMode = false;
}
#endregion
#region Interaction Key
private void OnInteraction(InputValue value)
{
}
private void OnInteractionHold(InputValue value)
{
if (IsInShipMode)
{
GameManager.Inst.CameraController.CamDredgeMode();
IsdredgeMode = true;
IsAssaultMode = false;
IsInShipMode = false;
}
else
{
GameManager.Inst.CameraController.CamInShipMode();
IsInShipMode = true;
IsAssaultMode = false;
IsdredgeMode = false;
}
}
#endregion
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -116,7 +116,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.23584905, g: 0.23584905, b: 0.23584905, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.23584902, g: 0.23584902, b: 0.23584902, 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: []

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -117,7 +117,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.13725486, g: 0.16862741, b: 0.29411763, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.13725483, g: 0.16862738, b: 0.2941176, 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: []

View File

@ -130,7 +130,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.003921569, g: 0.015686275, b: 0.050980374, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.003921569, g: 0.015686275, b: 0.05098036, 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: []

View File

@ -130,7 +130,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.454902, g: 0.454902, b: 0.454902, 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: []

View File

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

View File

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

View File

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

View File

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

View File

@ -50,7 +50,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 6fa6e3a289a54da4387f58e1eb847ef8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

View File

@ -11,3 +11,5 @@ EditorBuildSettings:
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 52ef95baf252a46f2979b3dff5d5a7fa,
type: 2}
com.unity.input.settings: {fileID: 11400000, guid: e0caac234b4984d92bb375ffa95898bf,
type: 2}