pull
aha
This commit is contained in:
bance
@@ -5183,11 +5183,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6423cb96f98604ea1be2455ae7cff97d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
"energiafejleszt\xE9s": {fileID: 652887773}
|
||||
"akciofejleszt\xE9s": {fileID: 767162772}
|
||||
"harcfejleszt\xE9s": {fileID: 917471241}
|
||||
"ujradobasfejleszt\xE9s": {fileID: 723782981}
|
||||
"hackfejleszt\xE9s": {fileID: 1785481345}
|
||||
energiafejlesztes: {fileID: 652887773}
|
||||
akciofejlesztes: {fileID: 767162772}
|
||||
harcfejlesztes: {fileID: 917471241}
|
||||
ujradobasfejlesztes: {fileID: 723782981}
|
||||
hackfejlesztes: {fileID: 1785481345}
|
||||
kovetkezokor: {fileID: 1177305936}
|
||||
betarazas: {fileID: 235549630}
|
||||
nyomozas: {fileID: 83085749}
|
||||
@@ -9093,6 +9093,7 @@ GameObject:
|
||||
- component: {fileID: 401176109}
|
||||
- component: {fileID: 401176108}
|
||||
- component: {fileID: 401176107}
|
||||
- component: {fileID: 401176110}
|
||||
m_Layer: 5
|
||||
m_Name: TestGomb
|
||||
m_TagString: Untagged
|
||||
@@ -9215,6 +9216,18 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401176105}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!225 &401176110
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401176105}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 1
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!1 &410263759
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -12,17 +12,38 @@ public class jatekmanager : MonoBehaviour
|
||||
public static jatekmanager Instance;
|
||||
|
||||
//game objectek implementálása
|
||||
public GameObject energiafejlesztés;
|
||||
public GameObject akciofejlesztés;
|
||||
public GameObject harcfejlesztés;
|
||||
public GameObject ujradobasfejlesztés;
|
||||
public GameObject hackfejlesztés;
|
||||
public GameObject energiafejlesztes;
|
||||
private Button energiafejlesztesgomb;
|
||||
|
||||
public GameObject akciofejlesztes;
|
||||
private Button akciofejlesztesgomb;
|
||||
|
||||
public GameObject harcfejlesztes;
|
||||
private Button harcfejlesztesgomb;
|
||||
|
||||
public GameObject ujradobasfejlesztes;
|
||||
private Button ujradobasfejlesztesgomb;
|
||||
|
||||
public GameObject hackfejlesztes;
|
||||
private Button hackfejlesztesgomb;
|
||||
|
||||
public GameObject kovetkezokor;
|
||||
private Button kovetkezokorgomb;
|
||||
|
||||
public GameObject betarazas;
|
||||
private Button betarazasgomb;
|
||||
|
||||
public GameObject nyomozas;
|
||||
private Button nyomozasgomb;
|
||||
|
||||
public GameObject hackeles;
|
||||
private Button hackelesgomb;
|
||||
|
||||
public GameObject rolldice;
|
||||
private Button rolldicegomb;
|
||||
|
||||
public GameObject test;
|
||||
private Button testgomb;
|
||||
|
||||
|
||||
//script-ek implementalasa
|
||||
@@ -84,6 +105,19 @@ public class jatekmanager : MonoBehaviour
|
||||
turnManager = FindObjectOfType<TurnManager>();
|
||||
source = FindObjectOfType<Source>();
|
||||
vegpontozas = FindObjectOfType<vegpontozas>();
|
||||
|
||||
|
||||
energiafejlesztesgomb = energiafejlesztes.GetComponent<Button>();
|
||||
akciofejlesztesgomb = akciofejlesztes.GetComponent<Button>();
|
||||
harcfejlesztesgomb = harcfejlesztes.GetComponent<Button>();
|
||||
ujradobasfejlesztesgomb = ujradobasfejlesztes.GetComponent<Button>();
|
||||
hackfejlesztesgomb = hackfejlesztes.GetComponent<Button>();
|
||||
kovetkezokorgomb = kovetkezokor.GetComponent<Button>();
|
||||
betarazasgomb = betarazas.GetComponent<Button>();
|
||||
nyomozasgomb = nyomozas.GetComponent<Button>();
|
||||
hackelesgomb = hackeles.GetComponent<Button>();
|
||||
rolldicegomb = rolldice.GetComponent<Button>();
|
||||
testgomb = test.GetComponent<Button>();
|
||||
|
||||
//hatterzene lejatszas
|
||||
audioManager = FindObjectOfType<AudioManager>();
|
||||
@@ -188,18 +222,39 @@ public class jatekmanager : MonoBehaviour
|
||||
|
||||
private async void HandleKorkezdet()
|
||||
{
|
||||
rolldice.SetActive(true);
|
||||
rolldicegomb.interactable = true;
|
||||
megjelen(rolldicegomb);
|
||||
|
||||
energiafejlesztesgomb.interactable = false;
|
||||
atlatszo(energiafejlesztesgomb);
|
||||
|
||||
akciofejlesztesgomb.interactable = false;
|
||||
atlatszo(akciofejlesztesgomb);
|
||||
|
||||
hackfejlesztesgomb.interactable = false;
|
||||
atlatszo(hackfejlesztesgomb);
|
||||
|
||||
ujradobasfejlesztesgomb.interactable = false;
|
||||
atlatszo(ujradobasfejlesztesgomb);
|
||||
|
||||
hackfejlesztesgomb.interactable = false;
|
||||
atlatszo(hackfejlesztesgomb);
|
||||
|
||||
kovetkezokorgomb.interactable = false;
|
||||
atlatszo(kovetkezokorgomb);
|
||||
|
||||
betarazasgomb.interactable = false;
|
||||
atlatszo(betarazasgomb);
|
||||
|
||||
nyomozasgomb.interactable = false;
|
||||
atlatszo(nyomozasgomb);
|
||||
|
||||
hackelesgomb.interactable = false;
|
||||
atlatszo(hackelesgomb);
|
||||
|
||||
helyszinaktivalasBtn.interactable = false;
|
||||
atlatszo(helyszinaktivalasBtn);
|
||||
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
ujradobasfejlesztés.SetActive(false);
|
||||
hackfejlesztés.SetActive(false);
|
||||
kovetkezokor.SetActive(false);
|
||||
betarazas.SetActive(false);
|
||||
nyomozas.SetActive(false);
|
||||
hackeles.SetActive(false);
|
||||
helyszinaktivalasBtn.gameObject.SetActive(false);
|
||||
//test.SetActive(false);
|
||||
|
||||
//ha ugynok state-el vegezne kapcsoljon vissza mindent
|
||||
@@ -267,6 +322,7 @@ public class jatekmanager : MonoBehaviour
|
||||
movement.threethree_Collider.gameObject.SetActive(false);
|
||||
movement.threefour_Collider.gameObject.SetActive(false);
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
@@ -279,40 +335,129 @@ public class jatekmanager : MonoBehaviour
|
||||
helyszinaktivalasBtn.gameObject.SetActive(false);
|
||||
//test.SetActive(false);
|
||||
rolldice.SetActive(false);
|
||||
=======
|
||||
energiafejlesztesgomb.interactable = false;
|
||||
atlatszo(energiafejlesztesgomb);
|
||||
|
||||
akciofejlesztesgomb.interactable = false;
|
||||
atlatszo(akciofejlesztesgomb);
|
||||
|
||||
harcfejlesztesgomb.interactable = false;
|
||||
atlatszo(harcfejlesztesgomb);
|
||||
|
||||
ujradobasfejlesztesgomb.interactable = false;
|
||||
atlatszo(ujradobasfejlesztesgomb);
|
||||
|
||||
hackfejlesztesgomb.interactable = false;
|
||||
atlatszo(hackfejlesztesgomb);
|
||||
|
||||
kovetkezokorgomb.interactable = false;
|
||||
atlatszo(kovetkezokorgomb);
|
||||
|
||||
betarazasgomb.interactable = false;
|
||||
atlatszo(betarazasgomb);
|
||||
|
||||
nyomozasgomb.interactable = false;
|
||||
atlatszo(nyomozasgomb);
|
||||
|
||||
hackelesgomb.interactable = false;
|
||||
atlatszo(hackelesgomb);
|
||||
|
||||
helyszinaktivalasBtn.interactable = false;
|
||||
atlatszo(helyszinaktivalasBtn);
|
||||
|
||||
testgomb.interactable = false;
|
||||
atlatszo(testgomb);
|
||||
|
||||
rolldicegomb.interactable = false;
|
||||
atlatszo(rolldicegomb);
|
||||
>>>>>>> Stashed changes
|
||||
}
|
||||
|
||||
|
||||
private async void HandleFejlesztes()
|
||||
{
|
||||
energiafejlesztés.SetActive(true);
|
||||
akciofejlesztés.SetActive(true);
|
||||
harcfejlesztés.SetActive(true);
|
||||
ujradobasfejlesztés.SetActive(true);
|
||||
hackfejlesztés.SetActive(true);
|
||||
kovetkezokor.SetActive(false);
|
||||
//rolldice.SetActive(false);
|
||||
helyszinaktivalasBtn.gameObject.SetActive(false);
|
||||
|
||||
betarazas.SetActive(false);
|
||||
nyomozas.SetActive(false);
|
||||
hackeles.SetActive(false);
|
||||
betarazas.SetActive(false);
|
||||
|
||||
energiafejlesztesgomb.interactable = true;
|
||||
megjelen(energiafejlesztesgomb);
|
||||
|
||||
akciofejlesztesgomb.interactable = true;
|
||||
megjelen(akciofejlesztesgomb);
|
||||
|
||||
harcfejlesztesgomb.interactable = true;
|
||||
megjelen(harcfejlesztesgomb);
|
||||
|
||||
ujradobasfejlesztesgomb.interactable = true;
|
||||
megjelen(ujradobasfejlesztesgomb);
|
||||
|
||||
hackfejlesztesgomb.interactable = true;
|
||||
megjelen(hackfejlesztesgomb);
|
||||
|
||||
kovetkezokorgomb.interactable = true;
|
||||
megjelen(kovetkezokorgomb);
|
||||
|
||||
rolldicegomb.interactable = false;
|
||||
atlatszo(rolldicegomb);
|
||||
|
||||
helyszinaktivalasBtn.interactable = false;
|
||||
atlatszo(helyszinaktivalasBtn);
|
||||
|
||||
betarazasgomb.interactable = false;
|
||||
atlatszo(betarazasgomb);
|
||||
|
||||
nyomozasgomb.interactable = false;
|
||||
atlatszo(nyomozasgomb);
|
||||
|
||||
hackelesgomb.interactable = false;
|
||||
atlatszo(hackelesgomb);
|
||||
}
|
||||
|
||||
private async void HandleAkcio()
|
||||
{
|
||||
//itt a movement bekapcsol
|
||||
kovetkezokor.SetActive(true);
|
||||
betarazas.SetActive(true);
|
||||
nyomozas.SetActive(true);
|
||||
hackeles.SetActive(true);
|
||||
helyszinaktivalasBtn.gameObject.SetActive(true);
|
||||
energiafejlesztés.SetActive(false);
|
||||
akciofejlesztés.SetActive(false);
|
||||
harcfejlesztés.SetActive(false);
|
||||
ujradobasfejlesztés.SetActive(false);
|
||||
hackfejlesztés.SetActive(false);
|
||||
energiafejlesztes.SetActive(false);
|
||||
hackfejlesztes.SetActive(false);
|
||||
harcfejlesztes.SetActive(false);
|
||||
ujradobasfejlesztes.SetActive(false);
|
||||
akciofejlesztes.SetActive(false);
|
||||
|
||||
//itt a movement bekapcsol
|
||||
kovetkezokorgomb.interactable = true;
|
||||
megjelen(kovetkezokorgomb);
|
||||
|
||||
betarazasgomb.interactable = true;
|
||||
megjelen(betarazasgomb);
|
||||
|
||||
nyomozasgomb.interactable = true;
|
||||
megjelen(nyomozasgomb);
|
||||
|
||||
hackelesgomb.interactable = true;
|
||||
megjelen(hackfejlesztesgomb);
|
||||
|
||||
helyszinaktivalasBtn.interactable = true;
|
||||
megjelen(helyszinaktivalasBtn);
|
||||
|
||||
energiafejlesztesgomb.interactable = false;
|
||||
atlatszo(energiafejlesztesgomb);
|
||||
|
||||
akciofejlesztesgomb.interactable = false;
|
||||
atlatszo(akciofejlesztesgomb);
|
||||
|
||||
harcfejlesztesgomb.interactable = false;
|
||||
atlatszo(harcfejlesztesgomb);
|
||||
|
||||
ujradobasfejlesztesgomb.interactable = false;
|
||||
atlatszo(ujradobasfejlesztesgomb);
|
||||
|
||||
hackfejlesztesgomb.interactable = false;
|
||||
atlatszo(hackfejlesztesgomb);
|
||||
|
||||
kovetkezokorgomb.interactable = true;
|
||||
megjelen(kovetkezokorgomb);
|
||||
|
||||
kovetkezokor.SetActive(true);
|
||||
|
||||
//ha ugynok valasztasbol jon kapcsolaja vissza a collidereket
|
||||
movement.oneone_Collider.gameObject.SetActive(true);
|
||||
@@ -357,13 +502,32 @@ public class jatekmanager : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerator atlatszo(Button gomb)
|
||||
{
|
||||
while (gomb.GetComponent<CanvasGroup>().alpha > 0.25f)
|
||||
{
|
||||
gomb.GetComponent<CanvasGroup>().alpha -= 0.5f;
|
||||
yield return new WaitForSecondsRealtime(0.01f);
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerator megjelen(Button gomb)
|
||||
{
|
||||
while (gomb.GetComponent<CanvasGroup>().alpha < 1f)
|
||||
{
|
||||
gomb.GetComponent<CanvasGroup>().alpha += 0.5f;
|
||||
yield return new WaitForSecondsRealtime(0.01f);
|
||||
}
|
||||
}
|
||||
|
||||
private async void ugynokDeaktivalas(bool bekapcsolas)
|
||||
{
|
||||
energiafejlesztés.SetActive(bekapcsolas);
|
||||
akciofejlesztés.SetActive(bekapcsolas);
|
||||
harcfejlesztés.SetActive(bekapcsolas);
|
||||
ujradobasfejlesztés.SetActive(bekapcsolas);
|
||||
hackfejlesztés.SetActive(bekapcsolas);
|
||||
|
||||
energiafejlesztes.SetActive(bekapcsolas);
|
||||
akciofejlesztes.SetActive(bekapcsolas);
|
||||
harcfejlesztes.SetActive(bekapcsolas);
|
||||
ujradobasfejlesztes.SetActive(bekapcsolas);
|
||||
hackfejlesztes.SetActive(bekapcsolas);
|
||||
kovetkezokor.SetActive(bekapcsolas);
|
||||
betarazas.SetActive(bekapcsolas);
|
||||
nyomozas.SetActive(bekapcsolas);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -20,264 +20,12 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 30
|
||||
width: 1470
|
||||
height: 761
|
||||
height: 870
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 3855
|
||||
controlID: 20
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 278
|
||||
y: 95
|
||||
width: 842.5
|
||||
height: 430
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 842.5, y: 409}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -210.625
|
||||
m_HBaseRangeMax: 210.625
|
||||
m_VBaseRangeMin: -102.25
|
||||
m_VBaseRangeMax: 102.25
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 842.5
|
||||
height: 409
|
||||
m_Scale: {x: 2, y: 2}
|
||||
m_Translation: {x: 421.25, y: 204.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -210.625
|
||||
y: -102.25
|
||||
width: 421.25
|
||||
height: 204.5
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 2
|
||||
m_LastWindowPixelSize: {x: 1685, y: 860}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 4}
|
||||
- {fileID: 9}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1122.5
|
||||
height: 761
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 3856
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 5}
|
||||
- {fileID: 7}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1122.5
|
||||
height: 451
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 3857
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 278
|
||||
height: 451
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 6}
|
||||
m_Panes:
|
||||
- {fileID: 6}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Hierarchy
|
||||
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 95
|
||||
width: 277
|
||||
height: 430
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 2afbfffff66b00002e6d000060760000a2760000fe770000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: GameView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 278
|
||||
y: 0
|
||||
width: 844.5
|
||||
height: 451
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_Panes:
|
||||
- {fileID: 8}
|
||||
- {fileID: 2}
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -293,14 +41,14 @@ MonoBehaviour:
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Scene
|
||||
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 278
|
||||
y: 95
|
||||
width: 842.5
|
||||
height: 430
|
||||
x: 278.5
|
||||
y: 66
|
||||
width: 686
|
||||
height: 519
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -557,9 +305,9 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: -5.0540023, y: -0.47023767, z: 0.040666837}
|
||||
m_Target: {x: -5.075182, y: -1.8616787, z: 0.16727127}
|
||||
speed: 2
|
||||
m_Value: {x: -5.0540023, y: -0.47023767, z: 0.040666837}
|
||||
m_Value: {x: -5.076811, y: -1.8688006, z: 0.16737424}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -610,9 +358,9 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 13.287295
|
||||
m_Target: 13.740025
|
||||
speed: 2
|
||||
m_Value: 13.287295
|
||||
m_Value: 13.729728
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -637,6 +385,258 @@ MonoBehaviour:
|
||||
m_SceneVisActive: 1
|
||||
m_LastLockedObject: {fileID: 0}
|
||||
m_ViewIsLockedToObject: 0
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 4}
|
||||
- {fileID: 9}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 966.5
|
||||
height: 870
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 21
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 5}
|
||||
- {fileID: 7}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 966.5
|
||||
height: 540
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 22
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 278.5
|
||||
height: 540
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 6}
|
||||
m_Panes:
|
||||
- {fileID: 6}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Hierarchy
|
||||
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 66
|
||||
width: 277.5
|
||||
height: 519
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 144f0000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 94adffff46afffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 5}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: SceneView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 278.5
|
||||
y: 0
|
||||
width: 688
|
||||
height: 540
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_Panes:
|
||||
- {fileID: 2}
|
||||
- {fileID: 8}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 259
|
||||
y: 86
|
||||
width: 637
|
||||
height: 370
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 637, y: 349}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -159.25
|
||||
m_HBaseRangeMax: 159.25
|
||||
m_VBaseRangeMin: -87.25
|
||||
m_VBaseRangeMax: 87.25
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 0
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 637
|
||||
height: 349
|
||||
m_Scale: {x: 2, y: 2}
|
||||
m_Translation: {x: 318.5, y: 174.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -159.25
|
||||
y: -87.25
|
||||
width: 318.5
|
||||
height: 174.5
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 2
|
||||
m_LastWindowPixelSize: {x: 1274, y: 740}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &9
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -647,23 +647,23 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ConsoleWindow
|
||||
m_Name: ProjectBrowser
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 451
|
||||
width: 1122.5
|
||||
height: 310
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 11}
|
||||
y: 540
|
||||
width: 966.5
|
||||
height: 330
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 10}
|
||||
m_Panes:
|
||||
- {fileID: 10}
|
||||
- {fileID: 11}
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &10
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -680,14 +680,14 @@ MonoBehaviour:
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_TitleContent:
|
||||
m_Text: Project
|
||||
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 546
|
||||
width: 1121.5
|
||||
height: 289
|
||||
y: 606
|
||||
width: 965.5
|
||||
height: 309
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -718,9 +718,9 @@ MonoBehaviour:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 247a0000
|
||||
m_LastClickedID: 31268
|
||||
m_ExpandedIDs: 00000000027a000000ca9a3bffffff7f
|
||||
m_SelectedIDs: 9cc70000
|
||||
m_LastClickedID: 51100
|
||||
m_ExpandedIDs: 0000000096c7000000ca9a3bffffff7f
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -748,7 +748,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000027a000000ca9a3bffffff7f
|
||||
m_ExpandedIDs:
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -773,8 +773,8 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: 96300000
|
||||
m_LastClickedInstanceID: 12438
|
||||
m_SelectedInstanceIDs: 144f0000
|
||||
m_LastClickedInstanceID: 20244
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000
|
||||
m_RenameOverlay:
|
||||
@@ -792,7 +792,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_ClientGUIView: {fileID: 9}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
@@ -800,7 +800,7 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_NewAssetIndexInList: -1
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_ScrollPosition: {x: 0, y: 38}
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 207
|
||||
@@ -820,14 +820,14 @@ MonoBehaviour:
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Console
|
||||
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 546
|
||||
width: 1121.5
|
||||
height: 289
|
||||
y: 486
|
||||
width: 897
|
||||
height: 218
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -840,17 +840,17 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_Name: InspectorWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1122.5
|
||||
x: 966.5
|
||||
y: 0
|
||||
width: 347.5
|
||||
height: 761
|
||||
width: 503.5
|
||||
height: 870
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 13}
|
||||
@@ -878,10 +878,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1122.5
|
||||
y: 95
|
||||
width: 346.5
|
||||
height: 740
|
||||
x: 966.5
|
||||
y: 66
|
||||
width: 502.5
|
||||
height: 849
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -893,7 +893,7 @@ MonoBehaviour:
|
||||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
m_LastVerticalScrollValue: 0
|
||||
m_LastVerticalScrollValue: 702
|
||||
m_GlobalObjectId:
|
||||
m_InspectorMode: 0
|
||||
m_LockTracker:
|
||||
|
||||
@@ -15,15 +15,20 @@ MonoBehaviour:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 28
|
||||
y: 65
|
||||
width: 1366
|
||||
height: 680
|
||||
m_ShowMode: 4
|
||||
<<<<<<< Updated upstream
|
||||
m_Title: Console
|
||||
m_RootView: {fileID: 3}
|
||||
=======
|
||||
m_Title: Inspector
|
||||
m_RootView: {fileID: 2}
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
m_Maximized: 0
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -32,6 +37,7 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
<<<<<<< Updated upstream
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: InspectorWindow
|
||||
@@ -58,14 +64,16 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 4}
|
||||
- {fileID: 6}
|
||||
- {fileID: 3}
|
||||
- {fileID: 5}
|
||||
- {fileID: 4}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@@ -78,7 +86,7 @@ MonoBehaviour:
|
||||
m_TopViewHeight: 30
|
||||
m_UseBottomView: 1
|
||||
m_BottomViewHeight: 20
|
||||
--- !u!114 &4
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -100,7 +108,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
m_LastLoadedLayoutName:
|
||||
--- !u!114 &5
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -121,6 +129,31 @@ MonoBehaviour:
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 6}
|
||||
- {fileID: 11}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 30
|
||||
width: 1366
|
||||
height: 630
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 18
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -135,17 +168,24 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 7}
|
||||
- {fileID: 2}
|
||||
- {fileID: 10}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 30
|
||||
width: 1366
|
||||
y: 0
|
||||
width: 1074
|
||||
height: 630
|
||||
<<<<<<< Updated upstream
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 20
|
||||
=======
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 19
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -160,43 +200,27 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 8}
|
||||
- {fileID: 11}
|
||||
- {fileID: 9}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 1011
|
||||
height: 630
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 21
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 9}
|
||||
- {fileID: 10}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1011
|
||||
height: 379
|
||||
=======
|
||||
width: 1074
|
||||
height: 391
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 22
|
||||
--- !u!114 &9
|
||||
controlID: 20
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -213,6 +237,42 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 1011
|
||||
height: 379
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 22
|
||||
=======
|
||||
width: 309.5
|
||||
height: 391
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &9
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: GameView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 309.5
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 175
|
||||
height: 379
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
@@ -241,15 +301,27 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 836
|
||||
height: 379
|
||||
=======
|
||||
width: 764.5
|
||||
height: 391
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 15}
|
||||
m_Panes:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 15}
|
||||
- {fileID: 13}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &11
|
||||
=======
|
||||
- {fileID: 12}
|
||||
- {fileID: 14}
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &10
|
||||
>>>>>>> Stashed changes
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -265,9 +337,15 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 379
|
||||
width: 1011
|
||||
height: 251
|
||||
=======
|
||||
y: 391
|
||||
width: 1074
|
||||
height: 239
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 17}
|
||||
@@ -277,6 +355,32 @@ MonoBehaviour:
|
||||
- {fileID: 12}
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: InspectorWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1074
|
||||
y: 0
|
||||
width: 292
|
||||
height: 630
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 17}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -462,6 +566,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
<<<<<<< Updated upstream
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
@@ -611,6 +716,8 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
@@ -622,10 +729,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 175
|
||||
y: 86
|
||||
width: 834
|
||||
height: 358
|
||||
=======
|
||||
x: 318.5
|
||||
y: 95
|
||||
width: 781
|
||||
height: 370
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -882,9 +996,15 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: {x: -0.6508466, y: 2.6651125, z: 0.050433118}
|
||||
speed: 2
|
||||
m_Value: {x: -0.6508466, y: 2.6651125, z: 0.050433118}
|
||||
=======
|
||||
m_Target: {x: -5.063279, y: -0.4617358, z: 0.179349}
|
||||
speed: 2
|
||||
m_Value: {x: -5.063279, y: -0.4617358, z: 0.179349}
|
||||
>>>>>>> Stashed changes
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -935,9 +1055,15 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: 9.950926
|
||||
speed: 2
|
||||
m_Value: 9.950926
|
||||
=======
|
||||
m_Target: 12.532305
|
||||
speed: 2
|
||||
m_Value: 12.532305
|
||||
>>>>>>> Stashed changes
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -962,7 +1088,160 @@ MonoBehaviour:
|
||||
m_SceneVisActive: 1
|
||||
m_LastLockedObject: {fileID: 0}
|
||||
m_ViewIsLockedToObject: 0
|
||||
<<<<<<< Updated upstream
|
||||
--- !u!114 &16
|
||||
=======
|
||||
--- !u!114 &13
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Hierarchy
|
||||
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 95
|
||||
width: 308.5
|
||||
height: 370
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 2afbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 8}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
--- !u!114 &14
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 309.5
|
||||
y: 95
|
||||
width: 762.5
|
||||
height: 370
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 1920, y: 1080}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -480
|
||||
m_HBaseRangeMax: 480
|
||||
m_VBaseRangeMin: -270
|
||||
m_VBaseRangeMax: 270
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 762.5
|
||||
height: 349
|
||||
m_Scale: {x: 0.64629626, y: 0.6462963}
|
||||
m_Translation: {x: 381.24997, y: 174.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -589.8997
|
||||
y: -270
|
||||
width: 1179.7994
|
||||
height: 540
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.6462963
|
||||
m_LastWindowPixelSize: {x: 1525, y: 740}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &15
|
||||
>>>>>>> Stashed changes
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -983,9 +1262,15 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 465
|
||||
width: 1010
|
||||
height: 230
|
||||
=======
|
||||
y: 606
|
||||
width: 1155
|
||||
height: 309
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -1011,14 +1296,21 @@ MonoBehaviour:
|
||||
m_LastFolders:
|
||||
- Assets/Scripts
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: /home/tom/Documents/dev/find the source
|
||||
m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
<<<<<<< Updated upstream
|
||||
scrollPos: {x: 0, y: 39}
|
||||
m_SelectedIDs: 607b0000
|
||||
m_LastClickedID: 31584
|
||||
m_ExpandedIDs: 000000003c7b00005c7b0000687b000000ca9a3b
|
||||
=======
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 3a7a0000
|
||||
m_LastClickedID: 31290
|
||||
m_ExpandedIDs: 00000000207a0000
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -1046,7 +1338,11 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_ExpandedIDs: 000000003c7b0000
|
||||
=======
|
||||
m_ExpandedIDs: 00000000207a0000
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -1071,8 +1367,13 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
<<<<<<< Updated upstream
|
||||
m_SelectedInstanceIDs: aa6f0000
|
||||
m_LastClickedInstanceID: 28586
|
||||
=======
|
||||
m_SelectedInstanceIDs: aa6c0000
|
||||
m_LastClickedInstanceID: 27818
|
||||
>>>>>>> Stashed changes
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000687a00003a79000058790000
|
||||
m_RenameOverlay:
|
||||
@@ -1090,7 +1391,11 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
<<<<<<< Updated upstream
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
=======
|
||||
m_ClientGUIView: {fileID: 10}
|
||||
>>>>>>> Stashed changes
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
@@ -1098,7 +1403,11 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_NewAssetIndexInList: -1
|
||||
<<<<<<< Updated upstream
|
||||
m_ScrollPosition: {x: 0, y: 89}
|
||||
=======
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
>>>>>>> Stashed changes
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 142
|
||||
@@ -1123,9 +1432,15 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 465
|
||||
width: 1010
|
||||
height: 230
|
||||
=======
|
||||
y: 486
|
||||
width: 1073
|
||||
height: 218
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -1146,13 +1461,19 @@ MonoBehaviour:
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Inspector
|
||||
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 1011
|
||||
y: 86
|
||||
width: 354
|
||||
=======
|
||||
x: 1074
|
||||
y: 95
|
||||
width: 291
|
||||
>>>>>>> Stashed changes
|
||||
height: 609
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
@@ -1165,7 +1486,11 @@ MonoBehaviour:
|
||||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
<<<<<<< Updated upstream
|
||||
m_LastVerticalScrollValue: 324
|
||||
=======
|
||||
m_LastVerticalScrollValue: 0
|
||||
>>>>>>> Stashed changes
|
||||
m_GlobalObjectId:
|
||||
m_InspectorMode: 0
|
||||
m_LockTracker:
|
||||
|
||||
Reference in New Issue
Block a user