PrefabLens
Chrome extension
Simulated pull request page. Not GitHub — but the Raw / Semantic toggle and the semantic views below are the real PrefabLens extension code and WASM diff engine running in your browser, exactly as they do on github.com.
github.com/you/unity-project/pull/2/files

Rebalance robot physics and rework the playground scene #2

4 files changed, merging feat/robot-rebalance into main

Assets/Prefabs/Robot.prefab +29 −27
@@ -10,7 +10,7 @@ GameObject:
1010 m_Component:
1111 - component: {fileID: 773946660032344633}
1212 m_Layer: 0
13- m_Name: Head
13+ m_Name: Sensor
1414 m_TagString: Untagged
1515 m_Icon: {fileID: 0}
1616 m_NavMeshLayer: 0
@@ -25,7 +25,7 @@ Transform:
2525 m_GameObject: {fileID: 5267583679722982000}
2626 serializedVersion: 2
2727 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
28- m_LocalPosition: {x: 0, y: 2, z: 0}
28+ m_LocalPosition: {x: 0, y: 2.2, z: 0.1}
2929 m_LocalScale: {x: 1, y: 1, z: 1}
3030 m_ConstrainProportionsScale: 0
3131 m_Children: []
@@ -93,9 +93,9 @@ GameObject:
9393 serializedVersion: 6
9494 m_Component:
9595 - component: {fileID: 9003171066890524446}
96- - component: {fileID: 3496157676355288704}
9796 - component: {fileID: 7524019088176543755}
9897 - component: {fileID: 4382273337907184133}
98+ - component: {fileID: 5978502647804666025}
9999 m_Layer: 0
100100 m_Name: Robot
101101 m_TagString: Untagged
@@ -120,27 +120,6 @@ Transform:
120120 - {fileID: 773946660032344633}
121121 m_Father: {fileID: 0}
122122 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
123---- !u!65 &3496157676355288704
124-BoxCollider:
125- m_ObjectHideFlags: 0
126- m_CorrespondingSourceObject: {fileID: 0}
127- m_PrefabInstance: {fileID: 0}
128- m_PrefabAsset: {fileID: 0}
129- m_GameObject: {fileID: 7703008261286675462}
130- m_Material: {fileID: 0}
131- m_IncludeLayers:
132- serializedVersion: 2
133- m_Bits: 0
134- m_ExcludeLayers:
135- serializedVersion: 2
136- m_Bits: 0
137- m_LayerOverridePriority: 0
138- m_IsTrigger: 0
139- m_ProvidesContacts: 0
140- m_Enabled: 1
141- serializedVersion: 3
142- m_Size: {x: 1, y: 2, z: 1}
143- m_Center: {x: 0, y: 0, z: 0}
144123 --- !u!54 &7524019088176543755
145124 Rigidbody:
146125 m_ObjectHideFlags: 0
@@ -149,7 +128,7 @@ Rigidbody:
149128 m_PrefabAsset: {fileID: 0}
150129 m_GameObject: {fileID: 7703008261286675462}
151130 serializedVersion: 5
152- m_Mass: 5
131+ m_Mass: 12
153132 m_LinearDamping: 0
154133 m_AngularDamping: 0.05
155134 m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -180,8 +159,31 @@ MonoBehaviour:
180159 m_Script: {fileID: 11500000, guid: 703cbb55826be49d58e62cadc6597c6f, type: 3}
181160 m_Name:
182161 m_EditorClassIdentifier: Assembly-CSharp::FixtureBehaviour
183- speed: 2.5
162+ speed: 4
184163 level: 1
185164 label: robot
186- offset: {x: 0, y: 0, z: 0}
165+ offset: {x: 0, y: 0.5, z: 0}
187166 target: {fileID: 0}
167+--- !u!136 &5978502647804666025
168+CapsuleCollider:
169+ m_ObjectHideFlags: 0
170+ m_CorrespondingSourceObject: {fileID: 0}
171+ m_PrefabInstance: {fileID: 0}
172+ m_PrefabAsset: {fileID: 0}
173+ m_GameObject: {fileID: 7703008261286675462}
174+ m_Material: {fileID: 0}
175+ m_IncludeLayers:
176+ serializedVersion: 2
177+ m_Bits: 0
178+ m_ExcludeLayers:
179+ serializedVersion: 2
180+ m_Bits: 0
181+ m_LayerOverridePriority: 0
182+ m_IsTrigger: 0
183+ m_ProvidesContacts: 0
184+ m_Enabled: 1
185+ serializedVersion: 2
186+ m_Radius: 0.5
187+ m_Height: 2.2
188+ m_Direction: 1
189+ m_Center: {x: 0, y: 0, z: 0}
188190
Assets/Prefabs/RobotVariant.prefab +5 −1
@@ -8,9 +8,13 @@ PrefabInstance:
88 serializedVersion: 3
99 m_TransformParent: {fileID: 0}
1010 m_Modifications:
11+ - target: {fileID: 4382273337907184133, guid: 16eec5cd08e894210b8bfeaad861586c, type: 3}
12+ propertyPath: label
13+ value: variant
14+ objectReference: {fileID: 0}
1115 - target: {fileID: 4382273337907184133, guid: 16eec5cd08e894210b8bfeaad861586c, type: 3}
1216 propertyPath: level
13- value: 7
17+ value: 9
1418 objectReference: {fileID: 0}
1519 - target: {fileID: 7703008261286675462, guid: 16eec5cd08e894210b8bfeaad861586c, type: 3}
1620 propertyPath: m_Name
1721
Assets/Scenes/Playground.unity +38 −37
@@ -119,7 +119,7 @@ NavMeshSettings:
119119 debug:
120120 m_Flags: 0
121121 m_NavMeshData: {fileID: 0}
122---- !u!1 &628110117
122+--- !u!1 &615180537
123123 GameObject:
124124 m_ObjectHideFlags: 0
125125 m_CorrespondingSourceObject: {fileID: 0}
@@ -127,39 +127,24 @@ GameObject:
127127 m_PrefabAsset: {fileID: 0}
128128 serializedVersion: 6
129129 m_Component:
130- - component: {fileID: 628110118}
131- - component: {fileID: 628110121}
132- - component: {fileID: 628110120}
133- - component: {fileID: 628110119}
130+ - component: {fileID: 615180541}
131+ - component: {fileID: 615180540}
132+ - component: {fileID: 615180539}
133+ - component: {fileID: 615180538}
134134 m_Layer: 0
135- m_Name: Marble
135+ m_Name: Floor
136136 m_TagString: Untagged
137137 m_Icon: {fileID: 0}
138138 m_NavMeshLayer: 0
139139 m_StaticEditorFlags: 0
140140 m_IsActive: 1
141---- !u!4 &628110118
142-Transform:
143- m_ObjectHideFlags: 0
144- m_CorrespondingSourceObject: {fileID: 0}
145- m_PrefabInstance: {fileID: 0}
146- m_PrefabAsset: {fileID: 0}
147- m_GameObject: {fileID: 628110117}
148- serializedVersion: 2
149- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
150- m_LocalPosition: {x: 0, y: 1, z: 0}
151- m_LocalScale: {x: 1, y: 1, z: 1}
152- m_ConstrainProportionsScale: 0
153- m_Children: []
154- m_Father: {fileID: 971361890}
155- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
156---- !u!23 &628110119
141+--- !u!23 &615180538
157142 MeshRenderer:
158143 m_ObjectHideFlags: 0
159144 m_CorrespondingSourceObject: {fileID: 0}
160145 m_PrefabInstance: {fileID: 0}
161146 m_PrefabAsset: {fileID: 0}
162- m_GameObject: {fileID: 628110117}
147+ m_GameObject: {fileID: 615180537}
163148 m_Enabled: 1
164149 m_CastShadows: 1
165150 m_ReceiveShadows: 1
@@ -202,13 +187,13 @@ MeshRenderer:
202187 m_SortingOrder: 0
203188 m_MaskInteraction: 0
204189 m_AdditionalVertexStreams: {fileID: 0}
205---- !u!135 &628110120
206-SphereCollider:
190+--- !u!64 &615180539
191+MeshCollider:
207192 m_ObjectHideFlags: 0
208193 m_CorrespondingSourceObject: {fileID: 0}
209194 m_PrefabInstance: {fileID: 0}
210195 m_PrefabAsset: {fileID: 0}
211- m_GameObject: {fileID: 628110117}
196+ m_GameObject: {fileID: 615180537}
212197 m_Material: {fileID: 0}
213198 m_IncludeLayers:
214199 serializedVersion: 2
@@ -220,17 +205,33 @@ SphereCollider:
220205 m_IsTrigger: 0
221206 m_ProvidesContacts: 0
222207 m_Enabled: 1
223- serializedVersion: 3
224- m_Radius: 0.5
225- m_Center: {x: 0, y: 0, z: 0}
226---- !u!33 &628110121
208+ serializedVersion: 5
209+ m_Convex: 0
210+ m_CookingOptions: 30
211+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
212+--- !u!33 &615180540
227213 MeshFilter:
228214 m_ObjectHideFlags: 0
229215 m_CorrespondingSourceObject: {fileID: 0}
230216 m_PrefabInstance: {fileID: 0}
231217 m_PrefabAsset: {fileID: 0}
232- m_GameObject: {fileID: 628110117}
233- m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
218+ m_GameObject: {fileID: 615180537}
219+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
220+--- !u!4 &615180541
221+Transform:
222+ m_ObjectHideFlags: 0
223+ m_CorrespondingSourceObject: {fileID: 0}
224+ m_PrefabInstance: {fileID: 0}
225+ m_PrefabAsset: {fileID: 0}
226+ m_GameObject: {fileID: 615180537}
227+ serializedVersion: 2
228+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
229+ m_LocalPosition: {x: 0, y: 0, z: 0}
230+ m_LocalScale: {x: 1, y: 1, z: 1}
231+ m_ConstrainProportionsScale: 0
232+ m_Children: []
233+ m_Father: {fileID: 0}
234+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
234235 --- !u!1 &971361886
235236 GameObject:
236237 m_ObjectHideFlags: 0
@@ -337,11 +338,10 @@ Transform:
337338 m_GameObject: {fileID: 971361886}
338339 serializedVersion: 2
339340 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
340- m_LocalPosition: {x: 0, y: 0.5, z: 0}
341+ m_LocalPosition: {x: 3, y: 0.5, z: -1}
341342 m_LocalScale: {x: 1, y: 1, z: 1}
342343 m_ConstrainProportionsScale: 0
343- m_Children:
344- - {fileID: 628110118}
344+ m_Children: []
345345 m_Father: {fileID: 0}
346346 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
347347 --- !u!1 &1256042085
@@ -371,8 +371,8 @@ Light:
371371 m_Enabled: 1
372372 serializedVersion: 13
373373 m_Type: 1
374- m_Color: {r: 1, g: 1, b: 1, a: 1}
375- m_Intensity: 1
374+ m_Color: {r: 1, g: 0.8, b: 0.6, a: 1}
375+ m_Intensity: 0.4
376376 m_Range: 10
377377 m_SpotAngle: 30
378378 m_InnerSpotAngle: 21.802082
@@ -447,3 +447,4 @@ SceneRoots:
447447 m_Roots:
448448 - {fileID: 1256042087}
449449 - {fileID: 971361890}
450+ - {fileID: 615180541}
450451
Assets/Settings/Fixture.asset +13 −9
@@ -12,18 +12,22 @@ MonoBehaviour:
1212 m_Script: {fileID: 11500000, guid: f7942e5a835264f3582eaf184cdf5a5c, type: 3}
1313 m_Name: Fixture
1414 m_EditorClassIdentifier: Assembly-CSharp::FixtureData
15- hitPoints: 100
16- title: fixture
15+ hitPoints: 150
16+ title: fixture v2
1717 weights:
18- - 0.1
19- - 0.2
2018 - 0.7
19+ - 0.2
20+ - 0.1
21+ - 0.05
2122 items:
22- - itemName: sword
23- cost: 50
24- consumable: 0
2523 - itemName: potion
2624 cost: 10
2725 consumable: 1
28- materialRef: {fileID: 2100000, guid: d10cc984e47164feb9cb74c75c0f3cf6, type: 2}
29- tint: {r: 1, g: 1, b: 1, a: 1}
26+ - itemName: sword
27+ cost: 50
28+ consumable: 0
29+ - itemName: shield
30+ cost: 80
31+ consumable: 0
32+ materialRef: {fileID: 0}
33+ tint: {r: 1, g: 0.5, b: 0, a: 1}
3034