Bandaid fix for input manager issues. Remove ass from applehills overworld.
This commit is contained in:
@@ -437,7 +437,7 @@ MonoBehaviour:
|
|||||||
m_FallbackScreenDPI: 96
|
m_FallbackScreenDPI: 96
|
||||||
m_DefaultSpriteDPI: 96
|
m_DefaultSpriteDPI: 96
|
||||||
m_DynamicPixelsPerUnit: 1
|
m_DynamicPixelsPerUnit: 1
|
||||||
m_PresetInfoIsWorld: 1
|
m_PresetInfoIsWorld: 0
|
||||||
--- !u!114 &9137259633125916521
|
--- !u!114 &9137259633125916521
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -456006,6 +456006,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: DialogueCanvas
|
value: DialogueCanvas
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6771925387362164676, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
|
||||||
|
propertyPath: m_PresetInfoIsWorld
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
|
- target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@@ -456065,7 +456069,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: AppleHillsScripts::Dialogue.SpeechBubble
|
m_EditorClassIdentifier: AppleHillsScripts::Dialogue.SpeechBubble
|
||||||
textDisplay: {fileID: 1200370542}
|
textDisplay: {fileID: 1200370542}
|
||||||
imageDisplay: {fileID: 0}
|
imageDisplay: {fileID: 2114652570}
|
||||||
displayMode: 1
|
displayMode: 1
|
||||||
typewriterSpeed: 0.05
|
typewriterSpeed: 0.05
|
||||||
typingSoundSource: {fileID: 0}
|
typingSoundSource: {fileID: 0}
|
||||||
@@ -463232,6 +463236,17 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
|
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
|
||||||
m_PrefabInstance: {fileID: 2109163090}
|
m_PrefabInstance: {fileID: 2109163090}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &2114652570 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 60731842453945467, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1687785381}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
--- !u!1001 &2117822310
|
--- !u!1001 &2117822310
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
3080
Assets/Scenes/TestingStuff/MichalTesting_ItemsPuzzles.unity
Normal file
3080
Assets/Scenes/TestingStuff/MichalTesting_ItemsPuzzles.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9999e33608d12e04a87dd0edf7b7866f
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -47,11 +47,13 @@ namespace UI
|
|||||||
// Subscribe to scene loaded events
|
// Subscribe to scene loaded events
|
||||||
SceneManagerService.Instance.SceneLoadCompleted += SetPauseMenuByLevel;
|
SceneManagerService.Instance.SceneLoadCompleted += SetPauseMenuByLevel;
|
||||||
|
|
||||||
|
#if UNITY_EDITOR
|
||||||
// Set initial state based on current scene
|
// Set initial state based on current scene
|
||||||
SetPauseMenuByLevel(SceneManager.GetActiveScene().name);
|
SetPauseMenuByLevel(SceneManager.GetActiveScene().name);
|
||||||
|
|
||||||
// Initialize pause menu state
|
// Initialize pause menu state
|
||||||
HidePauseMenu(false);
|
HidePauseMenu(false);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
|
|||||||
Reference in New Issue
Block a user