-
Notifications
You must be signed in to change notification settings - Fork 19
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 #72 from TeknoPT/development
Update Version
- Loading branch information
Showing
6 changed files
with
238 additions
and
12 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 |
|---|---|---|
|
|
@@ -22,3 +22,4 @@ Assets/Editor Default Resources/crosstales | |
| Assets/Plugins/crosstales | ||
|
|
||
| .idea | ||
| _builds/ | ||
8 changes: 8 additions & 0 deletions
8
Assets/Phantasma/Phantasma.Business/src/Blockchain/Contracts.meta
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| m_EditorVersion: 2021.3.8f1 | ||
| m_EditorVersionWithRevision: 2021.3.8f1 (b30333d56e81) | ||
| m_EditorVersion: 2021.3.15f1 | ||
| m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) |
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,167 @@ | ||
| { | ||
| "templatePinStates": [], | ||
| "dependencyTypeInfos": [ | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.AnimationClip", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEditor.Animations.AnimatorController", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.AnimatorOverrideController", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEditor.Audio.AudioMixerController", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.ComputeShader", | ||
| "ignore": true, | ||
| "defaultInstantiationMode": 1, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Cubemap", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.GameObject", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEditor.LightingDataAsset", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": false | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.LightingSettings", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Material", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEditor.MonoScript", | ||
| "ignore": true, | ||
| "defaultInstantiationMode": 1, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.PhysicMaterial", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.PhysicsMaterial2D", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Rendering.VolumeProfile", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEditor.SceneAsset", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": false | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Shader", | ||
| "ignore": true, | ||
| "defaultInstantiationMode": 1, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.ShaderVariantCollection", | ||
| "ignore": true, | ||
| "defaultInstantiationMode": 1, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Texture", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Texture2D", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| }, | ||
| { | ||
| "userAdded": false, | ||
| "type": "UnityEngine.Timeline.TimelineAsset", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 0, | ||
| "supportsModification": true | ||
| } | ||
| ], | ||
| "defaultDependencyTypeInfo": { | ||
| "userAdded": false, | ||
| "type": "<default_scene_template_dependencies>", | ||
| "ignore": false, | ||
| "defaultInstantiationMode": 1, | ||
| "supportsModification": true | ||
| }, | ||
| "newSceneOverride": 0 | ||
| } |