marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

massive number of fixes, removed compilation error, logs, negative scale issues, serialization issues ETC

Browse Source
This commit is contained in:
marcin
2024-11-25 15:15:55 +01:00
parent 48d565f77e
commit 8d766ed470
48 changed files with 1442 additions and 2434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Animations/kolo_wajcha.anim
View File

@@ -8,7 +8,7 @@ AnimationClip:
m_PrefabAsset: {fileID: 0}
m_Name: kolo_wajcha
serializedVersion: 6
m_Legacy: 0
m_Legacy: 1
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
@@ -86,21 +86,7 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 2720275347
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2

4
Assets/Meshes/Enviroment/Nature/Trees/Old_TreeA/Old_treeA.prefab
View File

@@ -312,7 +312,7 @@ Transform:
m_GameObject: {fileID: 5004512160185210627}
m_LocalRotation: {x: -0.10559149, y: 0.033817608, z: 0.048628133, w: 0.992644}
m_LocalPosition: {x: 1.068, y: 0.292, z: 0.074}
m_LocalScale: {x: -0.04753561, y: 0.5957044, z: 0.03875747}
m_LocalScale: {x: 0.04753561, y: 0.5957044, z: 0.03875747}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2088936957602817829}
@@ -366,7 +366,7 @@ Transform:
m_GameObject: {fileID: 6268488875741484053}
m_LocalRotation: {x: 0.036936127, y: 0.0072039403, z: -0.08499403, w: 0.99567056}
m_LocalPosition: {x: 1.067, y: 0.297, z: 0.181}
m_LocalScale: {x: -0.04753561, y: 0.5957044, z: 0.03875747}
m_LocalScale: {x: 0.04753561, y: 0.5957044, z: 0.03875747}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2088936957602817829}

4
Assets/Meshes/scroll/scrollRT.renderTexture
View File

@@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1029
m_Height: 690
m_Width: 1048
m_Height: 588
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 0

2
Assets/Plugins/Pixel Crushers/Common/Scripts/UI/UIPanel.cs
View File

@@ -116,7 +116,7 @@ namespace PixelCrushers
}
}
private Animator m_animator = null;
protected Animator m_animator = null;
private Animator myAnimator
{
get

19
Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab
View File

@@ -2427,7 +2427,7 @@ MonoBehaviour:
m_ReverseArrangement: 0
--- !u!95 &9581424
Animator:
serializedVersion: 4
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -2444,7 +2444,8 @@ Animator:
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &11418554
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2574,7 +2575,7 @@ CanvasGroup:
m_IgnoreParentGroups: 0
--- !u!95 &9512998
Animator:
serializedVersion: 4
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -2591,7 +2592,8 @@ Animator:
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &11427878
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2608,8 +2610,8 @@ MonoBehaviour:
focusCheckFrequency: 0.2
refreshSelectablesFrequency: 0
selectPreviousOnDisable: 1
showAnimationTrigger:
hideAnimationTrigger:
showAnimationTrigger: Show
hideAnimationTrigger: Hide
startState: 0
waitForShowAnimationToSetOpen: 0
m_deactivateOnHidden: 1
@@ -2761,7 +2763,7 @@ CanvasGroup:
m_IgnoreParentGroups: 0
--- !u!95 &9579632
Animator:
serializedVersion: 4
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -2778,7 +2780,8 @@ Animator:
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &175308
GameObject:
m_ObjectHideFlags: 0

2
Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Dialogue/StandardUISubtitlePanel.cs
View File

@@ -107,7 +107,7 @@ namespace PixelCrushers.DialogueSystem
protected Color originalColor { get; set; }
private string m_accumulatedText = string.Empty;
public string accumulatedText { get { return m_accumulatedText; } set { m_accumulatedText = value; } }
private Animator m_animator = null;
//private Animator m_animator = null;
protected Animator animator { get { if (m_animator == null && portraitImage != null) m_animator = portraitImage.GetComponent<Animator>(); return m_animator; } }
private bool m_isDefaultNPCPanel = false;
public bool isDefaultNPCPanel { get { return m_isDefaultNPCPanel; } set { m_isDefaultNPCPanel = value; } }

2
Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller
View File

@@ -19363,7 +19363,7 @@ AnimatorStateMachine:
second: []
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -144, y: 0, z: 0}
m_EntryPosition: {x: -144, y: -36, z: 0}
m_EntryPosition: {x: -180, y: -110, z: 0}
m_ExitPosition: {x: -144, y: 36, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110249884}

