Skip to content

Commit

Permalink
Merge branch 'feature'
Browse files Browse the repository at this point in the history
  • Loading branch information
LovelyCatHyt committed Dec 20, 2020
2 parents 3e4dd41 + 44a8c82 commit 691218f
Show file tree
Hide file tree
Showing 27 changed files with 16,578 additions and 484 deletions.
4 changes: 2 additions & 2 deletions Assets/Config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"mazeEditorAddress": ">tcp://127.0.0.1:25565",
"mazePath": "D:\\Repos\\Unity\\MazeViewer\\Builds\\Maze_for_c.txt",
"resultPath": "D:\\Repos\\Unity\\MazeViewer\\Builds\\answer.txt",
"mazePath": "D:\\Repos\\Unity\\MazeViewer\\Builds\\Maze_v1.0\\RecFiles\\Maze_for_c.txt",
"resultPath": "D:\\Repos\\Unity\\MazeViewer\\Builds\\Maze_v1.0\\RecFiles\\answer.txt",
"maxInfoCount": 4,
"infoLifeTime": 10.0
}
98 changes: 98 additions & 0 deletions Assets/Materials/Particle_Dots.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Particle_Dots
m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0.1
- _DstBlend: 1
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.296
- _GlossyReflections: 1
- _LightingEnabled: 1
- _Metallic: 0
- _Mode: 4
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 1
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0}
8 changes: 8 additions & 0 deletions Assets/Materials/Particle_Dots.mat.meta

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

2 changes: 1 addition & 1 deletion Assets/Materials/Route_Idle.mat
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0.7529412, b: 0, a: 1}
- _Color: {r: 0.3357633, g: 0.5471698, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
3 changes: 1 addition & 2 deletions Assets/Prefabs/DataText.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c5b1da97fdedd00448a9260f1fa542be, type: 3}
m_Name:
m_EditorClassIdentifier:
anchor: {fileID: 7483421996807223207}
availableDistance: 10
availableDistance: 20
--- !u!1 &8226842304164581159
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 691218f

Please sign in to comment.