aboutsummaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorAlee <Alee14498@gmail.com>2019-06-08 13:31:22 -0400
committerAlee <Alee14498@gmail.com>2019-06-08 13:31:22 -0400
commit6385ea0ad301faa1b9f0db0ec2285ebe02ec6db2 (patch)
tree3e45af36ede45151a4d98969c81be6c186565b02 /Assets
parentda26749bc406145e91fb2b234661ce4dcc7eae54 (diff)
downloadUnicity-6385ea0ad301faa1b9f0db0ec2285ebe02ec6db2.tar.gz
Unicity-6385ea0ad301faa1b9f0db0ec2285ebe02ec6db2.tar.bz2
Unicity-6385ea0ad301faa1b9f0db0ec2285ebe02ec6db2.zip
Started working on Experimental 3
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Plugins.meta9
-rw-r--r--Assets/Scenes/Main Menu/MainMenu.unity4
-rw-r--r--Assets/Scenes/Simulation/SimulationScene.unity4
3 files changed, 4 insertions, 13 deletions
diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
deleted file mode 100644
index fb8f959..0000000
--- a/Assets/Plugins.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 720712be6e31c444f88f57bb85bf5fa5
-folderAsset: yes
-timeCreated: 1504268238
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity
index cbf6a59..63518bd 100644
--- a/Assets/Scenes/Main Menu/MainMenu.unity
+++ b/Assets/Scenes/Main Menu/MainMenu.unity
@@ -160,7 +160,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 225.84998, y: -0.000030517578}
+ m_AnchoredPosition: {x: 225.84998, y: 0}
m_SizeDelta: {x: -451.7, y: 0.00012207}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &17355104
@@ -2210,7 +2210,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_text: Experimental 2
+ m_text: Experimental 3
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2}
diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity
index 88761a2..f53306c 100644
--- a/Assets/Scenes/Simulation/SimulationScene.unity
+++ b/Assets/Scenes/Simulation/SimulationScene.unity
@@ -1012,7 +1012,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_text: 'Unicity - Experimental 2
+ m_text: 'Unicity - Experimental 3
Please note that game is under active development,
and features may be incomplete or missing.'
@@ -1243,7 +1243,7 @@ PrefabInstance:
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}