Skip to content

Commit b3c2a86

Browse files
maross3maross3
authored
Add files via upload
1 parent 41d8bd8 commit b3c2a86

File tree

5 files changed

+252
-11
lines changed

5 files changed

+252
-11
lines changed

‎UIFramework/Prefab.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UIFramework/Prefab/Knob.prefab

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &7401210057881585921
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 7401210057881585920}
12+
m_Layer: 0
13+
m_Name: Anchor
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &7401210057881585920
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 7401210057881585921}
26+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
27+
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalScale: {x: 1, y: 1, z: 1}
29+
m_ConstrainProportionsScale: 0
30+
m_Children: []
31+
m_Father: {fileID: 7401210059241990385}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!1 &7401210059241990286
35+
GameObject:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
serializedVersion: 6
41+
m_Component:
42+
- component: {fileID: 7401210059241990385}
43+
- component: {fileID: 7401210059241990389}
44+
- component: {fileID: 7401210059241990386}
45+
- component: {fileID: 7401210059241990387}
46+
- component: {fileID: 7401210059241990384}
47+
m_Layer: 0
48+
m_Name: Knob
49+
m_TagString: Untagged
50+
m_Icon: {fileID: 0}
51+
m_NavMeshLayer: 0
52+
m_StaticEditorFlags: 0
53+
m_IsActive: 1
54+
--- !u!4 &7401210059241990385
55+
Transform:
56+
m_ObjectHideFlags: 0
57+
m_CorrespondingSourceObject: {fileID: 0}
58+
m_PrefabInstance: {fileID: 0}
59+
m_PrefabAsset: {fileID: 0}
60+
m_GameObject: {fileID: 7401210059241990286}
61+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
62+
m_LocalPosition: {x: -0.13615197, y: 0.94512403, z: 0.028078783}
63+
m_LocalScale: {x: 1, y: 1, z: 1}
64+
m_ConstrainProportionsScale: 0
65+
m_Children:
66+
- {fileID: 7401210057881585920}
67+
m_Father: {fileID: 0}
68+
m_RootOrder: 0
69+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
70+
--- !u!114 &7401210059241990389
71+
MonoBehaviour:
72+
m_ObjectHideFlags: 0
73+
m_CorrespondingSourceObject: {fileID: 0}
74+
m_PrefabInstance: {fileID: 0}
75+
m_PrefabAsset: {fileID: 0}
76+
m_GameObject: {fileID: 7401210059241990286}
77+
m_Enabled: 1
78+
m_EditorHideFlags: 0
79+
m_Script: {fileID: 11500000, guid: a459a13daafd4ac49d7c70f8ba74a94a, type: 3}
80+
m_Name:
81+
m_EditorClassIdentifier:
82+
parent: {fileID: 7401210057881585921}
83+
bounds:
84+
serializedVersion: 2
85+
x: 0
86+
y: 0
87+
width: 100
88+
height: 100
89+
backColor: {r: 0, g: 0, b: 0, a: 1}
90+
foreColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
91+
visible: 0
92+
Value: 0
93+
radius: 40
94+
angle: 424
95+
rotationSpeed: 20
96+
indicatorRadius: 8
97+
indicatorDistanceFromCenter: 28
98+
--- !u!212 &7401210059241990386
99+
SpriteRenderer:
100+
m_ObjectHideFlags: 0
101+
m_CorrespondingSourceObject: {fileID: 0}
102+
m_PrefabInstance: {fileID: 0}
103+
m_PrefabAsset: {fileID: 0}
104+
m_GameObject: {fileID: 7401210059241990286}
105+
m_Enabled: 1
106+
m_CastShadows: 0
107+
m_ReceiveShadows: 0
108+
m_DynamicOccludee: 1
109+
m_StaticShadowCaster: 0
110+
m_MotionVectors: 1
111+
m_LightProbeUsage: 1
112+
m_ReflectionProbeUsage: 1
113+
m_RayTracingMode: 0
114+
m_RayTraceProcedural: 0
115+
m_RenderingLayerMask: 1
116+
m_RendererPriority: 0
117+
m_Materials:
118+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
119+
m_StaticBatchInfo:
120+
firstSubMesh: 0
121+
subMeshCount: 0
122+
m_StaticBatchRoot: {fileID: 0}
123+
m_ProbeAnchor: {fileID: 0}
124+
m_LightProbeVolumeOverride: {fileID: 0}
125+
m_ScaleInLightmap: 1
126+
m_ReceiveGI: 1
127+
m_PreserveUVs: 0
128+
m_IgnoreNormalsForChartDetection: 0
129+
m_ImportantGI: 0
130+
m_StitchLightmapSeams: 1
131+
m_SelectedEditorRenderState: 0
132+
m_MinimumChartSize: 4
133+
m_AutoUVMaxDistance: 0.5
134+
m_AutoUVMaxAngle: 89
135+
m_LightmapParameters: {fileID: 0}
136+
m_SortingLayerID: 0
137+
m_SortingLayer: 0
138+
m_SortingOrder: 0
139+
m_Sprite: {fileID: 0}
140+
m_Color: {r: 1, g: 1, b: 1, a: 1}
141+
m_FlipX: 0
142+
m_FlipY: 0
143+
m_DrawMode: 0
144+
m_Size: {x: 1, y: 1}
145+
m_AdaptiveModeThreshold: 0.5
146+
m_SpriteTileMode: 0
147+
m_WasSpriteAssigned: 0
148+
m_MaskInteraction: 0
149+
m_SpriteSortPoint: 0
150+
--- !u!54 &7401210059241990387
151+
Rigidbody:
152+
m_ObjectHideFlags: 0
153+
m_CorrespondingSourceObject: {fileID: 0}
154+
m_PrefabInstance: {fileID: 0}
155+
m_PrefabAsset: {fileID: 0}
156+
m_GameObject: {fileID: 7401210059241990286}
157+
serializedVersion: 2
158+
m_Mass: 1
159+
m_Drag: 0
160+
m_AngularDrag: 0.05
161+
m_UseGravity: 0
162+
m_IsKinematic: 1
163+
m_Interpolate: 0
164+
m_Constraints: 0
165+
m_CollisionDetection: 0
166+
--- !u!65 &7401210059241990384
167+
BoxCollider:
168+
m_ObjectHideFlags: 0
169+
m_CorrespondingSourceObject: {fileID: 0}
170+
m_PrefabInstance: {fileID: 0}
171+
m_PrefabAsset: {fileID: 0}
172+
m_GameObject: {fileID: 7401210059241990286}
173+
m_Material: {fileID: 0}
174+
m_IsTrigger: 0
175+
m_Enabled: 1
176+
serializedVersion: 2
177+
m_Size: {x: 1, y: 1.03, z: 0.07}
178+
m_Center: {x: 0.39, y: 0.48, z: 0}

