Skip to content

Commit 200b123

Browse files
committed
Minor changes to sample scene, added delta rebind
1 parent 3ad7c58 commit 200b123

File tree

2 files changed

+237
-7
lines changed

2 files changed

+237
-7
lines changed

Assets/Samples/RebindingUI/RebindingMaterial.mat

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ Material:
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
14+
m_ValidKeywords:
15+
- _EMISSION
1516
m_InvalidKeywords: []
16-
m_LightmapFlags: 4
17+
m_LightmapFlags: 2
1718
m_EnableInstancingVariants: 0
1819
m_DoubleSidedGI: 0
1920
m_CustomRenderQueue: -1
@@ -66,7 +67,7 @@ Material:
6667
- _DetailNormalMapScale: 1
6768
- _DstBlend: 0
6869
- _GlossMapScale: 1
69-
- _Glossiness: 0.74
70+
- _Glossiness: 0.5
7071
- _GlossyReflections: 1
7172
- _Metallic: 0
7273
- _Mode: 0
@@ -78,7 +79,7 @@ Material:
7879
- _UVSec: 0
7980
- _ZWrite: 1
8081
m_Colors:
81-
- _Color: {r: 0.9999992, g: 0.92156786, b: 0.0156863, a: 1}
82-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
- _Color: {r: 1, g: 0, b: 1.1e-44, a: 1}
83+
- _EmissionColor: {r: 0.27450982, g: 0.078431375, b: 0.19607843, a: 1}
8384
m_BuildTextureStacks: []
8485
m_AllowLocking: 1

Assets/Samples/RebindingUI/RebindingUISampleScene.unity

