mirror of
https://gitgud.io/AbstractConcept/rimworld-animation-studio.git
synced 2024-08-15 00:43:27 +00:00
Added guard for 'None' SoundDef option
This commit is contained in:
parent
23f8d8cfec
commit
b15c046738
68 changed files with 86 additions and 99 deletions
Binary file not shown.
|
@ -21,6 +21,9 @@ namespace RimWorldAnimationStudio
|
|||
|
||||
public void PlaySound(string soundDefName)
|
||||
{
|
||||
if (string.IsNullOrEmpty(soundDefName) || soundDefName.ToLower() == "none")
|
||||
{ return; }
|
||||
|
||||
SoundDef soundDef = SoundDefs.GetNamed(soundDefName);
|
||||
|
||||
if (soundDef == null)
|
||||
|
|
|
@ -19,7 +19,7 @@ namespace RimWorldAnimationStudio
|
|||
PawnKeyframe keyframe = Workspace.GetCurrentOrPreviousKeyframe(Workspace.ActorID);
|
||||
|
||||
if (keyframe != null)
|
||||
{ text.text = keyframe.SoundEffect == null || keyframe.SoundEffect == "" ? "None" : keyframe.SoundEffect; }
|
||||
{ text.text = string.IsNullOrEmpty(keyframe.SoundEffect) ? "None" : keyframe.SoundEffect; }
|
||||
|
||||
else
|
||||
{ text.text = "None"; }
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Library/Artifacts/26/264e363c3cac710fd2031e3cef9a51aa
Normal file
BIN
Library/Artifacts/26/264e363c3cac710fd2031e3cef9a51aa
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -21,7 +21,7 @@ MonoBehaviour:
|
|||
m_ShowMode: 4
|
||||
m_Title:
|
||||
m_RootView: {fileID: 2}
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
--- !u!114 &2
|
||||
|
@ -46,7 +46,7 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 1920
|
||||
height: 997
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
|
@ -115,7 +115,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 677, y: 492}
|
||||
m_MaxSize: {x: 14001, y: 14042}
|
||||
vertical: 0
|
||||
controlID: 3533
|
||||
controlID: 41
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -140,7 +140,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 402, y: 492}
|
||||
m_MaxSize: {x: 10001, y: 14042}
|
||||
vertical: 1
|
||||
controlID: 3534
|
||||
controlID: 42
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -165,7 +165,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 402, y: 221}
|
||||
m_MaxSize: {x: 8002, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 3535
|
||||
controlID: 43
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -324,10 +324,10 @@ MonoBehaviour:
|
|||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -960
|
||||
m_HBaseRangeMax: 960
|
||||
m_VBaseRangeMin: -453.5
|
||||
m_VBaseRangeMax: 453.5
|
||||
m_HBaseRangeMin: -537.5
|
||||
m_HBaseRangeMax: 537.5
|
||||
m_VBaseRangeMin: -325
|
||||
m_VBaseRangeMax: 325
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
|
@ -344,24 +344,24 @@ MonoBehaviour:
|
|||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 1920
|
||||
height: 907
|
||||
y: 0
|
||||
width: 1075
|
||||
height: 650
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 960, y: 453.5}
|
||||
m_Translation: {x: 537.5, y: 325}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -960
|
||||
y: -453.5
|
||||
width: 1920
|
||||
height: 907
|
||||
x: -537.5
|
||||
y: -325
|
||||
width: 1075
|
||||
height: 650
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 1920, y: 928}
|
||||
m_LastWindowPixelSize: {x: 1075, y: 650}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
|
@ -398,7 +398,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 74a0fcff88a0fcff2ea1fcff4cfbffffbc420000
|
||||
m_ExpandedIDs: 8af5ffff9ef5ffff44f6ffff4afbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
@ -1115,9 +1115,9 @@ MonoBehaviour:
|
|||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 143}
|
||||
m_SelectedIDs: 4e4e0000
|
||||
m_LastClickedID: 20046
|
||||
m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b
|
||||
m_SelectedIDs: 4c4e0000
|
||||
m_LastClickedID: 20044
|
||||
m_ExpandedIDs: 00000000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e000000ca9a3b
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
@ -1145,7 +1145,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b
|
||||
m_ExpandedIDs: 00000000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -130,129 +130,129 @@ ScriptsOnlyBuild:
|
|||
- Class: 114
|
||||
Script: {instanceID: 11264}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11270}
|
||||
Script: {instanceID: 11272}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11294}
|
||||
Script: {instanceID: 11296}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11452}
|
||||
Script: {instanceID: 11454}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11506}
|
||||
Script: {instanceID: 11508}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11582}
|
||||
Script: {instanceID: 11584}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11594}
|
||||
Script: {instanceID: 11596}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11608}
|
||||
Script: {instanceID: 11610}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11662}
|
||||
Script: {instanceID: 11664}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11736}
|
||||
Script: {instanceID: 11738}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11762}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11766}
|
||||
Script: {instanceID: 11764}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11768}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11776}
|
||||
Script: {instanceID: 11770}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11786}
|
||||
Script: {instanceID: 11778}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11808}
|
||||
Script: {instanceID: 11788}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11872}
|
||||
Script: {instanceID: 11810}
|
||||
- Class: 114
|
||||
Script: {instanceID: 11878}
|
||||
Script: {instanceID: 11874}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12146}
|
||||
Script: {instanceID: 11880}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12182}
|
||||
Script: {instanceID: 12148}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12326}
|
||||
Script: {instanceID: 12184}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12350}
|
||||
Script: {instanceID: 12328}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12366}
|
||||
Script: {instanceID: 12352}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12436}
|
||||
Script: {instanceID: 12368}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12616}
|
||||
Script: {instanceID: 12438}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12640}
|
||||
Script: {instanceID: 12618}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12758}
|
||||
Script: {instanceID: 12642}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12882}
|
||||
Script: {instanceID: 12760}
|
||||
- Class: 114
|
||||
Script: {instanceID: 12926}
|
||||
Script: {instanceID: 12884}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13176}
|
||||
Script: {instanceID: 12928}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13202}
|
||||
Script: {instanceID: 13178}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13242}
|
||||
Script: {instanceID: 13204}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13252}
|
||||
Script: {instanceID: 13244}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13262}
|
||||
Script: {instanceID: 13254}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13272}
|
||||
Script: {instanceID: 13264}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13374}
|
||||
Script: {instanceID: 13274}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13392}
|
||||
Script: {instanceID: 13376}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13394}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13428}
|
||||
Script: {instanceID: 13396}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13468}
|
||||
Script: {instanceID: 13430}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13484}
|
||||
Script: {instanceID: 13470}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13500}
|
||||
Script: {instanceID: 13486}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13512}
|
||||
Script: {instanceID: 13502}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13516}
|
||||
Script: {instanceID: 13514}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13552}
|
||||
Script: {instanceID: 13518}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13684}
|
||||
Script: {instanceID: 13554}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13710}
|
||||
Script: {instanceID: 13686}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13842}
|
||||
Script: {instanceID: 13712}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13916}
|
||||
Script: {instanceID: 13844}
|
||||
- Class: 114
|
||||
Script: {instanceID: 13920}
|
||||
Script: {instanceID: 13918}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14048}
|
||||
Script: {instanceID: 13922}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14112}
|
||||
Script: {instanceID: 14050}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14208}
|
||||
Script: {instanceID: 14114}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14358}
|
||||
Script: {instanceID: 14210}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14506}
|
||||
Script: {instanceID: 14360}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14532}
|
||||
Script: {instanceID: 14508}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14534}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14566}
|
||||
Script: {instanceID: 14536}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14588}
|
||||
Script: {instanceID: 14568}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14590}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14630}
|
||||
Script: {instanceID: 14592}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14636}
|
||||
Script: {instanceID: 14632}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14678}
|
||||
Script: {instanceID: 14638}
|
||||
- Class: 114
|
||||
Script: {instanceID: 14680}
|
||||
- Class: 115
|
||||
Script: {instanceID: 0}
|
||||
- Class: 128
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
Loading…
Reference in a new issue