Fix infinite loading
This commit is contained in:
parent
5c617324ae
commit
5a629cb66a
@ -39,7 +39,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 20
|
value: 28.5
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -60,7 +60,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0
|
value: -33
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -138,7 +138,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 20
|
value: 28.5
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -159,7 +159,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0
|
value: -33
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -78,7 +78,7 @@ Material:
|
|||||||
- _Mode: 0
|
- _Mode: 0
|
||||||
- _OcclusionStrength: 1
|
- _OcclusionStrength: 1
|
||||||
- _Parallax: 0.02
|
- _Parallax: 0.02
|
||||||
- _Rotation: 368.0398
|
- _Rotation: 14.949908
|
||||||
- _SmoothnessTextureChannel: 0
|
- _SmoothnessTextureChannel: 0
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 1
|
||||||
- _SrcBlend: 1
|
- _SrcBlend: 1
|
||||||
|
2293764
Assets/Scenes/0-Splash.unity
2293764
Assets/Scenes/0-Splash.unity
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,6 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using UnityEditor;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class AbilityIndexer : MonoBehaviour
|
public class AbilityIndexer : MonoBehaviour
|
||||||
@ -45,15 +46,36 @@ public class AbilityIndexer : MonoBehaviour
|
|||||||
DontDestroyOnLoad(gameObject);
|
DontDestroyOnLoad(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnValidate()
|
[ContextMenu("Refresh List")]
|
||||||
|
public void RefrehsList()
|
||||||
{
|
{
|
||||||
if (Abilities == null) return;
|
if (Abilities == null) return;
|
||||||
|
|
||||||
foreach (BaseAbility baseAbility in Resources.FindObjectsOfTypeAll<BaseAbility>())
|
Abilities.Clear();
|
||||||
{
|
|
||||||
if (Abilities.Contains(baseAbility)) continue;
|
|
||||||
|
|
||||||
Abilities.Add(baseAbility);
|
foreach (BaseAbility ability in Resources.LoadAll<BaseAbility>("Abilities"))
|
||||||
|
{
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
if (!AssetDatabase.Contains(ability))
|
||||||
|
continue; // Skip if not a real asset
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!Abilities.Contains(ability))
|
||||||
|
{
|
||||||
|
Abilities.Add(ability);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* private void OnValidate()
|
||||||
|
{
|
||||||
|
if (Abilities == null) return;
|
||||||
|
|
||||||
|
foreach (BaseAbility baseAbility in Resources.FindObjectsOfTypeAll<BaseAbility>())
|
||||||
|
{
|
||||||
|
if (Abilities.Contains(baseAbility)) continue;
|
||||||
|
|
||||||
|
Abilities.Add(baseAbility);
|
||||||
|
}
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using UnityEditor;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class StatusEffectIndexer : MonoBehaviour
|
public class StatusEffectIndexer : MonoBehaviour
|
||||||
@ -45,7 +46,28 @@ public class StatusEffectIndexer : MonoBehaviour
|
|||||||
DontDestroyOnLoad(gameObject);
|
DontDestroyOnLoad(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnValidate()
|
[ContextMenu("Refresh List")]
|
||||||
|
public void RefrehsList()
|
||||||
|
{
|
||||||
|
if (StatusEffects == null) return;
|
||||||
|
|
||||||
|
StatusEffects.Clear();
|
||||||
|
|
||||||
|
foreach (StatusEffect statusEffect in Resources.LoadAll<StatusEffect>("Items"))
|
||||||
|
{
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
if (!AssetDatabase.Contains(statusEffect))
|
||||||
|
continue; // Skip if not a real asset
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!StatusEffects.Contains(statusEffect))
|
||||||
|
{
|
||||||
|
StatusEffects.Add(statusEffect);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*private void OnValidate()
|
||||||
{
|
{
|
||||||
if (StatusEffects == null) return;
|
if (StatusEffects == null) return;
|
||||||
|
|
||||||
@ -55,5 +77,5 @@ public class StatusEffectIndexer : MonoBehaviour
|
|||||||
|
|
||||||
StatusEffects.Add(statusEffect);
|
StatusEffects.Add(statusEffect);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using Kryz.CharacterStats.Examples;
|
using Kryz.CharacterStats.Examples;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using UnityEditor;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class ItemIndexer : MonoBehaviour
|
public class ItemIndexer : MonoBehaviour
|
||||||
@ -34,7 +35,28 @@ public class ItemIndexer : MonoBehaviour
|
|||||||
DontDestroyOnLoad(gameObject);
|
DontDestroyOnLoad(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnValidate()
|
[ContextMenu("Refresh List")]
|
||||||
|
public void RefrehsList()
|
||||||
|
{
|
||||||
|
if (Items == null) return;
|
||||||
|
|
||||||
|
Items.Clear();
|
||||||
|
|
||||||
|
foreach (Item item in Resources.LoadAll<Item>("Items"))
|
||||||
|
{
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
if (!AssetDatabase.Contains(item))
|
||||||
|
continue; // Skip if not a real asset
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!Items.Contains(item))
|
||||||
|
{
|
||||||
|
Items.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*private void OnValidate()
|
||||||
{
|
{
|
||||||
if (Items == null) return;
|
if (Items == null) return;
|
||||||
|
|
||||||
@ -44,5 +66,5 @@ public class ItemIndexer : MonoBehaviour
|
|||||||
|
|
||||||
Items.Add(item);
|
Items.Add(item);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@ using UnityEngine;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using UnityEngine.AI;
|
using UnityEngine.AI;
|
||||||
|
|
||||||
[ExecuteInEditMode]
|
|
||||||
public class MinimapMesh : MonoBehaviour
|
public class MinimapMesh : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private GameEvent onMinimapGenerated;
|
[SerializeField] private GameEvent onMinimapGenerated;
|
||||||
@ -42,11 +41,12 @@ public class MinimapMesh : MonoBehaviour
|
|||||||
triangles = NavMesh.CalculateTriangulation();
|
triangles = NavMesh.CalculateTriangulation();
|
||||||
|
|
||||||
// Create new mesh with data
|
// Create new mesh with data
|
||||||
if (mesh == null)
|
|
||||||
mesh = new Mesh();
|
|
||||||
|
|
||||||
mesh.vertices = triangles.vertices;
|
mesh = new Mesh
|
||||||
mesh.triangles = triangles.indices;
|
{
|
||||||
|
vertices = triangles.vertices,
|
||||||
|
triangles = triangles.indices
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// set to mesh filter
|
// set to mesh filter
|
||||||
|
@ -2,10 +2,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.2d.tilemap": "1.0.0",
|
"com.unity.2d.tilemap": "1.0.0",
|
||||||
"com.unity.ads": "4.4.2",
|
|
||||||
"com.unity.ai.navigation": "1.1.5",
|
"com.unity.ai.navigation": "1.1.5",
|
||||||
"com.unity.analytics": "3.8.1",
|
"com.unity.analytics": "3.8.1",
|
||||||
"com.unity.collab-proxy": "2.4.3",
|
|
||||||
"com.unity.feature.development": "1.0.1",
|
"com.unity.feature.development": "1.0.1",
|
||||||
"com.unity.ide.rider": "3.0.31",
|
"com.unity.ide.rider": "3.0.31",
|
||||||
"com.unity.ide.visualstudio": "2.0.22",
|
"com.unity.ide.visualstudio": "2.0.22",
|
||||||
|
@ -15,15 +15,6 @@
|
|||||||
"com.unity.modules.uielements": "1.0.0"
|
"com.unity.modules.uielements": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.ads": {
|
|
||||||
"version": "4.4.2",
|
|
||||||
"depth": 0,
|
|
||||||
"source": "registry",
|
|
||||||
"dependencies": {
|
|
||||||
"com.unity.ugui": "1.0.0"
|
|
||||||
},
|
|
||||||
"url": "https://packages.unity.com"
|
|
||||||
},
|
|
||||||
"com.unity.ai.navigation": {
|
"com.unity.ai.navigation": {
|
||||||
"version": "1.1.5",
|
"version": "1.1.5",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@ -43,13 +34,6 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.collab-proxy": {
|
|
||||||
"version": "2.4.3",
|
|
||||||
"depth": 0,
|
|
||||||
"source": "registry",
|
|
||||||
"dependencies": {},
|
|
||||||
"url": "https://packages.unity.com"
|
|
||||||
},
|
|
||||||
"com.unity.editorcoroutines": {
|
"com.unity.editorcoroutines": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user