mission ver.1 + endless game + moving the inventory system + DataHolder

This commit is contained in:
Залетов Федор 2022-01-17 17:49:27 +03:00
parent 1f94abd083
commit 7313001ee7
174 changed files with 19121 additions and 17626 deletions

Binary file not shown.

125
Assets/DataHolder.cs Normal file
View File

@ -0,0 +1,125 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class DataHolder : MonoBehaviour
{
public static DataHolder main;
public List<BattleConfig> easyLevels;
public List<BattleConfig> normalLevels;
public List<BattleConfig> hardLevels;
public MissionConfig mission;
[SerializeField] private string _currentScene;
private int score = 10;
private int missionChecker;
public enum complexityLevels
{
easy,
normal,
hard,
all
};
private void Awake()
{
if(_currentScene == null)
{
Debug.LogError("WARNING! _currentScene in DataHolder not found");
}
if (main != null && main != this)
{
Debug.LogWarning("2 dataholders on the scene");
Destroy(this);
return;
}
main = this;
}
public void SetScore(int _newScore)
{
score = _newScore;
}
public int GetScore()
{
return score;
}
public void ChangeScene(string _sceneName)
{
SceneManager.LoadScene(_sceneName, LoadSceneMode.Additive);
SceneManager.UnloadSceneAsync(_currentScene);
_currentScene = _sceneName;
}
//RANDOM LEVELS BLOCK
public BattleConfig RandomLevel(complexityLevels _complexity)
{
switch (_complexity)
{
case complexityLevels.easy:
return RandomEasyLevel();
case complexityLevels.normal:
return RandomNormalLevel();
case complexityLevels.hard:
return RandomHardLevel();
default:
return RandomAllLevel();
}
}
private BattleConfig RandomEasyLevel()
{
return easyLevels[Random.Range(0, easyLevels.Count)];
}
private BattleConfig RandomNormalLevel()
{
return normalLevels[Random.Range(0, normalLevels.Count)]; ;
}
private BattleConfig RandomHardLevel()
{
return hardLevels[Random.Range(0, hardLevels.Count)];
}
private BattleConfig RandomAllLevel()
{
int _maxNumber = Random.Range(0,
easyLevels.Count + normalLevels.Count + hardLevels.Count);
if (_maxNumber < easyLevels.Count)
{
Debug.Log(_maxNumber);
return easyLevels[_maxNumber];
}
else if (_maxNumber - easyLevels.Count < normalLevels.Count)
{
return normalLevels[_maxNumber - easyLevels.Count];
}
else
{
return hardLevels[_maxNumber - easyLevels.Count - normalLevels.Count];
}
}
//RANDOM LEVELS BLOCK END
public void NewMission(MissionConfig _mission)
{
mission = _mission;
missionChecker = 0;
}
public BattleConfig NextBattle()
{
missionChecker++;
if(missionChecker > mission.missionItems.Count)
{
return null;
}
return mission.missionItems[missionChecker - 1].battle;
}
public void ReturnInMainMenu()
{
ChangeScene("MainMenu");
}
}

11
Assets/DataHolder.cs.meta Normal file
View File

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

Binary file not shown.

View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 1adb65df912c9a74bbbaae177c2372d9
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Serifiqo 4F
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

16
Assets/MainCamera.cs Normal file
View File

@ -0,0 +1,16 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MainCamera : MonoBehaviour
{
public void GoToMission(MissionConfig _mission)
{
DataHolder.main.NewMission(_mission);
DataHolder.main.ChangeScene("BattleScene");
}
public void EndlessGame()
{
DataHolder.main.ChangeScene("BattleScene");
}
}

11
Assets/MainCamera.cs.meta Normal file
View File

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

43
Assets/PhaseCounter.cs Normal file
View File

@ -0,0 +1,43 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class PhaseCounter : MonoBehaviour
{
private Text _phaseCount;
private int _maxPhase = 1;
private int _phase = 1;
private void Awake()
{
_phaseCount = GetComponent<Text>();
}
public void NewPhase()
{
_phase++;
_phaseCount.text = "Phase: " + _phase + "/" + _maxPhase;
}
public void NewMaxPhase(BattleConfig _config)
{
var _character = _config.battleCharacteristics;
if(_character.SecondPhase == true)
{
if(_character.ThirdPhase == true)
{
_maxPhase = 3;
}
else
{
_maxPhase = 2;
}
}
else
{
_maxPhase = 1;
}
_phase = 0;
NewPhase();
}
}

View File

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

View File

@ -0,0 +1,753 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1609771953299064646
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4771069441355296626}
- component: {fileID: 6735017615792461092}
- component: {fileID: 8339040599585838505}
m_Layer: 5
m_Name: Type
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4771069441355296626
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609771953299064646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -72.6, y: -62.9}
m_SizeDelta: {x: 543.4585, y: 388.6396}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6735017615792461092
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609771953299064646}
m_CullTransparentMesh: 0
--- !u!114 &8339040599585838505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609771953299064646}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3}
m_FontSize: 300
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Atk
--- !u!1 &2048239979282860772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7888672239921792392}
- component: {fileID: 5307945446722769428}
- component: {fileID: 7644878962686554186}
m_Layer: 5
m_Name: Cost
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7888672239921792392
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048239979282860772}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 74.9, y: -110.8}
m_SizeDelta: {x: 543.4585, y: 388.6396}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5307945446722769428
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048239979282860772}
m_CullTransparentMesh: 0
--- !u!114 &7644878962686554186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048239979282860772}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3}
m_FontSize: 300
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 2
--- !u!1 &2174222393832354180
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4691312143915581112}
- component: {fileID: 8079126108144025688}
- component: {fileID: 8993951774176160205}
- component: {fileID: 1552329347112270613}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4691312143915581112
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2174222393832354180}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0029296875, y: -0.00012207031}
m_SizeDelta: {x: 209.58911, y: 280.18066}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8079126108144025688
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2174222393832354180}
m_CullTransparentMesh: 0
--- !u!114 &8993951774176160205
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2174222393832354180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1552329347112270613
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2174222393832354180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8993951774176160205}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2077714030763369409}
m_TargetAssemblyTypeName:
m_MethodName: OnClick
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2395137712401459668
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1461157171804990757}
- component: {fileID: 264836397697721033}
- component: {fileID: 6764859267273153880}
m_Layer: 5
m_Name: Quantity
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1461157171804990757
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2395137712401459668}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -72.6, y: -110.8}
m_SizeDelta: {x: 543.4585, y: 388.6396}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &264836397697721033
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2395137712401459668}
m_CullTransparentMesh: 0
--- !u!114 &6764859267273153880
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2395137712401459668}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3}
m_FontSize: 300
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 15
--- !u!1 &6582633329347417722
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3741952534908770683}
- component: {fileID: 3656883488476568494}
- component: {fileID: 2412892185416126480}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3741952534908770683
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6582633329347417722}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3656883488476568494
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6582633329347417722}
m_CullTransparentMesh: 0
--- !u!114 &2412892185416126480
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6582633329347417722}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6765128093930921004
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6765128093930921005}
- component: {fileID: 6765128093930921007}
- component: {fileID: 6765128093930921006}
m_Layer: 5
m_Name: BakgroundCard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6765128093930921005
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128093930921004}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000011444092, y: 0}
m_SizeDelta: {x: 209.59454, y: 280.18082}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6765128093930921007
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128093930921004}
m_CullTransparentMesh: 0
--- !u!114 &6765128093930921006
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128093930921004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6765128094213305608
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6765128094213305609}
- component: {fileID: 2077714030763369409}
- component: {fileID: 5139430113101627829}
m_Layer: 5
m_Name: UltraMegaAttack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6765128094213305609
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128094213305608}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6765128093930921005}
- {fileID: 7690771068042610719}
- {fileID: 669571680899366569}
- {fileID: 7888672239921792392}
- {fileID: 4771069441355296626}
- {fileID: 1461157171804990757}
- {fileID: 3741952534908770683}
- {fileID: 4691312143915581112}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -54.8, y: -380.83}
m_SizeDelta: {x: 209.59491, y: 280.18555}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2077714030763369409
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128094213305608}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c0cf382e614d3e84194ce693591df5d5, type: 3}
m_Name:
m_EditorClassIdentifier:
cardConfig: {fileID: 11400000, guid: e8ca549d99fe5cf4397542620ed834cb, type: 2}
number: 0
cardObject: {fileID: 6765128094213305608}
picture: {fileID: 2412892185416126480}
nameCard: {fileID: 953190357057458929}
costTitle: {fileID: 4939875813011195202}
cost: {fileID: 7644878962686554186}
type: {fileID: 8339040599585838505}
quantity: {fileID: 6764859267273153880}
--- !u!222 &5139430113101627829
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765128094213305608}
m_CullTransparentMesh: 0
--- !u!1 &6799654100190161255
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 669571680899366569}
- component: {fileID: 6433774047502603482}
- component: {fileID: 4939875813011195202}
m_Layer: 5
m_Name: CostTitle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &669571680899366569
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6799654100190161255}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 74.9, y: -62.9}
m_SizeDelta: {x: 543.4585, y: 388.6396}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6433774047502603482
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6799654100190161255}
m_CullTransparentMesh: 0
--- !u!114 &4939875813011195202
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6799654100190161255}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3}
m_FontSize: 300
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Stam
--- !u!1 &8862432786639125036
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7690771068042610719}
- component: {fileID: 7015885660958318054}
- component: {fileID: 953190357057458929}
m_Layer: 5
m_Name: Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7690771068042610719
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862432786639125036}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341}
m_Children: []
m_Father: {fileID: 6765128094213305609}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.00024414, y: 103}
m_SizeDelta: {x: 1948.9277, y: 388.6396}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7015885660958318054
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862432786639125036}
m_CullTransparentMesh: 0
--- !u!114 &953190357057458929
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862432786639125036}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3}
m_FontSize: 300
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Big attack

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 36c35c372a23bc349b3f2613d898cdda
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,182 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1821969145
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1821969147}
- component: {fileID: 1821969146}
m_Layer: 0
m_Name: DataHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1821969146
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1821969145}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7dc4bce8f5915e742a365be001dbc164, type: 3}
m_Name:
m_EditorClassIdentifier:
easyLevels:
- {fileID: 11400000, guid: 3cef7b3afdcce6a4a97f2883ee7ce203, type: 2}
- {fileID: 11400000, guid: 842ea87c23ba82e4980d0d5c1bccb263, type: 2}
- {fileID: 11400000, guid: c4b45319e9ae8c24a9438acde55e9f9a, type: 2}
normalLevels:
- {fileID: 11400000, guid: 831eae662de3b074ba854d72dd4b7706, type: 2}
- {fileID: 11400000, guid: a58b74e66a955c842842e28c951d39f5, type: 2}
- {fileID: 11400000, guid: 0b30cfc668c041747a968d2c8bf1a3cb, type: 2}
hardLevels:
- {fileID: 11400000, guid: c76ef6aeaf7e2074fb44abc864f27a75, type: 2}
- {fileID: 11400000, guid: 1ddd96264d0ff474fb1b38acae40b69f, type: 2}
- {fileID: 11400000, guid: f978d621347647a4f8505449e105298e, type: 2}
mission: {fileID: 0}
_currentScene: MainMenu
--- !u!4 &1821969147
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1821969145}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 715.51013, y: 440.34518, z: -70.05032}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c0f2ab0c52da4e04fa0f6cb87378dd5a guid: ae36a43ecda2f5645878559e1b6f717a
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,63 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!850595691 &4890085278179872738
LightingSettings:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SampleSceneSettings
serializedVersion: 3
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
m_BakeBackend: 0
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_TextureCompression: 1
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 2
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 256
m_FinalGatherFiltering: 1
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 2
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1