2144
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/Characters/CharacterVisibilityController.cs
View File

@@ -96,7 +96,7 @@ namespace Beyond
private Shader m_transparent;
private Shader m_opaque;
private int m_thresholID = Shader.PropertyToID("_Threshold");
private int m_baseColorID = Shader.PropertyToID("BaseColor");
private int m_baseColorID = Shader.PropertyToID("_BaseColor");
private int m_FresnelColorID = Shader.PropertyToID("_FresnelColor");
private int m_FresnelPowerID = Shader.PropertyToID("FresnelPower");
private int m_InvisibilityID = Shader.PropertyToID("_Invisibility");

2
Assets/Scripts/Characters/Deer/DeerController.cs
View File

@@ -13,7 +13,7 @@ namespace Beyond
[SerializeField] private new Renderer renderer;
private string colorString = "BaseColor";
private string colorString = "_BaseColor";
public float movementDuration = 9f;

2
Assets/Scripts/Characters/Player.cs
View File

@@ -135,7 +135,7 @@ namespace Beyond
[SerializeField] public MenuScroll menuScroll;
// [SerializeField]
private int faithRegenValue = 1;
//private int faithRegenValue = 1;
// private float faithRegenTime = 1f;
// private float faithCurrentTime = 0f;

4
Assets/Scripts/CollisionEventTrigger.cs
View File

@@ -31,7 +31,7 @@ public class CollisionEventTrigger : MonoBehaviour
if (useTagFilter && collision.gameObject.tag != targetTag)
{
Debug.Log("Collision with object with different tag.");
//Debug.Log("Collision with object with different tag.");
return;
}
@@ -53,7 +53,7 @@ public class CollisionEventTrigger : MonoBehaviour
// Check if the event is assigned (not null)
if (OnCollisionEnterEvent != null)
{
Debug.Log("Event is being invoked.");
//Debug.Log("Event is being invoked.");
// Invoke the event
OnCollisionEnterEvent.Invoke();
}

2
Assets/Scripts/Controllers/QTE/QTEController.cs
View File

@@ -23,7 +23,7 @@ namespace Beyond
private const string SEQUENCE_END_TAG = "QTEEnd";
private bool startedFade = false;
//private bool startedFade = false;
public bool IsSequenceRunning { get => m_isSequenceRunning; }

2
Assets/Scripts/DestinationTargetManager.cs
View File

@@ -23,7 +23,7 @@ namespace Beyond
if (Instance == null)
{
Instance = this;
DontDestroyOnLoad(gameObject);
//DontDestroyOnLoad(gameObject);
}
else
{

2
Assets/Scripts/Editor/CustomHierarchyDecorator.cs
View File

@@ -37,7 +37,7 @@ public static class CustomHierarchyDecorator
return;
}
Debug.Log("HierarchyDecoratorSettings loaded successfully.");
//Debug.Log("HierarchyDecoratorSettings loaded successfully.");
}
// Rysowanie nag³ówka

4
Assets/Scripts/Effects/FightCamera.cs
View File

@@ -78,8 +78,8 @@ namespace Beyond
m_meleeManager.onDamageHit.RemoveListener(OnDamageHit);
m_meleeManager.onRecoilHit.RemoveListener(OnDamageHit);
}
if (m_postProcessType == PostProcessType.ON_COMBAT)
GameStateManager.Instance.m_OnStateChanged.AddListener(OnGameStateChange);
if (m_postProcessType == PostProcessType.ON_COMBAT && GameStateManager.Instance != null)
GameStateManager.Instance.m_OnStateChanged.RemoveListener(OnGameStateChange);
}
[Button]

22
Assets/Scripts/GameState/GameStateManager.cs
View File

