Skip to content

Commit d162b14

Browse files
felineartsfelinearts
committed
Merge branch 'main' of https://github.com/UnityTechnologies/LoadyDungeons into Lune-Blocking
2 parents c30d930 + 65cc57b commit d162b14

31 files changed

Lines changed: 1446 additions & 786 deletions

‎Assets/AddressableAssetsData/AssetGroups/Hats.asset‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,27 @@ MonoBehaviour:
2121
m_Address: Hat00
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
m_MainAsset: {fileID: 8249111256857059732, guid: b53baa10142cbb346a47ab071d32889a,
25-
type: 3}
26-
m_TargetAsset: {fileID: 8249111256857059732, guid: b53baa10142cbb346a47ab071d32889a,
27-
type: 3}
24+
m_MainAsset: {fileID: 0}
25+
m_TargetAsset: {fileID: 0}
2826
- m_GUID: 6e65281e8a345ff4ea1b73f2a1578a6d
2927
m_Address: Hat01
3028
m_ReadOnly: 0
3129
m_SerializedLabels: []
32-
m_MainAsset: {fileID: 5166224616317297372, guid: 6e65281e8a345ff4ea1b73f2a1578a6d,
33-
type: 3}
34-
m_TargetAsset: {fileID: 5166224616317297372, guid: 6e65281e8a345ff4ea1b73f2a1578a6d,
35-
type: 3}
30+
m_MainAsset: {fileID: 0}
31+
m_TargetAsset: {fileID: 0}
3632
- m_GUID: 6c93cb6413eaf5f46bbe190dbbad2651
3733
m_Address: Hat02
3834
m_ReadOnly: 0
3935
m_SerializedLabels: []
40-
m_MainAsset: {fileID: 6774698051306351897, guid: 6c93cb6413eaf5f46bbe190dbbad2651,
36+
m_MainAsset: {fileID: 0}
37+
m_TargetAsset: {fileID: 0}
38+
- m_GUID: 434c1413ad6a76842a3a98e6a21aefa5
39+
m_Address: Hat03
40+
m_ReadOnly: 0
41+
m_SerializedLabels: []
42+
m_MainAsset: {fileID: 6774698051306351897, guid: 434c1413ad6a76842a3a98e6a21aefa5,
4143
type: 3}
42-
m_TargetAsset: {fileID: 6774698051306351897, guid: 6c93cb6413eaf5f46bbe190dbbad2651,
44+
m_TargetAsset: {fileID: 6774698051306351897, guid: 434c1413ad6a76842a3a98e6a21aefa5,
4345
type: 3}
4446
m_ReadOnly: 0
4547
m_Settings: {fileID: 11400000, guid: 661d48ea9271a404cae43a9e2517e23a, type: 2}

‎Assets/Art/Goal_Door.fbx.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/Models.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/Door.prefab‎

Lines changed: 100 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ Transform:
2929
m_GameObject: {fileID: 5495074216500759982}
3030
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3131
m_LocalPosition: {x: -0.31, y: 0.91, z: 3.4551387}
32-
m_LocalScale: {x: 2.2921, y: 1.8536, z: 1}
33-
m_Children: []
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children:
34+
- {fileID: 704669665175325423}
3435
m_Father: {fileID: 0}
3536
m_RootOrder: 0
3637
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -105,5 +106,100 @@ BoxCollider:
105106
m_IsTrigger: 1
106107
m_Enabled: 1
107108
serializedVersion: 2
108-
m_Size: {x: 2, y: 2, z: 2}
109-
m_Center: {x: 0, y: 0, z: 0}
109+
m_Size: {x: 2, y: 2.5171194, z: 2.4713173}
110+
m_Center: {x: 0, y: 1.0145516, z: -0.23565865}
111+
--- !u!1001 &1030695594982223108
112+
PrefabInstance:
113+
m_ObjectHideFlags: 0
114+
serializedVersion: 2
115+
m_Modification:
116+
m_TransformParent: {fileID: 5495074216500759978}
117+
m_Modifications:
118+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
119+
type: 3}
120+
propertyPath: m_RootOrder
121+
value: 0
122+
objectReference: {fileID: 0}
123+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
124+
type: 3}
125+
propertyPath: m_LocalScale.x
126+
value: 1
127+
objectReference: {fileID: 0}
128+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
129+
type: 3}
130+
propertyPath: m_LocalScale.y
131+
value: 1
132+
objectReference: {fileID: 0}
133+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
134+
type: 3}
135+
propertyPath: m_LocalScale.z
136+
value: 1
137+
objectReference: {fileID: 0}
138+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
139+
type: 3}
140+
propertyPath: m_LocalPosition.x
141+
value: -0
142+
objectReference: {fileID: 0}
143+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
144+
type: 3}
145+
propertyPath: m_LocalPosition.y
146+
value: 0
147+
objectReference: {fileID: 0}
148+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
149+
type: 3}
150+
propertyPath: m_LocalPosition.z
151+
value: 0
152+
objectReference: {fileID: 0}
153+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
154+
type: 3}
155+
propertyPath: m_LocalRotation.w
156+
value: -0.50008726
157+
objectReference: {fileID: 0}
158+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
159+
type: 3}
160+
propertyPath: m_LocalRotation.x
161+
value: 0.49991274
162+
objectReference: {fileID: 0}
163+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
164+
type: 3}
165+
propertyPath: m_LocalRotation.y
166+
value: 0.50008726
167+
objectReference: {fileID: 0}
168+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
169+
type: 3}
170+
propertyPath: m_LocalRotation.z
171+
value: 0.49991274
172+
objectReference: {fileID: 0}
173+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
174+
type: 3}
175+
propertyPath: m_LocalEulerAnglesHint.x
176+
value: -89.98
177+
objectReference: {fileID: 0}
178+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
179+
type: 3}
180+
propertyPath: m_LocalEulerAnglesHint.y
181+
value: 270
182+
objectReference: {fileID: 0}
183+
- target: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
184+
type: 3}
185+
propertyPath: m_LocalEulerAnglesHint.z
186+
value: 0
187+
objectReference: {fileID: 0}
188+
- target: {fileID: -7511558181221131132, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
189+
type: 3}
190+
propertyPath: m_Materials.Array.data[0]
191+
value:
192+
objectReference: {fileID: 2100000, guid: 777785f55ad6a8749953b09d9a30f546, type: 2}
193+
- target: {fileID: 919132149155446097, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
194+
type: 3}
195+
propertyPath: m_Name
196+
value: Goal_Door
197+
objectReference: {fileID: 0}
198+
m_RemovedComponents: []
199+
m_SourcePrefab: {fileID: 100100000, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4, type: 3}
200+
--- !u!4 &704669665175325423 stripped
201+
Transform:
202+
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5fcdbb1f8bb0ac44d8d34a32ed6bafa4,
203+
type: 3}
204+
m_PrefabInstance: {fileID: 1030695594982223108}
205+
m_PrefabAsset: {fileID: 0}

‎Assets/Prefabs/GameplayCanvas.prefab‎

Lines changed: 8 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &7702242262789508225
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: 7702242262789508226}
12-
- component: {fileID: 7702242262789508252}
13-
- component: {fileID: 7702242262789508227}
14-
m_Layer: 5
15-
m_Name: Text
16-
m_TagString: Untagged
17-
m_Icon: {fileID: 0}
18-
m_NavMeshLayer: 0
19-
m_StaticEditorFlags: 0
20-
m_IsActive: 1
21-
--- !u!224 &7702242262789508226
22-
RectTransform:
23-
m_ObjectHideFlags: 0
24-
m_CorrespondingSourceObject: {fileID: 0}
25-
m_PrefabInstance: {fileID: 0}
26-
m_PrefabAsset: {fileID: 0}
27-
m_GameObject: {fileID: 7702242262789508225}
28-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
29-
m_LocalPosition: {x: 0, y: 0, z: 0}
30-
m_LocalScale: {x: 1, y: 1, z: 1}
31-
m_Children: []
32-
m_Father: {fileID: 7702242263277782300}
33-
m_RootOrder: 0
34-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35-
m_AnchorMin: {x: 0, y: 0}
36-
m_AnchorMax: {x: 1, y: 1}
37-
m_AnchoredPosition: {x: 0, y: 0}
38-
m_SizeDelta: {x: 0, y: 0}
39-
m_Pivot: {x: 0.5, y: 0.5}
40-
--- !u!222 &7702242262789508252
41-
CanvasRenderer:
42-
m_ObjectHideFlags: 0
43-
m_CorrespondingSourceObject: {fileID: 0}
44-
m_PrefabInstance: {fileID: 0}
45-
m_PrefabAsset: {fileID: 0}
46-
m_GameObject: {fileID: 7702242262789508225}
47-
m_CullTransparentMesh: 0
48-
--- !u!114 &7702242262789508227
49-
MonoBehaviour:
50-
m_ObjectHideFlags: 0
51-
m_CorrespondingSourceObject: {fileID: 0}
52-
m_PrefabInstance: {fileID: 0}
53-
m_PrefabAsset: {fileID: 0}
54-
m_GameObject: {fileID: 7702242262789508225}
55-
m_Enabled: 1
56-
m_EditorHideFlags: 0
57-
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
58-
m_Name:
59-
m_EditorClassIdentifier:
60-
m_Material: {fileID: 0}
61-
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
62-
m_RaycastTarget: 1
63-
m_Maskable: 1
64-
m_OnCullStateChanged:
65-
m_PersistentCalls:
66-
m_Calls: []
67-
m_FontData:
68-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
69-
m_FontSize: 14
70-
m_FontStyle: 0
71-
m_BestFit: 0
72-
m_MinSize: 10
73-
m_MaxSize: 40
74-
m_Alignment: 4
75-
m_AlignByGeometry: 0
76-
m_RichText: 1
77-
m_HorizontalOverflow: 0
78-
m_VerticalOverflow: 0
79-
m_LineSpacing: 1
80-
m_Text: X
813
--- !u!1 &7702242263051669512
824
GameObject:
835
m_ObjectHideFlags: 0
@@ -112,8 +34,8 @@ RectTransform:
11234
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11335
m_AnchorMin: {x: 1, y: 1}
11436
m_AnchorMax: {x: 1, y: 1}
115-
m_AnchoredPosition: {x: -26, y: -17}
116-
m_SizeDelta: {x: 100, y: 100}
37+
m_AnchoredPosition: {x: -38, y: -22}
38+
m_SizeDelta: {x: 121.24988, y: 87.824234}
11739
m_Pivot: {x: 1, y: 1}
11840
--- !u!222 &7702242263051669515
11941
CanvasRenderer:
@@ -142,7 +64,7 @@ MonoBehaviour:
14264
m_OnCullStateChanged:
14365
m_PersistentCalls:
14466
m_Calls: []
145-
m_Sprite: {fileID: 0}
67+
m_Sprite: {fileID: 21300000, guid: 5999dfa22b38c2b4a8c4886304228f4e, type: 3}
14668
m_Type: 0
14769
m_PreserveAspect: 0
14870
m_FillCenter: 1
@@ -181,15 +103,14 @@ RectTransform:
181103
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
182104
m_LocalPosition: {x: 0, y: 0, z: 0}
183105
m_LocalScale: {x: 1, y: 1, z: 1}
184-
m_Children:
185-
- {fileID: 7702242262789508226}
106+
m_Children: []
186107
m_Father: {fileID: 7702242264122354704}
187108
m_RootOrder: 1
188109
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
189110
m_AnchorMin: {x: 0, y: 1}
190111
m_AnchorMax: {x: 0, y: 1}
191-
m_AnchoredPosition: {x: 0, y: 0}
192-
m_SizeDelta: {x: 64.38263, y: 30}
112+
m_AnchoredPosition: {x: 44, y: -22}
113+
m_SizeDelta: {x: 64, y: 64}
193114
m_Pivot: {x: 0, y: 1}
194115
--- !u!222 &7702242263277782303
195116
CanvasRenderer:
@@ -218,8 +139,8 @@ MonoBehaviour:
218139
m_OnCullStateChanged:
219140
m_PersistentCalls:
220141
m_Calls: []
221-
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
222-
m_Type: 1
142+
m_Sprite: {fileID: 21300000, guid: 8c32906745141e64d936ee29733d3e44, type: 3}
143+
m_Type: 0
223144
m_PreserveAspect: 0
224145
m_FillCenter: 1
225146
m_FillMethod: 4

0 commit comments

Comments
 (0)