View File

@ -5,14 +5,14 @@ using UnityEngine.UI;
public class CanvasChanger : MonoBehaviour public class CanvasChanger : MonoBehaviour
{ {
public Canvas canvasToOn; public GameObject canvasToOn;
public Canvas canvasToOff; public GameObject canvasToOff;
public void ChangeCanvas() public void ChangeCanvas()
{ {
if (canvasToOn != null) if (canvasToOn != null)
canvasToOn.enabled = true; canvasToOn.SetActive(true);
if (canvasToOn != null) if (canvasToOn != null)
canvasToOff.enabled = false; canvasToOff.SetActive(false);
} }
} }

View File

@ -94,17 +94,16 @@ public class Card : MonoBehaviour
{ {
DeckManager.main.NewStaminaQuantity(_stamina + _card.addStamina); DeckManager.main.NewStaminaQuantity(_stamina + _card.addStamina);
} }
//если перестанет резко работать карты на хил и армор, то дело в этом, если нет => нужно удалить коментарий else if (_card.addArmor > 0)
//else if (_card.addArmor > 0) {
//{
DeckManager.main.NewStaminaQuantity(_stamina - _card.quantityStamina); DeckManager.main.NewStaminaQuantity(_stamina - _card.quantityStamina);
Player.main.AddArmor(_card.addArmor); Player.main.AddArmor(_card.addArmor);
//} }
//else if (_card.addHealth > 0) else if (_card.addHealth > 0)
//{ {
DeckManager.main.NewStaminaQuantity(_stamina - _card.quantityStamina); DeckManager.main.NewStaminaQuantity(_stamina - _card.quantityStamina);
Player.main.ChangeHp(-_card.addHealth); Player.main.ChangeHp(-_card.addHealth);
//} }
DeckManager.main.currentCard = null; DeckManager.main.currentCard = null;
DeckManager.main.MarkersRegulator(); DeckManager.main.MarkersRegulator();
DestroyObject(); DestroyObject();

View File

@ -7,7 +7,7 @@ using System;
using UnityEditor; using UnityEditor;
[CreateAssetMenu(fileName = "BattleConfig")] [CreateAssetMenu(fileName = "BattleConfig", menuName = "Configs/BattleConfig")]
public class BattleConfig : ScriptableObject public class BattleConfig : ScriptableObject
{ {
public BattleCharacteristics battleCharacteristics; public BattleCharacteristics battleCharacteristics;
@ -15,7 +15,7 @@ public class BattleConfig : ScriptableObject
[Serializable] [Serializable]
public class BattleCharacteristics public class BattleCharacteristics
{ {
public bool FirstPhase;
public Phase firstPhaseOptions; public Phase firstPhaseOptions;
public bool SecondPhase; public bool SecondPhase;
public Phase SecondPhaseOptions; public Phase SecondPhaseOptions;

View File

@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: EasyBattle_1
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 1
maximumQuantity: 2
SecondPhase: 0
SecondPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 727470f1003b0d84ea84cdd280a59b2b guid: 3cef7b3afdcce6a4a97f2883ee7ce203
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 4890085278179872738 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: EasyBattle_2
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 1
maximumQuantity: 2
SecondPhase: 0
SecondPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 842ea87c23ba82e4980d0d5c1bccb263
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: EasyBattle_3
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 1
maximumQuantity: 1
SecondPhase: 0
SecondPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c4b45319e9ae8c24a9438acde55e9f9a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -13,7 +13,6 @@ MonoBehaviour:
m_Name: FirstBattle m_Name: FirstBattle
m_EditorClassIdentifier: Assembly-CSharp::battleConfig m_EditorClassIdentifier: Assembly-CSharp::battleConfig
battleCharacteristics: battleCharacteristics:
FirstPhase: 1
firstPhaseOptions: firstPhaseOptions:
enemies: enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2} - {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
@ -21,13 +20,13 @@ MonoBehaviour:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2} - {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
minimumQuantity: 3 minimumQuantity: 3
maximumQuantity: 3 maximumQuantity: 3
SecondPhase: 1 SecondPhase: 0
SecondPhaseOptions: SecondPhaseOptions:
enemies: enemies:
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2} - {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 1 minimumQuantity: 1
maximumQuantity: 2 maximumQuantity: 2
ThirdPhase: 1 ThirdPhase: 0
ThirdPhaseOptions: ThirdPhaseOptions:
enemies: enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2} - {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}

View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: HardBattle_1
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 3
maximumQuantity: 3
SecondPhase: 1
SecondPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 3
maximumQuantity: 3
ThirdPhase: 1
ThirdPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c76ef6aeaf7e2074fb44abc864f27a75
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: HardBattle_2
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3
SecondPhase: 1
SecondPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3
ThirdPhase: 1
ThirdPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1ddd96264d0ff474fb1b38acae40b69f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: HardBattle_3
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3
SecondPhase: 1
SecondPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3
ThirdPhase: 1
ThirdPhaseOptions:
enemies:
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
minimumQuantity: 3
maximumQuantity: 3

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f978d621347647a4f8505449e105298e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: NormalBattle_1
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
minimumQuantity: 2
maximumQuantity: 2
SecondPhase: 1
SecondPhaseOptions:
enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
minimumQuantity: 2
maximumQuantity: 3
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 831eae662de3b074ba854d72dd4b7706
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: NormalBattle_2
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 2
maximumQuantity: 3
SecondPhase: 1
SecondPhaseOptions:
enemies:
- {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2}
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
minimumQuantity: 2
maximumQuantity: 3
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a58b74e66a955c842842e28c951d39f5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
m_Name: NormalBattle_3
m_EditorClassIdentifier:
battleCharacteristics:
firstPhaseOptions:
enemies:
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
minimumQuantity: 3
maximumQuantity: 3
SecondPhase: 0
SecondPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0
ThirdPhase: 0
ThirdPhaseOptions:
enemies: []
minimumQuantity: 0
maximumQuantity: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0b30cfc668c041747a968d2c8bf1a3cb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4,7 +4,7 @@ using UnityEngine;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
[CreateAssetMenu(fileName = "CardConfig")] [CreateAssetMenu(fileName = "Configs/CardConfig")]
public class CardConfig : ScriptableObject public class CardConfig : ScriptableObject
{ {
public CardCharacteristics CardCharacteristics; public CardCharacteristics CardCharacteristics;

View File

@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 9c4c6a3d3a1809644803be5d2cb70212, type: 3}
m_Name: UltraMegaAttack
m_EditorClassIdentifier:
CardCharacteristics:
cardName: UltraMegaAttack
picture: {fileID: 21300000, guid: 49fd699074bfe8742b2664b5fd5b5396, type: 3}
description:
specialization: 1
quantityStamina: 0
quantityHealth: 0
damage: 30
addHealth: 0
addStamina: 0
addArmor: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e8ca549d99fe5cf4397542620ed834cb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4,7 +4,7 @@ using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
[CreateAssetMenu(fileName = "EnemyConfig")] [CreateAssetMenu(fileName = "Configs/EnemyConfig")]
public class EnemyConfig : ScriptableObject public class EnemyConfig : ScriptableObject
{ {
public EnemyCharacteristics enemyCharacteristics; public EnemyCharacteristics enemyCharacteristics;

View File

@ -0,0 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.SceneManagement;
using System;
using UnityEditor;
[CreateAssetMenu(fileName = "MissionConfig")]
public class MissionConfig : ScriptableObject
{
public List<
MissionCharacteristics> missionItems = new List<MissionCharacteristics>();
}
[Serializable]
public class MissionCharacteristics
{
public BattleConfig battle;
// Â áóäóùåì ñþäà äîáàâÿòñÿ ñîáûòèÿ
}

View File

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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fa163f2f9747ec9418f19577175a653e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: c912d3615048b3c4e9c6d0cf942bb4db, type: 3}
m_Name: FirstMission
m_EditorClassIdentifier:
missionItems:
- battle: {fileID: 11400000, guid: 3cef7b3afdcce6a4a97f2883ee7ce203, type: 2}
- battle: {fileID: 11400000, guid: a58b74e66a955c842842e28c951d39f5, type: 2}
- battle: {fileID: 11400000, guid: c4b45319e9ae8c24a9438acde55e9f9a, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0039c482e027b964ba368d339754bb7f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -89,6 +89,7 @@ public class DeckManager : MonoBehaviour
} }
} }
CardInTable.Clear(); CardInTable.Clear();
HandingOut();
if (stamina < 3) if (stamina < 3)
NewStaminaQuantity(stamina + 1); NewStaminaQuantity(stamina + 1);
//нужна корутина для вражеского хода //нужна корутина для вражеского хода
@ -154,28 +155,13 @@ public class DeckManager : MonoBehaviour
currentCard = null; currentCard = null;
MarkersRegulator(); MarkersRegulator();
} }
/*public void ActionInPlayer()
{
if (waitingEnemyTurn || currentCard == null || !Player.main.CheckMarker()) return;
if (currentCard.CardCharacteristics.healing > 0)
{
Player.main.ChangeHp(-currentCard.CardCharacteristics.healing);
}
else if(currentCard.CardCharacteristics.addStamina)
NewStaminaQuantity(stamina - currentCard.CardCharacteristics.quantityStamina);
CardInTable[numberCurrentCard].GetComponent<Card>().DestroyObject();
currentCard = null;
MarkersRegulator();
}*/
IEnumerator EnemyStep() IEnumerator EnemyStep()
{ {
waitingEnemyTurn = true; waitingEnemyTurn = true;
Session.main.EnemiesStep(); Session.main.EnemiesStep();
yield return new WaitForSeconds(0.5f); yield return new WaitForSeconds(0.5f);
waitingEnemyTurn = false; waitingEnemyTurn = false;
HandingOut();
} }
} }

