Merge pull request #8 from FireDragonGameStudio/hotfix_inventory_load…

…_visibility fixed item visibility on inventory load; small cleanup
FireDragonGameStudio · Apr 14, 2023 · b239b35 · b239b35
2 parents faaa157 + b7fed1f
commit b239b35
Show file tree

Hide file tree

Showing 10 changed files with 1,697 additions and 2,716 deletions.
diff --git a/Assets/FmvMaker/Scripts/Graph/Nodes/FmvLoadInventory.cs b/Assets/FmvMaker/Scripts/Graph/Nodes/FmvLoadInventory.cs
@@ -44,9 +44,10 @@ private void LoadInventoryItems() {
                     targetObject.transform.SetParent(fmvInventoryElementsPanel.transform);
                     targetObject.transform.localScale = Vector3.one;
 
-                    // get clickable facade
+                    // get clickable facade and make sure it's visible
                     FmvClickableFacade itemFacade = targetObject.GetComponent<FmvClickableFacade>();
                     itemFacade.SetItemData(gameDataEntry.GetItemModel());
+                    itemFacade.ChangeVisibility(1);
                     itemFacade.OnItemClicked.RemoveAllListeners();
                     itemFacade.OnItemClicked.AddListener(ClickInventoryItem);
 

diff --git a/Assets/FmvMaker/Scripts/Graph/Provider/FmvGraphVideos.cs b/Assets/FmvMaker/Scripts/Graph/Provider/FmvGraphVideos.cs
@@ -160,15 +160,13 @@ private void ToggleAllAvailableClickables() {
                 for (int i = 0; i < clickables.Length; i++) {
                     clickables[i].ChangeVisibility(1);
                 }
-                //clickableObjects.ToggleFindableItems(true);
             }
 
             if (Input.GetKeyUp(ShowAllAvailableClickablesKey)) {
                 FmvClickableFacade[] clickables = FmvSceneVariables.VideoElementsPanel.GetComponentsInChildren<FmvClickableFacade>();
                 for (int i = 0; i < clickables.Length; i++) {
                     clickables[i].ChangeVisibility(0);
                 }
-                //clickableObjects.ToggleFindableItems(false);
             }
         }
     }

diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log
diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log
diff --git a/Logs/AssetImportWorker1-prev.log b/Logs/AssetImportWorker1-prev.log
diff --git a/Logs/AssetImportWorker1.log b/Logs/AssetImportWorker1.log
diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log
@@ -1,3 +1,6 @@
 Base path: 'C:/Data/UnityInstallations/2021.3.16f1/Editor/Data', plugins path 'C:/Data/UnityInstallations/2021.3.16f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
+Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
+
+Quitting shader compiler process
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,3 +1,4 @@
 Base path: 'C:/Data/UnityInstallations/2021.3.16f1/Editor/Data', plugins path 'C:/Data/UnityInstallations/2021.3.16f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
+Cmd: shutdown
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -12,10 +12,10 @@ EditorUserSettings:
       value: 525452570354580d555c0f2044720f444f154e7a7e2a73687f71456ab0e4366e
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5b50560753530f090f58557641200a4412161b7e7c7022652e794c66b7b9373e
+      value: 5b55560252565b0f5c0b542444755944414f482c782a75327d2d4d66b7b4356e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5b55560252565b0f5c0b542444755944414f482c782a75327d2d4d66b7b4356e
+      value: 5b50560753530f090f58557641200a4412161b7e7c7022652e794c66b7b9373e
       flags: 0
     RecentlyUsedScenePath-0:
       value: 224247031146467d001821231b264d5f25141d24293b69142428113ce5c6392eacf238e0f323

diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
@@ -120,7 +120,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 226
+  controlID: 21
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -140,12 +140,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1062
+    width: 1059
     height: 987
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 92
+  controlID: 129
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,7 +163,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1062
+    width: 1059
     height: 656
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -192,7 +192,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 656
-    width: 1062
+    width: 1059
     height: 331
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
@@ -219,14 +219,14 @@ MonoBehaviour:
   - {fileID: 11}
   m_Position:
     serializedVersion: 2
-    x: 1062
+    x: 1059
     y: 0
-    width: 418
+    width: 419
     height: 987
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 18
+  controlID: 22
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -244,7 +244,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 418
+    width: 419
     height: 434
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -270,7 +270,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 434
-    width: 418
+    width: 419
     height: 553
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -294,9 +294,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1480
+    x: 1478
     y: 0
