Auto stash before merge of "origin/development" and "feature/Portraits"

2025-01-21 22:58:50 -05:00 · 2024-04-23 13:53:53 -04:00 · 2024-04-23 13:53:53 -04:00 · 4ee16e6538
commit 4ee16e6538
parent 8fb1caf7ea
2 changed files with 274 additions and 13 deletions
--- a/Assets/CoursePrefabs/AR
+++ b/Assets/CoursePrefabs/AR
@ -1591,7 +1591,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 9027534693502164449}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+  m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
  m_LocalPosition: {x: 7.395, y: -10.31, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -1608,8 +1608,9 @@ Transform:
  - {fileID: 2022335937194353601}
  - {fileID: 5525590200919642878}
  - {fileID: 2707085690439898539}
+  - {fileID: 3705208541305940477}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
 --- !u!1 &9177841558424855058
 GameObject:
  m_ObjectHideFlags: 0
@ -1765,42 +1766,42 @@ PrefabInstance:
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.39
+      value: -5.024
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -0.265
+      value: 1.94
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 1.456006
+      value: 2.322
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.70710677
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.70710677
+      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
@ -1812,6 +1813,11 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 90
      objectReference: {fileID: 0}
+    - target: {fileID: 6721457260758073326, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6968731835860397699, guid: 43969d21369fb28449867f790ad23f48,
        type: 3}
      propertyPath: m_Name
@ -1825,7 +1831,11 @@ PrefabInstance:
        type: 3}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 5608748146813560283}
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 43969d21369fb28449867f790ad23f48, type: 3}
 --- !u!4 &2707085690439898539 stripped
@ -2667,6 +2677,120 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1286751401854560728}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1499391459154218144
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8935256399111493289}
+    m_Modifications:
+    - target: {fileID: 13421801062693606, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.063
+      objectReference: {fileID: 0}
+    - target: {fileID: 13421801062693606, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.128
+      objectReference: {fileID: 0}
+    - target: {fileID: 13421801062693606, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.017
+      objectReference: {fileID: 0}
+    - target: {fileID: 558795984027051854, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.106
+      objectReference: {fileID: 0}
+    - target: {fileID: 558795984027051854, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.126
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -5.024
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.716
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.322
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6721457260758073326, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6968731835860397699, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_Name
+      value: Portrait (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7712133272663817622, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e2129f69403e8fe4d887786a7b772ac4,
+        type: 3}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+        type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 9055444180373868095}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 43969d21369fb28449867f790ad23f48, type: 3}
+--- !u!4 &3705208541305940477 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
+    type: 3}
+  m_PrefabInstance: {fileID: 1499391459154218144}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1700849154212800015
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5077,6 +5201,74 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 5428843397177384615}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5604382647749890269
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2707085690439898539}
+    m_Modifications:
+    - target: {fileID: 1071618544589174, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_Name
+      value: SM_Prop_PaintingFrame_02
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 64098605733493640, guid: c8d92f646973d514a9e08df146be03bb,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+--- !u!4 &5608748146813560283 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb,
+    type: 3}
+  m_PrefabInstance: {fileID: 5604382647749890269}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5676775228288820406
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -7487,3 +7679,71 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 9021501688470868766}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &9060086224196025145
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3705208541305940477}
+    m_Modifications:
+    - target: {fileID: 1071618544589174, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_Name
+      value: SM_Prop_PaintingFrame_02
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 64098605733493640, guid: c8d92f646973d514a9e08df146be03bb,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c8d92f646973d514a9e08df146be03bb, type: 3}
+--- !u!4 &9055444180373868095 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4647542051386630, guid: c8d92f646973d514a9e08df146be03bb,
+    type: 3}
+  m_PrefabInstance: {fileID: 9060086224196025145}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Portraits/Portrait.prefab
+++ b/Assets/Portraits/Portrait.prefab
@ -159,7 +159,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0.97, y: 0.97}
+  m_SizeDelta: {x: 0.95, y: 0.95}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &3471652741733989752
 Canvas:
@ -602,7 +602,8 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 64033581236736632, guid: ed629bcb6b6da494f8e3db45dd71e896, type: 3}
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []