Skip to content

Commit

Permalink
Merge branch 'hotfix/v2.12.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
naukri7707 committed Jan 29, 2024
2 parents bdf4d0a + 9ee871b commit b6561c9
Showing 1 changed file with 50 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ GameObject:
- component: {fileID: 320707574}
- component: {fileID: 320707573}
m_Layer: 0
m_Name: Label
m_Name: Rename
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -284,6 +284,7 @@ MonoBehaviour:
useLabelWithNicifyName: 0
bindingMessage: change me!
renameTarget: 0
renameBySubString: {x: 0, y: 0}
--- !u!4 &320707574
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -329,6 +330,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 660676859}
- {fileID: 1885695013}
- {fileID: 144739884}
- {fileID: 2120952487}
- {fileID: 554693068}
Expand Down Expand Up @@ -930,7 +932,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cfc969da6719de749bf86044bca37c9a, type: 3}
m_Name:
m_EditorClassIdentifier:
readonlyWidget: 0
readOnlyWidget: 0
bad: 0
good: 0
readOnlyMultipleWidgets: 0
Expand Down Expand Up @@ -1233,6 +1235,52 @@ Transform:
m_Children: []
m_Father: {fileID: 974059910}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1885695012
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1885695013}
- component: {fileID: 1885695014}
m_Layer: 0
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1885695013
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885695012}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 341137828}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1885695014
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885695012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d6d99a27effb404ead7daec229cb6f2, type: 3}
m_Name:
m_EditorClassIdentifier:
simple: 0
bindingWithString: change me!
--- !u!1 &1949409778
GameObject:
m_ObjectHideFlags: 0
Expand Down

0 comments on commit b6561c9

Please sign in to comment.