-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from UkrainianBanderasCat/master
Merge from master fork
- Loading branch information
Showing
21 changed files
with
5,184 additions
and
993 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!114 &-4931931716007226603 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 11 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 0} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| version: 0 | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 8 | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: WireTransition | ||
| m_Shader: {fileID: -6465566751694194690, guid: 3bbdd95b31a119ae59dcf88040492981, | ||
| type: 3} | ||
| m_Parent: {fileID: 0} | ||
| m_ModifiedSerializedProperties: 0 | ||
| m_ValidKeywords: [] | ||
| m_InvalidKeywords: [] | ||
| m_LightmapFlags: 4 | ||
| m_EnableInstancingVariants: 0 | ||
| m_DoubleSidedGI: 0 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| disabledShaderPasses: [] | ||
| m_LockedProperties: | ||
| 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: 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} | ||
| - _Tex: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Ints: [] | ||
| m_Floats: | ||
| - _BUILTIN_QueueControl: 0 | ||
| - _BUILTIN_QueueOffset: 0 | ||
| - _BumpScale: 1 | ||
| - _Cutoff: 0.5 | ||
| - _DetailNormalMapScale: 1 | ||
| - _DstBlend: 0 | ||
| - _Exposure: 1 | ||
| - _Fill: 5.099995 | ||
| - _Filled: 0 | ||
| - _GlossMapScale: 1 | ||
| - _Glossiness: 0.5 | ||
| - _GlossyReflections: 1 | ||
| - _Metallic: 0 | ||
| - _Mode: 0 | ||
| - _OcclusionStrength: 1 | ||
| - _On: 0 | ||
| - _Parallax: 0.02 | ||
| - _Rotation: 0 | ||
| - _SmoothnessTextureChannel: 0 | ||
| - _SpecularHighlights: 1 | ||
| - _Speed: 10 | ||
| - _SrcBlend: 1 | ||
| - _UVSec: 0 | ||
| - _ZWrite: 1 | ||
| m_Colors: | ||
| - _Color: {r: 0.1254902, g: 0.14117648, b: 0.18039216, a: 1} | ||
| - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
| - _OffCol: {r: 0.1603774, g: 0.1603774, b: 0.1603774, a: 1} | ||
| - _OnCol: {r: 1, g: 0, b: 0, a: 1} | ||
| - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} | ||
| m_BuildTextureStacks: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using UnityEngine; | ||
|
|
||
| public class DebugConsole : MonoBehaviour | ||
| { | ||
| //#if !UNITY_EDITOR | ||
| static string myLog = ""; | ||
| private string output; | ||
| private string stack; | ||
|
|
||
| void OnEnable() | ||
| { | ||
| Application.logMessageReceived += Log; | ||
| } | ||
|
|
||
| void OnDisable() | ||
| { | ||
| Application.logMessageReceived -= Log; | ||
| } | ||
|
|
||
| public void Log(string logString, string stackTrace, LogType type) | ||
| { | ||
| output = logString; | ||
| stack = stackTrace; | ||
| myLog = output + "\n" + myLog; | ||
| if (myLog.Length > 5000) | ||
| { | ||
| myLog = myLog.Substring(0, 4000); | ||
| } | ||
| } | ||
|
|
||
| void OnGUI() | ||
| { | ||
| //if (!Application.isEditor) //Do not display in editor ( or you can use the UNITY_EDITOR macro to also disable the rest) | ||
| { | ||
| myLog = GUI.TextArea(new Rect(10, 10, Screen.width - 10, Screen.height - 10), myLog); | ||
| } | ||
| } | ||
| //#endif | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.