Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UFrameIT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FrameIT
UFrameIT
Commits
52c44a3b
Commit
52c44a3b
authored
5 years ago
by
Richard Marcus
Browse files
Options
Downloads
Patches
Plain Diff
some game qol
parent
27f217ef
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Assets/FactManager.cs
+9
-3
9 additions, 3 deletions
Assets/FactManager.cs
Assets/StartScreen.unity
+165
-5
165 additions, 5 deletions
Assets/StartScreen.unity
ProjectSettings/ProjectSettings.asset
+5
-3
5 additions, 3 deletions
ProjectSettings/ProjectSettings.asset
with
179 additions
and
11 deletions
Assets/FactManager.cs
+
9
−
3
View file @
52c44a3b
...
...
@@ -359,7 +359,12 @@ public void OnHit(RaycastHit hit)
{
Fact
tempFact
=
Facts
[
hit
.
transform
.
GetComponent
<
FactObject
>().
Id
];
if
(
this
.
lineModeIsFirstPointSelected
)
//we can only reach points that are lower than that with the measuring tape
if
(
ActiveToolMode
==
ToolMode
.
CreateLineMode
&&
tempFact
.
Representation
.
transform
.
position
.
y
>
2.5f
)
return
;
//no 0 distances
if
(
this
.
lineModeIsFirstPointSelected
&&
this
.
lineModeFirstPointSelected
.
Id
!=
tempFact
.
Id
)
{
//Event for end of line-drawing in "ShinyThings"
CommunicationEvents
.
StopLineDrawingEvent
.
Invoke
(
null
);
...
...
@@ -528,6 +533,7 @@ public void OnHit(RaycastHit hit)
break;*/
//If Left-Mouse-Button was pressed in ExtraMode
case
ToolMode
.
ExtraMode
:
/*
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point")) {
var menu = GameObject.Instantiate(SmartMenu);
menu.GetComponent<SmartMenu>().FactManager = this;
...
...
@@ -539,7 +545,7 @@ public void OnHit(RaycastHit hit)
{
PointFact fact = AddPointFact(hit, GetFirstEmptyID());
CommunicationEvents.AddFactEvent.Invoke(fact);
}
}
*/
break
;
}
...
...
This diff is collapsed.
Click to expand it.
Assets/StartScreen.unity
+
165
−
5
View file @
52c44a3b
...
...
@@ -146,7 +146,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
,
y
:
-
477
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
-
504
}
m_SizeDelta
:
{
x
:
200
,
y
:
50
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&206630816
...
...
@@ -176,8 +176,8 @@ MonoBehaviour:
m_fontMaterials
:
[]
m_fontColor32
:
serializedVersion
:
2
rgba
:
42
94967295
m_fontColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
rgba
:
42
83256278
m_fontColor
:
{
r
:
0.8396226
,
g
:
0.30495724
,
b
:
0.30495724
,
a
:
1
}
m_enableVertexGradient
:
0
m_colorMode
:
3
m_fontColorGradient
:
...
...
@@ -195,8 +195,8 @@ MonoBehaviour:
m_outlineColor
:
serializedVersion
:
2
rgba
:
4278190080
m_fontSize
:
36
m_fontSizeBase
:
36
m_fontSize
:
28
m_fontSizeBase
:
28
m_fontWeight
:
400
m_enableAutoSizing
:
0
m_fontSizeMin
:
18
...
...
@@ -581,6 +581,7 @@ RectTransform:
-
{
fileID
:
1305554811
}
-
{
fileID
:
206630815
}
-
{
fileID
:
1976054182
}
-
{
fileID
:
1809880657
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -602,6 +603,165 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
WaitingText
:
{
fileID
:
206630816
}
---
!u!1
&1809880656
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1809880657
}
-
component
:
{
fileID
:
1809880659
}
-
component
:
{
fileID
:
1809880658
}
m_Layer
:
5
m_Name
:
Description
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&1809880657
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1809880656
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
2
,
y
:
2
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1439106389
}
m_RootOrder
:
3
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
,
y
:
77
}
m_SizeDelta
:
{
x
:
200
,
y
:
50
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1809880658
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1809880656
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
f4688fdb7df04437aeb418b961361dc5
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_text
:
'
-
frameitconcept
-
frameitframework
-
frameworldtask'
m_isRightToLeft
:
0
m_fontAsset
:
{
fileID
:
11400000
,
guid
:
8f586378b4e144a9851e7b34d9b748ee
,
type
:
2
}
m_sharedMaterial
:
{
fileID
:
2180264
,
guid
:
8f586378b4e144a9851e7b34d9b748ee
,
type
:
2
}
m_fontSharedMaterials
:
[]
m_fontMaterial
:
{
fileID
:
0
}
m_fontMaterials
:
[]
m_fontColor32
:
serializedVersion
:
2
rgba
:
4294967295
m_fontColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_enableVertexGradient
:
0
m_colorMode
:
3
m_fontColorGradient
:
topLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
topRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_fontColorGradientPreset
:
{
fileID
:
0
}
m_spriteAsset
:
{
fileID
:
0
}
m_tintAllSprites
:
0
m_overrideHtmlColors
:
0
m_faceColor
:
serializedVersion
:
2
rgba
:
4294967295
m_outlineColor
:
serializedVersion
:
2
rgba
:
4278190080
m_fontSize
:
28
m_fontSizeBase
:
28
m_fontWeight
:
400
m_enableAutoSizing
:
0
m_fontSizeMin
:
18
m_fontSizeMax
:
72
m_fontStyle
:
0
m_textAlignment
:
258
m_characterSpacing
:
0
m_wordSpacing
:
0
m_lineSpacing
:
0
m_lineSpacingMax
:
0
m_paragraphSpacing
:
0
m_charWidthMaxAdj
:
0
m_enableWordWrapping
:
1
m_wordWrappingRatios
:
0.4
m_overflowMode
:
0
m_firstOverflowCharacterIndex
:
17
m_linkedTextComponent
:
{
fileID
:
0
}
m_isLinkedTextComponent
:
0
m_isTextTruncated
:
0
m_enableKerning
:
1
m_enableExtraPadding
:
0
checkPaddingRequired
:
0
m_isRichText
:
1
m_parseCtrlCharacters
:
1
m_isOrthographic
:
1
m_isCullingEnabled
:
0
m_ignoreRectMaskCulling
:
0
m_ignoreCulling
:
1
m_horizontalMapping
:
0
m_verticalMapping
:
0
m_uvLineOffset
:
0
m_geometrySortingOrder
:
0
m_VertexBufferAutoSizeReduction
:
1
m_firstVisibleCharacter
:
0
m_useMaxVisibleDescender
:
1
m_pageToDisplay
:
1
m_margin
:
{
x
:
-193.95554
,
y
:
0
,
z
:
-201.01343
,
w
:
0
}
m_textInfo
:
textComponent
:
{
fileID
:
1809880658
}
characterCount
:
52
spriteCount
:
0
spaceCount
:
5
wordCount
:
6
linkCount
:
0
lineCount
:
3
pageCount
:
1
materialCount
:
1
m_isUsingLegacyAnimationComponent
:
0
m_isVolumetricText
:
0
m_spriteAnimator
:
{
fileID
:
0
}
m_hasFontAssetChanged
:
0
m_subTextObjects
:
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
m_baseMaterial
:
{
fileID
:
0
}
m_maskOffset
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
---
!u!222
&1809880659
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1809880656
}
m_CullTransparentMesh
:
0
---
!u!1
&1976054181
GameObject
:
m_ObjectHideFlags
:
0
...
...
This diff is collapsed.
Click to expand it.
ProjectSettings/ProjectSettings.asset
+
5
−
3
View file @
52c44a3b
...
...
@@ -39,7 +39,9 @@ PlayerSettings:
y
:
0
width
:
1
height
:
1
m_SplashScreenLogos
:
[]
m_SplashScreenLogos
:
-
logo
:
{
fileID
:
21300000
,
guid
:
fe54135f12b2d1c4c9773f181baae1bd
,
type
:
3
}
duration
:
2
m_VirtualRealitySplashScreen
:
{
fileID
:
0
}
m_HolographicTrackingLossScreen
:
{
fileID
:
0
}
defaultScreenWidth
:
1920
...
...
@@ -52,7 +54,7 @@ PlayerSettings:
m_StackTraceTypes
:
010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading
:
-1
androidShowActivityIndicatorOnLoading
:
-1
displayResolutionDialog
:
1
displayResolutionDialog
:
0
iosUseCustomAppBackgroundBehavior
:
0
iosAllowHTTPDownload
:
1
allowedAutorotateToPortrait
:
1
...
...
@@ -92,7 +94,7 @@ PlayerSettings:
visibleInBackground
:
1
allowFullscreenSwitch
:
1
graphicsJobMode
:
0
fullscreenMode
:
1
fullscreenMode
:
3
xboxSpeechDB
:
0
xboxEnableHeadOrientation
:
0
xboxEnableGuest
:
0
...
...
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