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

렌더 텍스처 수정 중

Browse Source
This commit is contained in:
NTG_Lenovo 2024-09-09 21:27:15 +09:00
parent 288e6a7897
commit a5767065c6
23 changed files with 1802 additions and 3962 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4920
Assets/01.Scenes/01.Tycoon.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/02.Scripts/Character/Npc/Customer.cs
View File

@ -253,6 +253,8 @@ namespace BlueWater.Npcs.Customers
OnInteraction?.Invoke();
}
public virtual void CancelInteraction() { }
public bool CanInteraction() => true;
public void ShowInteractionUi()

4
Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs
View File

@ -98,6 +98,10 @@ namespace BlueWater.Players.Tycoons
{
_closestInteraction?.Interaction();
}
else if (context.canceled)
{
_closestInteraction?.CancelInteraction();
}
}
public void OnDevelopKey01(InputAction.CallbackContext context)

1
Assets/02.Scripts/Interface/IPlayerInteraction.cs
View File

@ -11,6 +11,7 @@ namespace BlueWater.Interfaces
float InteractionRadius { get; }
void Interaction();
void CancelInteraction();
bool CanInteraction();
void ShowInteractionUi();
void HideInteractionUi();

2
Assets/02.Scripts/Item/Item.cs
View File

@ -206,6 +206,8 @@ namespace BlueWater.Items
OnAcquired();
}
public virtual void CancelInteraction() { }
public virtual bool CanInteraction() => true;
public void ShowInteractionUi()

41
Assets/02.Scripts/LiquidController.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DG.Tweening;
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine;
@ -13,6 +13,9 @@ namespace BlueWater
#region Variables
[Title("컴포넌트")]
[SerializeField]
private GameObject _liquidPanel;
[SerializeField]
private Renderer _renderTexture;
@ -61,10 +64,16 @@ namespace BlueWater
[SerializeField, Tooltip("오브젝트 풀링 최대 개수")]
private int _objectPoolCount = 1000;
[Title("패널")]
[SerializeField]
private float _moveDuration = 0.5f;
private IObjectPool<Liquid> _objectPool;
private List<Liquid> _activeLiquids = new();
private Dictionary<Color, int> _colorCounts = new();
private Material _instanceMaterial;
private Tween _showTween;
private Tween _hideTween;
private bool _isPouring;
private float _startTime = float.PositiveInfinity;
@ -88,18 +97,26 @@ namespace BlueWater
private void Awake()
{
_objectPool = new ObjectPool<Liquid>(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount);
_hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).From(-249f).Pause()
.SetAutoKill(false);
_showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).From(-150f).Pause()
.SetAutoKill(false);
}
private void Start()
{
TycoonEvents.OnDrinkUiOpened += Initialize;
TycoonEvents.OnDrinkUiClosed += ReleaseAllObject;
TycoonEvents.OnLiquidRegionEntered += ShowPanel;
TycoonEvents.OnLiquidRegionExited += HidePanel;
_instanceMaterial = Instantiate(_liquidRenderer.material);
_liquidRenderer.material = _instanceMaterial;
_timeInterval = 1f / _liquidsPerSecond;
_instanceMaterial.SetFloat(_liquidAmountHash, 0f);
SetCurrentAmount(0f);
}
private void Update()
@ -134,8 +151,8 @@ namespace BlueWater
private void OnDestroy()
{
TycoonEvents.OnDrinkUiOpened -= Initialize;
TycoonEvents.OnDrinkUiClosed -= ReleaseAllObject;
TycoonEvents.OnLiquidRegionEntered -= ShowPanel;
TycoonEvents.OnLiquidRegionExited -= HidePanel;
}
#endregion
@ -283,8 +300,18 @@ namespace BlueWater
}
}
public void ShowPanel()
{
_hideTween.Pause();
_showTween.Restart();
}
public void HidePanel()
{
_showTween.Pause();
_hideTween.Restart();
}
#endregion
}
}

