Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -312,6 +312,41 @@ Prefab:
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 137633099225627500, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137465337205798530, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 95382948226770932, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114500945209285186, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114190481229737154, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114899861654494680, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114209789467565428, guid: a07a17662cd4063429d93d71f9d60268,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: a07a17662cd4063429d93d71f9d60268, type: 2}
m_IsPrefabParent: 0
@@ -726,27 +761,17 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 137989919835585960, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137977011574391156, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137887839324668780, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137283920860187190, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137886154225314348, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137146625879488762, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137882897729520676, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137700338509548526, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
@@ -756,67 +781,67 @@ Prefab:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137844377177677396, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137250885884723058, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137810667867847698, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137086441743674792, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137789922993508538, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137768270628878222, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137768270628878222, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137886154225314348, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137730531208175708, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137625716860552156, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137700338509548526, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137844377177677396, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137625716860552156, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137810667867847698, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137502466085502348, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137033384413054596, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137478558691585026, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137887839324668780, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137421543958321332, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137989919835585960, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137408266075655898, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137013850894391230, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137293482517897374, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137730531208175708, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137250885884723058, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137882897729520676, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
@@ -826,27 +851,27 @@ Prefab:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137122300322247650, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137033495769154858, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137086441743674792, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137502466085502348, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137033495769154858, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137789922993508538, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137033384413054596, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137293482517897374, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137013850894391230, guid: 76c68a71635b83b4ab2e8d4198fe8062,
- target: {fileID: 137478558691585026, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
@@ -855,6 +880,31 @@ Prefab:
propertyPath: m_Name
value: Player1F
objectReference: {fileID: 0}
- target: {fileID: 95726820851238290, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114412621729434016, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114721970030927946, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114113709668887810, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114849586422487382, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 76c68a71635b83b4ab2e8d4198fe8062, type: 2}
m_IsPrefabParent: 0
@@ -1287,7 +1337,7 @@ Prefab:
- target: {fileID: 58990085343610828, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114849586422487382, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
@@ -1516,6 +1566,21 @@ Prefab:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 137146625879488762, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137283920860187190, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 114113709668887810, guid: 76c68a71635b83b4ab2e8d4198fe8062,
type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 76c68a71635b83b4ab2e8d4198fe8062, type: 2}
m_IsPrefabParent: 0
@@ -1720,6 +1785,41 @@ Prefab:
propertyPath: m_Name
value: Player1
objectReference: {fileID: 0}
- target: {fileID: 137963935007523036, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 137937110361049060, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 95854311283210360, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114093114371236576, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114744157190493678, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114049634155377480, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114905180719309230, guid: 3c763d8e93f7a5f45b850afc433986e7,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 3c763d8e93f7a5f45b850afc433986e7, type: 2}
m_IsPrefabParent: 0
@@ -53,7 +53,7 @@ void Update()
void OnTriggerEnter2D(Collider2D other)
{
// hit.enabled = true;
TraitArchetype enemy = other.transform.root.Find("HeadBone").GetComponent<HeadCollision>().GetSkill();
TraitArchetype enemy = traits.GetPreset(PlayerPrefs.GetInt("Player" + other.transform.root.name[6] + "Trait", 0));
if (other.gameObject.tag == "LightFist" && roundEnd.PauseTimer <= leastAmountofTime)
{
if (Time.time <= timeStamp + 2)
@@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

public class TraitDescription : MonoBehaviour {

public Text traitname;
public Text description;
public int player;
public TraitDatabase database;

private TraitArchetype archetype;
void Start ()
{
archetype = database.GetPreset(PlayerPrefs.GetInt("Player" + player + "Trait", 0));
traitname.text = archetype.playerName;
description.text = archetype.flavorText;
StartCoroutine(Timer());
}

IEnumerator Timer()
{
yield return new WaitForSeconds(5);
gameObject.SetActive(false);
}
}
@@ -1,26 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2017
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BareKnuckleBrawl", "BareKnuckleBrawl.csproj", "{5CCD4124-73CA-8945-DD96-54E5561223EB}"
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BareKnuckleBrawl", "Assembly-CSharp.csproj", "{087BCD6D-7FB7-580B-AAE9-075CA4D7762D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BareKnuckleBrawl.Editor", "BareKnuckleBrawl.Editor.csproj", "{5AB0A054-3549-2B8F-1012-0D9A474E1505}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BareKnuckleBrawl", "Assembly-CSharp-Editor.csproj", "{4BF58E22-06E1-F1BA-679A-8C812AF608D3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5CCD4124-73CA-8945-DD96-54E5561223EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5CCD4124-73CA-8945-DD96-54E5561223EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CCD4124-73CA-8945-DD96-54E5561223EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5CCD4124-73CA-8945-DD96-54E5561223EB}.Release|Any CPU.Build.0 = Release|Any CPU
{5AB0A054-3549-2B8F-1012-0D9A474E1505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5AB0A054-3549-2B8F-1012-0D9A474E1505}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5AB0A054-3549-2B8F-1012-0D9A474E1505}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5AB0A054-3549-2B8F-1012-0D9A474E1505}.Release|Any CPU.Build.0 = Release|Any CPU
{087BCD6D-7FB7-580B-AAE9-075CA4D7762D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{087BCD6D-7FB7-580B-AAE9-075CA4D7762D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{087BCD6D-7FB7-580B-AAE9-075CA4D7762D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{087BCD6D-7FB7-580B-AAE9-075CA4D7762D}.Release|Any CPU.Build.0 = Release|Any CPU
{4BF58E22-06E1-F1BA-679A-8C812AF608D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BF58E22-06E1-F1BA-679A-8C812AF608D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BF58E22-06E1-F1BA-679A-8C812AF608D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BF58E22-06E1-F1BA-679A-8C812AF608D3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
EndGlobalSection
EndGlobal
@@ -20,7 +20,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 2}
m_MinSize: {x: 950, y: 521}
m_MinSize: {x: 950, y: 542}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
@@ -43,7 +43,7 @@ MonoBehaviour:
y: 0
width: 1536
height: 781
m_MinSize: {x: 950, y: 521}
m_MinSize: {x: 950, y: 542}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &3
MonoBehaviour:
@@ -107,10 +107,10 @@ MonoBehaviour:
y: 30
width: 1536
height: 731
m_MinSize: {x: 711, y: 471}
m_MaxSize: {x: 18008, y: 14021}
m_MinSize: {x: 713, y: 492}
m_MaxSize: {x: 18008, y: 14042}
vertical: 0
controlID: 15112
controlID: 12018
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -131,10 +131,10 @@ MonoBehaviour:
y: 0
width: 716
height: 731
m_MinSize: {x: 200, y: 321}
m_MinSize: {x: 202, y: 421}
m_MaxSize: {x: 4002, y: 8021}
vertical: 1
controlID: 15113
controlID: 11914
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -153,12 +153,12 @@ MonoBehaviour:
y: 0
width: 716
height: 328
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
- {fileID: 15}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &8
@@ -179,14 +179,14 @@ MonoBehaviour:
y: 328
width: 716
height: 403
m_MinSize: {x: 102, y: 121}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 14}
- {fileID: 13}
m_Selected: 1
m_LastSelected: 0
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -207,10 +207,10 @@ MonoBehaviour:
y: 0
width: 378
height: 731
m_MinSize: {x: 234, y: 471}
m_MaxSize: {x: 10004, y: 14021}
m_MinSize: {x: 234, y: 492}
m_MaxSize: {x: 10004, y: 14042}
vertical: 1
controlID: 15057
controlID: 11990
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -229,8 +229,8 @@ MonoBehaviour:
y: 0
width: 378
height: 324
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
@@ -288,33 +288,6 @@ MonoBehaviour:
m_Selected: 0
m_LastSelected: 1
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69ae4fd6f42d145009ab903686ea2fbf, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AutoRepaintOnSceneChange: 1
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: SpriteMesh Editor
m_Image: {fileID: 0}
m_Tooltip:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: 0
y: 420
width: 714
height: 382
m_PersistentViewDataDictionary: {fileID: 0}
textureColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -341,7 +314,7 @@ MonoBehaviour:
width: 714
height: 382
m_PersistentViewDataDictionary: {fileID: 0}
m_MaximizeOnPlay: 0
m_MaximizeOnPlay: 1
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -358,8 +331,8 @@ MonoBehaviour:
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 1
m_VSlider: 1
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableSliderZoom: 0
@@ -371,18 +344,18 @@ MonoBehaviour:
y: 17
width: 714
height: 365
m_Scale: {x: 0.49488375, y: 0.49488375}
m_Translation: {x: 406.2731, y: 200.07436}
m_Scale: {x: 0.33796299, y: 0.33796296}
m_Translation: {x: 357, y: 182.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -820.94653
y: -404.28555
width: 1442.7631
height: 737.54694
x: -1056.3287
y: -540
width: 2112.6575
height: 1080
m_MinimalGUI: 1
m_defaultScale: 0.33796296
m_TargetTexture: {fileID: 0}
@@ -391,7 +364,7 @@ MonoBehaviour:
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000100000100
--- !u!114 &15
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -419,14 +392,14 @@ MonoBehaviour:
height: 307
m_PersistentViewDataDictionary: {fileID: 0}
m_SceneLighting: 1
lastFramingTime: 7218.915245145214
lastFramingTime: 4151.218267880781
m_2DMode: 1
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -3.3640404, y: 0.9943897, z: 2.4499075}
m_Target: {x: 437.99734, y: 505.53528, z: -7.75}
speed: 2
m_Value: {x: -3.3640404, y: 0.9943897, z: 2.4499075}
m_Value: {x: 437.99734, y: 505.53528, z: -7.75}
m_RenderMode: 31
m_ValidateTrueMetals: 0
m_SceneViewState:
@@ -454,9 +427,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 2.5173075
m_Target: 1613.2095
speed: 2
m_Value: 2.5173075
m_Value: 1613.2095
m_Ortho:
m_Target: 1
speed: 2
@@ -468,7 +441,7 @@ MonoBehaviour:
m_ReplacementString:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &16
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -528,6 +501,33 @@ MonoBehaviour:
m_CurrentEditor: 1
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69ae4fd6f42d145009ab903686ea2fbf, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AutoRepaintOnSceneChange: 1
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: SpriteMesh Editor
m_Image: {fileID: 0}
m_Tooltip:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: 0
y: 420
width: 714
height: 382
m_PersistentViewDataDictionary: {fileID: 0}
textureColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -556,10 +556,10 @@ MonoBehaviour:
height: 303
m_PersistentViewDataDictionary: {fileID: 0}
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 0cb1f1ff
m_LastClickedID: -937716
m_ExpandedIDs: deb0f1ffe0b0f1ffe6b0f1ffeab0f1ff04b1f1ff20b1f1ff58b1f1ff5cb1f1ff3ab5f1ff58b5f1ff6cb5f1ff80b5f1ff90b5f1ff94b5f1ffa0b5f1ff46b7f1ffbeb7f1ffc4b7f1ff40cef1ffd2aaf8ffd4aaf8ffdeaaf8fffaaaf8ff14abf8ffe2b8f8ff96d9ffff38dbffff44dbffff5edbffff60dbffff76dbffff7adbffff7cdbffff96dbffffa6dbffffb6dbffffb8dbffff56ddffffb0ddffffc0ddffffc6ddffffd2ddffffe2ddfffff0ddffff8adfffff90dfffffa8dfffffaedfffffd4dffffff6dffffffadfffff06e0ffff16e0ffff24e0ffff38e1ffff52e1ffff5ce1ffff9ae1ffff0ae2ffff0ce2ffff42e2ffff46e2ffff48e2ffff08f2ffff000000005a640100
scrollPos: {x: 0, y: 18}
m_SelectedIDs: f0000100
m_LastClickedID: 65776
m_ExpandedIDs: 4ab0fbff38fafdff8efafdffbcfafdff14fbfdffcefbfdff6efcfdffc4fcfdfff2fcfdffa2fefdfff0fefdff42fffdffaafffdff2800feffc600feff1801feff4801feffa601feff4a02feff2403feff90abfeffdeabfeff30acfeff98acfeff14adfeff72adfeffb6adfeff0caefeff3aaefeff92aefeffecaffeff42b0feff70b0feffc8b0feff80b1feffdeb1feff20b2feff72b2feffa2b2fefff2b2feff00b3feffaab3feffaeb3feff66c3feffd8cefeff5025ffffa625ffffd425ffff2c26ffff082affff5a2affffc22affffde2bffff302cffff602cffffbe2cffff622dffff3a2effff4ae4ffffbce4ffff5ce8ffff2ce9ffff50ebffff4cfaffff00000000ea5400005c550000d0800000c6000100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -578,7 +578,7 @@ MonoBehaviour:
m_ClientGUIView: {fileID: 10}
m_SearchString:
m_ExpandedScenes:
- Workspace (Alex)
- Arena2 - Ring
m_CurrenRootInstanceID: 0
m_Locked: 0
m_CurrentSortingName: TransformSorting
@@ -632,7 +632,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ee240000
m_LastClickedID: 9454
m_ExpandedIDs: 00000000582c00006c300000703100007a3100009c320000c63200002a330000323300005c3300005e330000203400007c3400008234000086340000ec340000903900009239000094390000
m_ExpandedIDs: 00000000f02d0000002e0000062e00000e2e0000222e0000242e00003a2e0000402e0000262f0000ac310000a4330000a03e0000a23e0000a43e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -657,10 +657,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 2332}
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000582c00006c300000703100007a3100009c320000c63200002a330000323300005c3300005e330000203400007c3400008234000086340000ec340000903900009239000094390000
m_ExpandedIDs: 00000000f02d0000002e0000062e00000e2e0000222e0000242e00003a2e0000402e0000262f0000ac310000a4330000a03e0000a23e0000a43e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -13,8 +13,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- {fileID: 8}
- {fileID: 13}
- {fileID: 9}
- {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 713, y: 492}
m_MaxSize: {x: 18008, y: 14042}
vertical: 0
controlID: 13660
controlID: 11235
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -122,10 +122,10 @@ MonoBehaviour:
y: 0
width: 716
height: 731
m_MinSize: {x: 202, y: 442}
m_MaxSize: {x: 4002, y: 8042}
m_MinSize: {x: 202, y: 421}
m_MaxSize: {x: 4002, y: 8021}
vertical: 1
controlID: 13611
controlID: 11185
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -180,14 +180,14 @@ MonoBehaviour:
height: 307
m_PersistentViewDataDictionary: {fileID: 0}
m_SceneLighting: 1
lastFramingTime: 7218.915245145214
lastFramingTime: 4151.218267880781
m_2DMode: 1
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -0.5269252, y: 2.052861, z: 2.4072266}
m_Target: {x: 437.99734, y: 505.53528, z: -7.75}
speed: 2
m_Value: {x: -0.5269252, y: 2.052861, z: 2.4072266}
m_Value: {x: 437.99734, y: 505.53528, z: -7.75}
m_RenderMode: 31
m_ValidateTrueMetals: 0
m_SceneViewState:
@@ -215,9 +215,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 6.9264073
m_Target: 1613.2095
speed: 2
m_Value: 6.9264073
m_Value: 1613.2095
m_Ortho:
m_Target: 1
speed: 2
@@ -311,14 +311,42 @@ MonoBehaviour:
y: 328
width: 716
height: 403
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 2}
- {fileID: 8}
m_Selected: 0
m_LastSelected: 0
m_LastSelected: 1
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69ae4fd6f42d145009ab903686ea2fbf, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AutoRepaintOnSceneChange: 1
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: SpriteMesh Editor
m_Image: {fileID: 0}
m_Tooltip:
m_DepthBufferBits: 0
m_Pos:
serializedVersion: 2
x: 0
y: 420
width: 714
height: 382
m_PersistentViewDataDictionary: {fileID: 0}
textureColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -330,8 +358,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 9}
- {fileID: 11}
- {fileID: 10}
- {fileID: 12}
m_Position:
serializedVersion: 2
x: 716
@@ -341,8 +369,8 @@ MonoBehaviour:
m_MinSize: {x: 234, y: 492}
m_MaxSize: {x: 10004, y: 14042}
vertical: 1
controlID: 13661
--- !u!114 &9
controlID: 11236
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -360,14 +388,14 @@ MonoBehaviour:
y: 0
width: 378
height: 324
m_MinSize: {x: 204, y: 221}
m_MaxSize: {x: 4004, y: 4021}
m_ActualView: {fileID: 10}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 11}
m_Panes:
- {fileID: 10}
- {fileID: 11}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -395,10 +423,10 @@ MonoBehaviour:
height: 303
m_PersistentViewDataDictionary: {fileID: 0}
m_TreeViewState:
scrollPos: {x: 0, y: 60}
m_SelectedIDs: b0dfffff
m_LastClickedID: -8272
m_ExpandedIDs: 96d9ffff38dbffff3adbffff44dbffff5edbffff60dbffff76dbffff7adbffff7cdbffff96dbffffa6dbffffb8dbffff56ddffffb0ddffffc6ddffffd2ddffffe2ddfffff0ddffff8adfffff90dfffffa8dfffffaedfffffd4dfffffe4dffffff4dffffff6dffffffadfffff06e0ffff16e0ffff24e0ffff38e1ffff52e1ffff5ce1ffff9ae1ffff0ae2ffff0ce2ffff42e2ffff48e2ffff08f2ffff000000003c3b0000
scrollPos: {x: 0, y: 18}
m_SelectedIDs: f0000100
m_LastClickedID: 65776
m_ExpandedIDs: 4ab0fbff38fafdff8efafdffbcfafdff14fbfdffcefbfdff6efcfdffc4fcfdfff2fcfdffa2fefdfff0fefdff42fffdffaafffdff2800feffc600feff1801feff4801feffa601feff4a02feff2403feff90abfeffdeabfeff30acfeff98acfeff14adfeff72adfeffb6adfeff0caefeff3aaefeff92aefeffecaffeff42b0feff70b0feffc8b0feff80b1feffdeb1feff20b2feff72b2feffa2b2fefff2b2feff00b3feffaab3feffaeb3feff66c3feffd8cefeff5025ffffa625ffffd425ffff2c26ffff082affff5a2affffc22affffde2bffff302cffff602cffffbe2cffff622dffff3a2effff4ae4ffffbce4ffff5ce8ffff2ce9ffff50ebffff4cfaffff00000000ea5400005c550000d0800000c6000100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -414,14 +442,14 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 9}
m_ClientGUIView: {fileID: 10}
m_SearchString:
m_ExpandedScenes:
- Arena1 - Bar
- Workspace (Alex)
m_CurrenRootInstanceID: 0
m_Locked: 0
m_CurrentSortingName: TransformSorting
--- !u!114 &11
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -441,12 +469,12 @@ MonoBehaviour:
height: 407
m_MinSize: {x: 234, y: 271}
m_MaxSize: {x: 10004, y: 10021}
m_ActualView: {fileID: 12}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 12}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -484,7 +512,8 @@ MonoBehaviour:
m_ScenePaths: []
m_ShowAllHits: 0
m_SearchArea: 0
m_Folders: []
m_Folders:
- Assets/Scenes
m_ViewMode: 0
m_StartGridSize: 64
m_LastFolders: []
@@ -495,7 +524,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ee240000
m_LastClickedID: 9454
m_ExpandedIDs: 00000000582c00006c300000703100007a3100009c320000c63200002a330000323300005c3300005e330000203400007c3400008234000086340000ec340000903900009239000094390000
m_ExpandedIDs: 00000000ea2d0000f02d0000002e0000062e00000e2e0000162e0000222e0000242e00003a2e0000402e0000262f0000ac310000a4330000a03e0000a23e0000a43e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -520,10 +549,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 2448}
m_SelectedIDs: b0dfffff
scrollPos: {x: 0, y: 0}
m_SelectedIDs: f0000100
m_LastClickedID: 0
m_ExpandedIDs: 00000000582c00006c300000703100007a3100009c320000c63200002a330000323300005c3300005e330000203400007c3400008234000086340000ec340000903900009239000094390000
m_ExpandedIDs: 00000000f02d0000002e0000062e00000e2e0000222e0000242e00003a2e0000402e0000262f0000ac310000a4330000a03e0000a23e0000a43e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -539,7 +568,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 11}
m_ClientGUIView: {fileID: 12}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -548,8 +577,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: b0dfffff
m_LastClickedInstanceID: -8272
m_SelectedInstanceIDs: f0000100
m_LastClickedInstanceID: 65776
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
@@ -578,7 +607,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_DirectoriesAreaWidth: 110
--- !u!114 &13
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -598,13 +627,13 @@ MonoBehaviour:
height: 731
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 14}
- {fileID: 15}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &14
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
@@ -638,7 +667,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
--- !u!114 &15
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +264 Bytes (100%) Library/assetDatabase3
Binary file not shown.
BIN -72 Bytes (98%) Library/expandedItems
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.
@@ -1 +1 @@
26fa22747bc191ba7a1b1be28edc8af9358542c7
4734a65589f7a374aae401181a7b135e09755902
Binary file not shown.