Skip to content

Commit 1c13c3f

Browse files
LeonardoTPereiraLeonardoTPereira
committed
Fixes a lot of errors that restricting some variables to non-static caused. Also the ones from changing the Room and the RoomBHV 2D arrays to Dictionaries. Adds a HashCode to Coordinates so the dictionary can find the right rooms by the coordinates. Player now waits for an event from RoomBHV that the starting room has been created to position itself. RoomBHV now place all needed PlaceableObjects inside itself. Lots of Debug Logs that will be deleted soon. Changes Interface so now the EA dungeons are saved in the right format in the .txt.
1 parent f433973 commit 1c13c3f

28 files changed

+910
-612
lines changed

‎Assets/Prefabs/Room.prefab‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ SpriteRenderer:
5050
m_LightProbeUsage: 1
5151
m_ReflectionProbeUsage: 1
5252
m_RayTracingMode: 0
53+
m_RayTraceProcedural: 0
5354
m_RenderingLayerMask: 4294967295
5455
m_RendererPriority: 0
5556
m_Materials:
@@ -135,7 +136,8 @@ MonoBehaviour:
135136
type: 3}
136137
teleportTransform: {fileID: 4757452092410706}
137138
gradientMaterial: {fileID: 2100000, guid: c88c6a03d73d70a43a9d8c26c177ed75, type: 2}
138-
destination: {fileID: 0}
139+
destination: {fileID: 2111537569747417202, guid: 6493f5f9ec583344d9eee647ad947f21,
140+
type: 3}
139141
unlockSnd: {fileID: 8300000, guid: f7987142c1aaefa498b7748d83e0f77f, type: 3}
140142
--- !u!82 &82771547812302412
141143
AudioSource:
@@ -307,6 +309,7 @@ SpriteRenderer:
307309
m_LightProbeUsage: 1
308310
m_ReflectionProbeUsage: 1
309311
m_RayTracingMode: 0
312+
m_RayTraceProcedural: 0
310313
m_RenderingLayerMask: 4294967295
311314
m_RendererPriority: 0
312315
m_Materials:
@@ -435,6 +438,7 @@ SpriteRenderer:
435438
m_LightProbeUsage: 1
436439
m_ReflectionProbeUsage: 1
437440
m_RayTracingMode: 0
441+
m_RayTraceProcedural: 0
438442
m_RenderingLayerMask: 4294967295
439443
m_RendererPriority: 0
440444
m_Materials:
@@ -520,7 +524,8 @@ MonoBehaviour:
520524
type: 3}
521525
teleportTransform: {fileID: 4191061800590270}
522526
gradientMaterial: {fileID: 2100000, guid: 5af165038c57488488a10367446e405f, type: 2}
523-
destination: {fileID: 0}
527+
destination: {fileID: 3761539166365797510, guid: 33bc69aee992c69439b5f20d84f43731,
528+
type: 3}
524529
unlockSnd: {fileID: 8300000, guid: f7987142c1aaefa498b7748d83e0f77f, type: 3}
525530
--- !u!82 &82236141939253266
526531
AudioSource:
@@ -668,10 +673,11 @@ SpriteRenderer:
668673
m_LightProbeUsage: 1
669674
m_ReflectionProbeUsage: 1
670675
m_RayTracingMode: 0
676+
m_RayTraceProcedural: 0
671677
m_RenderingLayerMask: 4294967295
672678
m_RendererPriority: 0
673679
m_Materials:
674-
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
680+
- {fileID: 2100000, guid: 8f79ab74a235e69408fd36c02bb99811, type: 2}
675681
m_StaticBatchInfo:
676682
firstSubMesh: 0
677683
subMeshCount: 0
@@ -753,7 +759,8 @@ MonoBehaviour:
753759
type: 3}
754760
teleportTransform: {fileID: 4178795282519426}
755761
gradientMaterial: {fileID: 2100000, guid: 8f79ab74a235e69408fd36c02bb99811, type: 2}
756-
destination: {fileID: 0}
762+
destination: {fileID: 8690080842966673077, guid: 754960a2ab7dfaa498c71bbee6dab635,
763+
type: 3}
757764
unlockSnd: {fileID: 8300000, guid: f7987142c1aaefa498b7748d83e0f77f, type: 3}
758765
--- !u!82 &82423396311077630
759766
AudioSource:
@@ -955,6 +962,7 @@ SpriteRenderer:
955962
m_LightProbeUsage: 1
956963
m_ReflectionProbeUsage: 1
957964
m_RayTracingMode: 0
965+
m_RayTraceProcedural: 0
958966
m_RenderingLayerMask: 4294967295
959967
m_RendererPriority: 0
960968
m_Materials:
@@ -1113,6 +1121,7 @@ SpriteRenderer:
11131121
m_LightProbeUsage: 1
11141122
m_ReflectionProbeUsage: 1
11151123
m_RayTracingMode: 0
1124+
m_RayTraceProcedural: 0
11161125
m_RenderingLayerMask: 4294967295
11171126
m_RendererPriority: 0
11181127
m_Materials:
@@ -1222,6 +1231,7 @@ SpriteRenderer:
12221231
m_LightProbeUsage: 1
12231232
m_ReflectionProbeUsage: 1
12241233
m_RayTracingMode: 0
1234+
m_RayTraceProcedural: 0
12251235
m_RenderingLayerMask: 4294967295
12261236
m_RendererPriority: 0
12271237
m_Materials:
@@ -1320,6 +1330,7 @@ SpriteRenderer:
13201330
m_LightProbeUsage: 1
13211331
m_ReflectionProbeUsage: 1
13221332
m_RayTracingMode: 0
1333+
m_RayTraceProcedural: 0
13231334
m_RenderingLayerMask: 4294967295
13241335
m_RendererPriority: 0
13251336
m_Materials:
@@ -1394,7 +1405,7 @@ MonoBehaviour:
13941405
m_Script: {fileID: 11500000, guid: cdf8378b01e52be43958c231943c2f07, type: 3}
13951406
m_Name:
13961407
m_EditorClassIdentifier:
1397-
keyID:
1408+
keyID: 03000000
13981409
isOpen: 0
13991410
isClosedByEnemies: 0
14001411
lockedSprite: {fileID: -2804735369662088147, guid: 29269b331c7bd2e4ca9b20f2eb3d526d,
@@ -1405,7 +1416,8 @@ MonoBehaviour:
14051416
type: 3}
14061417
teleportTransform: {fileID: 4317141115486034}
14071418
gradientMaterial: {fileID: 2100000, guid: 5db105d0bbe6bfa4fbcc1197e12afd7b, type: 2}
1408-
destination: {fileID: 0}
1419+
destination: {fileID: 2760642564320694933, guid: 1846683e8ac887748a9d6f0f49dd5fd7,
1420+
type: 3}
14091421
unlockSnd: {fileID: 8300000, guid: f7987142c1aaefa498b7748d83e0f77f, type: 3}
14101422
--- !u!82 &82943865087853100
14111423
AudioSource:
@@ -1553,18 +1565,11 @@ MonoBehaviour:
15531565
m_Script: {fileID: 11500000, guid: eebd30311a6e4ae4686e3bcf02963395, type: 3}
15541566
m_Name:
15551567
m_EditorClassIdentifier:
1556-
x: 0
1557-
y: 0
15581568
northDoor:
15591569
southDoor:
15601570
eastDoor:
15611571
westDoor:
1562-
availableKeyID:
1563-
treasureID: -1
1564-
isStart: 0
1565-
isEnd: 0
15661572
hasEnemies: 0
1567-
difficultyLevel: 0
15681573
enemiesIndex:
15691574
doorNorth: {fileID: 114081829205008226}
15701575
doorSouth: {fileID: 114023979573330110}
@@ -1706,6 +1711,7 @@ SpriteRenderer:
17061711
m_LightProbeUsage: 1
17071712
m_ReflectionProbeUsage: 1
17081713
m_RayTracingMode: 0
1714+
m_RayTraceProcedural: 0
17091715
m_RenderingLayerMask: 4294967295
17101716
m_RendererPriority: 0
17111717
m_Materials:
@@ -1800,6 +1806,7 @@ SpriteRenderer:
18001806
m_LightProbeUsage: 1
18011807
m_ReflectionProbeUsage: 1
18021808
m_RayTracingMode: 0
1809+
m_RayTraceProcedural: 0
18031810
m_RenderingLayerMask: 1
18041811
m_RendererPriority: 0
18051812
m_Materials:

‎Assets/Resources/Levels/test.txt‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
10
2+
14
3+
0
4+
4
5+
3
6+
2
7+
1
8+
4
9+
c
10+
2
11+
0
12+
3
13+
2
14+
2
15+
1
16+
c
17+
2
18+
2
19+
B
20+
0
21+
0
22+
2
23+
3
24+
-4
25+
2
26+
4
27+
3
28+
0
29+
+4
30+
2
31+
10
32+
4
33+
0
34+
+1
35+
2
36+
11
37+
c
38+
2
39+
12
40+
4
41+
0
42+
+3
43+
3
44+
4
45+
c
46+
3
47+
10
48+
c
49+
4
50+
2
51+
4
52+
1
53+
4
54+
3
55+
c
56+
4
57+
4
58+
4
59+
1
60+
4
61+
8
62+
4
63+
1
64+
4
65+
9
66+
c
67+
4
68+
10
69+
s
70+
0
71+
0
72+
5
73+
4
74+
-1
75+
5
76+
10
77+
c
78+
6
79+
4
80+
1
81+
0
82+
6
83+
5
84+
c
85+
6
86+
6
87+
2
88+
4
89+
6
90+
8
91+
2
92+
4
93+
6
94+
9
95+
-3
96+
6
97+
10
98+
2
99+
0
100+
+2
101+
7
102+
4
103+
c
104+
7
105+
6
106+
-2
107+
7
108+
8
109+
c
110+
8
111+
4
112+
2
113+
4
114+
8
115+
6
116+
1
117+
0
118+
8
119+
7
120+
c
121+
8
122+
8
123+
1
124+
0
125+
8
126+
9
127+
c
128+
8
129+
10
130+
2
131+
4

‎Assets/Resources/Levels/test.txt.meta‎

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

‎Assets/Scenes/LevelWithEnemies.unity‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ GameObject:
142142
m_Icon: {fileID: 0}
143143
m_NavMeshLayer: 0
144144
m_StaticEditorFlags: 0
145-
m_IsActive: 1
145+
m_IsActive: 0
146146
--- !u!114 &32265376
147147
MonoBehaviour:
148148
m_ObjectHideFlags: 0
@@ -1648,6 +1648,10 @@ PrefabInstance:
16481648
propertyPath: m_IsActive
16491649
value: 1
16501650
objectReference: {fileID: 0}
1651+
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
1652+
propertyPath: m_RootOrder
1653+
value: 1
1654+
objectReference: {fileID: 0}
16511655
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
16521656
propertyPath: m_LocalPosition.x
16531657
value: 0
@@ -1660,6 +1664,10 @@ PrefabInstance:
16601664
propertyPath: m_LocalPosition.z
16611665
value: 0
16621666
objectReference: {fileID: 0}
1667+
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
1668+
propertyPath: m_LocalRotation.w
1669+
value: 1
1670+
objectReference: {fileID: 0}
16631671
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
16641672
propertyPath: m_LocalRotation.x
16651673
value: -0
@@ -1672,19 +1680,16 @@ PrefabInstance:
16721680
propertyPath: m_LocalRotation.z
16731681
value: -0
16741682
objectReference: {fileID: 0}
1675-
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
1676-
propertyPath: m_LocalRotation.w
1677-
value: 1
1678-
objectReference: {fileID: 0}
1679-
- target: {fileID: 4491509972427642, guid: 8fea4dd3f18348d42a4a32bb977123cd, type: 3}
1680-
propertyPath: m_RootOrder
1681-
value: 1
1682-
objectReference: {fileID: 0}
16831683
- target: {fileID: 114422053890188650, guid: 8fea4dd3f18348d42a4a32bb977123cd,
16841684
type: 3}
16851685
propertyPath: cam
16861686
value:
16871687
objectReference: {fileID: 826402172}
1688+
- target: {fileID: 114422053890188650, guid: 8fea4dd3f18348d42a4a32bb977123cd,
1689+
type: 3}
1690+
propertyPath: npc
1691+
value:
1692+
objectReference: {fileID: 912414392}
16881693
- target: {fileID: 114422053890188650, guid: 8fea4dd3f18348d42a4a32bb977123cd,
16891694
type: 3}
16901695
propertyPath: minimap
@@ -1696,11 +1701,6 @@ PrefabInstance:
16961701
value:
16971702
objectReference: {fileID: 11400000, guid: c48fd973ae42b1749bbc26a2cf958bba,
16981703
type: 2}
1699-
- target: {fileID: 114422053890188650, guid: 8fea4dd3f18348d42a4a32bb977123cd,
1700-
type: 3}
1701-
propertyPath: npc
1702-
value:
1703-
objectReference: {fileID: 912414392}
17041704
- target: {fileID: 212597136606239852, guid: 8fea4dd3f18348d42a4a32bb977123cd,
17051705
type: 3}
17061706
propertyPath: m_Sprite

0 commit comments

Comments
 (0)