17
Assets/02.Scripts/LiquidInteractionRegion.cs Normal file
View File

@ -0,0 +1,17 @@
using UnityEngine;
namespace BlueWater
{
public class LiquidInteractionRegion : MonoBehaviour
{
private void OnTriggerEnter(Collider other)
{
TycoonEvents.OnLiquidRegionEntered?.Invoke();
}
private void OnTriggerExit(Collider other)
{
TycoonEvents.OnLiquidRegionExited?.Invoke();
}
}
}

2
Assets/02.Scripts/LiquidInteractionRegion.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f0f3dc568d0721b48ad5f24339d24951

3
Assets/02.Scripts/Prop/Tycoon/Bar.cs
View File

@ -1,4 +1,3 @@
using BlueWater.Uis;
using UnityEngine;
namespace BlueWater.Tycoons
@ -10,7 +9,7 @@ namespace BlueWater.Tycoons
public override void Interaction()
{
TycoonUiManager.Instance.BarUi.Open(TycoonUiManager.Instance.PopupUiList);
// TycoonUiManager.Instance.BarUi.Open(TycoonUiManager.Instance.PopupUiList);
}
public void ActiveIsPouring()

2
Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs
View File

@ -94,6 +94,8 @@ namespace BlueWater.Tycoons
public abstract void Interaction();
public virtual void CancelInteraction() { }
public virtual bool CanInteraction() => true;
public virtual void ShowInteractionUi()

32
Assets/02.Scripts/Prop/Tycoon/Liquid.cs Normal file
View File

@ -0,0 +1,32 @@
using UnityEngine;
namespace BlueWater.Tycoons
{
public class Liquid : InteractionFurniture
{
[SerializeField]
private LiquidController _liquidController;
protected override void Awake()
{
base.Awake();
_liquidController = FindAnyObjectByType<LiquidController>();
}
public override void Interaction()
{
_liquidController.ActiveIsPouring();
}
public override void CancelInteraction()
{
_liquidController.InActiveIsPouring();
}
public override bool CanInteraction()
{
return true;
}
}
}

2
Assets/02.Scripts/Prop/Tycoon/Liquid.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2568fe8d4d702ed4698ed46b9c2ad25a

3
Assets/02.Scripts/Tycoon/TycoonEvents.cs
View File

@ -8,6 +8,9 @@ namespace BlueWater
// 음료
public static Action<string> OnDrinkRecipeAcquired;
public static Action OnLiquidRegionEntered;
public static Action OnLiquidRegionExited;
public static Action OnBrewingUiOpened;
public static Action OnBrewingUiClosed;
public static Action<LiquidData> OnDrinkRecipeSelected;

28
Assets/02.Scripts/Ui/Tycoon/BarUi.cs
View File

@ -1,28 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace BlueWater.Uis
{
public class BarUi : SwitchActionPopupUi
{
[SerializeField]
private CocktailStatusUi _cocktailStatusUi;
public override void Open(List<PopupUi> popupUiList)
{
base.Open(popupUiList);
_cocktailStatusUi.ResetCocktailStatus();
TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar);
TycoonEvents.OnDrinkUiOpened?.Invoke();
}
public override void Close()
{
base.Close();
TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Base);
TycoonEvents.OnDrinkUiClosed?.Invoke();
}
}
}

2
Assets/02.Scripts/Ui/Tycoon/BarUi.cs.meta
View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 1e18fddab7a69284394b8b5bad8d1dbe

4
Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs
View File

@ -30,9 +30,6 @@ namespace BlueWater.Uis
[field: SerializeField]
public BrewingUi BrewingUi { get; private set; }
[field: SerializeField]
public BarUi BarUi { get; private set; }
[SerializeField]
private Image _fadeImage;
@ -84,7 +81,6 @@ namespace BlueWater.Uis
TycoonManagementUi = GetComponentInChildren<TycoonManagementUi>(true);
TycoonStageUi = GetComponentInChildren<TycoonStageUi>(true);
BrewingUi = GetComponentInChildren<BrewingUi>(true);
BarUi = GetComponentInChildren<BarUi>(true);
_fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
PopupUiList = new List<PopupUi>(8);
}

4
Assets/04.Materials/Liquid3.mat
View File

@ -77,6 +77,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}

2
Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
View File

@ -252,7 +252,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: 0, z: -1.439}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 6509241874729291456}

2
Assets/05.Prefabs/LiquidObject.prefab
View File

@ -78,7 +78,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -403788685
m_SortingLayer: 1
m_SortingOrder: 11
m_SortingOrder: 12
m_Sprite: {fileID: 21300000, guid: c6fd44c44ec0c504c9d09e9c3e421708, type: 3}
m_Color: {r: 0, g: 0.7294118, b: 1, a: 1}
m_FlipX: 0

193
Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab Normal file
View File

@ -0,0 +1,193 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7208898558036350106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7358052634285927493}
m_Layer: 8
m_Name: Center
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7358052634285927493
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7208898558036350106}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 809828747251277026}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 0.18181819
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 80
objectReference: {fileID: 0}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Name
value: Liquid
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3}
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 7358052634285927493}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 1535180298174803447}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &809828747251277026 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5897095096647521783 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1535180298174803447
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5897095096647521783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3}
m_Name:
m_EditorClassIdentifier:
<CenterTransform>k__BackingField: {fileID: 7358052634285927493}
<VisualLook>k__BackingField: {fileID: 6077686033771388879}
<InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
<InteractionUi>k__BackingField: {fileID: 8793236136028073839}
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.5
IsOpened: 0
--- !u!212 &6077686033771388879 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!223 &8975593228546502023 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}

7
Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta Normal file
View File

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

487
Assets/09.Shaders/Liquid3.shadergraph
View File