View File

@ -0,0 +1,33 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AddEquipment : MonoBehaviour
{
public void AddOrRemove()
{
if (Inventory.main.EquipedOrNot(Inventory.main.lastCardNum))
{
Inventory.main.playerEquipment.Remove(Inventory.main.allEquipment[Inventory.main.lastCardNum]);
for (int i = 0; i < Inventory.main.playerPlace.Count; i++)
{
if (Inventory.main.playerPlace[i].name == Inventory.main.allEquipment[Inventory.main.lastCardNum].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.place.ToString())
{
Inventory.main.playerPlace[i].image.sprite = Inventory.main.imagePlug;
Inventory.main.playerPlace[i].GetComponent<PlaceEquipment>().equipmentNum = -1;
}
}
}
else
{
Inventory.main.playerEquipment.Add(Inventory.main.allEquipment[Inventory.main.lastCardNum]);
Inventory.main.WhichPlace(Inventory.main.lastCardNum);
}
DataScript.PlayerEquipment = Inventory.main.playerEquipment;
EquipmentInfo.main.CardAbout(Inventory.main.lastCardNum);
}
}

View File

@ -8,7 +8,7 @@ public class EquipmentButton : MonoBehaviour
public void OnClick() public void OnClick()
{ {
MainMenuScript.main.lastCardNum = num; Inventory.main.lastCardNum = num;
Camera.main.GetComponent<EquipmentInfo>().CardAbout(num); EquipmentInfo.main.CardAbout(num);
} }
} }

View File

@ -0,0 +1,43 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class EquipmentInfo : MonoBehaviour
{
public static EquipmentInfo main;
[SerializeField] private Text localName;
[SerializeField] private Text desqription;
[SerializeField] private Image icon;
[SerializeField] private Button AddButton;
private void Awake()
{
if (main != null && main != this)
{
Debug.LogWarning("2 dataholders on the scene");
Destroy(this);
return;
}
main = this;
}
private void Start()
{
CardAbout(0);
}
public void CardAbout(int _index)
{
localName.text = Inventory.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.name;
desqription.text = Inventory.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.description;
icon.sprite = Inventory.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite;
if (Inventory.main.EquipedOrNot(Inventory.main.lastCardNum))
AddButton.GetComponentInChildren<Text>().text = "UnEquip";
else
AddButton.GetComponentInChildren<Text>().text = "Equip";
}
}

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class MainMenuScript : MonoBehaviour public class Inventory : MonoBehaviour
{ {
public static MainMenuScript main; public static Inventory main;
public List<GameObject> allEquipment = new List<GameObject>(); public List<GameObject> allEquipment = new List<GameObject>();
public List<GameObject> playerEquipment = new List<GameObject>(); public List<GameObject> playerEquipment = new List<GameObject>();
@ -38,9 +38,13 @@ public class MainMenuScript : MonoBehaviour
{ {
for (int i = 0; i < playerPlace.Count; i++) for (int i = 0; i < playerPlace.Count; i++)
{ {
if (playerPlace[i].name == allEquipment[_num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.place.ToString()) var _config =
allEquipment[_num].GetComponent<Equipment>().equipmentConfig.
equipmentCharacteristics;
if (_config == null) Debug.LogError("config not found!");
if (playerPlace[i].name == _config.name)
{ {
playerPlace[i].image.sprite = allEquipment[_num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite; playerPlace[i].image.sprite = _config.sprite;
playerPlace[i].GetComponent<PlaceEquipment>().equipmentNum = lastCardNum; playerPlace[i].GetComponent<PlaceEquipment>().equipmentNum = lastCardNum;
} }
} }

View File

@ -11,8 +11,8 @@ public class PlaceEquipment : MonoBehaviour
public void EquipmentAbout() public void EquipmentAbout()
{ {
//Óðàààààà, âñå ðàáîòàåò //Óðàààààà, âñå ðàáîòàåò
if (GetComponentInChildren<Image>().sprite.name != MainMenuScript.main.imagePlug.name && equipmentNum != -1) if (GetComponentInChildren<Image>().sprite.name != Inventory.main.imagePlug.name && equipmentNum != -1)
Camera.main.GetComponent<EquipmentInfo>().CardAbout(equipmentNum); EquipmentInfo.main.CardAbout(equipmentNum);
} }
} }

View File

@ -29,7 +29,7 @@ public class SpawnButton : MonoBehaviour
public void ChangePage(int _page) public void ChangePage(int _page)
{ {
if ((page + _page) * maxHeroButOnPage - MainMenuScript.main.allEquipment.Count < 0) if ((page + _page) * maxHeroButOnPage - Inventory.main.allEquipment.Count < 0)
{ {
if (page + _page > -1) if (page + _page > -1)
{ {
@ -53,7 +53,7 @@ public class SpawnButton : MonoBehaviour
for (int i = _begin; i < _end; i++) for (int i = _begin; i < _end; i++)
{ {
if (i > MainMenuScript.main.allEquipment.Count - 1) if (i > Inventory.main.allEquipment.Count - 1)
{ {
break; break;
} }
@ -62,7 +62,7 @@ public class SpawnButton : MonoBehaviour
link.transform.GetComponent<EquipmentButton>().num = i; link.transform.GetComponent<EquipmentButton>().num = i;
link.transform.localPosition = new Vector3(_x, _y, 0); link.transform.localPosition = new Vector3(_x, _y, 0);
link.image.sprite = MainMenuScript.main.allEquipment[i].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite; link.image.sprite = Inventory.main.allEquipment[i].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite;
_x += gameObject.GetComponent<RectTransform>().rect.width + distX; _x += gameObject.GetComponent<RectTransform>().rect.width + distX;

View File

@ -1,33 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AddEquipment : MonoBehaviour
{
public void AddOrRemove()
{
if (MainMenuScript.main.EquipedOrNot(MainMenuScript.main.lastCardNum))
{
MainMenuScript.main.playerEquipment.Remove(MainMenuScript.main.allEquipment[MainMenuScript.main.lastCardNum]);
for (int i = 0; i < MainMenuScript.main.playerPlace.Count; i++)
{
if (MainMenuScript.main.playerPlace[i].name == MainMenuScript.main.allEquipment[MainMenuScript.main.lastCardNum].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.place.ToString())
{
MainMenuScript.main.playerPlace[i].image.sprite = MainMenuScript.main.imagePlug;
MainMenuScript.main.playerPlace[i].GetComponent<PlaceEquipment>().equipmentNum = -1;
}
}
}
else
{
MainMenuScript.main.playerEquipment.Add(MainMenuScript.main.allEquipment[MainMenuScript.main.lastCardNum]);
MainMenuScript.main.WhichPlace(MainMenuScript.main.lastCardNum);
}
DataScript.PlayerEquipment = MainMenuScript.main.playerEquipment;
Camera.main.GetComponent<EquipmentInfo>().CardAbout(MainMenuScript.main.lastCardNum);
}
}

View File

@ -1,31 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class EquipmentInfo : MonoBehaviour
{
[SerializeField] private Text localName;
[SerializeField] private Text desqription;
[SerializeField] private Image icon;
[SerializeField] private Button AddButton;
private void Start()
{
CardAbout(0);
}
public void CardAbout(int _index)
{
localName.text = MainMenuScript.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.name;
desqription.text = MainMenuScript.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.description;
icon.sprite = MainMenuScript.main.allEquipment[_index].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite;
if (MainMenuScript.main.EquipedOrNot(MainMenuScript.main.lastCardNum))
AddButton.GetComponentInChildren<Text>().text = "UnEquip";
else
AddButton.GetComponentInChildren<Text>().text = "Equip";
}
}

View File

@ -5,8 +5,9 @@ using UnityEngine.SceneManagement;
public class SceneLoader : MonoBehaviour public class SceneLoader : MonoBehaviour
{ {
public void ChangeScene(string _sceneName) public void ChangeScene(string _sceneName)
{ {
SceneManager.LoadScene(_sceneName); DataHolder.main.ChangeScene(_sceneName);
} }
} }

View File

@ -10,30 +10,36 @@ public class Session : MonoBehaviour
{ {
public static Session main; public static Session main;
[SerializeField] private PlayerConfig playerConfig; [SerializeField] private PlayerConfig playerConfig;
[SerializeField] private BattleConfig battleConfig;
[SerializeField] private UnityEvent onVictory; [SerializeField] private UnityEvent onVictory;
[SerializeField] private UnityEvent onDefeat; [SerializeField] private UnityEvent onDefeat;
[SerializeField] private UnityEvent onInventory;
[SerializeField] private UnityEvent onNextLevel;
[Header("Enemies")] [Header("Enemies")]
[Space] [Space (3)]
[SerializeField] private List<Transform> enemyUIPositions = new List<Transform>(); [SerializeField] private List<Transform> enemyUIPositions = new List<Transform>();
[SerializeField] private List<GameObject> enemyPrefabs; [SerializeField] private List<GameObject> enemyPrefabs;
[Header("Player")] [Header("Player")]
[Space]
[SerializeField] private GameObject player; [SerializeField] private GameObject player;
[SerializeField] private Transform playerPosition; [SerializeField] private Transform playerPosition;
[HideInInspector] public GameObject playerLink; [HideInInspector] public GameObject playerLink;
[Header("UI")]
[Space]
[SerializeField] private PhaseCounter phaseCounter;
[Space(3)] [Space(3)]
[Header("For checking")] [Header("For checking")]
[SerializeField] private BattleConfig battleConfig;
public int numberPhase = 1; public int numberPhase = 1;
public int quantityEnemies = 0; public int quantityEnemies = 0;
public bool waitingEndingRound = false; public bool waitingEndingRound = false;
[SerializeField] private BattleConfig nextLevel;
public List<GameObject> currentEnemies = new List<GameObject>(); public List<GameObject> currentEnemies = new List<GameObject>();
private void Awake() private void Awake()
@ -44,14 +50,18 @@ public class Session : MonoBehaviour
Destroy(this); Destroy(this);
return; return;
} }
main = this; main = this;
battleConfig = SearchNextLevel();
nextLevel = SearchNextLevel();
Debug.Log(battleConfig.name + " " + nextLevel.name);
} }
public void Start() public void Start()
{ {
phaseCounter.NewMaxPhase(battleConfig);
CreatePlayer(); CreatePlayer();
FirstPhase(); FirstPhase();
} }
public void FirstPhase() public void FirstPhase()
{ {
var FP = battleConfig.battleCharacteristics.firstPhaseOptions; var FP = battleConfig.battleCharacteristics.firstPhaseOptions;
@ -64,14 +74,15 @@ public class Session : MonoBehaviour
} }
} }
public void SecondPhase() public void SecondPhase()
{ {
if (!battleConfig.battleCharacteristics.SecondPhase) if (!battleConfig.battleCharacteristics.SecondPhase)
{ {
Victory(); Victory();
return; return;
} }
phaseCounter.NewPhase();
var SP = battleConfig.battleCharacteristics.SecondPhaseOptions; var SP = battleConfig.battleCharacteristics.SecondPhaseOptions;
int quantity = Random.Range(SP.minimumQuantity, SP.maximumQuantity); int quantity = Random.Range(SP.minimumQuantity, SP.maximumQuantity);
for (int i = 0; i < quantity; i++) for (int i = 0; i < quantity; i++)
@ -82,7 +93,6 @@ public class Session : MonoBehaviour
} }
} }
public void ThirdPhase() public void ThirdPhase()
{ {
if (!battleConfig.battleCharacteristics.ThirdPhase) if (!battleConfig.battleCharacteristics.ThirdPhase)
@ -90,6 +100,8 @@ public class Session : MonoBehaviour
Victory(); Victory();
return; return;
} }
phaseCounter.NewPhase();
var TP = battleConfig.battleCharacteristics.ThirdPhaseOptions; var TP = battleConfig.battleCharacteristics.ThirdPhaseOptions;
int quantity = Random.Range(TP.minimumQuantity, TP.maximumQuantity); int quantity = Random.Range(TP.minimumQuantity, TP.maximumQuantity);
for (int i = 0; i < quantity; i++) for (int i = 0; i < quantity; i++)
@ -101,6 +113,7 @@ public class Session : MonoBehaviour
} }
} }
//EventLogic
public void Victory() public void Victory()
{ {
onVictory?.Invoke(); onVictory?.Invoke();
@ -109,47 +122,13 @@ public class Session : MonoBehaviour
{ {
onDefeat?.Invoke(); onDefeat?.Invoke();
} }
public void EnemyDeath(GameObject _deadEnemy) public void Inventory()
{ {
quantityEnemies--; onInventory?.Invoke();
for(int i = 0; i < currentEnemies.Count; i++)
{
if(currentEnemies[i] == _deadEnemy)
{
Destroy(currentEnemies[i]);
currentEnemies.RemoveAt(i);
}
}
if (quantityEnemies == 0)
{
StartCoroutine(ChekingCoroutine());
}
SwitchEnemyPosition();
} }
IEnumerator ChekingCoroutine()
{ //EventLogic end
waitingEndingRound = true;
currentEnemies.Clear();
yield return new WaitForSeconds(0.5f);
if (numberPhase == 1 && battleConfig.battleCharacteristics.SecondPhase)
{
numberPhase++;
SecondPhase();
}
else if (numberPhase == 2 && battleConfig.battleCharacteristics.ThirdPhase)
{
numberPhase++;
ThirdPhase();
}
else
{
Victory();
}
waitingEndingRound = false;
}
// RandomBlock // RandomBlock
@ -166,8 +145,6 @@ public class Session : MonoBehaviour
Debug.LogError("WARNING! no config found for position" + _position.ToString()); Debug.LogError("WARNING! no config found for position" + _position.ToString());
return null; return null;
} }
EnemyConfig RandomInRandomizer(int _position, List<EnemyConfig> _enemyConfigs) EnemyConfig RandomInRandomizer(int _position, List<EnemyConfig> _enemyConfigs)
{ {
int _numberEnemy; int _numberEnemy;
@ -181,10 +158,10 @@ public class Session : MonoBehaviour
return _enemyConfigs[_numberEnemy]; return _enemyConfigs[_numberEnemy];
} }
// RandomBlock end // RandomBlock end
//EnemyBlock
public GameObject CreateEnemies(EnemyConfig _config, int _position) public GameObject CreateEnemies(EnemyConfig _config, int _position)
{ {
for (int i = 0; i < enemyPrefabs.Count; i++) for (int i = 0; i < enemyPrefabs.Count; i++)
@ -200,7 +177,6 @@ public class Session : MonoBehaviour
return null; return null;
} }
public void SwitchEnemyPosition() public void SwitchEnemyPosition()
{ {
for (int i = 0; i < currentEnemies.Count; i++) for (int i = 0; i < currentEnemies.Count; i++)
@ -210,15 +186,6 @@ public class Session : MonoBehaviour
} }
} }
public void CreatePlayer()
{
Instantiate(player, playerPosition);
Player.main.playerConfig = playerConfig;
Player.main.NewInformation();
}
public void EnemiesStep() public void EnemiesStep()
{ {
for (int i = 0; i < currentEnemies.Count; i++) for (int i = 0; i < currentEnemies.Count; i++)
@ -229,4 +196,83 @@ public class Session : MonoBehaviour
} }
} }
} }
public void EnemyDeath(GameObject _deadEnemy)
{
quantityEnemies--;
for (int i = 0; i < currentEnemies.Count; i++)
{
if (currentEnemies[i] == _deadEnemy)
{
Destroy(currentEnemies[i]);
currentEnemies.RemoveAt(i);
}
}
if (quantityEnemies == 0)
{
StartCoroutine(ChekingCoroutine());
}
SwitchEnemyPosition();
}
IEnumerator ChekingCoroutine()
{
waitingEndingRound = true;
currentEnemies.Clear();
yield return new WaitForSeconds(0.2f);
if (numberPhase == 1 && battleConfig.battleCharacteristics.SecondPhase)
{
numberPhase++;
SecondPhase();
}
else if (numberPhase == 2 && battleConfig.battleCharacteristics.ThirdPhase)
{
numberPhase++;
ThirdPhase();
}
else
{
Victory();
}
waitingEndingRound = false;
}
//EnemyBlock end
public void CreatePlayer()
{
Instantiate(player, playerPosition);
Player.main.playerConfig = playerConfig;
Player.main.NewInformation();
}
public void LaunchNextLevel()
{
if (nextLevel == null)
{
DataHolder.main.mission = null;
DataHolder.main.ReturnInMainMenu();
return;
}
phaseCounter.NewMaxPhase(nextLevel);
onNextLevel?.Invoke();
}
public void NextLevel()
{
battleConfig = nextLevel;
nextLevel = SearchNextLevel() ;
FirstPhase();
}
public BattleConfig SearchNextLevel()
{
if(DataHolder.main.mission != null)
{
return DataHolder.main.NextBattle();
}
else
{
return DataHolder.main.RandomLevel(DataHolder.complexityLevels.all);
}
}
} }

Binary file not shown.

View File

@ -15,120 +15,16 @@ MonoBehaviour:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 43 y: 43.2
width: 1920 width: 1536
height: 997 height: 780.8
m_ShowMode: 4 m_ShowMode: 4
m_Title: Game m_Title: Game
m_RootView: {fileID: 6} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 392} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 1
--- !u!114 &2 --- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 9}
- {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1920
height: 947
m_MinSize: {x: 677, y: 342}
m_MaxSize: {x: 12002, y: 8042}
vertical: 0
controlID: 207
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 1531
y: 0
width: 389
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 379
height: 626
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 626
width: 1531
height: 321
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 13}
- {fileID: 18}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -141,22 +37,22 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 7} - {fileID: 3}
- {fileID: 2} - {fileID: 4}
- {fileID: 8} - {fileID: 5}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1536
height: 997 height: 781
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1 m_UseTopView: 1
m_TopViewHeight: 30 m_TopViewHeight: 30
m_UseBottomView: 1 m_UseBottomView: 1
m_BottomViewHeight: 20 m_BottomViewHeight: 20
--- !u!114 &7 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -173,15 +69,42 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1536
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
m_LoadedToolbars: m_LoadedToolbars:
- {fileID: 19} - {fileID: 17}
m_MainToolbar: {fileID: 19} m_MainToolbar: {fileID: 17}
m_LastLoadedLayoutName: Default m_LastLoadedLayoutName:
--- !u!114 &8 --- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 7}
- {fileID: 8}
- {fileID: 9}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1536
height: 731
m_MinSize: {x: 911, y: 442}
m_MaxSize: {x: 22006, y: 10021}
vertical: 0
controlID: 129
--- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -197,12 +120,12 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 977 y: 761
width: 1920 width: 1536
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
--- !u!114 &9 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -216,17 +139,95 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 10} - {fileID: 10}
- {fileID: 5} - {fileID: 11}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 826
height: 947 height: 731
m_MinSize: {x: 402, y: 342} m_MinSize: {x: 201, y: 442}
m_MaxSize: {x: 8002, y: 8042} m_MaxSize: {x: 4001, y: 8042}
vertical: 1 vertical: 1
controlID: 212 controlID: 40
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 826
y: 0
width: 202
height: 731
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 12}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 1028
y: 0
width: 232
height: 731
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 1260
y: 0
width: 276
height: 731
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -236,22 +237,23 @@ MonoBehaviour:
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children: []
- {fileID: 4}
- {fileID: 11}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 826
height: 626 height: 304
m_MinSize: {x: 402, y: 221} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 8002, y: 4021} m_MaxSize: {x: 4001, y: 4021}
vertical: 0 m_ActualView: {fileID: 16}
controlID: 213 m_Panes:
- {fileID: 16}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -262,24 +264,22 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 379 x: 0
y: 0 y: 304
width: 1152 width: 826
height: 626 height: 427
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 15}
- {fileID: 17}
- {fileID: 12}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &12 --- !u!114 &12
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -289,23 +289,89 @@ MonoBehaviour:
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_MinSize: {x: 400, y: 100} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 2048, y: 2048} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Asset Store m_Text: Hierarchy
m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 468 x: 826.4
y: 181 y: 73.6
width: 973 width: 200
height: 501 height: 710
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 44beffffd6dafffffef1ffff74f5ffff3efbffff40fbffff88420000645c0000345d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 10}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 69ecbac459fb9794c855039793ba3e1f
--- !u!114 &13 --- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1260
y: 73.6
width: 275
height: 710
m_ViewDataDictionary: {fileID: 0}
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
--- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -321,14 +387,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_TitleContent: m_TitleContent:
m_Text: Project m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1028
y: 646 y: 73.6
width: 1530 width: 230
height: 353 height: 710
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
@ -343,22 +409,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scripts/MainMenuScripts - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 16
m_LastFolders: m_LastFolders:
- Assets/Scripts/MainMenuScripts - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: 16
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega" m_LastProjectPath: C:\Users\Dara\Documents\1\PO
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 179} scrollPos: {x: 0, y: 0}
m_SelectedIDs: b84e0000 m_SelectedIDs: 3a430000
m_LastClickedID: 20152 m_LastClickedID: 17210
m_ExpandedIDs: 00000000c64c0000c84c0000ca4c0000cc4c0000ce4c0000d04c0000d24c0000684d000000ca9a3b m_ExpandedIDs: 0000000016430000184300001a4300001c4300001e430000204300002243000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -374,7 +440,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 8}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
@ -386,7 +452,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000c64c0000c84c0000ca4c0000cc4c0000ce4c0000d04c0000d24c000000ca9a3b m_ExpandedIDs: 0000000016430000184300001a4300001c4300001e4300002043000022430000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -411,10 +477,10 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: b2a20000 m_SelectedInstanceIDs:
m_LastClickedInstanceID: 41650 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: 18190000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -430,7 +496,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 8}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
@ -439,46 +505,9 @@ MonoBehaviour:
m_ResourceFile: m_ResourceFile:
m_NewAssetIndexInList: -1 m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64 m_GridSize: 16
m_SkipHiddenPackages: 0 m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 115 m_DirectoriesAreaWidth: 110
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1531
y: 73
width: 388
height: 926
m_ViewDataDictionary: {fileID: 0}
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
--- !u!114 &15 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -488,51 +517,86 @@ MonoBehaviour:
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Hierarchy m_Text: Game
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73 y: 377.6
width: 378 width: 825
height: 605 height: 406
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy: m_SerializedViewNames: []
m_TreeViewState: m_SerializedViewValues: []
scrollPos: {x: 0, y: 0} m_PlayModeViewName: GameView
m_SelectedIDs: 924e0000 m_ShowGizmos: 0
m_LastClickedID: 20114 m_TargetDisplay: 0
m_ExpandedIDs: 18defeff68defefff8e0feffd40affff340bffffbe14ffffbc1dffff361fffffc035ffffda35fffff435ffff983fffff8c57ffffc874ffffe884ffff2a85ffff5e89ffff3a8affffe291ffff8eacffff5aaeffff96aeffffceafffffdab2ffff78c1ffff14c3ffff70c5ffff90cdffff88dfffff1ae9ffff9aeaffffe6f9ffff m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_RenameOverlay: m_TargetSize: {x: 1920, y: 1080}
m_UserAcceptedRename: 0 m_TextureFilterMode: 0
m_Name: m_TextureHideFlags: 61
m_OriginalName: m_RenderIMGUI: 1
m_EditFieldRect: m_MaximizeOnPlay: 0
serializedVersion: 2 m_UseMipMap: 0
x: 0 m_VSyncEnabled: 0
y: 0 m_Gizmos: 0
width: 0 m_Stats: 0
height: 0 m_SelectedSizes: 00000000000000000000000006000000000000000000000000000000000000000000000000000000
m_UserData: 0 m_ZoomArea:
m_IsWaitingForDelay: 0 m_HRangeLocked: 0
m_IsRenaming: 0 m_VRangeLocked: 0
m_OriginalEventType: 11 hZoomLockedByDefault: 0
m_IsRenamingFilename: 0 vZoomLockedByDefault: 0
m_ClientGUIView: {fileID: 4} m_HBaseRangeMin: -768
m_SearchString: m_HBaseRangeMax: 768
m_ExpandedScenes: [] m_VBaseRangeMin: -432
m_CurrenRootInstanceID: 0 m_VBaseRangeMax: 432
m_LockTracker: m_HAllowExceedBaseRangeMin: 1
m_IsLocked: 0 m_HAllowExceedBaseRangeMax: 1
m_CurrentSortingName: TransformSorting m_VAllowExceedBaseRangeMin: 1
m_WindowGUID: 6d9414b650e7cec488f30bf477bedba3 m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
m_UpDirection: 1
m_DrawArea:
serializedVersion: 2
x: 0
y: 21
width: 825
height: 385
m_Scale: {x: 0.44560185, y: 0.44560185}
m_Translation: {x: 412.5, y: 192.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -925.7143
y: -432
width: 1851.4286
height: 864
m_MinimalGUI: 1
m_defaultScale: 0.44560185
m_LastWindowPixelSize: {x: 1031.25, y: 507.5}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -549,17 +613,17 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Scene m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 379 x: 0
y: 73 y: 73.6
width: 1150 width: 825
height: 605 height: 283
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 9d5f0e9f01c36574eb312c2f04eed96f m_WindowGUID: d52a7f6dc5db5f8489a3af2606ac8314
m_Gizmos: 1 m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856 m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1 m_SceneIsLit: 1
@ -569,9 +633,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 1078.0482, y: 496.9724, z: -88.59586} m_Target: {x: 844.64734, y: 590.2435, z: 1.3679504}
speed: 2 speed: 2
m_Value: {x: 1078.0482, y: 496.9724, z: -88.59586} m_Value: {x: 844.64734, y: 590.2435, z: 1.3679504}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@ -622,9 +686,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 754.3985 m_Target: 661.67755
speed: 2 speed: 2
m_Value: 754.3985 m_Value: 661.67755
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
@ -650,120 +714,6 @@ MonoBehaviour:
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &17 --- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 379
y: 73
width: 1150
height: 605
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1150, y: 584}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
m_MaximizeOnPlay: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 00000000000000000000000006000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -575
m_HBaseRangeMax: 575
m_VBaseRangeMin: -292
m_VBaseRangeMax: 292
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
m_UpDirection: 1
m_DrawArea:
serializedVersion: 2
x: 0
y: 21
width: 1150
height: 584
m_Scale: {x: 1, y: 1}
m_Translation: {x: 575, y: 292}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -575
y: -292
width: 1150
height: 584
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1150, y: 605}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000001000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 699
width: 1530
height: 300
m_ViewDataDictionary: {fileID: 0}
--- !u!114 &19
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1 +1 @@
{"m_DefineSymbols":{"m_Value":[],"m_Initialized":false},"m_AllowUnsafeCode":{"m_Value":false,"m_Initialized":false},"m_ScriptDebugInfoEnabled":{"m_Value":true,"m_Initialized":true}} {"m_DefineSymbols":{"m_Value":[],"m_Initialized":false},"m_AllowUnsafeCode":{"m_Value":false,"m_Initialized":false},"m_ScriptDebugInfoEnabled":{"m_Value":false,"m_Initialized":true}}

Binary file not shown.

View File

@ -1,4 +1,8 @@
sceneSetups: sceneSetups:
- path: Assets/Scenes/DataHolder.unity
isLoaded: 1
isActive: 0
isSubScene: 0
- path: Assets/Scenes/MainMenu.unity - path: Assets/Scenes/MainMenu.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1

View File

@ -1,20 +1,20 @@
m_ProjectFiles: m_ProjectFiles:
m_ManifestFileStatus: m_ManifestFileStatus:
m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/manifest.json" m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/manifest.json
m_PathExists: 1 m_PathExists: 1
m_ContentTrackingEnabled: 1 m_ContentTrackingEnabled: 1
m_ModificationDate: m_ModificationDate:
serializedVersion: 2 serializedVersion: 2
ticks: 637777933765572559 ticks: 637775701382787131
m_Hash: 3969132510 m_Hash: 1047088217
m_LockFileStatus: m_LockFileStatus:
m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/packages-lock.json" m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/packages-lock.json
m_PathExists: 1 m_PathExists: 1
m_ContentTrackingEnabled: 1 m_ContentTrackingEnabled: 1
m_ModificationDate: m_ModificationDate:
serializedVersion: 2 serializedVersion: 2
ticks: 637777933765582533 ticks: 637775804813421276
m_Hash: 397170090 m_Hash: 1522590259
m_EmbeddedPackageManifests: m_EmbeddedPackageManifests:
m_ManifestsStatus: {} m_ManifestsStatus: {}
m_PackageAssets: m_PackageAssets:
@ -25,7 +25,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 5.0.7 version: 5.0.7
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.animation@5.0.7" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.animation@5.0.7
assetPath: Packages/com.unity.2d.animation assetPath: Packages/com.unity.2d.animation
name: com.unity.2d.animation name: com.unity.2d.animation
displayName: 2D Animation displayName: 2D Animation
@ -184,7 +184,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 4.0.1 version: 4.0.1
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.pixel-perfect@4.0.1" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.pixel-perfect@4.0.1
assetPath: Packages/com.unity.2d.pixel-perfect assetPath: Packages/com.unity.2d.pixel-perfect
name: com.unity.2d.pixel-perfect name: com.unity.2d.pixel-perfect
displayName: 2D Pixel Perfect displayName: 2D Pixel Perfect
@ -259,7 +259,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 4.1.0 version: 4.1.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.psdimporter@4.1.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.psdimporter@4.1.0
assetPath: Packages/com.unity.2d.psdimporter assetPath: Packages/com.unity.2d.psdimporter
name: com.unity.2d.psdimporter name: com.unity.2d.psdimporter
displayName: 2D PSD Importer displayName: 2D PSD Importer
@ -390,7 +390,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.sprite@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.sprite@1.0.0
assetPath: Packages/com.unity.2d.sprite assetPath: Packages/com.unity.2d.sprite
name: com.unity.2d.sprite name: com.unity.2d.sprite
displayName: 2D Sprite displayName: 2D Sprite
@ -441,7 +441,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 5.1.4 version: 5.1.4
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.spriteshape@5.1.4" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.spriteshape@5.1.4
assetPath: Packages/com.unity.2d.spriteshape assetPath: Packages/com.unity.2d.spriteshape
name: com.unity.2d.spriteshape name: com.unity.2d.spriteshape
displayName: 2D SpriteShape displayName: 2D SpriteShape
@ -592,7 +592,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.tilemap@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.tilemap@1.0.0
assetPath: Packages/com.unity.2d.tilemap assetPath: Packages/com.unity.2d.tilemap
name: com.unity.2d.tilemap name: com.unity.2d.tilemap
displayName: 2D Tilemap Editor displayName: 2D Tilemap Editor
@ -642,7 +642,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.9.0 version: 1.9.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.collab-proxy@1.9.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.collab-proxy@1.9.0
assetPath: Packages/com.unity.collab-proxy assetPath: Packages/com.unity.collab-proxy
name: com.unity.collab-proxy name: com.unity.collab-proxy
displayName: Version Control displayName: Version Control
@ -767,7 +767,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 2.0.7 version: 2.0.7
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.rider@2.0.7" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.rider@2.0.7
assetPath: Packages/com.unity.ide.rider assetPath: Packages/com.unity.ide.rider
name: com.unity.ide.rider name: com.unity.ide.rider
displayName: JetBrains Rider Editor displayName: JetBrains Rider Editor
@ -878,7 +878,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 2.0.11 version: 2.0.11
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.visualstudio@2.0.11" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.visualstudio@2.0.11
assetPath: Packages/com.unity.ide.visualstudio assetPath: Packages/com.unity.ide.visualstudio
name: com.unity.ide.visualstudio name: com.unity.ide.visualstudio
displayName: Visual Studio Editor displayName: Visual Studio Editor
@ -967,7 +967,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.2.4 version: 1.2.4
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.vscode@1.2.4" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.vscode@1.2.4
assetPath: Packages/com.unity.ide.vscode assetPath: Packages/com.unity.ide.vscode
name: com.unity.ide.vscode name: com.unity.ide.vscode
displayName: Visual Studio Code Editor displayName: Visual Studio Code Editor
@ -1038,7 +1038,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.1.29 version: 1.1.29
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.test-framework@1.1.29" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.test-framework@1.1.29
assetPath: Packages/com.unity.test-framework assetPath: Packages/com.unity.test-framework
name: com.unity.test-framework name: com.unity.test-framework
displayName: Test Framework displayName: Test Framework
@ -1131,7 +1131,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 3.0.6 version: 3.0.6
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.textmeshpro@3.0.6" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.textmeshpro@3.0.6
assetPath: Packages/com.unity.textmeshpro assetPath: Packages/com.unity.textmeshpro
name: com.unity.textmeshpro name: com.unity.textmeshpro
displayName: TextMeshPro displayName: TextMeshPro
@ -1294,7 +1294,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.4.8 version: 1.4.8
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.timeline@1.4.8" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.timeline@1.4.8
assetPath: Packages/com.unity.timeline assetPath: Packages/com.unity.timeline
name: com.unity.timeline name: com.unity.timeline
displayName: Timeline displayName: Timeline
@ -1452,7 +1452,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.toolchain.win-x86_64-linux-x86_64@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.toolchain.win-x86_64-linux-x86_64@1.0.0
assetPath: Packages/com.unity.toolchain.win-x86_64-linux-x86_64 assetPath: Packages/com.unity.toolchain.win-x86_64-linux-x86_64
name: com.unity.toolchain.win-x86_64-linux-x86_64 name: com.unity.toolchain.win-x86_64-linux-x86_64
displayName: Toolchain Win Linux x64 displayName: Toolchain Win Linux x64
@ -1546,7 +1546,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ugui@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ugui@1.0.0
assetPath: Packages/com.unity.ugui assetPath: Packages/com.unity.ugui
name: com.unity.ugui name: com.unity.ugui
displayName: Unity UI displayName: Unity UI
@ -1609,7 +1609,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ai@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ai@1.0.0
assetPath: Packages/com.unity.modules.ai assetPath: Packages/com.unity.modules.ai
name: com.unity.modules.ai name: com.unity.modules.ai
displayName: AI displayName: AI
@ -1657,7 +1657,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.androidjni@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.androidjni@1.0.0
assetPath: Packages/com.unity.modules.androidjni assetPath: Packages/com.unity.modules.androidjni
name: com.unity.modules.androidjni name: com.unity.modules.androidjni
displayName: Android JNI displayName: Android JNI
@ -1705,7 +1705,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.animation@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.animation@1.0.0
assetPath: Packages/com.unity.modules.animation assetPath: Packages/com.unity.modules.animation
name: com.unity.modules.animation name: com.unity.modules.animation
displayName: Animation displayName: Animation
@ -1753,7 +1753,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.assetbundle@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.assetbundle@1.0.0
assetPath: Packages/com.unity.modules.assetbundle assetPath: Packages/com.unity.modules.assetbundle
name: com.unity.modules.assetbundle name: com.unity.modules.assetbundle
displayName: Asset Bundle displayName: Asset Bundle
@ -1801,7 +1801,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.audio@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.audio@1.0.0
assetPath: Packages/com.unity.modules.audio assetPath: Packages/com.unity.modules.audio
name: com.unity.modules.audio name: com.unity.modules.audio
displayName: Audio displayName: Audio
@ -1849,7 +1849,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.cloth@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.cloth@1.0.0
assetPath: Packages/com.unity.modules.cloth assetPath: Packages/com.unity.modules.cloth
name: com.unity.modules.cloth name: com.unity.modules.cloth
displayName: Cloth displayName: Cloth
@ -1901,7 +1901,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.director@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.director@1.0.0
assetPath: Packages/com.unity.modules.director assetPath: Packages/com.unity.modules.director
name: com.unity.modules.director name: com.unity.modules.director
displayName: Director displayName: Director
@ -1957,7 +1957,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imageconversion@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imageconversion@1.0.0
assetPath: Packages/com.unity.modules.imageconversion assetPath: Packages/com.unity.modules.imageconversion
name: com.unity.modules.imageconversion name: com.unity.modules.imageconversion
displayName: Image Conversion displayName: Image Conversion
@ -2006,7 +2006,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imgui@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imgui@1.0.0
assetPath: Packages/com.unity.modules.imgui assetPath: Packages/com.unity.modules.imgui
name: com.unity.modules.imgui name: com.unity.modules.imgui
displayName: IMGUI displayName: IMGUI
@ -2054,7 +2054,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.jsonserialize@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.jsonserialize@1.0.0
assetPath: Packages/com.unity.modules.jsonserialize assetPath: Packages/com.unity.modules.jsonserialize
name: com.unity.modules.jsonserialize name: com.unity.modules.jsonserialize
displayName: JSONSerialize displayName: JSONSerialize
@ -2102,7 +2102,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.particlesystem@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.particlesystem@1.0.0
assetPath: Packages/com.unity.modules.particlesystem assetPath: Packages/com.unity.modules.particlesystem
name: com.unity.modules.particlesystem name: com.unity.modules.particlesystem
displayName: Particle System displayName: Particle System
@ -2150,7 +2150,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics@1.0.0
assetPath: Packages/com.unity.modules.physics assetPath: Packages/com.unity.modules.physics
name: com.unity.modules.physics name: com.unity.modules.physics
displayName: Physics displayName: Physics
@ -2198,7 +2198,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics2d@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics2d@1.0.0
assetPath: Packages/com.unity.modules.physics2d assetPath: Packages/com.unity.modules.physics2d
name: com.unity.modules.physics2d name: com.unity.modules.physics2d
displayName: Physics 2D displayName: Physics 2D
@ -2246,7 +2246,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.screencapture@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.screencapture@1.0.0
assetPath: Packages/com.unity.modules.screencapture assetPath: Packages/com.unity.modules.screencapture
name: com.unity.modules.screencapture name: com.unity.modules.screencapture
displayName: Screen Capture displayName: Screen Capture
@ -2298,7 +2298,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrain@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrain@1.0.0
assetPath: Packages/com.unity.modules.terrain assetPath: Packages/com.unity.modules.terrain
name: com.unity.modules.terrain name: com.unity.modules.terrain
displayName: Terrain displayName: Terrain
@ -2346,7 +2346,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrainphysics@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrainphysics@1.0.0
assetPath: Packages/com.unity.modules.terrainphysics assetPath: Packages/com.unity.modules.terrainphysics
name: com.unity.modules.terrainphysics name: com.unity.modules.terrainphysics
displayName: Terrain Physics displayName: Terrain Physics
@ -2402,7 +2402,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.tilemap@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.tilemap@1.0.0
assetPath: Packages/com.unity.modules.tilemap assetPath: Packages/com.unity.modules.tilemap
name: com.unity.modules.tilemap name: com.unity.modules.tilemap
displayName: Tilemap displayName: Tilemap
@ -2454,7 +2454,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ui@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ui@1.0.0
assetPath: Packages/com.unity.modules.ui assetPath: Packages/com.unity.modules.ui
name: com.unity.modules.ui name: com.unity.modules.ui
displayName: UI displayName: UI
@ -2502,7 +2502,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielements@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielements@1.0.0
assetPath: Packages/com.unity.modules.uielements assetPath: Packages/com.unity.modules.uielements
name: com.unity.modules.uielements name: com.unity.modules.uielements
displayName: UIElements displayName: UIElements
@ -2566,7 +2566,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.umbra@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.umbra@1.0.0
assetPath: Packages/com.unity.modules.umbra assetPath: Packages/com.unity.modules.umbra
name: com.unity.modules.umbra name: com.unity.modules.umbra
displayName: Umbra displayName: Umbra
@ -2614,7 +2614,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unityanalytics@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unityanalytics@1.0.0
assetPath: Packages/com.unity.modules.unityanalytics assetPath: Packages/com.unity.modules.unityanalytics
name: com.unity.modules.unityanalytics name: com.unity.modules.unityanalytics
displayName: Unity Analytics displayName: Unity Analytics
@ -2670,7 +2670,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequest@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequest@1.0.0
assetPath: Packages/com.unity.modules.unitywebrequest assetPath: Packages/com.unity.modules.unitywebrequest
name: com.unity.modules.unitywebrequest name: com.unity.modules.unitywebrequest
displayName: Unity Web Request displayName: Unity Web Request
@ -2718,7 +2718,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestassetbundle@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestassetbundle@1.0.0
assetPath: Packages/com.unity.modules.unitywebrequestassetbundle assetPath: Packages/com.unity.modules.unitywebrequestassetbundle
name: com.unity.modules.unitywebrequestassetbundle name: com.unity.modules.unitywebrequestassetbundle
displayName: Unity Web Request Asset Bundle displayName: Unity Web Request Asset Bundle
@ -2774,7 +2774,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestaudio@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestaudio@1.0.0
assetPath: Packages/com.unity.modules.unitywebrequestaudio assetPath: Packages/com.unity.modules.unitywebrequestaudio
name: com.unity.modules.unitywebrequestaudio name: com.unity.modules.unitywebrequestaudio
displayName: Unity Web Request Audio displayName: Unity Web Request Audio
@ -2830,7 +2830,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequesttexture@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequesttexture@1.0.0
assetPath: Packages/com.unity.modules.unitywebrequesttexture assetPath: Packages/com.unity.modules.unitywebrequesttexture
name: com.unity.modules.unitywebrequesttexture name: com.unity.modules.unitywebrequesttexture
displayName: Unity Web Request Texture displayName: Unity Web Request Texture
@ -2886,7 +2886,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestwww@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestwww@1.0.0
assetPath: Packages/com.unity.modules.unitywebrequestwww assetPath: Packages/com.unity.modules.unitywebrequestwww
name: com.unity.modules.unitywebrequestwww name: com.unity.modules.unitywebrequestwww
displayName: Unity Web Request WWW displayName: Unity Web Request WWW
@ -2958,7 +2958,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vehicles@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vehicles@1.0.0
assetPath: Packages/com.unity.modules.vehicles assetPath: Packages/com.unity.modules.vehicles
name: com.unity.modules.vehicles name: com.unity.modules.vehicles
displayName: Vehicles displayName: Vehicles
@ -3010,7 +3010,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.video@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.video@1.0.0
assetPath: Packages/com.unity.modules.video assetPath: Packages/com.unity.modules.video
name: com.unity.modules.video name: com.unity.modules.video
displayName: Video displayName: Video
@ -3070,7 +3070,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vr@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vr@1.0.0
assetPath: Packages/com.unity.modules.vr assetPath: Packages/com.unity.modules.vr
name: com.unity.modules.vr name: com.unity.modules.vr
displayName: VR displayName: VR
@ -3132,7 +3132,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.wind@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.wind@1.0.0
assetPath: Packages/com.unity.modules.wind assetPath: Packages/com.unity.modules.wind
name: com.unity.modules.wind name: com.unity.modules.wind
displayName: Wind displayName: Wind
@ -3180,7 +3180,7 @@ m_PackageAssets:
isDirectDependency: 1 isDirectDependency: 1
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.xr@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.xr@1.0.0
assetPath: Packages/com.unity.modules.xr assetPath: Packages/com.unity.modules.xr
name: com.unity.modules.xr name: com.unity.modules.xr
displayName: XR displayName: XR
@ -3240,7 +3240,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.subsystems@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.subsystems@1.0.0
assetPath: Packages/com.unity.modules.subsystems assetPath: Packages/com.unity.modules.subsystems
name: com.unity.modules.subsystems name: com.unity.modules.subsystems
displayName: Subsystems displayName: Subsystems
@ -3292,7 +3292,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.0.0 version: 1.0.0
source: 2 source: 2
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielementsnative@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielementsnative@1.0.0
assetPath: Packages/com.unity.modules.uielementsnative assetPath: Packages/com.unity.modules.uielementsnative
name: com.unity.modules.uielementsnative name: com.unity.modules.uielementsnative
displayName: UIElements Native displayName: UIElements Native
@ -3351,7 +3351,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.0.0 version: 1.0.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot@1.0.0
assetPath: Packages/com.unity.sysroot assetPath: Packages/com.unity.sysroot
name: com.unity.sysroot name: com.unity.sysroot
displayName: Sysroot Base displayName: Sysroot Base
@ -3426,7 +3426,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.0.0 version: 1.0.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot.linux-x86_64@1.0.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot.linux-x86_64@1.0.0
assetPath: Packages/com.unity.sysroot.linux-x86_64 assetPath: Packages/com.unity.sysroot.linux-x86_64
name: com.unity.sysroot.linux-x86_64 name: com.unity.sysroot.linux-x86_64
displayName: Sysroot Linux x64 displayName: Sysroot Linux x64
@ -3500,7 +3500,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.0.6 version: 1.0.6
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ext.nunit@1.0.6" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ext.nunit@1.0.6
assetPath: Packages/com.unity.ext.nunit assetPath: Packages/com.unity.ext.nunit
name: com.unity.ext.nunit name: com.unity.ext.nunit
displayName: Custom NUnit displayName: Custom NUnit
@ -3516,8 +3516,18 @@ m_PackageAssets:
errors: [] errors: []
versions: versions:
all: all:
- 0.1.5-preview
- 0.1.6-preview
- 0.1.9-preview
- 1.0.0
- 1.0.5
- 1.0.6 - 1.0.6
compatible: compatible:
- 0.1.5-preview
- 0.1.6-preview
- 0.1.9-preview
- 1.0.0
- 1.0.5
- 1.0.6 - 1.0.6
verified: 1.0.6 verified: 1.0.6
dependencies: [] dependencies: []
@ -3538,7 +3548,7 @@ m_PackageAssets:
entitlements: entitlements:
isAllowed: 1 isAllowed: 1
isAssetStorePackage: 0 isAssetStorePackage: 0
datePublishedTicks: 0 datePublishedTicks: 637429759280000000
documentationUrl: documentationUrl:
hasRepository: 1 hasRepository: 1
repository: repository:
@ -3551,7 +3561,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 1.1.0 version: 1.1.0
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.mathematics@1.1.0" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.mathematics@1.1.0
assetPath: Packages/com.unity.mathematics assetPath: Packages/com.unity.mathematics
name: com.unity.mathematics name: com.unity.mathematics
displayName: Mathematics displayName: Mathematics
@ -3567,12 +3577,40 @@ m_PackageAssets:
errors: [] errors: []
versions: versions:
all: all:
- 0.0.12-preview.2
- 0.0.12-preview.5
- 0.0.12-preview.8
- 0.0.12-preview.10
- 0.0.12-preview.11
- 0.0.12-preview.13
- 0.0.12-preview.17
- 0.0.12-preview.19
- 0.0.12-preview.20
- 1.0.0-preview.1
- 1.0.1
- 1.1.0-preview.1
- 1.1.0 - 1.1.0
- 1.2.1 - 1.2.1
- 1.2.4
- 1.2.5
compatible: compatible:
- 0.0.12-preview.2
- 0.0.12-preview.5
- 0.0.12-preview.8
- 0.0.12-preview.10
- 0.0.12-preview.11
- 0.0.12-preview.13
- 0.0.12-preview.17
- 0.0.12-preview.19
- 0.0.12-preview.20
- 1.0.0-preview.1
- 1.0.1
- 1.1.0-preview.1
- 1.1.0 - 1.1.0
- 1.2.1 - 1.2.1
verified: 1.2.1 - 1.2.4
- 1.2.5
verified: 1.2.5
dependencies: [] dependencies: []
resolvedDependencies: [] resolvedDependencies: []
keywords: keywords:
@ -3589,7 +3627,7 @@ m_PackageAssets:
entitlements: entitlements:
isAllowed: 1 isAllowed: 1
isAssetStorePackage: 0 isAssetStorePackage: 0
datePublishedTicks: 0 datePublishedTicks: 636984649280000000
documentationUrl: documentationUrl:
hasRepository: 1 hasRepository: 1
repository: repository:
@ -3602,7 +3640,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 4.0.3 version: 4.0.3
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.common@4.0.3" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.common@4.0.3
assetPath: Packages/com.unity.2d.common assetPath: Packages/com.unity.2d.common
name: com.unity.2d.common name: com.unity.2d.common
displayName: 2D Common displayName: 2D Common
@ -3634,7 +3672,6 @@ m_PackageAssets:
- 4.0.1 - 4.0.1
- 4.0.2 - 4.0.2
- 4.0.3 - 4.0.3
- 4.0.4
- 5.0.0-pre.1 - 5.0.0-pre.1
- 5.0.0-pre.2 - 5.0.0-pre.2
- 5.0.0 - 5.0.0
@ -3643,13 +3680,10 @@ m_PackageAssets:
- 6.0.0-pre.4 - 6.0.0-pre.4
- 6.0.0 - 6.0.0
- 6.0.1 - 6.0.1
- 6.0.2
- 7.0.0-pre.3 - 7.0.0-pre.3
- 7.0.0-pre.4
compatible: compatible:
- 4.0.3 - 4.0.3
- 4.0.4 verified: 4.0.3
verified: 4.0.4
dependencies: dependencies:
- name: com.unity.2d.sprite - name: com.unity.2d.sprite
version: 1.0.0 version: 1.0.0
@ -3695,7 +3729,7 @@ m_PackageAssets:
isDirectDependency: 0 isDirectDependency: 0
version: 4.0.2 version: 4.0.2
source: 1 source: 1
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.path@4.0.2" resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.path@4.0.2
assetPath: Packages/com.unity.2d.path assetPath: Packages/com.unity.2d.path
name: com.unity.2d.path name: com.unity.2d.path
displayName: 2D Path displayName: 2D Path
@ -3761,5 +3795,5 @@ m_PackageAssets:
path: path:
m_LocalPackages: m_LocalPackages:
m_LocalFileStatus: [] m_LocalFileStatus: []
m_ProjectPath: "E:/Projects \u0441#/Unity/omega/Packages" m_ProjectPath: C:/Users/Dara/Documents/1/PO/Packages
m_EditorVersion: 2020.3.19f1 (68f137dc9bbe) m_EditorVersion: 2020.3.19f1 (68f137dc9bbe)

View File

@ -1 +1 @@
f5e98bd93cbb082bc13febd9deb805dc 41bc876834200554b9cdf46ac8dbc2f9

Binary file not shown.

Binary file not shown.

View File

@ -568,3 +568,123 @@ C# parse time : 121ms
candidates check time : 40ms candidates check time : 40ms
console write time : 0ms console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 10:25:44 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 836,8699ms
moved types parse time: 50ms
candidates parse time : 1ms
C# parse time : 193ms
candidates check time : 47ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 10:26:23 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 126,582ms
moved types parse time: 73ms
candidates parse time : 1ms
C# parse time : 181ms
candidates check time : 52ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 10:43:17 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 76,7953ms
moved types parse time: 42ms
candidates parse time : 1ms
C# parse time : 176ms
candidates check time : 25ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 10:43:25 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 69,8128ms
moved types parse time: 41ms
candidates parse time : 0ms
C# parse time : 149ms
candidates check time : 25ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 11:33:41 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 664,1221ms
moved types parse time: 46ms
candidates parse time : 1ms
C# parse time : 196ms
candidates check time : 38ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:44:33 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 112,1263ms
moved types parse time: 45ms
candidates parse time : 1ms
C# parse time : 160ms
candidates check time : 30ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:44:57 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 65,8006ms
moved types parse time: 42ms
candidates parse time : 0ms
C# parse time : 207ms
candidates check time : 26ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:44:59 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 70,1434ms
moved types parse time: 42ms
candidates parse time : 1ms
C# parse time : 146ms
candidates check time : 23ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:45:14 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 67,8497ms
moved types parse time: 44ms
candidates parse time : 1ms
C# parse time : 146ms
candidates check time : 24ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:45:23 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 66,9149ms
moved types parse time: 42ms
candidates parse time : 0ms
C# parse time : 142ms
candidates check time : 22ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:45:30 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 128,6556ms
moved types parse time: 42ms
candidates parse time : 0ms
C# parse time : 147ms
candidates check time : 23ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 17.01.2022 13:45:41 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 71,8069ms
moved types parse time: 42ms
candidates parse time : 0ms
C# parse time : 144ms
candidates check time : 23ms
console write time : 0ms

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
Quitting shader compiler process

