Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A plethora of improvements and additions #39

Merged
merged 206 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from 205 commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
8d6b55f
Update animal-ai-unity.sln
alhasacademy96 Apr 20, 2024
f9b661a
Update Assembly-CSharp.csproj
alhasacademy96 Apr 20, 2024
9e3d626
added code to save to csv file
alhasacademy96 Apr 20, 2024
caf944a
re-added core unity files
alhasacademy96 Apr 30, 2024
e3066bf
the data is now recorded per arena/episode.
alhasacademy96 Apr 30, 2024
756b7e1
further work on data logs:
alhasacademy96 Apr 30, 2024
6afa328
the folder and .csv files are now stored corectly
alhasacademy96 May 1, 2024
481a86a
Update ProjectSettings.asset
alhasacademy96 May 1, 2024
a83c777
Create build.meta
alhasacademy96 May 1, 2024
d2eeadc
minor comment fix
alhasacademy96 May 1, 2024
65f407c
reformatting
alhasacademy96 May 1, 2024
ae5b05a
minor region fix
alhasacademy96 May 1, 2024
eb2572c
removed region tags for these scripts as theyre not effective
alhasacademy96 May 1, 2024
da76cdd
added forward/backward and rotate attributes
alhasacademy96 May 2, 2024
dec8bb9
modularized .csv code logic for clarity
alhasacademy96 May 2, 2024
108179a
logs are now unique and contains date/time stamp.
alhasacademy96 May 10, 2024
c08e43a
Update AAI3EnvironmentManager.unity
alhasacademy96 May 10, 2024
53407f6
added new package - recorder - to capture ingame footage and take scr…
alhasacademy96 May 10, 2024
8eb0b7d
Update Assembly-CSharp.csproj
alhasacademy96 May 13, 2024
2004008
changed method to comply with naming standards
alhasacademy96 May 13, 2024
66f62b6
Update TrainingAgent.cs
alhasacademy96 May 13, 2024
1f982fc
minor changes
alhasacademy96 May 13, 2024
e9c5763
minor comment fix
alhasacademy96 May 21, 2024
2a51a6e
added new summary for missed method in yamlclasses.cs
alhasacademy96 May 21, 2024
e234121
trying to read incoming msg from python
alhasacademy96 Jun 3, 2024
ae1280f
Update ArenasParametersSideChannel.cs
alhasacademy96 Jun 3, 2024
f5b96b7
Update TrainingAgent.cs
alhasacademy96 Jun 3, 2024
5ee86fa
added data log for agent freezes
alhasacademy96 Jun 3, 2024
f96a547
added human-readable data to .csv file
alhasacademy96 Jun 3, 2024
af4c428
added reward log
alhasacademy96 Jun 4, 2024
46940fe
logging data to csv changes:
alhasacademy96 Jun 4, 2024
22939a0
minor format
alhasacademy96 Jun 4, 2024
7d4788e
fixed issue where episode count would not increment
alhasacademy96 Jun 4, 2024
9baca2d
added padding between data in csv file
alhasacademy96 Jun 4, 2024
0c911db
added TODO
alhasacademy96 Jun 4, 2024
50b2299
minor change
alhasacademy96 Jun 7, 2024
21c71bd
implemented experimental buffering for data log
alhasacademy96 Jun 9, 2024
323083c
minor change to testing yaml case
alhasacademy96 Jun 9, 2024
91fafb1
added reward types to each reward goal
alhasacademy96 Jun 9, 2024
2388e42
added new parameter to recognize each reward type
alhasacademy96 Jun 9, 2024
cd9f758
added new column to .csv file to record type of reward collected
alhasacademy96 Jun 9, 2024
826fe66
added check to make sure header is not written more than once
alhasacademy96 Jun 9, 2024
828cfbe
added reward types to goals stored in resources folder
alhasacademy96 Jun 9, 2024
6eb65fe
corrected some goal params
alhasacademy96 Jun 9, 2024
c9f9b87
moved pillar-button mesh to correct folder for coherency
alhasacademy96 Jun 9, 2024
02a2acd
made changes to record type of reward before logging to .csv
alhasacademy96 Jun 9, 2024
a6438fe
added code to track dispensed goal directly from parent
alhasacademy96 Jun 9, 2024
a71184c
added new column to record dispensed rewards (if any)
alhasacademy96 Jun 9, 2024
7d6f55a
ignoring data observations folder
alhasacademy96 Jun 9, 2024
ea82cc9
Update .gitignore
alhasacademy96 Jun 10, 2024
a9669aa
added new column to .csv file to record if a reward was dispensed (no…
alhasacademy96 Jun 10, 2024
00c11c8
added TODO for .csv feature
alhasacademy96 Jun 10, 2024
2becfed
added raycast data to .csv file if enabled in python.
alhasacademy96 Jun 10, 2024
3cbc7cd
added method summaries for later recall
alhasacademy96 Jun 10, 2024
67965d9
added doc ref on batched raycasts
alhasacademy96 Jun 10, 2024
939ebf6
corrected calculation on raycasts in comments
alhasacademy96 Jun 10, 2024
cabfca2
added raycast tags to .csv file (if enabled in python script)
alhasacademy96 Jun 12, 2024
bfcc311
removed one todo item
alhasacademy96 Jun 12, 2024
3fdcebe
added logic to log event when (and if) spawnerbutton was triggered
alhasacademy96 Jun 12, 2024
605955d
minor - debug log added
alhasacademy96 Jun 12, 2024
5cdf8f3
minor shuffle
alhasacademy96 Jun 12, 2024
63b8a2d
minor changes
alhasacademy96 Jun 12, 2024
a6085a4
added code to stop listening to event to avoid memory leak
alhasacademy96 Jun 12, 2024
83c89d1
cleaned up spawnerbutton script
alhasacademy96 Jun 12, 2024
5c742ca
added new object - datazone
alhasacademy96 Jun 12, 2024
ea1f815
removed redundant logic causing y axis to improperly randomize
alhasacademy96 Jun 12, 2024
a614620
removed redundant directory usage
alhasacademy96 Jun 16, 2024
5aa914b
removed unused script that handled deleted UI elements
alhasacademy96 Jun 16, 2024
869aa03
removed redundant directory
alhasacademy96 Jun 16, 2024
83e9564
removed redundant directory usage
alhasacademy96 Jun 16, 2024
2bd9caf
modularized training agent health logic
alhasacademy96 Jun 16, 2024
88afa06
Revert "modularized training agent health logic"
alhasacademy96 Jun 16, 2024
1f28c6b
added debugs to notification states
alhasacademy96 Jun 16, 2024
c7b3960
fixed bug where the arena would reset uncontrollably if notification …
alhasacademy96 Jun 16, 2024
4a74c43
minor details on datazones
alhasacademy96 Jun 17, 2024
beb5f9d
minor folder changes
alhasacademy96 Jun 17, 2024
b9fdccf
added rigidbody component to datazone obj
alhasacademy96 Jun 17, 2024
27571ff
completed todo set by Ben:
alhasacademy96 Jun 19, 2024
f55e0d5
minor cleanup
alhasacademy96 Jun 19, 2024
a389b52
minor changes to comments
alhasacademy96 Jun 19, 2024
0f0289e
added TODO
alhasacademy96 Jun 19, 2024
678a9ff
moved file comments to top of file for readability
alhasacademy96 Jun 21, 2024
d785a2c
cleaned up GITHUB templates for issues
alhasacademy96 Jun 23, 2024
0210204
implemented basic datazone that logs to csv file
alhasacademy96 Jun 23, 2024
87ae60d
csv file now collects/logs datazones per timestep
alhasacademy96 Jun 23, 2024
0e16897
added observationlogs to git.ignore config again
alhasacademy96 Jul 12, 2024
d0f2c1d
working feature: string param to set datazone ID
alhasacademy96 Jul 12, 2024
cb2cc36
working feature: datazone visibility boolean
alhasacademy96 Jul 16, 2024
2f75d07
added code to allow multiple triggers to collisions to datazone gameo…
alhasacademy96 Jul 16, 2024
462c4a1
fix for some rewards not having correct tags in unity
alhasacademy96 Jul 16, 2024
0463004
added missing valanced gameobjects:
alhasacademy96 Jul 16, 2024
ac78bc2
removed todo
alhasacademy96 Jul 16, 2024
060531e
renamed param for datazone
alhasacademy96 Jul 17, 2024
43bee68
set datazone GO to be able to walk through by the agent
alhasacademy96 Jul 17, 2024
0fd1183
working feature: datazone agent left datazone msg in .csv
alhasacademy96 Jul 17, 2024
50c03df
Create datazone-test.yaml
alhasacademy96 Jul 17, 2024
7a5ee9e
Update datazone-test.yaml
alhasacademy96 Jul 17, 2024
5cfeb96
Create datazone-test.yaml.meta
alhasacademy96 Jul 17, 2024
64e3927
IMPORTANT:
alhasacademy96 Jul 17, 2024
eaa2439
removed debug logs
alhasacademy96 Jul 17, 2024
c45168a
minor comments
alhasacademy96 Jul 19, 2024
2b541c5
added checks for agent pos == 40 for x or z
alhasacademy96 Jul 19, 2024
68a2c89
IMPORTANT:
alhasacademy96 Jul 19, 2024
28dbda6
added TODO
alhasacademy96 Jul 19, 2024
8f85fff
removed UIManager GO
alhasacademy96 Jul 22, 2024
7e707bf
Update .gitignore
alhasacademy96 Jul 22, 2024
209bf8b
minor comment change on GO description
alhasacademy96 Jul 23, 2024
be5e74a
added code to track dispenser ids
alhasacademy96 Jul 23, 2024
0901f20
added new column: combined spawner data
alhasacademy96 Jul 23, 2024
b714bb5
removed debug log
alhasacademy96 Jul 23, 2024
ecf64ad
removed debug logs
alhasacademy96 Jul 23, 2024
5705c13
updated script to log counter and return spawnerbutton details
alhasacademy96 Jul 23, 2024
6869f97
added frozenAgentDelays param to example yaml
alhasacademy96 Jul 24, 2024
9de705c
changed isFrozen param name to WasAgentFrozen
alhasacademy96 Jul 24, 2024
7615d36
minor change in output log
alhasacademy96 Jul 24, 2024
baa30d8
combined columns:
alhasacademy96 Jul 24, 2024
b7c6730
minor column header changes:
alhasacademy96 Jul 24, 2024
13f7004
minor comments clean up
alhasacademy96 Jul 24, 2024
2c27aa9
added datazone item to ZONES section
alhasacademy96 Jul 24, 2024
a06ea1d
IMPORTANT
alhasacademy96 Jul 24, 2024
3529474
added todos
alhasacademy96 Jul 24, 2024
b20ce07
Update TrainingAgent.cs
alhasacademy96 Jul 24, 2024
f03c053
IMPORTANT:
alhasacademy96 Jul 25, 2024
89452b2
added call to flush data to .csv when episode ends
alhasacademy96 Jul 25, 2024
10fd61f
minor changes
alhasacademy96 Jul 25, 2024
30dbdfa
minor comment changes
alhasacademy96 Jul 25, 2024
81c990f
minor comment changes
alhasacademy96 Jul 25, 2024
cf5fefd
redundant comment removed
alhasacademy96 Jul 25, 2024
a4593e5
minor output to .csv file format on data
alhasacademy96 Jul 25, 2024
86cb3f8
added TODO
alhasacademy96 Jul 25, 2024
72e6ac5
added new column: active camera perspective
alhasacademy96 Jul 25, 2024
3175c26
Routine Project Cleanup on Scripts
alhasacademy96 Jul 26, 2024
fff8daa
reordered columns:
alhasacademy96 Jul 26, 2024
73894e9
minor comment reformat
alhasacademy96 Jul 26, 2024
222749d
Update TrainingAgent.cs
alhasacademy96 Jul 27, 2024
06d4c9f
Update TrainingAgent.cs
alhasacademy96 Jul 27, 2024
91ca87e
moved methods and grouped them relatively
alhasacademy96 Jul 27, 2024
ea50418
reordered columns for logical grouping
alhasacademy96 Jul 27, 2024
74363a3
removed debug log as redundant
alhasacademy96 Jul 27, 2024
619ab0e
added safety checks to prevent unnecessary .csv file creation
alhasacademy96 Jul 27, 2024
1f3d879
fixed bug where:
alhasacademy96 Jul 27, 2024
5322020
Revert "added safety checks to prevent unnecessary .csv file creation"
alhasacademy96 Jul 28, 2024
d94119e
minor header change:
alhasacademy96 Jul 30, 2024
1da91a7
added important todo
alhasacademy96 Jul 30, 2024
a5d42f3
ok so:
alhasacademy96 Jul 30, 2024
1606d85
implemented locking and safety to flushing data
alhasacademy96 Jul 30, 2024
18fb9b8
minor changes to code format
alhasacademy96 Jul 30, 2024
8323fbf
added todo for spawnerbutton.cs
alhasacademy96 Aug 2, 2024
f55f122
added safety checks to playercontrols.cs
alhasacademy96 Aug 5, 2024
5a4be5f
Revert "added safety checks to playercontrols.cs"
alhasacademy96 Aug 5, 2024
56a334b
removed yamlfile name-specific code
alhasacademy96 Aug 9, 2024
58be510
added sensors to add to observation for agent decsion making
alhasacademy96 Aug 9, 2024
cd330ad
Update .gitignore
alhasacademy96 Aug 9, 2024
335fb8e
fixed background error:
alhasacademy96 Aug 9, 2024
8f24c0a
removed redundant vars
alhasacademy96 Aug 9, 2024
418af67
important change:
alhasacademy96 Aug 9, 2024
33d0df7
minor comment change
alhasacademy96 Aug 9, 2024
9ed1b9c
added ability to run unity tests built in
alhasacademy96 Aug 9, 2024
9c34a48
found and fixed bug where:
alhasacademy96 Aug 9, 2024
9511687
Fixed potential error in fade.cs
alhasacademy96 Aug 12, 2024
d8acef1
added null/reference checks for sanity
alhasacademy96 Aug 12, 2024
e948a52
fixed bug where collecobservations() was ending episode prematurely
alhasacademy96 Aug 12, 2024
b4f31b8
added tests to automate properly
alhasacademy96 Aug 12, 2024
76232b2
Tests dump
alhasacademy96 Aug 12, 2024
08d91ee
old test suite dump
alhasacademy96 Aug 12, 2024
c2facf5
added grace checks for taking screenshots and saving file
alhasacademy96 Aug 12, 2024
285a360
screenshotcamera feature test file dump
alhasacademy96 Aug 12, 2024
7a9b51b
exposed method to public for tests
alhasacademy96 Aug 13, 2024
1b47baf
updated code to use unity start for reliable initialisation logic
alhasacademy96 Aug 13, 2024
d1ad898
added new tests for checking animal skins are correctly set
alhasacademy96 Aug 13, 2024
3ca155b
updating method access for testing
alhasacademy96 Aug 13, 2024
73d57a1
added tests for deathzone GO
alhasacademy96 Aug 13, 2024
65971b9
test dump for cameracollisions.cs
alhasacademy96 Aug 13, 2024
169e4fe
dump old tests for camerafollow.cs after adjustment
alhasacademy96 Aug 13, 2024
8a00fe4
updated code to handle division by 0 case
alhasacademy96 Aug 13, 2024
7a71dd1
adjusted tests for computing scale ratios and dumping tests to unity
alhasacademy96 Aug 13, 2024
530e03f
Old test dump (prefab.cs)
alhasacademy96 Aug 13, 2024
50aa0d8
removed instances and references to yaml file name var
alhasacademy96 Aug 13, 2024
a6c7aaf
updated minor packages in unity
alhasacademy96 Aug 14, 2024
28f5cdf
written new tests for sizechangegoal.cs
alhasacademy96 Aug 14, 2024
e41a8a0
added initial test on yaml reader.
alhasacademy96 Aug 14, 2024
c600196
added full list of tests
alhasacademy96 Aug 14, 2024
ef15dea
added tests for checking sidechannel comms
alhasacademy96 Aug 14, 2024
6cdefdf
added tests for AAIEnvironmentManager.cs
alhasacademy96 Aug 15, 2024
8d12abf
added further test units
alhasacademy96 Aug 15, 2024
787b7a5
added the rest of the test units after analysis
alhasacademy96 Aug 15, 2024
b916973
Improved arena config instance management
alhasacademy96 Aug 15, 2024
d8b505e
updated script to remove redundant comments
alhasacademy96 Aug 15, 2024
e08d028
added tests for arenasparameters.cs
alhasacademy96 Aug 15, 2024
df42a7c
refactored arenabuilders.cs for readability
alhasacademy96 Aug 15, 2024
4aa5bec
removed outlier semicolon in code
alhasacademy96 Aug 15, 2024
9b19b1f
added half of tests for arenabuilder.cs
alhasacademy96 Aug 15, 2024
338af86
old test script dump
alhasacademy96 Aug 15, 2024
16d024e
minor typo fix
alhasacademy96 Aug 15, 2024
4a2ce57
minor code fix
alhasacademy96 Aug 15, 2024
94cef1a
installed NuGet for external package installation
alhasacademy96 Aug 15, 2024
19bed32
simplified fulldecaygoal.cs principle method
alhasacademy96 Aug 15, 2024
4d1687e
fixed a bug where colors wre not updating properly
alhasacademy96 Aug 15, 2024
1f367e6
added tests for fulldecaygoal.cs
alhasacademy96 Aug 15, 2024
99e51c9
fixed a bug where the force would not apply in time
alhasacademy96 Aug 16, 2024
2cf2b59
minor reformat
alhasacademy96 Aug 16, 2024
da58497
fixed misplaced masses on movable objects:
alhasacademy96 Aug 16, 2024
6bacc1b
Fixed object collider issues
alhasacademy96 Aug 16, 2024
6cbc219
increased datazone mass to 180 for better physics handling
alhasacademy96 Aug 16, 2024
594c7f3
removed redundant method comments
alhasacademy96 Aug 16, 2024
d3a4d4a
merge-conflict resolves push
alhasacademy96 Aug 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
---
name: Bug report
name: Bug Report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
**Describe the Bug**
A clear and concise description of what the bug is.


**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.
**Expected Behavior**
A clear and concise description of what you expected to happen.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- OS: [e.g. Windows, Linux, macOS]
- Unity Version [e.g. 2021.3.21f1]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
**Additional Context**
Add any other context about the problem here.


**Screenshots**
If applicable, add screenshots to help explain your problem.
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest an idea for this project
name: Feature Request
about: Suggest an idea for Animal-AI
title: ''
labels: ''
assignees: ''
Expand All @@ -10,11 +10,14 @@ assignees: ''
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]


**Describe the solution you'd like**
A clear and concise description of what you want to happen.


**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.


**Additional context**
Add any other context or screenshots about the feature request here.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,8 @@ Assets/Prefabs/Other-Unique/SignPosterboard.prefab
.plastic/plastic.wktree
.plastic/plastic.changes
.plastic/plastic.wktree
/ObservationLogs
*.csv
/ObservationLogs
.DS_Store
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset
alhasacademy96 marked this conversation as resolved.
Show resolved Hide resolved
783 changes: 396 additions & 387 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions Assets/NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources />
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
<config>
<add key="packageInstallLocation" value="CustomWithinAssets" />
<add key="repositoryPath" value="./Packages" />
<add key="PackagesConfigDirectoryPath" value="." />
<add key="slimRestore" value="true" />
<add key="PreferNetStandardOverNetFramework" value="true" />
</config>
</configuration>
23 changes: 23 additions & 0 deletions Assets/NuGet.config.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Packages.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Assets/Prefabs/AAI3Arena.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,9 @@ MonoBehaviour:
- {fileID: 6599169884992408241, guid: c382c2a5deefcec4493637923a912932, type: 3}
- {fileID: 1323439192758780, guid: 70289c4d2c6d4a94eb4d73531e1a9ce6, type: 3}
- {fileID: 8069506010422567580, guid: 2e66c94a6ed25c641ad85c58ce7e981b, type: 3}
- {fileID: 7041498159436349378, guid: 00c912a41dbd87a4ba31cad3fe3ec871, type: 3}
alhasacademy96 marked this conversation as resolved.
Show resolved Hide resolved
- {fileID: 1311020654520240, guid: 4ab9cee937b1d44788ffc287caba796b, type: 3}
- {fileID: 1311020654520240, guid: 6a410b42e9ae8480ca41567b3afb30f0, type: 3}
spawnedObjectsHolder: {fileID: 6276814220842007455, guid: ff9a0b038a04e8747a9f95217df0b26f, type: 3}
maxSpawnAttemptsForAgent: 100
maxSpawnAttemptsForPrefabs: 20
Expand All @@ -866,7 +869,6 @@ MonoBehaviour:
- {fileID: 7334380931721050334}
- {fileID: 2049938451244076549}
arenaID: -1
maxarenaID: -1
alhasacademy96 marked this conversation as resolved.
Show resolved Hide resolved
_agent: {fileID: 0}
--- !u!1 &1583564189836146
GameObject:
Expand Down
8 changes: 8 additions & 0 deletions Assets/Prefabs/DataZone.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

137 changes: 137 additions & 0 deletions Assets/Prefabs/DataZone/DataZone.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7041498159436349378
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7038326920510554818}
- component: {fileID: 7046777348394065180}
- component: {fileID: 5324416873341341450}
- component: {fileID: 7013282172734433842}
- component: {fileID: 7056487143949059500}
- component: {fileID: -2281997811760159165}
m_Layer: 0
m_Name: DataZone
m_TagString: DataZone
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7038326920510554818
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7046777348394065180
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!54 &5324416873341341450
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
serializedVersion: 2
m_Mass: 180
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &7013282172734433842
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &7056487143949059500
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9b0135a408e62104eb704ae5d1ad5fd6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &-2281997811760159165
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7041498159436349378}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d638726ee68a164a9c73bbdaed7637d, type: 3}
m_Name:
m_EditorClassIdentifier:
rotationRange: {x: 0, y: 360}
sizeMin: {x: 1, y: 0.5, z: 1}
sizeMax: {x: 30, y: 10, z: 30}
canRandomizeColor: 0
ratioSize: {x: 1, y: 1, z: 1}
sizeAdjustment: 0.999
textureUVOverride: 0
typicalOrigin: 1
7 changes: 7 additions & 0 deletions Assets/Prefabs/DataZone/DataZone.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Prefabs/Moveable/HeavyBlock.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_Mass: 2
m_Mass: 420
alhasacademy96 marked this conversation as resolved.
Show resolved Hide resolved
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
Expand All @@ -133,6 +133,6 @@ MonoBehaviour:
sizeMax: {x: 10, y: 10, z: 10}
canRandomizeColor: 0
ratioSize: {x: 1, y: 1, z: 1}
sizeAdjustement: 0.999
sizeAdjustment: 0.999
alhasacademy96 marked this conversation as resolved.
Show resolved Hide resolved
textureUVOverride: 0
typicalOrigin: 1
Loading