‎UIFramework/Prefab/Knob.prefab.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UIFramework/Scenes/Knobby.unity

+58
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,65 @@ Transform:
202202
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
203203
m_LocalPosition: {x: 0, y: 0, z: -10}
204204
m_LocalScale: {x: 1, y: 1, z: 1}
205+
m_ConstrainProportionsScale: 0
205206
m_Children: []
206207
m_Father: {fileID: 0}
207208
m_RootOrder: 0
208209
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
210+
--- !u!1001 &7401210059465095729
211+
PrefabInstance:
212+
m_ObjectHideFlags: 0
213+
serializedVersion: 2
214+
m_Modification:
215+
m_TransformParent: {fileID: 0}
216+
m_Modifications:
217+
- target: {fileID: 7401210059241990286, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
218+
propertyPath: m_Name
219+
value: Knob
220+
objectReference: {fileID: 0}
221+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
222+
propertyPath: m_RootOrder
223+
value: 1
224+
objectReference: {fileID: 0}
225+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
226+
propertyPath: m_LocalPosition.x
227+
value: -0.13615197
228+
objectReference: {fileID: 0}
229+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
230+
propertyPath: m_LocalPosition.y
231+
value: 0.94512403
232+
objectReference: {fileID: 0}
233+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
234+
propertyPath: m_LocalPosition.z
235+
value: 0.028078783
236+
objectReference: {fileID: 0}
237+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
238+
propertyPath: m_LocalRotation.w
239+
value: 1
240+
objectReference: {fileID: 0}
241+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
242+
propertyPath: m_LocalRotation.x
243+
value: 0
244+
objectReference: {fileID: 0}
245+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
246+
propertyPath: m_LocalRotation.y
247+
value: 0
248+
objectReference: {fileID: 0}
249+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
250+
propertyPath: m_LocalRotation.z
251+
value: 0
252+
objectReference: {fileID: 0}
253+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
254+
propertyPath: m_LocalEulerAnglesHint.x
255+
value: 0
256+
objectReference: {fileID: 0}
257+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
258+
propertyPath: m_LocalEulerAnglesHint.y
259+
value: 0
260+
objectReference: {fileID: 0}
261+
- target: {fileID: 7401210059241990385, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}
262+
propertyPath: m_LocalEulerAnglesHint.z
263+
value: 0
264+
objectReference: {fileID: 0}
265+
m_RemovedComponents: []
266+
m_SourcePrefab: {fileID: 100100000, guid: 5fb80530298daee4992e10c3ea9ab344, type: 3}

‎UIFramework/UI/Controls/Base/Control.cs

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using Sirenix.OdinInspector;
1+
using Sirenix.OdinInspector;
42
using UnityEngine;
53
using Utils;
64

@@ -55,13 +53,5 @@ public virtual void ViewInEditor()
5553
{
5654
bounds.GizmoSelectedRect(Color.magenta);
5755
}
58-
59-
[Button]
60-
public void InspectorInvalidate()
61-
{
62-
Start();
63-
Invalidate();
64-
Update();
65-
}
6656
}
6757
}

0 commit comments

Comments
 (0)