-    width: 356
+    width: 358
     height: 987
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -379,23 +379,23 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Script Graph
+    m_Text: State Graph
     m_Image: {fileID: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 84
     y: 73
-    width: 1061
+    width: 1058
     height: 635
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
   _data:
-    _json: '{"locked":false,"graphInspectorEnabled":true,"variablesInspectorEnabled":true,"isActive":false,"referenceData":{"rootObjectInstanceID":25270,"parentElementGuids":["d94c1dbe-be4f-461b-98ee-01fc8d14bb0c"]},"sidebars":{"left":{"size":335.0,"scroll":{"x":0.0,"y":0.0}},"right":{"size":335.0,"scroll":{"x":0.0,"y":0.0}},"panels":[{"height":555.0,"anchor":"Left","order":0,"controlHint":{"$content":"Unity.VisualScripting.GraphInspectorPanel","$type":"System.RuntimeType"},"scroll":{"x":0.0,"y":0.0}},{"height":200.0,"anchor":"Left","order":0,"controlHint":{"$content":"Unity.VisualScripting.VariablesPanel","$type":"System.RuntimeType"},"scroll":{"x":0.0,"y":0.0}}]},"reliablePosition":{"xMin":84.0,"yMin":73.0,"xMax":1145.0,"yMax":708.0},"saveChangesMessage":"Unity.VisualScripting.GraphWindow
-      has unsaved changes.","m_MinSize":{"x":100.0,"y":100.0},"m_MaxSize":{"x":4000.0,"y":4000.0},"m_TitleContent":{"m_Text":"Script
-      Graph","m_Image":null,"m_Tooltip":""},"m_Pos":{"xMin":84.0,"yMin":73.0,"xMax":1145.0,"yMax":708.0},"m_ViewDataDictionary":null,"m_OverlayCanvas":{"destinationMarker":null,"m_LastAppliedPresetName":"Default","m_SaveData":[]}}'
+    _json: '{"locked":false,"graphInspectorEnabled":true,"variablesInspectorEnabled":true,"isActive":false,"referenceData":{"rootObjectInstanceID":23368,"parentElementGuids":[]},"sidebars":{"left":{"size":335.0,"scroll":{"x":0.0,"y":0.0}},"right":{"size":335.0,"scroll":{"x":0.0,"y":0.0}},"panels":[{"height":555.0,"anchor":"Left","order":0,"controlHint":{"$content":"Unity.VisualScripting.GraphInspectorPanel","$type":"System.RuntimeType"},"scroll":{"x":0.0,"y":0.0}},{"height":200.0,"anchor":"Left","order":0,"controlHint":{"$content":"Unity.VisualScripting.VariablesPanel","$type":"System.RuntimeType"},"scroll":{"x":0.0,"y":0.0}}]},"reliablePosition":{"xMin":84.0,"yMin":73.0,"xMax":1142.0,"yMax":708.0},"saveChangesMessage":"Unity.VisualScripting.GraphWindow
+      has unsaved changes.","m_MinSize":{"x":100.0,"y":100.0},"m_MaxSize":{"x":4000.0,"y":4000.0},"m_TitleContent":{"m_Text":"State
+      Graph","m_Image":null,"m_Tooltip":""},"m_Pos":{"xMin":84.0,"yMin":73.0,"xMax":1142.0,"yMax":708.0},"m_ViewDataDictionary":null,"m_OverlayCanvas":{"destinationMarker":null,"m_LastAppliedPresetName":"Default","m_SaveData":[]}}'
     _objectReferences: []
 --- !u!114 &16
 MonoBehaviour:
@@ -420,7 +420,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 84
     y: 73
-    width: 1061
+    width: 1058
     height: 635
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -432,7 +432,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1061, y: 614}
+  m_TargetSize: {x: 1058, y: 614}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -447,8 +447,8 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -530.5
-    m_HBaseRangeMax: 530.5
+    m_HBaseRangeMin: -529
+    m_HBaseRangeMax: 529
     m_VBaseRangeMin: -307
     m_VBaseRangeMax: 307
     m_HAllowExceedBaseRangeMin: 1
@@ -468,23 +468,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1061
+      width: 1058
       height: 614
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 530.5, y: 307}
+    m_Translation: {x: 529, y: 307}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -530.5
+      x: -529
       y: -307
-      width: 1061
+      width: 1058
       height: 614
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1061, y: 635}
+  m_LastWindowPixelSize: {x: 1058, y: 635}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000100000100
@@ -920,7 +920,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 84
     y: 729
-    width: 1061
+    width: 1058
     height: 310
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -979,9 +979,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1146
+    x: 1143
     y: 73
-    width: 416
+    width: 417
     height: 413
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -990,9 +990,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 8c650000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 8ce0ffff14faffff285b00003e5b0000765b00007a5b0000845b0000e6620000f0620000
+      m_ExpandedIDs: 14faffff285b00007a5b0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1037,9 +1037,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1146
+    x: 1143
     y: 507
-    width: 416
+    width: 417
     height: 532
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -1058,22 +1058,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/FmvMaker/Prefabs
+    - Assets/FmvMaker/Scenes
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/FmvMaker/Prefabs
+  - Assets/FmvMaker/Scenes
   m_LastFoldersGridSize: 16
   m_LastProjectPath: C:\Data\UnityProjects\FmvMaker
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: b65c0000
-    m_LastClickedID: 23734
-    m_ExpandedIDs: 00000000645c0000665c0000685c00006a5c00006c5c00006e5c0000705c0000725c0000745c0000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000325d000000ca9a3b
+    scrollPos: {x: 0, y: 84}
+    m_SelectedIDs: 245d0000
+    m_LastClickedID: 23844
+    m_ExpandedIDs: 00000000645c0000665c0000685c00006a5c00006c5c00006e5c0000705c0000725c0000745c0000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000265d000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1101,7 +1101,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000645c0000665c0000685c00006a5c00006c5c00006e5c0000705c0000725c0000745c0000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000
+    m_ExpandedIDs: 00000000645c0000665c0000685c00006a5c00006c5c00006e5c0000705c0000725c0000745c0000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1128,7 +1128,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -1178,9 +1178,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1564
+    x: 1562
     y: 73
-    width: 355
+    width: 357
     height: 966
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas: