Skip to content

Hand color picker #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
octoberU merged 5 commits into from
Feb 15, 2025
Merged

Hand color picker #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5fe586
Implement color pickers
octoberU Feb 15, 2025
53bfd16
Add color picker to settings menu
octoberU Feb 15, 2025
8fad2b2
Update UI & gun colors whenever the color config changes
octoberU Feb 15, 2025
efbbcfc
Merge branch 'main' into hand-color-picker
octoberU Feb 15, 2025
979efab
Add localization strings for hand colors
octoberU Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Assets/AudioKata/Prefabs/DebugPlayer.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,11 @@ PrefabInstance:
propertyPath: handType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1666709261117039964, guid: 2942a21401a861746b6c0d436c5815c1,
type: 3}
propertyPath: gunMaterial
value:
objectReference: {fileID: 2100000, guid: c2ab1f4105630ab4cb06edcff6e903cb, type: 2}
- target: {fileID: 1666709261117039964, guid: 2942a21401a861746b6c0d436c5815c1,
type: 3}
propertyPath: gunTrailManager
Expand Down Expand Up @@ -712,6 +717,11 @@ PrefabInstance:
propertyPath: handType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1666709261117039964, guid: 2942a21401a861746b6c0d436c5815c1,
type: 3}
propertyPath: gunMaterial
value:
objectReference: {fileID: 2100000, guid: 0b53c5d351c35704583bc86d74cf7471, type: 2}
- target: {fileID: 1666709261117039964, guid: 2942a21401a861746b6c0d436c5815c1,
type: 3}
propertyPath: gunTrailManager
Expand Down
364 changes: 364 additions & 0 deletions Assets/AudioKata/Prefabs/Pages/Settings/SettingColorPicker.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,364 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3256957734412286033
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8329072073024516413}
- component: {fileID: 8649361243547566873}
- component: {fileID: 4795036804523424932}
- component: {fileID: 4007703050341204625}
m_Layer: 5
m_Name: ColorPicker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8329072073024516413
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256957734412286033}
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: 6748346447434165752}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 203.76999, y: 0}
m_SizeDelta: {x: 404.44, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8649361243547566873
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256957734412286033}
m_CullTransparentMesh: 1
--- !u!114 &4795036804523424932
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256957734412286033}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: d6200033707e00b48954c55d4784e054, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!114 &4007703050341204625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256957734412286033}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 148a2f1730164db493d3c1b3c2a3f01c, type: 3}
m_Name:
m_EditorClassIdentifier:
hueImage: {fileID: 4795036804523424932}
hueTexture: {fileID: 2800000, guid: d6200033707e00b48954c55d4784e054, type: 3}
--- !u!1 &5058055937950736560
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6748346447434165752}
- component: {fileID: 4596775207724112533}
m_Layer: 5
m_Name: SettingColorPicker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6748346447434165752
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5058055937950736560}
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:
- {fileID: 8125189699215648571}
- {fileID: 5357244903851936119}
- {fileID: 8329072073024516413}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4596775207724112533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5058055937950736560}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e301af5a8d61498990f8de95e3ac575b, type: 3}
m_Name:
m_EditorClassIdentifier:
colorPicker: {fileID: 4007703050341204625}
selectedColorImage: {fileID: 6030633045267444157}
displayNameLabel: {fileID: 3794331111414666930}
--- !u!1 &9202431194417966167
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5357244903851936119}
- component: {fileID: 9216722518556760306}
- component: {fileID: 6030633045267444157}
m_Layer: 5
m_Name: SelectedColor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5357244903851936119
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9202431194417966167}
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: 6748346447434165752}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -40, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9216722518556760306
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9202431194417966167}
m_CullTransparentMesh: 1
--- !u!114 &6030633045267444157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9202431194417966167}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6842e05038768bc449fd0fbc194dfc76, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1001 &2959281589107803213
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6748346447434165752}
m_Modifications:
- target: {fileID: 2141838651368821503, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5147179209850649711, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_Name
value: SettingDisplayName Variant
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_SizeDelta.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_SizeDelta.y
value: 50
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -250
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a5cbf6748c79bff498db1be79416e8ed, type: 3}
--- !u!114 &3794331111414666930 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2141838651368821503, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
m_PrefabInstance: {fileID: 2959281589107803213}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &8125189699215648571 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6472519384575681398, guid: a5cbf6748c79bff498db1be79416e8ed,
type: 3}
m_PrefabInstance: {fileID: 2959281589107803213}
m_PrefabAsset: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/AudioKata/Prefabs/Pages/Settings/SettingColorPicker.prefab.meta
View file
Open in desktop

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

Loading