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

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; } }