Lines changed: 231 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,12 @@ CanvasRenderer:
199199
m_PrefabAsset: {fileID: 0}
200200
m_GameObject: {fileID: 14011389}
201201
m_CullTransparentMesh: 0
202+
--- !u!224 &16074951 stripped
203+
RectTransform:
204+
m_CorrespondingSourceObject: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
205+
type: 3}
206+
m_PrefabInstance: {fileID: 1855225027}
207+
m_PrefabAsset: {fileID: 0}
202208
--- !u!1 &51853243
203209
GameObject:
204210
m_ObjectHideFlags: 0
@@ -1603,7 +1609,7 @@ GameObject:
16031609
m_Icon: {fileID: 0}
16041610
m_NavMeshLayer: 0
16051611
m_StaticEditorFlags: 0
1606-
m_IsActive: 1
1612+
m_IsActive: 0
16071613
--- !u!224 &508436406
16081614
RectTransform:
16091615
m_ObjectHideFlags: 0
@@ -4279,7 +4285,7 @@ Camera:
42794285
m_Enabled: 1
42804286
serializedVersion: 2
42814287
m_ClearFlags: 2
4282-
m_BackGroundColor: {r: 0.15619439, g: 0.23934135, b: 0.2830189, a: 0}
4288+
m_BackGroundColor: {r: 0.13536845, g: 0.167992, b: 0.24528301, a: 0}
42834289
m_projectionMatrixMode: 1
42844290
m_GateFitMode: 2
42854291
m_FOVAxisMode: 0
@@ -4521,6 +4527,7 @@ RectTransform:
45214527
m_Children:
45224528
- {fileID: 1880645689}
45234529
- {fileID: 1414988296}
4530+
- {fileID: 16074951}
45244531
- {fileID: 1099885700}
45254532
- {fileID: 825336766}
45264533
- {fileID: 1237134518}
@@ -5164,6 +5171,228 @@ MonoBehaviour:
51645171
m_FillOrigin: 0
51655172
m_UseSpriteMesh: 0
51665173
m_PixelsPerUnitMultiplier: 1
5174+
--- !u!1001 &1855225027
5175+
PrefabInstance:
5176+
m_ObjectHideFlags: 0
5177+
serializedVersion: 2
5178+
m_Modification:
5179+
serializedVersion: 3
5180+
m_TransformParent: {fileID: 1219085456}
5181+
m_Modifications:
5182+
- target: {fileID: 690190895482579582, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5183+
type: 3}
5184+
propertyPath: m_Text
5185+
value: W/A/S/D
5186+
objectReference: {fileID: 0}
5187+
- target: {fileID: 6680292650503350822, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5188+
type: 3}
5189+
propertyPath: m_Name
5190+
value: LookRebind
5191+
objectReference: {fileID: 0}
5192+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5193+
type: 3}
5194+
propertyPath: m_Pivot.x
5195+
value: 0.5
5196+
objectReference: {fileID: 0}
5197+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5198+
type: 3}
5199+
propertyPath: m_Pivot.y
5200+
value: 0.5
5201+
objectReference: {fileID: 0}
5202+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5203+
type: 3}
5204+
propertyPath: m_RootOrder
5205+
value: 2
5206+
objectReference: {fileID: 0}
5207+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5208+
type: 3}
5209+
propertyPath: m_AnchorMax.x
5210+
value: 0
5211+
objectReference: {fileID: 0}
5212+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5213+
type: 3}
5214+
propertyPath: m_AnchorMax.y
5215+
value: 1
5216+
objectReference: {fileID: 0}
5217+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5218+
type: 3}
5219+
propertyPath: m_AnchorMin.x
5220+
value: 0
5221+
objectReference: {fileID: 0}
5222+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5223+
type: 3}
5224+
propertyPath: m_AnchorMin.y
5225+
value: 1
5226+
objectReference: {fileID: 0}
5227+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5228+
type: 3}
5229+
propertyPath: m_SizeDelta.x
5230+
value: 166.5
5231+
objectReference: {fileID: 0}
5232+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5233+
type: 3}
5234+
propertyPath: m_SizeDelta.y
5235+
value: 88.099976
5236+
objectReference: {fileID: 0}
5237+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5238+
type: 3}
5239+
propertyPath: m_LocalPosition.x
5240+
value: 0
5241+
objectReference: {fileID: 0}
5242+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5243+
type: 3}
5244+
propertyPath: m_LocalPosition.y
5245+
value: 0
5246+
objectReference: {fileID: 0}
5247+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5248+
type: 3}
5249+
propertyPath: m_LocalPosition.z
5250+
value: 0
5251+
objectReference: {fileID: 0}
5252+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5253+
type: 3}
5254+
propertyPath: m_LocalRotation.w
5255+
value: 1
5256+
objectReference: {fileID: 0}
5257+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5258+
type: 3}
5259+
propertyPath: m_LocalRotation.x
5260+
value: -0
5261+
objectReference: {fileID: 0}
5262+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5263+
type: 3}
5264+
propertyPath: m_LocalRotation.y
5265+
value: -0
5266+
objectReference: {fileID: 0}
5267+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5268+
type: 3}
5269+
propertyPath: m_LocalRotation.z
5270+
value: -0
5271+
objectReference: {fileID: 0}
5272+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5273+
type: 3}
5274+
propertyPath: m_AnchoredPosition.x
5275+
value: 203.5
5276+
objectReference: {fileID: 0}
5277+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5278+
type: 3}
5279+
propertyPath: m_AnchoredPosition.y
5280+
value: -150
5281+
objectReference: {fileID: 0}
5282+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5283+
type: 3}
5284+
propertyPath: m_LocalEulerAnglesHint.x
5285+
value: 0
5286+
objectReference: {fileID: 0}
5287+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5288+
type: 3}
5289+
propertyPath: m_LocalEulerAnglesHint.y
5290+
value: 0
5291+
objectReference: {fileID: 0}
5292+
- target: {fileID: 6680292650503350825, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5293+
type: 3}
5294+
propertyPath: m_LocalEulerAnglesHint.z
5295+
value: 0
5296+
objectReference: {fileID: 0}
5297+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5298+
type: 3}
5299+
propertyPath: action
5300+
value:
5301+
objectReference: {fileID: 7723093844229559393, guid: 7dead05c54ca85b4681351aafd8bd03a,
5302+
type: 3}
5303+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5304+
type: 3}
5305+
propertyPath: m_Action
5306+
value:
5307+
objectReference: {fileID: 4485540969121359642, guid: 7dead05c54ca85b4681351aafd8bd03a,
5308+
type: 3}
5309+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5310+
type: 3}
5311+
propertyPath: m_BindingId
5312+
value: 7c03e976-d9da-4d96-9bcd-622e98b0f3c3
5313+
objectReference: {fileID: 0}
5314+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5315+
type: 3}
5316+
propertyPath: m_RebindText
5317+
value:
5318+
objectReference: {fileID: 1121800143}
5319+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5320+
type: 3}
5321+
propertyPath: m_UIActionMap
5322+
value:
5323+
objectReference: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
5324+
type: 3}
5325+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5326+
type: 3}
5327+
propertyPath: m_RebindOverlay
5328+
value:
5329+
objectReference: {fileID: 1106689461}
5330+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5331+
type: 3}
5332+
propertyPath: m_UIActionMap.m_Id
5333+
value: 9bafb3aa-af47-48ed-a3fb-1e18488dcd33
5334+
objectReference: {fileID: 0}
5335+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5336+
type: 3}
5337+
propertyPath: m_UIActionMap.m_Name
5338+
value: UI
5339+
objectReference: {fileID: 0}
5340+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5341+
type: 3}
5342+
propertyPath: m_DefaultInputActions
5343+
value:
5344+
objectReference: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
5345+
type: 3}
5346+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5347+
type: 3}
5348+
propertyPath: m_UIActionMap.m_Actions.Array.size
5349+
value: 0
5350+
objectReference: {fileID: 0}
5351+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5352+
type: 3}
5353+
propertyPath: m_UIActionMap.m_Bindings.Array.size
5354+
value: 0
5355+
objectReference: {fileID: 0}
5356+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5357+
type: 3}
5358+
propertyPath: m_UIActionMap.m_Actions.Array.data[0].m_Id
5359+
value: c8398143-11a9-4267-bc40-03845d725e0a
5360+
objectReference: {fileID: 0}
5361+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5362+
type: 3}
5363+
propertyPath: m_UIActionMap.m_Bindings.Array.data[0].m_Id
5364+
value: d586299a-f0d3-4146-9911-59a7caa0c454
5365+
objectReference: {fileID: 0}
5366+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5367+
type: 3}
5368+
propertyPath: m_UIActionMap.m_Actions.Array.data[0].m_Name
5369+
value: New action
5370+
objectReference: {fileID: 0}
5371+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5372+
type: 3}
5373+
propertyPath: m_UIActionMap.m_Actions.Array.data[0].m_Type
5374+
value: 1
5375+
objectReference: {fileID: 0}
5376+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5377+
type: 3}
5378+
propertyPath: m_UIActionMap.m_Bindings.Array.data[0].m_Action
5379+
value: New action
5380+
objectReference: {fileID: 0}
5381+
- target: {fileID: 6680292650503350826, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5382+
type: 3}
5383+
propertyPath: m_UIActionMap.m_Actions.Array.data[0].m_ExpectedControlType
5384+
value: Button
5385+
objectReference: {fileID: 0}
5386+
- target: {fileID: 6680292650847612335, guid: f25dcd618d3acd64795bf8bb32edb6c9,
5387+
type: 3}
5388+
propertyPath: m_Text
5389+
value: Move
5390+
objectReference: {fileID: 0}
5391+
m_RemovedComponents: []
5392+
m_RemovedGameObjects: []
5393+
m_AddedGameObjects: []
5394+
m_AddedComponents: []
5395+
m_SourcePrefab: {fileID: 100100000, guid: f25dcd618d3acd64795bf8bb32edb6c9, type: 3}
51675396
--- !u!1 &1870027503
51685397
GameObject:
51695398
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)