@@ -10,6 +10,7 @@ using Sirenix.OdinInspector;
using SRF.Components;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.SceneManagement;
namespace Beyond
{
@@ -50,6 +51,7 @@ namespace Beyond
}
private static GameStateManager s_instance = null;
private static bool s_isDestroyed = false;
private float m_enemyDamageModifier = 1f;
public SaveData m_saveData = new();
private HashSet<string> m_CompabStates;
@@ -63,6 +65,11 @@ namespace Beyond
{
return s_instance;
}
else if (s_isDestroyed)
{
//don't recreate object after scene destorys it
return null;
}
else
{
var inst = FindObjectOfType<GameStateManager>();
@@ -80,7 +87,13 @@ namespace Beyond
return s_instance;
}
}
//public void OnSc
public override void OnDestroy()
{
base.OnDestroy();
s_isDestroyed = true;
// Debug.Log("Destroying GameStateManager");
}
//[ShowInInspector]
public Difficulty GameDifficulty => m_saveData.difficulty;
@@ -95,7 +108,7 @@ namespace Beyond
Destroy(this);
return;
}
SceneManager.sceneLoaded += SceneManager_sceneUnloaded;
s_instance = this;
//SetDifficulty(Difficulty.NORMAL);
m_CompabStates = new HashSet<string>();
@@ -109,6 +122,11 @@ namespace Beyond
m_IdleStates.Add("Flee");
m_IdleStates.Add("Patrol");
}
//reset isDestroyed, so object can be recreated for the next scene
private void SceneManager_sceneUnloaded(Scene arg0, LoadSceneMode arg1)
{
s_isDestroyed = false;
}
public enum State
{

6
Assets/Scripts/Healing/HealAnimator.cs
View File

@@ -23,7 +23,7 @@ namespace Beyond
return;
}
m_bendEffectMax = m_material.GetFloat("_BendEffect");
m_initialColor = m_material.GetColor("BaseColor");
m_initialColor = m_material.GetColor("_BaseColor");
}
protected override void Start()
@@ -43,7 +43,7 @@ namespace Beyond
{
base.Heal();
m_material.DOFloat(0f, "_BendEffect", m_healTime).SetEase(m_easeType);
m_material.DOColor(m_targetColor, "BaseColor", m_healTime);
m_material.DOColor(m_targetColor, "_BaseColor", m_healTime);
}
@@ -52,7 +52,7 @@ namespace Beyond
{
base.Unheal();
m_material.DOFloat(m_bendEffectMax, "_BendEffect", m_healTime);//.SetEase(Ease.InOutElastic);
m_material.DOColor(m_initialColor, "BaseColor", m_healTime);
m_material.DOColor(m_initialColor, "_BaseColor", m_healTime);
}
// Update is called once per frame

5
Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs
View File

@@ -9,7 +9,7 @@ namespace Beyond
{
public class bThirdPersonController : vThirdPersonController
{
public bool triggerDieBehaviour = false;
//public bool triggerDieBehaviour = false;
protected bool m_isDashing;
protected bool m_GodMode = false;
@@ -208,7 +208,8 @@ namespace Beyond
base.OnTriggerExit(other);
}
//animation event handling
void DrawWeaponLowLeft() { }
}
}

2
Assets/Scripts/PostProcessController.cs
View File

@@ -26,7 +26,7 @@ public class PostProcessController : MonoBehaviour
// Funkcja p<>ynnie w<><77>cza efekt post-processingu (od 0 do 1) w czasie ustawionym w duration
public void EnablePostProcessing()
{
if (volume != null)
if (volume != null && isActiveAndEnabled)
{
// Je<4A>li ju<6A> jest jaka<6B> coroutina w trakcie, zatrzymujemy j<>
if (currentCoroutine != null)

6
Assets/Scripts/Save/TreesSaver.cs
View File

@@ -23,6 +23,10 @@ namespace Beyond
if (i < treesStateData.Count)
{
treeControllers[i].health = treesStateData[i].health;
if (!treeControllers[i].isActiveAndEnabled && treesStateData[i].isEnabled)
{
treeControllers[i].gameObject.SetActiveUpHierarchy(true);
}
treeControllers[i].SetTreeStateInstant(treesStateData[i].treeState);
}
}
@@ -31,7 +35,7 @@ namespace Beyond
public override string RecordData()
{
List<TreeStateData> treesStateData = new();
treeControllers.ForEach(controller => treesStateData.Add(new TreeStateData(controller.currentTreeState, controller.health)));
treeControllers.ForEach(controller => treesStateData.Add(new TreeStateData(controller.currentTreeState, controller.health, controller.isActiveAndEnabled)));
TreesDataContainer treesDataContainer = new();
treesDataContainer.treesData = treesStateData;
Debug.Log(treesStateData.Count);

24
Assets/Scripts/Skills/TreeSpotController.cs
View File

@@ -34,11 +34,13 @@ namespace Beyond
{
public TreeState treeState;
public float health = 100;
public bool isEnabled = true;
public TreeStateData(TreeState treeState, float health)
public TreeStateData(TreeState treeState, float health, bool isEnabled)
{
this.treeState = treeState;
this.health = health;
this.isEnabled = isEnabled;
}
}
@@ -73,8 +75,8 @@ namespace Beyond
[SerializeField] private List<Renderer> woodRenderers, leavesRenderers;
private List<Material> woodMaterials = new(), leavesMaterials = new();
private string woodColorName = "BaseColor",
leavesColorName = "BaseColor";
private string woodColorName = "_BaseColor",
leavesColorName = "_BaseColor";
[SerializeField] public bItemListData items;
@@ -251,13 +253,17 @@ namespace Beyond
}
currentTreeState = treeState;
if (instant)
//TODO make sure that is enough to deal with saved state and disabled trees
if (gameObject.activeInHierarchy)
{
StartCoroutine(SetInstantTreeSizeCoroutine(animationValue, animationName, animLayer));
}
else
{
StartCoroutine(SetAnimationTreeCoroutine(animationValue, animationName, animLayer));
if (instant)
{
StartCoroutine(SetInstantTreeSizeCoroutine(animationValue, animationName, animLayer));
}
else
{
StartCoroutine(SetAnimationTreeCoroutine(animationValue, animationName, animLayer));
}
}
onStateChanged?.Invoke(currentTreeState);

2
Assets/Scripts/Triggers/ColliderEventTrigger.cs
View File

@@ -61,7 +61,7 @@ namespace Beyond
{
_reEnable = true;
events.onEnable?.Invoke();
Debug.Log("ColliderEventTrigger OnEnable");
//Debug.Log("ColliderEventTrigger OnEnable");
}
}

