Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ARrobot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andre Gerhard Ortmann
ARrobot
Commits
205a1ad6
There was an error fetching the commit references. Please try again later.
Commit
205a1ad6
authored
Nov 10, 2021
by
Sarah Krings
Browse files
Options
Downloads
Patches
Plain Diff
Change Start screen for user study (only leave button for correct scene active)
parent
39dfe3e0
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
SPEAREDV2.0/Assets/RosSharp/Scenes/ChooseRobotScene.unity
+48
-8
48 additions, 8 deletions
SPEAREDV2.0/Assets/RosSharp/Scenes/ChooseRobotScene.unity
with
48 additions
and
8 deletions
SPEAREDV2.0/Assets/RosSharp/Scenes/ChooseRobotScene.unity
+
48
−
8
View file @
205a1ad6
...
...
@@ -456,7 +456,7 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0.00
4
1
,
y
:
0.03012275
}
m_AnchoredPosition
:
{
x
:
0.0
1
01
,
y
:
0.03012275
}
m_SizeDelta
:
{
x
:
40
,
y
:
5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&112573684
...
...
@@ -477,7 +477,7 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_text
:
Select a Scene or Scenario
m_text
:
Click "Start" to run SPEARED3
m_isRightToLeft
:
0
m_fontAsset
:
{
fileID
:
11400000
,
guid
:
6a84f857bec7e7345843ae29404c57ce
,
type
:
2
}
m_sharedMaterial
:
{
fileID
:
21202819797275496
,
guid
:
6a84f857bec7e7345843ae29404c57ce
,
...
...
@@ -513,7 +513,7 @@ MonoBehaviour:
m_fontSizeMin
:
18
m_fontSizeMax
:
72
m_fontStyle
:
0
m_textAlignment
:
25
7
m_textAlignment
:
25
8
m_characterSpacing
:
0
m_wordSpacing
:
0
m_lineSpacing
:
0
...
...
@@ -547,7 +547,7 @@ MonoBehaviour:
m_margin
:
{
x
:
0
,
y
:
1.1615484
,
z
:
0.9536365
,
w
:
1.6841211
}
m_textInfo
:
textComponent
:
{
fileID
:
112573684
}
characterCount
:
2
6
characterCount
:
2
9
spriteCount
:
0
spaceCount
:
4
wordCount
:
5
...
...
@@ -2492,7 +2492,7 @@ PrefabInstance:
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_textInfo.characterCount
value
:
9
value
:
5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
...
...
@@ -2502,7 +2502,7 @@ PrefabInstance:
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_textInfo.wordCount
value
:
2
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
...
...
@@ -2517,12 +2517,42 @@ PrefabInstance:
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_text
value
:
Grab&Drop
value
:
Start
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_fontStyle
value
:
33
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_textAlignment
value
:
4097
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_fontSize
value
:
0.14
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_fontSizeBase
value
:
0.14
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193212
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_firstOverflowCharacterIndex
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193215
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_AnchoredPosition.x
value
:
-0.00077
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786010476584173
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
.2
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786010476584173
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
...
...
@@ -2668,6 +2698,11 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
LegoMindstormBtn
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786008848669196
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193090
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_Mesh
...
...
@@ -2889,6 +2924,11 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
DobotBtn
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786008848669196
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3126786009469193090
,
guid
:
4f44c0d070528944c9bff425c6932763
,
type
:
3
}
propertyPath
:
m_Mesh
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment