Cleanup after last merge #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These were accidentally deleted in the 8d3cac1 merge commit.
* Made the `Terrain` gameobject in `Endless Mode.unity` into a prefab named `HexGrid.prefab` * [BaseController] Changed the type of `gameManager` from `GameObject` to `EndlessMode` * [EndlessMode] * Renamed `enemies` -> `enemyPrefabs`, `a` -> `linearSpawnRate` and `k` - > `exponentialSpawnRate` * [HexCell] Fixed some faulty merging (in b824f56): * Re-removed the unused `Position` property * Re-renamed the serialized `mr` field to `meshRenderer` * [HexGrid] * Renamed `towers` -> `towerPrefabs` * Removed the `SerializeField` attribute from `playerBase`, as it's always set in `Awake()` anyway * [RepairAnimationController] Renamed the VFX prefab fields (like `fxLow` -> `lowWearVFXPrefab`) * [RepairController] * Renamed `damageInterval` -> `wearInterval` and `timeStamp` -> `lastWearStateChangeTime` * Removed the unused `needRepair` field
...instead of three separate arrays (loosely) connected by their shared indices (namely `elevation`, `occupier` and `occupierRotation` in `TerrainData`).
The logic for setting cell elevation now no longer relies on the naively arbitrary indices of the `HexGrid.cellMaterials` list. It's instead replaced with logic based on an array - `HexGrid.cellTypes` - containing the material and the associated elevation for each type of cell. Also, moved some of the logic in the previous `HexGrid.ElevateCell()` to the setter of `HexCell.CellType`.
…merge # Conflicts: # Assets/Scripts/GameState/LeaderboardData.cs # Assets/Scripts/UI/Leaderboard.cs
...renamed to `EndlessModeManager`.
ddabble
force-pushed
the
fix/cleanup-after-merge
branch
from
4c183db
to
1d57a10
Compare
Fueredoriku
reviewed
Feb 24, 2022
Fueredoriku
reviewed
Feb 24, 2022
Fueredoriku
reviewed
Feb 24, 2022
Also improved the code for saving and loading the highscore data, by using `using` statements instead of closing the streams manually.
Fueredoriku
approved these changes
Feb 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See each commit message for details.