4
Assets/Scripts/UI/ConsumablesButtonController.cs
View File

@@ -61,7 +61,7 @@ namespace Beyond
{
return;
}
Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name);
//Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name);
//if current button type is gemstone, check if button should be active
m_currentWeapon = area.currentEquippedItem;
m_weaponPowerAttribute = m_currentWeapon.GetItemAttribute(bItemAttributes.Power);
@@ -76,7 +76,7 @@ namespace Beyond
{
return;
}
Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name);
//Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name);
if (m_currentWeaponGemable && weapon.GetItemAttribute(bItemAttributes.Power) !=null)
{
m_currentWeaponGemable = false;

2
Assets/Scripts/UI/UIImageFader.cs
View File

@@ -27,7 +27,7 @@ public class UIImageFader : MonoBehaviour
// Method to start the fade process
public void StartFade()
{
if (!isFading)
if (!isFading && gameObject.activeInHierarchy && enabled)
{
StartCoroutine(FadeRoutine());
}

3
Assets/Scripts/Utils/Editor/DebugLoggerInitializer.cs
View File

@@ -5,8 +5,9 @@ using UnityEngine;
namespace Beyond
{
[InitializeOnLoad]
public class DebugLoggerInitializer
public class DebugLoggerInitializer : MonoBehaviour
{
/*
static DebugLoggerInitializer()

11
Assets/Scripts/Utils/Extensions.cs
View File

@@ -32,7 +32,16 @@ namespace Beyond
component = g.GetComponentInChildren<T>();
return component;
}
*/
*/
public static void SetActiveUpHierarchy(this GameObject g, bool active)
{
g.SetActive(active);
if (g.transform.parent)
{
SetActiveUpHierarchy(g.transform.parent.gameObject, active);
}
}
public static T FindComponentDownHierarchy<T>(this GameObject g) where T : Component
{
T component;

4
Assets/Scripts/Video/VideoCutsceneController.cs
View File

@@ -41,7 +41,7 @@ namespace Beyond
public bool m_dontEnableUI = false;
private static VideoCutsceneController s_instance;
private static bool m_wasLoaded = false;
//private static bool m_wasLoaded = false;
private const string RESOURCE_PATH = "Prefabs/VideoCutsceneCanvas Variant";
public static VideoCutsceneController Instance
@@ -65,7 +65,7 @@ namespace Beyond
var resource = Resources.Load<GameObject>(RESOURCE_PATH);
if (resource)
{
m_wasLoaded = true;
//m_wasLoaded = true;
var gameobject = Instantiate<GameObject>(resource);
if (gameobject)
{

2
Assets/Shaders/BeyondLit.shadergraph
View File

@@ -7489,7 +7489,7 @@
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "BaseColor",
"m_DefaultReferenceName": "BaseColor",
"m_OverrideReferenceName": "",
"m_OverrideReferenceName": "_BaseColor",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",

2
Assets/Shaders/BeyondLitDoubleSided.shadergraph
View File

@@ -4594,7 +4594,7 @@
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "BaseColor",
"m_DefaultReferenceName": "BaseColor",
"m_OverrideReferenceName": "",
"m_OverrideReferenceName": "_BaseColor",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",

2
Assets/Shaders/BeyondLitFade.shadergraph
View File

@@ -5752,7 +5752,7 @@
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "BaseColor",
"m_DefaultReferenceName": "BaseColor",
"m_OverrideReferenceName": "",
"m_OverrideReferenceName": "_BaseColor",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",

2
Assets/Shaders/BeyondLitTransparent.shadergraph
View File

@@ -6914,7 +6914,7 @@
"m_DefaultRefNameVersion": 1,
"m_RefNameGeneratedByDisplayName": "BaseColor",
"m_DefaultReferenceName": "BaseColor",
"m_OverrideReferenceName": "",
"m_OverrideReferenceName": "_BaseColor",
"m_GeneratePropertyBlock": true,
"m_UseCustomSlotLabel": false,
"m_CustomSlotLabel": "",

5
Assets/ThirdParty/FluXY/CHANGELOG.txt vendored
View File

@@ -2,6 +2,11 @@
All notable changes to “FluXY - 2.5D fluid simulator” will be documented in this file.
## [1.4.1] - 2023-06-20
### Fixed
- "Blit material FluidSimulation uses dest texture as input" error in Unity 2022.
## [1.4] - 2022-11-28
### Added

4
Assets/ThirdParty/FluXY/Samples/Resources/Flipbooks/FireFlipbook.mat vendored
View File

@@ -41,11 +41,11 @@ Material:
- _FrameCount: 32
m_Floats:
- _Additiveness: 0.4
- _DetailAdvection: 0.582
- _DetailAdvection: 0.5
- _Duration: 2
- _Falloff: 0.2
- _Interpolation: 1
- _InvFade: 7.76
- _InvFade: 1
- _PlaybackOffset: 0
- _PlaybackSpeed: 1
m_Colors: []

29
Assets/ThirdParty/FluXY/Samples/Resources/Materials/Checker.mat vendored
View File

@@ -2,21 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Checker
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -65,28 +63,12 @@ Material:
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:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
@@ -112,7 +94,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &4867376423469122306
MonoBehaviour:
m_ObjectHideFlags: 11
@@ -125,4 +106,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 1

18
Assets/ThirdParty/FluXY/Samples/Resources/Materials/Fog.mat vendored
View File

@@ -2,16 +2,14 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fog
m_Shader: {fileID: 4800000, guid: ac39d2e3d512e4c7e9e69c2a398d0410, type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_DIRECTIONAL
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -26,7 +24,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Detail:
m_Texture: {fileID: 2800000, guid: dc9686736bbe940ecb6bad0b65c14d04, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -65,19 +63,18 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Additiveness: 0.231
- _Additiveness: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailAdvection: 0.723
- _DetailAdvection: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Falloff: 0.631
- _Falloff: 0.4
- _GlossMapScale: 1
- _Glossiness: 0.361
- _GlossyReflections: 1
- _InvFade: 1.07
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _MotionBlur: 1
@@ -91,4 +88,3 @@ Material:
m_Colors:
- _Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 0.7647059}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

29
Assets/ThirdParty/FluXY/Samples/Resources/Materials/Guy.mat vendored
View File

@@ -2,21 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Guy
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -65,28 +63,12 @@ Material:
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:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
@@ -112,7 +94,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &7453540739763953152
MonoBehaviour:
m_ObjectHideFlags: 11
@@ -125,4 +106,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 1

61
Assets/ThirdParty/FluXY/Samples/Resources/Materials/Piece.mat vendored
View File

@@ -1,43 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-9175737683816143566
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: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Piece
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -74,35 +55,11 @@ Material:
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:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -110,19 +67,11 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.49056596, g: 0.37749287, b: 0.27536485, a: 1}
- _Color: {r: 0.49056596, g: 0.37749285, b: 0.27536482, a: 1}
- _Color: {r: 0.49056602, g: 0.3774929, b: 0.27536488, 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: []

18
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP ToxicWaste.mat vendored
View File

@@ -15,7 +15,7 @@ MonoBehaviour:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -23,9 +23,7 @@ Material:
m_Name: URP ToxicWaste
m_Shader: {fileID: -6465566751694194690, guid: 34b9cd94cbb1d44549f707fb76ba499d,
type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_NONE
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -113,14 +111,14 @@ Material:
- Vector1_315F66DC: 1
- Vector1_32ADC857: 0.5
- Vector1_4AA7C398: 0
- Vector1_4E55263A: 0.853
- Vector1_4E55263A: 1
- Vector1_89BD7D39: 1
- Vector1_9E3307DE: 15
- Vector1_A6321E6B: 2.5
- Vector1_A668B339: 1
- Vector1_A6DF0022: 0.04
- Vector1_A8D33A48: -0.5
- Vector1_D30E0CD7: 0.306
- Vector1_D30E0CD7: 0.15
- Vector1_EA533925: 2
- _Additiveness: 0
- _BumpScale: 1
@@ -142,13 +140,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TileIndex: 1.25
- _TileIndex: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_3D2DB61D: {r: 0.3018868, g: 0.008354024, b: 0, a: 1}
- Color_9E182C8D: {r: 1, g: 0, b: 0, a: 1}
- Color_C1C04D3: {r: 0.4056604, g: 0, b: 0.051067144, a: 1}
- Color_3D2DB61D: {r: 0.6294432, g: 0.7169812, b: 0.23335709, a: 1}
- Color_9E182C8D: {r: 1, g: 1, b: 1, a: 1}
- Color_C1C04D3: {r: 0.7113185, g: 0.9150943, b: 0.17697577, a: 1}
- Color_DFEE58AE: {r: 0.7216981, g: 1, b: 0.98114526, a: 0.3882353}
- Vector2_73BFA364: {r: 0, g: 0, b: 0, a: 0}
- Vector2_7D6FBF77: {r: 4, g: 4, b: 0, a: 0}

35
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat vendored
View File

@@ -12,8 +12,7 @@ Material:
type: 3}
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_DIRECTIONAL
- _NOISE_ON
- _LIGHTSOURCE_POINT
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -99,17 +98,17 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 22.3
- Vector1_837DA489: 16
- Vector1_9808C570: 1
- Vector1_9E6B6241: 18
- Vector1_C4967509: 34.8
- Vector1_E676DA21: 26.42
- Vector1_F3B7B00E: 19.21
- Vector1_9E6B6241: 8
- Vector1_C4967509: 0.2
- Vector1_E676DA21: 8
- Vector1_F3B7B00E: 4
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
- _CastShadows: 1
- _Cull: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
@@ -119,7 +118,7 @@ Material:
- _LIGHTSOURCE: 1
- _Metallic: 0
- _Mode: 0
- _NOISE: 1
- _NOISE: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
@@ -132,19 +131,19 @@ Material:
- _ZTest: 8
- _ZWrite: 0
- _ZWriteControl: 0
- _densityThreshold: 0.953
- _noiseAdvectSpeed: 5.21
- _densityThreshold: 0.001
- _noiseAdvectSpeed: 1
- _noiseAdvectTime: 0.5
- _noisePow: 4.74
- _noiseScale: 22.2
- _shadowThreshold: 0.129
- _volumeExtrusion: 0.39
- _volumeFalloff: 1.222
- _noisePow: 3
- _noiseScale: 20
- _shadowThreshold: 0.1
- _volumeExtrusion: 1
- _volumeFalloff: 0.15
- _volumeOffset: 1
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.12996809, g: 0.7169812, b: 0.064257726, a: 1}
- Color_BE47E8B5: {r: 0.0018689941, g: 0.05660379, b: 0.005924961, a: 0.972549}
- Color_753F6498: {r: 0.16700785, g: 0.22076505, b: 0.254717, a: 1}
- Color_BE47E8B5: {r: 0.754717, g: 0.29547882, b: 0.75103265, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

39
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricLogo.mat vendored
View File

@@ -11,9 +11,8 @@ Material:
m_Shader: {fileID: -6465566751694194690, guid: ef381005b8a834c9fa2733d96c543d31,
type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_DIRECTIONAL
- _NOISE_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -99,14 +98,14 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 20.4
- Vector1_837DA489: 12
- Vector1_9808C570: 1
- Vector1_9E6B6241: 37
- Vector1_C4967509: -3.17
- Vector1_E676DA21: 21.04
- Vector1_F3B7B00E: 43.12
- _AlphaClip: 1
- _Blend: 0
- Vector1_9E6B6241: 12
- Vector1_C4967509: 0.5
- Vector1_E676DA21: 20
- Vector1_F3B7B00E: 2
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
- _CastShadows: 1
- _Cull: 2
@@ -119,32 +118,32 @@ Material:
- _LIGHTSOURCE: 1
- _Metallic: 0
- _Mode: 0
- _NOISE: 1
- _NOISE: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlend: 1
- _Surface: 1
- _UVSec: 0
- _ZTest: 8
- _ZWrite: 0
- _ZWriteControl: 0
- _densityThreshold: 0.799
- _noiseAdvectSpeed: -0.16
- _densityThreshold: 0.01
- _noiseAdvectSpeed: 0.5
- _noiseAdvectTime: 1
- _noisePow: 1.3
- _noisePow: 3
- _noiseScale: 4
- _shadowThreshold: 0.309
- _volumeExtrusion: 0.768
- _volumeFalloff: 0.57
- _volumeOffset: 0.057
- _shadowThreshold: 0.1
- _volumeExtrusion: 0.5
- _volumeFalloff: 0.5
- _volumeOffset: 0.5
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.46226418, g: 0.18543416, b: 0.0021804967, a: 1}
- Color_BE47E8B5: {r: 0.4245283, g: 0.17613408, b: 0, a: 0.972549}
- Color_753F6498: {r: 0.33922213, g: 0.6011469, b: 0.7264151, a: 1}
- Color_BE47E8B5: {r: 0.5754717, g: 0.45293194, b: 0.36102706, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

12
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricSmoke.mat vendored
View File

@@ -12,7 +12,7 @@ Material:
type: 3}
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_NONE
- _LIGHTSOURCE_POINT
- _NOISE_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
@@ -99,12 +99,12 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 9.9
- Vector1_837DA489: 12
- Vector1_9808C570: 1
- Vector1_9E6B6241: 38.9
- Vector1_9E6B6241: 8
- Vector1_C4967509: 4
- Vector1_E676DA21: 30
- Vector1_F3B7B00E: 4.23
- Vector1_F3B7B00E: 4
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
@@ -143,8 +143,8 @@ Material:
- _volumeOffset: 0.5
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.46070668, g: 0.47495696, b: 0.4811321, a: 1}
- Color_BE47E8B5: {r: 0.5849056, g: 0.2683053, b: 0, a: 0.972549}
- Color_753F6498: {r: 0.13527946, g: 0.25190458, b: 0.3018868, a: 1}
- Color_BE47E8B5: {r: 0.7264151, g: 0.4958822, b: 0.29810432, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

38
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP Water.mat vendored
View File

@@ -15,7 +15,7 @@ MonoBehaviour:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -23,11 +23,9 @@ Material:
m_Name: URP Water
m_Shader: {fileID: -6465566751694194690, guid: 1940d71d1af574d38b552638ff25c9ad,
type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_NONE
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
@@ -101,20 +99,20 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Vector1_2934D119: 20.45
- Vector1_2934D119: 0.5
- Vector1_315F66DC: 1
- Vector1_32ADC857: 26.3
- Vector1_4AA7C398: 0.279
- Vector1_4F638F23: -0.5
- Vector1_32ADC857: 1
- Vector1_4AA7C398: 0
- Vector1_4F638F23: -0.25
- Vector1_5F6501F5: 0
- Vector1_74E26674: 0.5
- Vector1_89BD7D39: 0.86
- Vector1_8F171F43: 0.2
- Vector1_A6321E6B: 1.17
- Vector1_A668B339: 0.294
- Vector1_A6DF0022: 0.25
- Vector1_D183151F: 0.7
- Vector1_F22C9906: 0.57
- Vector1_89BD7D39: 1
- Vector1_8F171F43: 0.1
- Vector1_A6321E6B: 3
- Vector1_A668B339: 0.5
- Vector1_A6DF0022: 0.04
- Vector1_D183151F: 4
- Vector1_F22C9906: 2
- _Additiveness: 0
- _BumpScale: 1
- _Cutoff: 0.5
@@ -135,13 +133,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TileIndex: 1.09
- _TileIndex: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_709ED842: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 0.6862745}
- Color_9E182C8D: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 0.8784314}
- Color_DFEE58AE: {r: 1, g: 1, b: 1, a: 1}
- Color_709ED842: {r: 1, g: 1, b: 1, a: 0.9058824}
- Color_9E182C8D: {r: 0.23905303, g: 0.5591888, b: 0.6415094, a: 0.8352941}
- Color_DFEE58AE: {r: 0.6045301, g: 0.8962264, b: 0.82638365, a: 0.3882353}
- Vector2_63614596: {r: 0.02, g: -0.1, b: 0, a: 0}
- Vector2_78FB6B63: {r: 5, g: 5, b: 0, a: 0}
- Vector2_7E649864: {r: 0, g: 0, b: 0, a: 0}

323
Assets/ThirdParty/FluXY/Samples/Resources/Shaders/URP/FluxyVolumetric.shadergraph vendored
View File

@@ -261,6 +261,15 @@
},
{
"m_Id": "c9b079fd494f4c8a99822b4a52a259b8"
},
{
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
{
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
{
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
}
],
"m_GroupDatas": [
@@ -332,20 +341,6 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "2a5ca6696c530e8c874719b853083a48"
},
"m_SlotId": 1
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -360,6 +355,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -402,6 +411,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -696,6 +719,20 @@
"m_SlotId": 4
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -1929,6 +1966,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "1c8a8ac7ae0941b3991c2fe6a11379a2",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"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_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.ShaderKeyword",
@@ -2224,6 +2285,44 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ViewVectorNode",
"m_ObjectId": "30d04585da65453cbe3485a7156cd296",
"m_Group": {
"m_Id": ""
},
"m_Name": "View Vector",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2002.999755859375,
"y": 33.00000762939453,
"width": 206.0,
"height": 131.0
}
},
"m_Slots": [
{
"m_Id": "5df6c952da824e288e634fe81979c48a"
},
{
"m_Id": "81dcfd920a3d46c8b29dceb767fd69d0"
}
],
"synonyms": [
"eye vector"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
@@ -2818,6 +2917,48 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.AddNode",
"m_ObjectId": "4fad8de703eb41b583e500027c9bdfb6",
"m_Group": {
"m_Id": ""
},
"m_Name": "Add",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -1630.0,
"y": -82.00000762939453,
"width": 130.0,
"height": 118.00001525878906
}
},
"m_Slots": [
{
"m_Id": "1c8a8ac7ae0941b3991c2fe6a11379a2"
},
{
"m_Id": "5e65d8acebf044e08eda4eaaab4c9668"
},
{
"m_Id": "de9e74eaad8f4bfbbfc9d0352a617b94"
}
],
"synonyms": [
"addition",
"sum",
"plus"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3176,6 +3317,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
"m_ObjectId": "5df6c952da824e288e634fe81979c48a",
"m_Id": 3,
"m_DisplayName": "World Space Position",
"m_SlotType": 0,
"m_Hidden": true,
"m_ShaderOutputName": "WorldSpacePosition",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 2
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -3218,6 +3383,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "5e65d8acebf044e08eda4eaaab4c9668",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"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_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3469,6 +3658,29 @@
]
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "72e0664908974c2cb8f362df4ed9648b",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -3977,6 +4189,29 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "81dcfd920a3d46c8b29dceb767fd69d0",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -5161,6 +5396,42 @@
}
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.PositionNode",
"m_ObjectId": "ab1a481cdf564504b837ed7877f6663f",
"m_Group": {
"m_Id": ""
},
"m_Name": "Position",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2003.0,
"y": -117.0,
"width": 206.0,
"height": 131.00001525878907
}
},
"m_Slots": [
{
"m_Id": "72e0664908974c2cb8f362df4ed9648b"
}
],
"synonyms": [
"location"
],
"m_Precision": 1,
"m_PreviewExpanded": false,
"m_PreviewMode": 2,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0,
"m_PositionSource": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -6767,6 +7038,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "de9e74eaad8f4bfbbfc9d0352a617b94",
"m_Id": 2,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"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_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",

938
Assets/ThirdParty/FluXY/Samples/URP VolumetricSmokeRing.unity vendored
View File

File diff suppressed because it is too large Load Diff

2
Assets/ThirdParty/FluXY/Scripts/FluxySolver.cs vendored
View File

@@ -400,6 +400,8 @@ namespace Fluxy
}
}
simulationMaterial.SetTexture("_MainTex", null);
RenderTexture.active = old;
}

2
Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs vendored
View File

@@ -16,7 +16,7 @@ namespace Invector.vCharacterController
public const float walkSpeed = 0.5f;
public const float runningSpeed = 1f;
public const float sprintSpeed = 1.5f;
private bool triggerDieBehaviour;
public bool triggerDieBehaviour;
public Vector3 lastCharacterPosition { get; protected set; }
#endregion

9
Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Animations/Melee_CombatSet.fbx.meta vendored
View File

@@ -1118,14 +1118,7 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0.4514425
functionName: NewEvent
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}