Skip to content

Commit

Permalink
progress on player notations
Browse files Browse the repository at this point in the history
  • Loading branch information
levimhuillet committed Sep 25, 2024
1 parent f4a72f4 commit 1f36113
Show file tree
Hide file tree
Showing 20 changed files with 1,584 additions and 152 deletions.
2 changes: 1 addition & 1 deletion Assets/Project/Prefabs/GameConsts.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ MonoBehaviour:
CorrectColor: {r: 0, g: 1, b: 0, a: 1}
IncorrectColor: {r: 1, g: 0, b: 0, a: 1}
DefaultCursor: {fileID: 0}
GrabCursor: {fileID: 2800000, guid: 82073a8bfd6b8488a89b8796d500d12d, type: 3}
GrabCursor: {fileID: 2800000, guid: e092f32e3e649f1408900c7496466b14, type: 3}
53 changes: 53 additions & 0 deletions Assets/Project/Prefabs/Interaction Canvas.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7618683885887015085}
- {fileID: 6675286704708702434}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1771,6 +1772,58 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8550636746114321518
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6675286704708702434}
- component: {fileID: 8344839661571374246}
m_Layer: 5
m_Name: Notation System
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6675286704708702434
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8550636746114321518}
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: 1636848379924528256}
m_RootOrder: 1
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8344839661571374246
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8550636746114321518}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 812dd140d4693604496cbd3fa5cc1050, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NotationContainerPrefab: {fileID: 3358757257444236955, guid: 1214005fc0e557849b5c362432d33f7a, type: 3}
m_NotationPrefab: {fileID: 591164972104762807, guid: c8a5b8da2707e3e4d8e37f1dd985ecb2, type: 3}
m_Raycaster: {fileID: 1636848379924528262}
--- !u!1001 &314611437135434802
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/Project/Prefabs/PlayerNotations.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions Assets/Project/Prefabs/PlayerNotations/NotationContainer.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3358757257444236955
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5909435560239727995}
- component: {fileID: -2513547262638202554}
m_Layer: 5
m_Name: NotationContainer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5909435560239727995
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3358757257444236955}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &-2513547262638202554
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3358757257444236955}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e8899b8e2338134db5cf9a1149d8de5, type: 3}
m_Name:
m_EditorClassIdentifier:

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1f36113

Please sign in to comment.