Skip to content

Commit 3e57779

Browse files
committed
Update RebindingUISample & Rename Shaders
1 parent 0f5f96c commit 3e57779

29 files changed

+1862
-125
lines changed

Assets/Samples/RebindingUI/Game/Bullet.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ MeshRenderer:
6666
m_RenderingLayerMask: 1
6767
m_RendererPriority: 0
6868
m_Materials:
69-
- {fileID: 2100000, guid: 37f709daf8a9e48b5b8a04fb235aa401, type: 2}
69+
- {fileID: 2100000, guid: bec5a833889cada42b1bb432731d3100, type: 2}
7070
m_StaticBatchInfo:
7171
firstSubMesh: 0
7272
subMeshCount: 0

Assets/Samples/RebindingUI/Game/BulletMaterial.mat

Lines changed: 156 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7332406110468820834
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 13
16+
hdPluginSubTargetMaterialVersions:
17+
m_Keys: []
18+
m_Values:
319
--- !u!21 &2100000
420
Material:
521
serializedVersion: 8
@@ -8,22 +24,32 @@ Material:
824
m_PrefabInstance: {fileID: 0}
925
m_PrefabAsset: {fileID: 0}
1026
m_Name: BulletMaterial
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
27+
m_Shader: {fileID: -6465566751694194690, guid: d7a2461f95655fa4b958f9503bc2e9cf,
28+
type: 3}
1229
m_Parent: {fileID: 0}
1330
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords:
15-
- _EMISSION
31+
m_ValidKeywords: []
1632
m_InvalidKeywords: []
17-
m_LightmapFlags: 2
33+
m_LightmapFlags: 4
1834
m_EnableInstancingVariants: 0
1935
m_DoubleSidedGI: 0
2036
m_CustomRenderQueue: -1
21-
stringTagMap: {}
22-
disabledShaderPasses: []
37+
stringTagMap:
38+
MotionVector: User
39+
disabledShaderPasses:
40+
- MOTIONVECTORS
41+
- TransparentDepthPrepass
42+
- TransparentDepthPostpass
43+
- TransparentBackface
44+
- RayTracingPrepass
2345
m_LockedProperties:
2446
m_SavedProperties:
2547
serializedVersion: 3
2648
m_TexEnvs:
49+
- _BaseMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
2753
- _BumpMap:
2854
m_Texture: {fileID: 0}
2955
m_Scale: {x: 1, y: 1}
@@ -60,26 +86,142 @@ Material:
6086
m_Texture: {fileID: 0}
6187
m_Scale: {x: 1, y: 1}
6288
m_Offset: {x: 0, y: 0}
89+
- _SpecGlossMap:
90+
m_Texture: {fileID: 0}
91+
m_Scale: {x: 1, y: 1}
92+
m_Offset: {x: 0, y: 0}
93+
- unity_Lightmaps:
94+
m_Texture: {fileID: 0}
95+
m_Scale: {x: 1, y: 1}
96+
m_Offset: {x: 0, y: 0}
97+
- unity_LightmapsInd:
98+
m_Texture: {fileID: 0}
99+
m_Scale: {x: 1, y: 1}
100+
m_Offset: {x: 0, y: 0}
101+
- unity_ShadowMasks:
102+
m_Texture: {fileID: 0}
103+
m_Scale: {x: 1, y: 1}
104+
m_Offset: {x: 0, y: 0}
63105
m_Ints: []
64106
m_Floats:
107+
- _AddPrecomputedVelocity: 0
108+
- _AlphaClip: 0
109+
- _AlphaCutoffEnable: 0
110+
- _AlphaDstBlend: 0
111+
- _AlphaSrcBlend: 1
112+
- _AlphaToMask: 0
113+
- _BUILTIN_QueueControl: 0
114+
- _BUILTIN_QueueOffset: 0
115+
- _Blend: 0
116+
- _BlendMode: 0
117+
- _BlendModePreserveSpecular: 1
65118
- _BumpScale: 1
119+
- _ClearCoatMask: 0
120+
- _ClearCoatSmoothness: 0
121+
- _ConservativeDepthOffsetEnable: 0
122+
- _Cull: 2
123+
- _CullMode: 2
124+
- _CullModeForward: 2
66125
- _Cutoff: 0.5
126+
- _DepthOffsetEnable: 0
127+
- _DetailAlbedoMapScale: 1
67128
- _DetailNormalMapScale: 1
129+
- _DoubleSidedEnable: 0
130+
- _DoubleSidedGIMode: 0
131+
- _DoubleSidedNormalMode: 2
68132
- _DstBlend: 0
69-
- _GlossMapScale: 1
70-
- _Glossiness: 0.5
71-
- _GlossyReflections: 1
133+
- _DstBlend2: 0
134+
- _DstBlendAlpha: 0
135+
- _EnableBlendModePreserveSpecularLighting: 1
136+
- _EnableFogOnTransparent: 1
137+
- _EnvironmentReflections: 1
138+
- _ExcludeFromTUAndAA: 0
139+
- _GlossMapScale: 0
140+
- _Glossiness: 0
141+
- _GlossyReflections: 0
142+
- _MaterialID: 1
143+
- _MaterialTypeMask: 2
72144
- _Metallic: 0
73-
- _Mode: 0
74145
- _OcclusionStrength: 1
75-
- _Parallax: 0.02
146+
- _OpaqueCullMode: 2
147+
- _Parallax: 0.005
148+
- _PerPixelSorting: 0
149+
- _QueueControl: 1
150+
- _QueueOffset: 0
151+
- _RayTracing: 0
152+
- _ReceiveShadows: 1
153+
- _ReceivesSSR: 1
154+
- _ReceivesSSRTransparent: 0
155+
- _RefractionModel: 0
156+
- _RenderQueueType: 1
157+
- _RequireSplitLighting: 0
158+
- _Smoothness: 0.5
76159
- _SmoothnessTextureChannel: 0
77160
- _SpecularHighlights: 1
78161
- _SrcBlend: 1
79-
- _UVSec: 0
162+
- _SrcBlendAlpha: 1
163+
- _StencilRef: 0
164+
- _StencilRefDepth: 8
165+
- _StencilRefDistortionVec: 4
166+
- _StencilRefGBuffer: 10
167+
- _StencilRefMV: 40
168+
- _StencilWriteMask: 6
169+
- _StencilWriteMaskDepth: 9
170+
- _StencilWriteMaskDistortionVec: 4
171+
- _StencilWriteMaskGBuffer: 15
172+
- _StencilWriteMaskMV: 41
173+
- _SupportDecals: 1
174+
- _Surface: 0
175+
- _SurfaceType: 0
176+
- _TransmissionEnable: 1
177+
- _TransparentBackfaceEnable: 0
178+
- _TransparentCullMode: 2
179+
- _TransparentDepthPostpassEnable: 0
180+
- _TransparentDepthPrepassEnable: 0
181+
- _TransparentSortPriority: 0
182+
- _TransparentWritingMotionVec: 0
183+
- _TransparentZWrite: 0
184+
- _UseShadowThreshold: 0
185+
- _WorkflowMode: 1
186+
- _XRMotionVectorsPass: 1
187+
- _ZTestDepthEqualForOpaque: 3
188+
- _ZTestGBuffer: 4
189+
- _ZTestTransparent: 4
80190
- _ZWrite: 1
81191
m_Colors:
82-
- _Color: {r: 0.8301887, g: 0.8009621, b: 0.23104309, a: 1}
83-
- _EmissionColor: {r: 0.8396226, g: 0.449911, b: 0.35248306, a: 1}
192+
- _Albedo: {r: 0.83137256, g: 0.8, b: 0.23137255, a: 1}
193+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
194+
- _Color: {r: 1, g: 1, b: 1, a: 1}
195+
- _Diffuse: {r: 1, g: 1, b: 1, a: 1}
196+
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
197+
- _Emission: {r: 0.8392157, g: 0.4509804, b: 0.3529412, a: 0}
198+
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
199+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
84200
m_BuildTextureStacks: []
85201
m_AllowLocking: 1
202+
--- !u!114 &2866137758639019065
203+
MonoBehaviour:
204+
m_ObjectHideFlags: 11
205+
m_CorrespondingSourceObject: {fileID: 0}
206+
m_PrefabInstance: {fileID: 0}
207+
m_PrefabAsset: {fileID: 0}
208+
m_GameObject: {fileID: 0}
209+
m_Enabled: 1
210+
m_EditorHideFlags: 0
211+
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
212+
m_Name:
213+
m_EditorClassIdentifier:
214+
version: 0
215+
--- !u!114 &9026287993339991371
216+
MonoBehaviour:
217+
m_ObjectHideFlags: 11
218+
m_CorrespondingSourceObject: {fileID: 0}
219+
m_PrefabInstance: {fileID: 0}
220+
m_PrefabAsset: {fileID: 0}
221+
m_GameObject: {fileID: 0}
222+
m_Enabled: 1
223+
m_EditorHideFlags: 0
224+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
225+
m_Name:
226+
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
227+
version: 10

Assets/Samples/RebindingUI/Game/BulletMaterial.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/RebindingUI/Game/CapsuleDebris.prefab

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ MeshRenderer:
6666
m_RenderingLayerMask: 1
6767
m_RendererPriority: 0
6868
m_Materials:
69-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
69+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
7070
m_StaticBatchInfo:
7171
firstSubMesh: 0
7272
subMeshCount: 0
@@ -95,10 +95,10 @@ Rigidbody:
9595
m_PrefabInstance: {fileID: 0}
9696
m_PrefabAsset: {fileID: 0}
9797
m_GameObject: {fileID: 2485973555241529759}
98-
serializedVersion: 5
98+
serializedVersion: 4
9999
m_Mass: 1
100-
m_LinearDamping: 0
101-
m_AngularDamping: 0.05
100+
m_Drag: 0
101+
m_AngularDrag: 0.05
102102
m_CenterOfMass: {x: 0, y: 0, z: 0}
103103
m_InertiaTensor: {x: 1, y: 1, z: 1}
104104
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}

Assets/Samples/RebindingUI/Game/CubeDebris.prefab

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ MeshRenderer:
6666
m_RenderingLayerMask: 1
6767
m_RendererPriority: 0
6868
m_Materials:
69-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
69+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
7070
m_StaticBatchInfo:
7171
firstSubMesh: 0
7272
subMeshCount: 0
@@ -116,10 +116,10 @@ Rigidbody:
116116
m_PrefabInstance: {fileID: 0}
117117
m_PrefabAsset: {fileID: 0}
118118
m_GameObject: {fileID: 2292259400330097555}
119-
serializedVersion: 5
119+
serializedVersion: 4
120120
m_Mass: 0.3
121-
m_LinearDamping: 0
122-
m_AngularDamping: 0.05
121+
m_Drag: 0
122+
m_AngularDrag: 0.05
123123
m_CenterOfMass: {x: 0, y: 0, z: 0}
124124
m_InertiaTensor: {x: 1, y: 1, z: 1}
125125
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}