@ -317,6 +317,15 @@
},
{
"m_Id": "a80f5045148b4e6a8db99957f45731f7"
},
{
"m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf"
},
{
"m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843"
},
{
"m_Id": "cae791b474054116adbf3b632705d906"
}
],
"m_GroupDatas": [],
@ -616,6 +625,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843"
},
"m_SlotId": 7
},
"m_InputSlot": {
"m_Node": {
"m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@ -1078,6 +1101,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "a652d57b83d6427eb2c2bc24b5264c96"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@ -1316,6 +1353,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "cae791b474054116adbf3b632705d906"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@ -1942,6 +1993,31 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
"m_ObjectId": "081f3a3aa6264afdbc201061d61ff86a",
"m_Id": 0,
"m_DisplayName": "RGBA",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "RGBA",
"m_StageCapability": 2,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@ -2149,7 +2225,7 @@
"hlslDeclarationOverride": 0,
"m_Hidden": false,
"m_Value": {
"m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"d39d76f18f907014a9979953fb5d43a0\",\"type\":3}}",
"m_Guid": ""
},
"isMainTexture": false,
@ -3210,6 +3286,54 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "20ffc2f956644ffd8173568cb44ca956",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"e00": 2.0,
"e01": 2.0,
"e02": 2.0,
"e03": 2.0,
"e10": 2.0,
"e11": 2.0,
"e12": 2.0,
"e13": 2.0,
"e20": 2.0,
"e21": 2.0,
"e22": 2.0,
"e23": 2.0,
"e30": 2.0,
"e31": 2.0,
"e32": 2.0,
"e33": 2.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -4381,6 +4505,21 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "44a879844bae4c9eb84cc2956c7185f1",
"m_Id": 5,
"m_DisplayName": "G",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "G",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -5170,6 +5309,66 @@
"m_BareResource": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
"m_ObjectId": "52a0bdd9ee2e49ceb75a4097f56b7843",
"m_Group": {
"m_Id": ""
},
"m_Name": "Sample Texture 2D",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 549.0,
"y": 2130.0,
"width": 208.0,
"height": 435.0
}
},
"m_Slots": [
{
"m_Id": "081f3a3aa6264afdbc201061d61ff86a"
},
{
"m_Id": "a4ed840cbd2943c78faadd075e119795"
},
{
"m_Id": "44a879844bae4c9eb84cc2956c7185f1"
},
{
"m_Id": "e7be06b6c6a1408bbd0bf7fa9b6ef1d4"
},
{
"m_Id": "639e8b195fac40a8a577e5ed1e32112d"
},
{
"m_Id": "ce9cf4efa18d471cb6a6a143f7664095"
},
{
"m_Id": "e3ec8dd8d588473dae836188d8fcdd2d"
},
{
"m_Id": "9a4494d59d0a4b9483d81ca8422a9911"
}
],
"synonyms": [
"tex2d"
],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_TextureType": 0,
"m_NormalMapSpace": 0,
"m_EnableGlobalMipBias": true,
"m_MipSamplingMode": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -5769,6 +5968,21 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "639e8b195fac40a8a577e5ed1e32112d",
"m_Id": 7,
"m_DisplayName": "A",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@ -6497,6 +6711,54 @@
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "7892c41bfe694810a46313787cb1aa2d",
"m_Id": 2,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 0.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 0.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 0.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@ -7637,6 +7899,19 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
"m_ObjectId": "9a4494d59d0a4b9483d81ca8422a9911",
"m_Id": 3,
"m_DisplayName": "Sampler",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Sampler",
"m_StageCapability": 3,
"m_BareResource": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -8137,6 +8412,21 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "a4ed840cbd2943c78faadd075e119795",
"m_Id": 4,
"m_DisplayName": "R",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "R",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@ -9091,6 +9381,19 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
"m_ObjectId": "bb61f0ae44d846a1ac5462de4c423f5c",
"m_Id": 0,
"m_DisplayName": "MainTex",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_BareResource": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@ -9831,6 +10134,42 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
"m_ObjectId": "cae791b474054116adbf3b632705d906",
"m_Group": {
"m_Id": ""
},
"m_Name": "Property",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 549.0,
"y": 2075.0,
"width": 127.0,
"height": 34.0
}
},
"m_Slots": [
{
"m_Id": "bb61f0ae44d846a1ac5462de4c423f5c"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Property": {
"m_Id": "0a1a4ed5edd441b2a25633a208f068e0"
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TimeNode",
@ -10015,6 +10354,24 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
"m_ObjectId": "ce9cf4efa18d471cb6a6a143f7664095",
"m_Id": 1,
"m_DisplayName": "Texture",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Texture",
"m_StageCapability": 3,
"m_BareResource": false,
"m_Texture": {
"m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
"m_Guid": ""
},
"m_DefaultType": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -11199,6 +11556,28 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
"m_ObjectId": "e3ec8dd8d588473dae836188d8fcdd2d",
"m_Id": 2,
"m_DisplayName": "UV",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "UV",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0
},
"m_Labels": [],
"m_Channel": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@ -11358,6 +11737,64 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "e7be06b6c6a1408bbd0bf7fa9b6ef1d4",
"m_Id": 6,
"m_DisplayName": "B",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
"m_ObjectId": "e7fffce0a08b4ec78b79ee64bdcdabdf",
"m_Group": {
"m_Id": ""
},
"m_Name": "Multiply",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 786.9999389648438,
"y": 1737.0,
"width": 207.99993896484376,
"height": 301.9998779296875
}
},
"m_Slots": [
{
"m_Id": "fa82698c49b54b23a5ec48fadbf8e0ed"
},
{
"m_Id": "20ffc2f956644ffd8173568cb44ca956"
},
{
"m_Id": "7892c41bfe694810a46313787cb1aa2d"
}
],
"synonyms": [
"multiplication",
"times",
"x"
],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -12356,6 +12793,54 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "fa82698c49b54b23a5ec48fadbf8e0ed",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 0.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 0.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 0.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",

2
ProjectSettings/TagManager.asset
View File

@ -27,7 +27,7 @@ TagManager:
- ClickGround
- DamageableProps
- Liquid
-
- Test
-
-
-