Skip to content

Commit

Permalink
Version 0.4b1 (#7)
Browse files Browse the repository at this point in the history
* SIM-51 (#5)

* - Added new icons
- Added legend for buildings
- Added arrow keys for camera control
- Updated config files
- Updated README
- Fixed Bomb being invisible
- Removed horizontal scrollbar from traffic popup
- Added + / - for zooming

* SIM-52 (#6)

* - Added colors for selected layer
- Done some optimization
- Made bomb smaller
- Removed + and - for zooming. Only use keypad + and -  or scroll for zooming
- Fixed a bug in the plane navigator for selecting a bomb target
- Fixed grid manager
- Increased default tiles per street to 60
- Updated Inno Setup version to 0.4b1
  • Loading branch information
leroyvandijk authored May 19, 2020
1 parent b7bed90 commit 4419091
Show file tree
Hide file tree
Showing 33 changed files with 1,352 additions and 258 deletions.
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/src/Assets/AssetBundles/paid.meta
/src/Assets/AssetBundles/paid.meta
/src/Assets/AssetBundles/paid.manifest.meta
/src/Assets/AssetBundles/paid.manifest
/src/Assets/AssetBundles/paid
/src/Assets/AssetBundles/free.meta
/src/Assets/AssetBundles/free.manifest.meta
/src/Assets/AssetBundles/free.manifest
/src/Assets/AssetBundles/free
28 changes: 20 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ If you want to use these assets, read chapter 5.1

| Key | Action |
|------------------------|-----------------------------------------------------------------|
| W | Move the camera forward |
| A | Move the camera to the left |
| S | Move the camera backwards |
| D | Move the camera to the right |
| W / Up Arrow | Move the camera forward |
| A / Left Arrow | Move the camera to the left |
| S / Down Arrow | Move the camera backwards |
| D / Right Arrow | Move the camera to the right |
| Escape | Go back to the main menu |
| F4 | Open the debug console |
| Left mouse button | When clicked on a building or vehicle it displays information |
| Hold right mouse button| Rotate the camera around |
| Scroll | Zoom in or out |
| Scroll / KP + or - | Zoom in or out |

## 2. Configuration

Expand Down Expand Up @@ -158,6 +158,8 @@ Example configuration:
"Rotation": 0
}
],
"Label": "$",
"Name": "BuildingS",
"MinSize": 15
},
{
Expand All @@ -173,6 +175,8 @@ Example configuration:
"Rotation": 0
}
],
"Label": "$$",
"Name": "BuildingM",
"MinSize": 20
},
{
Expand All @@ -188,6 +192,8 @@ Example configuration:
"Rotation": 0
}
],
"Label": "$$$",
"Name": "BuildingL",
"MinSize": 30
}
],
Expand Down Expand Up @@ -340,7 +346,7 @@ The game model looks like the following:
],
"layers": [ // Types of layers
{
"icon": "images/cpu_icon.png", // Location to image on the back-end for example https://simtainer.yourorginzation.local/images/cpu_icon.png
"icon": "images/cpu_icon.png", // Location to image on the back-end for example https://simtainer.yourorganization.local/images/cpu_icon.png
"layerType": "cpuLayer" // Name of the layer
},
{
Expand Down Expand Up @@ -482,13 +488,15 @@ Depending on the size of the input the game will choose a vehicle to use. You ca
Layers are fully dynamic depending on the API. Images should be placed at `BASEURL/images/example_icon.png`.
These images are loaded in the game. You can find the example JSON at paragraph 3.2.

**It is important to use a white icon, since Unity can only colorize white sprites.**

We used the layers for metrics about CPU, Memory and 500 error's.

Layers are managed in the LayerManager class.

You can see the layers in action in the gif at the beginning of this readme.

To disable Team Selection, edit the `config.json`.
To disable Layers, edit the `config.json`.

### 4.4 Team selection

Expand Down Expand Up @@ -593,4 +601,8 @@ There are other managers that have events as well, but the order does not matter

## 7. Developer note

This project is my graduation project. If you have any questions, feedback or suggestions, feel free to contact me!
This project is a graduation project. If you have any questions, feedback or suggestions, feel free to contact us (Harm Weites, Sebastiaan Bekker or Leroy van Dijk)!

## 8. Icons

Icons used in this project are from iconfinder.com created by DesignerzBase.
2 changes: 1 addition & 1 deletion innosetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "SimTainer"
#define MyAppVersion "0.3b2"
#define MyAppVersion "0.4b1"
#define MyAppPublisher "Wehkamp"
#define MyAppExeName "SimTainer.exe"

Expand Down
4 changes: 2 additions & 2 deletions src/Assets/FreeAssets/Prefabs/Bomb.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Transform:
m_GameObject: {fileID: 3285111104184262078}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 233, y: 97.042, z: 109.59628}
m_LocalScale: {x: 10, y: 10, z: 10}
m_LocalScale: {x: 5, y: 5, z: 5}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
Expand All @@ -41,7 +41,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3285111104184262078}
m_Mesh: {fileID: 0}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3539207181720727468
MeshRenderer:
m_ObjectHideFlags: 0
Expand Down
231 changes: 231 additions & 0 deletions src/Assets/Resources/Prefabs/UI/UI_Image_Legend.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &993539185272044432
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 993539185272044447}
- component: {fileID: 993539185272044445}
- component: {fileID: 993539185272044446}
m_Layer: 5
m_Name: UI_Image_Legend
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &993539185272044447
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539185272044432}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 993539187335799542}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -662.4, y: -0.7}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &993539185272044445
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539185272044432}
m_CullTransparentMesh: 0
--- !u!114 &993539185272044446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539185272044432}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 12ade680e28b952408205c4d13d60c45, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &993539187335799543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 993539187335799542}
- component: {fileID: 993539187335799540}
- component: {fileID: 993539187335799541}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &993539187335799542
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539187335799543}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 993539185272044447}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 44.18, y: -0.7}
m_SizeDelta: {x: 50.222656, y: 21.04004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &993539187335799540
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539187335799543}
m_CullTransparentMesh: 0
--- !u!114 &993539187335799541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993539187335799543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: $$$$$
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278255421
m_fontColor: {r: 0.23950672, g: 1, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 3
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0.12007904, w: 0.46959114}
m_textInfo:
textComponent: {fileID: 993539187335799541}
characterCount: 5
spriteCount: 0
spaceCount: 0
wordCount: 1
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
7 changes: 7 additions & 0 deletions src/Assets/Resources/Prefabs/UI/UI_Image_Legend.prefab.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4419091

Please sign in to comment.