Assets/Samples/RebindingUI/Game/Enemy.prefab

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ MeshRenderer:
6464
m_RenderingLayerMask: 1
6565
m_RendererPriority: 0
6666
m_Materials:
67-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
67+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
6868
m_StaticBatchInfo:
6969
firstSubMesh: 0
7070
subMeshCount: 0
@@ -150,7 +150,7 @@ MeshRenderer:
150150
m_RenderingLayerMask: 1
151151
m_RendererPriority: 0
152152
m_Materials:
153-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
153+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
154154
m_StaticBatchInfo:
155155
firstSubMesh: 0
156156
subMeshCount: 0
@@ -274,7 +274,7 @@ MeshRenderer:
274274
m_RenderingLayerMask: 1
275275
m_RendererPriority: 0
276276
m_Materials:
277-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
277+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
278278
m_StaticBatchInfo:
279279
firstSubMesh: 0
280280
subMeshCount: 0
@@ -360,7 +360,7 @@ MeshRenderer:
360360
m_RenderingLayerMask: 1
361361
m_RendererPriority: 0
362362
m_Materials:
363-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
363+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
364364
m_StaticBatchInfo:
365365
firstSubMesh: 0
366366
subMeshCount: 0
@@ -434,6 +434,7 @@ MonoBehaviour:
434434
rotationSpeedX: 130
435435
rotationSpeedY: 100
436436
speed: 1
437+
explosionColor: {r: 0.8711135, g: 0.5424528, b: 1, a: 1}
437438
manager: {fileID: 0}
438439
--- !u!135 &3464601146983780728
439440
SphereCollider:
@@ -463,10 +464,10 @@ Rigidbody:
463464
m_PrefabInstance: {fileID: 0}
464465
m_PrefabAsset: {fileID: 0}
465466
m_GameObject: {fileID: 5308828742654324719}
466-
serializedVersion: 5
467+
serializedVersion: 4
467468
m_Mass: 1
468-
m_LinearDamping: 0
469-
m_AngularDamping: 0.05
469+
m_Drag: 0
470+
m_AngularDrag: 0.05
470471
m_CenterOfMass: {x: 0, y: 0, z: 0}
471472
m_InertiaTensor: {x: 1, y: 1, z: 1}
472473
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -580,7 +581,7 @@ MeshRenderer:
580581
m_RenderingLayerMask: 1
581582
m_RendererPriority: 0
582583
m_Materials:
583-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
584+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
584585
m_StaticBatchInfo:
585586
firstSubMesh: 0
586587
subMeshCount: 0
@@ -666,7 +667,7 @@ MeshRenderer:
666667
m_RenderingLayerMask: 1
667668
m_RendererPriority: 0
668669
m_Materials:
669-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
670+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
670671
m_StaticBatchInfo:
671672
firstSubMesh: 0
672673
subMeshCount: 0
@@ -752,7 +753,7 @@ MeshRenderer:
752753
m_RenderingLayerMask: 1
753754
m_RendererPriority: 0
754755
m_Materials:
755-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
756+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
756757
m_StaticBatchInfo:
757758
firstSubMesh: 0
758759
subMeshCount: 0
@@ -838,7 +839,7 @@ MeshRenderer:
838839
m_RenderingLayerMask: 1
839840
m_RendererPriority: 0
840841
m_Materials:
841-
- {fileID: 2100000, guid: b8e14aa9fd46e491da8236fbbfd078d2, type: 2}
842+
- {fileID: 2100000, guid: 648e244e42393d148b43c45e546c0afc, type: 2}
842843
m_StaticBatchInfo:
843844
firstSubMesh: 0
844845
subMeshCount: 0

0 commit comments

Comments
 (0)