Skip to content

Commit

Permalink
final code for submission
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-aj committed Jun 26, 2024
1 parent 2f022a2 commit c8ac0a8
Show file tree
Hide file tree
Showing 16 changed files with 495 additions and 1,693 deletions.
3 changes: 0 additions & 3 deletions Assets/City.txt.meta

This file was deleted.

3 changes: 2 additions & 1 deletion Assets/CityMap/CityGridGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ void LoadTiles()

void LoadNpcs(string fileName, Transform parent)
{
var iterator = File.ReadAllLines(Application.dataPath + "/" + fileName + ".txt");
var readText = Resources.Load<TextAsset>(fileName);
var iterator = readText.text.Split('\n');
for (int i = 0; i < iterator.Length; i++)
{
var quoteLoc = iterator[i].IndexOf('"', 1);
Expand Down
5 changes: 3 additions & 2 deletions Assets/CityMap/CityReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ParsedData
public string[] Dialogue;
}

private const string FileName = "City.txt";
private const string FileName = "City";

private ParsedData ParseHeader(string[] iterator, out int lineEnd)
{
Expand Down Expand Up @@ -66,7 +66,8 @@ private ParsedData ParseHeader(string[] iterator, out int lineEnd)

public ParsedData ReadCity()
{
var iterator = File.ReadAllLines(Application.dataPath + "/" + FileName);
var textFile = Resources.Load<TextAsset>(FileName);
var iterator = textFile.text.Split('\n');

var parsed = ParseHeader(iterator, out int start);

Expand Down
2 changes: 1 addition & 1 deletion Assets/Iteractivity/Pictures and Assets/doors.png.meta

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

File renamed without changes.
7 changes: 7 additions & 0 deletions Assets/Resources/City.txt.meta

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

File renamed without changes.
7 changes: 7 additions & 0 deletions Assets/Resources/Room1Dialogue.txt.meta

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

3 changes: 0 additions & 3 deletions Assets/Room1Dialogue.txt.meta

This file was deleted.

32 changes: 32 additions & 0 deletions Assets/Settings/UniversalRP.asset
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ MonoBehaviour:
m_FsrSharpness: 0.92
m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 2048
Expand All @@ -52,9 +53,11 @@ MonoBehaviour:
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_AnyShadowsSupported: 1
m_SoftShadowsSupported: 0
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_SoftShadowQuality: 2
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
Expand All @@ -69,6 +72,7 @@ MonoBehaviour:
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
Expand All @@ -78,5 +82,33 @@ MonoBehaviour:
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_PrefilteringModeMainLightShadows: 4
m_PrefilteringModeAdditionalLight: 4
m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1
m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 1
m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 1
m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0
Loading

0 comments on commit c8ac0a8

Please sign in to comment.