View File

@ -1,43 +1,4 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: preprocess
insize=7883 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2542
Cmd: preprocess
insize=3642 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1299
Cmd: preprocess
insize=12310 file=Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4702
Cmd: preprocess
insize=3662 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2718
Cmd: preprocess
insize=4513 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3751
Cmd: preprocess
insize=3640 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1347
Cmd: preprocess
insize=10917 file=Assets/TextMesh Pro/Shaders/TMP_SDF.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4057
Cmd: preprocess
insize=3177 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2815
Cmd: preprocess
insize=8069 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2811
Cmd: preprocess
insize=10902 file=Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4047
Cmd: preprocess
insize=3694 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1723
Cmd: preprocess
insize=7914 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2554
Cmd: preprocess
insize=2468 file=Assets/TextMesh Pro/Shaders/TMP_Sprite.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1177
Cmd: shutdown Cmd: shutdown

View File

@ -1,4 +1,3 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +1,3 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +1,3 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +1,3 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Cmd: shutdown

View File

@ -1,4 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Cmd: shutdown

View File

@ -5,10 +5,10 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1
path: Assets/Scenes/MainMenu.unity
guid: ae36a43ecda2f5645878559e1b6f717a
- enabled: 1 - enabled: 1
path: Assets/Scenes/BattleScene.unity path: Assets/Scenes/BattleScene.unity
guid: 2cda990e2423bbf4892e6590ba056729 guid: 2cda990e2423bbf4892e6590ba056729
- enabled: 1
path: Assets/Scenes/MainMenu.unity
guid: c0f2ab0c52da4e04fa0f6cb87378dd5a
m_configObjects: {} m_configObjects: {}

View File

@ -9,6 +9,12 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0 flags: 0
RecentlyUsedScenePath-1: RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c761e0012163e233a3f7e38271427fb
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7d110203142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0 flags: 0
vcSharedLogLevel: vcSharedLogLevel: