warlock/UPF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed camera angle, ground color and added upgrade and infos button and menus UI

Browse Source
This commit is contained in:
Lorenzo
2022-04-10 15:07:50 +02:00
parent 32b942bda8
commit 3581fe785d
13 changed files with 15532 additions and 3163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

934
Assembly-CSharp.csproj
View File

File diff suppressed because it is too large Load Diff

6
Assets/Assets/PolygonSciFiWorlds/Materials/Environment/PolygonSciFiWorlds_Env_Triplanar_Exp.mat
View File

@@ -263,8 +263,8 @@ Material:
- _Glossiness: 0.5 - _Glossiness: 0.5
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Ground_Detail_Power: 1 - _Ground_Detail_Power: 1
- _Ground_Detail_Scale: 0.074 - _Ground_Detail_Scale: 0.021
- _Ground_Falloff: 118 - _Ground_Falloff: 5
- _Ground_Noise_Scale: 0.0181 - _Ground_Noise_Scale: 0.0181
- _Ground_Pebble_Scale: 0.0204 - _Ground_Pebble_Scale: 0.0204
- _MEtallic: 0.421 - _MEtallic: 0.421
@@ -301,7 +301,7 @@ Material:
- _EmissiveColor: {r: 1, g: 1, b: 1, a: 0} - _EmissiveColor: {r: 1, g: 1, b: 1, a: 0}
- _EmissiveColor1: {r: 1, g: 1, b: 1, a: 0} - _EmissiveColor1: {r: 1, g: 1, b: 1, a: 0}
- _GroundColour: {r: 1, g: 1, b: 1, a: 0} - _GroundColour: {r: 1, g: 1, b: 1, a: 0}
- _Ground_Colour: {r: 0.6392157, g: 0.0627451, b: 0.2901961, a: 1} - _Ground_Colour: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1}
- _Ground_Detail_Colour: {r: 0.09233382, g: 0.052335635, b: 0.16176468, a: 0} - _Ground_Detail_Colour: {r: 0.09233382, g: 0.052335635, b: 0.16176468, a: 0}
- _RimColor: {r: 0.2555147, g: 1, b: 0.9269017, a: 0} - _RimColor: {r: 0.2555147, g: 1, b: 0.9269017, a: 0}
- _RimColor1: {r: 0.1614143, g: 0.1380298, b: 0.8161765, a: 0} - _RimColor1: {r: 0.1614143, g: 0.1380298, b: 0.8161765, a: 0}

9
Assets/Assets/PolygonSciFiWorlds/Materials/Environment/PolygonScifiWorlds_Mat_01_A_Triplanar.mat
View File

@@ -4,12 +4,13 @@
Material: Material:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolygonScifiWorlds_Mat_01_A_Triplanar m_Name: PolygonScifiWorlds_Mat_01_A_Triplanar
m_Shader: {fileID: 4800000, guid: 8eed85a5cc01a114b8f3274bdbb76013, type: 3} m_Shader: {fileID: 4800000, guid: 8eed85a5cc01a114b8f3274bdbb76013, type: 3}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 0 m_LightmapFlags: 2
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
@@ -75,6 +76,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
- _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
@@ -99,3 +101,4 @@ Material:
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

11619
Assets/Game/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

5105
Assets/Game/Scenes/Test.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Game/Scenes/Test.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fdf6eb6086d3075439019853b176f153
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/Game/Scripts/CloseCertainMenu.cs Normal file
View File

@@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CloseCertainMenu : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Game/Scripts/CloseCertainMenu.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a61e190af399b184989cce74b3c5693a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Game/Scripts/SelectedItemMenu.cs
View File

