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
9802eae5
Commit
9802eae5
authored
9 months ago
by
Paul-Walcher
Browse files
Options
Downloads
Patches
Plain Diff
Rename successful
parent
83914da1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/Resources/Prefabs/Facts/Rectangle.prefab.meta
+1
-1
1 addition, 1 deletion
Assets/Resources/Prefabs/Facts/Rectangle.prefab.meta
Assets/Scenes/Worlds/RiverWorld.unity
+11
-1
11 additions, 1 deletion
Assets/Scenes/Worlds/RiverWorld.unity
with
12 additions
and
2 deletions
Assets/Resources/Prefabs/Facts/Rectangle.prefab.meta
+
1
−
1
View file @
9802eae5
fileFormatVersion: 2
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Resources/Prefabs/Facts/Square.prefab.meta
<<<<<<<< HEAD:Assets/Resources/Prefabs/Facts/Square.prefab.meta
guid:
3053a4bcf6f3c7c45ad438b69ffcde9b
guid:
a902fb8d5e61cc24ca5ec879e6542ee0
PrefabImporter:
PrefabImporter:
========
========
guid: ffa3cc5a8ea56dc4b8c5e907de1f715a
guid: ffa3cc5a8ea56dc4b8c5e907de1f715a
...
...
This diff is collapsed.
Click to expand it.
Assets/Scenes/Worlds/RiverWorld.unity
+
11
−
1
View file @
9802eae5
...
@@ -40512,6 +40512,11 @@ PrefabInstance:
...
@@ -40512,6 +40512,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
propertyPath: m_AnchoredPosition.y
value: 0
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 0}
- target: {fileID: 4371582021305344946, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -5
objectReference: {fileID: 0}
- target: {fileID: 4513918919072978879, guid: caf448c160a07214f8cf74da91506980,
- target: {fileID: 4513918919072978879, guid: caf448c160a07214f8cf74da91506980,
type: 3}
type: 3}
propertyPath: m_AnchoredPosition.y
propertyPath: m_AnchoredPosition.y
...
@@ -40562,6 +40567,11 @@ PrefabInstance:
...
@@ -40562,6 +40567,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
propertyPath: m_LocalPosition.y
value: 0
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 0}
- target: {fileID: 5187187330899431124, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -5
objectReference: {fileID: 0}
- target: {fileID: 5311304385787722976, guid: caf448c160a07214f8cf74da91506980,
- target: {fileID: 5311304385787722976, guid: caf448c160a07214f8cf74da91506980,
type: 3}
type: 3}
propertyPath: m_RootOrder
propertyPath: m_RootOrder
...
@@ -60627,7 +60637,7 @@ PrefabInstance:
...
@@ -60627,7 +60637,7 @@ PrefabInstance:
type: 3}
type: 3}
propertyPath: Rectangle
propertyPath: Rectangle
value:
value:
objectReference: {fileID: 6839596689016440457, guid:
3053a4bcf6f3c7c45ad438b69ffcde9b
,
objectReference: {fileID: 6839596689016440457, guid:
a902fb8d5e61cc24ca5ec879e6542ee0
,
type: 3}
type: 3}
- target: {fileID: 2872381745209199267, guid: b07552db700124a4680401e6fb94c186,
- target: {fileID: 2872381745209199267, guid: b07552db700124a4680401e6fb94c186,
type: 3}
type: 3}
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