@@ -18,14 +18,14 @@ public class SelectedItemMenu : MonoBehaviour
} }
void OnUpgradeClicked(){ void OnUpgradeClicked(){
Debug.Log("Opening Upgrade Menu for : " + Selector.selectedBuilding.buildingData.name); // Debug.Log("Opening Upgrade Menu for : " + Selector.selectedBuilding.buildingData.name);
for(int i = 0; i < menus.Length; i++){ for(int i = 0; i < menus.Length; i++){
menus[i].upgradeMenu.SetActive(menus[i].relatedBuildings.Contains(Selector.selectedBuilding.buildingData)); menus[i].upgradeMenu.SetActive(menus[i].relatedBuildings.Contains(Selector.selectedBuilding.buildingData));
} }
} }
void OnInfoClicked(){ void OnInfoClicked(){
Debug.Log("Opening Info Menu for : " + Selector.selectedBuilding.buildingData.name); // Debug.Log("Opening Info Menu for : " + Selector.selectedBuilding.buildingData.name);
for(int i = 0; i < menus.Length; i++){ for(int i = 0; i < menus.Length; i++){
menus[i].infoMenu.SetActive(menus[i].relatedBuildings.Contains(Selector.selectedBuilding.buildingData)); menus[i].infoMenu.SetActive(menus[i].relatedBuildings.Contains(Selector.selectedBuilding.buildingData));
} }

28
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

22
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

273
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

117
UPF.sln
View File

@@ -1,123 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.UI", "UnityEngine.UI.csproj", "{b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.Runtime", "Unity.RenderPipelines.Core.Runtime.csproj", "{b0558cdb-64c9-3a15-92e8-c93ae5b494ac}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.TestRunner", "UnityEngine.TestRunner.csproj", "{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics", "Unity.Mathematics.csproj", "{0bd64dde-46cc-a28c-b84b-e0522f6fed97}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Runtime", "Unity.RenderPipelines.Universal.Runtime.csproj", "{e581676b-e515-94dc-c7ee-e5158f5af96b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.TextMeshPro.csproj", "{968fcd68-5785-2424-a8b1-57d977f064ee}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{3c396443-9c6c-69d1-7248-8e6b6a3580d2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.ShaderLibrary", "Unity.RenderPipelines.Core.ShaderLibrary.csproj", "{c9a516c3-de53-877b-b458-f8a67e878a04}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipeline.Universal.ShaderLibrary", "Unity.RenderPipeline.Universal.ShaderLibrary.csproj", "{72f9865c-6891-ed55-bfc3-e1d7c8e26394}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Shaders", "Unity.RenderPipelines.Universal.Shaders.csproj", "{a565100f-fe57-c681-fc17-3c645ba47452}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary", "Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj", "{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.PlasticSCM.Editor", "Unity.PlasticSCM.Editor.csproj", "{3fc5e71b-00d4-6906-3b4f-dab1d0795696}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ShaderGraph.Editor", "Unity.ShaderGraph.Editor.csproj", "{885e274e-7f50-a377-4930-562fc60828cc}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VisualStudio.Editor", "Unity.VisualStudio.Editor.csproj", "{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{bbd5d945-3371-201c-a412-b472d2b13b80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor", "Unity.TextMeshPro.Editor.csproj", "{52312059-599b-ab0f-8b82-9e6cc546efd5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.CollabProxy.Editor", "Unity.CollabProxy.Editor.csproj", "{40c3d5a7-8695-a89e-b884-01ff4239925b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "UnityEditor.TestRunner.csproj", "{26f23d52-7433-1b44-0570-9da4a33f7995}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{e2612a72-7ae6-8888-531c-6c25c21ac0a8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Editor", "Unity.RenderPipelines.Universal.Editor.csproj", "{0944cd92-8f3d-69a1-8713-2c99f884a0a8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Services.Core.Editor", "Unity.Services.Core.Editor.csproj", "{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.Editor", "Unity.RenderPipelines.Core.Editor.csproj", "{b4be5cdf-66d4-ea8e-f726-9bf045e13587}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Searcher.Editor", "Unity.Searcher.Editor.csproj", "{c57ac926-239a-b887-19f0-e9834f17b0fe}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.UI", "UnityEditor.UI.csproj", "{d6fbbd1f-59ed-334c-8652-133616ce63a4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics.Editor", "Unity.Mathematics.Editor.csproj", "{d322fda3-5976-c697-265b-cc32f8c52c18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ShaderGraph.Utilities", "Unity.ShaderGraph.Utilities.csproj", "{4bb84661-785f-28e0-8162-52d940cc5908}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}.Debug|Any CPU.Build.0 = Debug|Any CPU {81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{b0558cdb-64c9-3a15-92e8-c93ae5b494ac}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{b0558cdb-64c9-3a15-92e8-c93ae5b494ac}.Debug|Any CPU.Build.0 = Debug|Any CPU {81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.Build.0 = Release|Any CPU
{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0bd64dde-46cc-a28c-b84b-e0522f6fed97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0bd64dde-46cc-a28c-b84b-e0522f6fed97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e581676b-e515-94dc-c7ee-e5158f5af96b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e581676b-e515-94dc-c7ee-e5158f5af96b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{968fcd68-5785-2424-a8b1-57d977f064ee}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{968fcd68-5785-2424-a8b1-57d977f064ee}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3c396443-9c6c-69d1-7248-8e6b6a3580d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3c396443-9c6c-69d1-7248-8e6b6a3580d2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c9a516c3-de53-877b-b458-f8a67e878a04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c9a516c3-de53-877b-b458-f8a67e878a04}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72f9865c-6891-ed55-bfc3-e1d7c8e26394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72f9865c-6891-ed55-bfc3-e1d7c8e26394}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a565100f-fe57-c681-fc17-3c645ba47452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a565100f-fe57-c681-fc17-3c645ba47452}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3fc5e71b-00d4-6906-3b4f-dab1d0795696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3fc5e71b-00d4-6906-3b4f-dab1d0795696}.Debug|Any CPU.Build.0 = Debug|Any CPU
{885e274e-7f50-a377-4930-562fc60828cc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{885e274e-7f50-a377-4930-562fc60828cc}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{bbd5d945-3371-201c-a412-b472d2b13b80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{bbd5d945-3371-201c-a412-b472d2b13b80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52312059-599b-ab0f-8b82-9e6cc546efd5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52312059-599b-ab0f-8b82-9e6cc546efd5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40c3d5a7-8695-a89e-b884-01ff4239925b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40c3d5a7-8695-a89e-b884-01ff4239925b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26f23d52-7433-1b44-0570-9da4a33f7995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26f23d52-7433-1b44-0570-9da4a33f7995}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e2612a72-7ae6-8888-531c-6c25c21ac0a8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e2612a72-7ae6-8888-531c-6c25c21ac0a8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0944cd92-8f3d-69a1-8713-2c99f884a0a8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0944cd92-8f3d-69a1-8713-2c99f884a0a8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{b4be5cdf-66d4-ea8e-f726-9bf045e13587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{b4be5cdf-66d4-ea8e-f726-9bf045e13587}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c57ac926-239a-b887-19f0-e9834f17b0fe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c57ac926-239a-b887-19f0-e9834f17b0fe}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{d6fbbd1f-59ed-334c-8652-133616ce63a4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{d6fbbd1f-59ed-334c-8652-133616ce63a4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{d322fda3-5976-c697-265b-cc32f8c52c18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{d322fda3-5976-c697-265b-cc32f8c52c18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4bb84661-785f-28e0-8162-52d940cc5908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4bb84661-785f-28e0-8162-52d940cc5908}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE