Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO
# Conflicts: # Library/ArtifactDB # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/SourceAssetDB # Logs/AssetImportWorker0-prev.log # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log
This commit is contained in:
commit
cffb612cc7
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
|
|
@ -0,0 +1,96 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e358c2b81c85b9e46a554b5c06625c27
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 897 KiB |
|
|
@ -0,0 +1,96 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dd98efe28d8ec124aa1125cdd7974e8f
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,5 +1,191 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &155847563069475330
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7169551962466069739}
|
||||
m_Layer: 0
|
||||
m_Name: NextStepIcon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7169551962466069739
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 155847563069475330}
|
||||
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: 2332513748879883826}
|
||||
- {fileID: 1065879951841179956}
|
||||
m_Father: {fileID: 6960669208474582203}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1206450128324718926
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1065879951841179956}
|
||||
- component: {fileID: 6860122213752178919}
|
||||
- component: {fileID: 5351522236423897339}
|
||||
m_Layer: 0
|
||||
m_Name: NextStepIcon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1065879951841179956
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206450128324718926}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.6407, y: 2.6407, z: 2.6407}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7169551962466069739}
|
||||
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: -263, y: -721}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6860122213752178919
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206450128324718926}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5351522236423897339
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206450128324718926}
|
||||
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: 21300000, guid: e358c2b81c85b9e46a554b5c06625c27, type: 3}
|
||||
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 &4871068495215094905
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2332513748879883826}
|
||||
- component: {fileID: 8409018559993473176}
|
||||
- component: {fileID: 296186267920285640}
|
||||
m_Layer: 5
|
||||
m_Name: NextStepIconText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2332513748879883826
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4871068495215094905}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.5485389, y: 0.60279, z: 0.60279}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7169551962466069739}
|
||||
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: 73, y: -730}
|
||||
m_SizeDelta: {x: 1394.0822, y: 338.06305}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8409018559993473176
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4871068495215094905}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &296186267920285640
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4871068495215094905}
|
||||
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: 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_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: '100 '
|
||||
--- !u!1 &5368382138041287103
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -183,6 +369,7 @@ RectTransform:
|
|||
- {fileID: 6960669209117571481}
|
||||
- {fileID: 6960669209950784644}
|
||||
- {fileID: 4051974769945323394}
|
||||
- {fileID: 7169551962466069739}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -245,6 +432,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 2b59d706054351043a791f29cd4400e1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
enemyStepIcon: {fileID: 5351522236423897339}
|
||||
enemyStepIconText: {fileID: 296186267920285640}
|
||||
allStepImageIcons:
|
||||
- {fileID: 21300000, guid: dd98efe28d8ec124aa1125cdd7974e8f, type: 3}
|
||||
- {fileID: 21300000, guid: e358c2b81c85b9e46a554b5c06625c27, type: 3}
|
||||
enemyName: {fileID: 6960669208474582200}
|
||||
enemyMaxHp: {fileID: 6960669210171686449}
|
||||
enemyHp: {fileID: 6960669209835327211}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ public class BaseEnemyTurn : MonoBehaviour
|
|||
public List<EnemyLoopTurn> enemyLoopTurns;
|
||||
public GameObject currentEnemy;
|
||||
|
||||
public int phase;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (basic != null && basic != this)
|
||||
|
|
@ -37,6 +39,19 @@ public class BaseEnemyTurn : MonoBehaviour
|
|||
Debug.LogError("Loop not found");
|
||||
|
||||
}
|
||||
|
||||
//Âîçâðàùàåò ôàçó àòàêè áåç åå èçìåíåíèÿ
|
||||
public void FindLoopForLocal(GameObject _enemy, int _phaseAttack)
|
||||
{
|
||||
for (int i = 0; i < enemyLoopTurns.Count; i++)
|
||||
{
|
||||
if (enemyLoopTurns[i].config == _enemy.GetComponent<Enemy>().enemyConfig)
|
||||
{
|
||||
phase = _phaseAttack % enemyLoopTurns[i].attackLoop.Count;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@ using UnityEngine.UI;
|
|||
|
||||
public class Enemy : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Image enemyStepIcon;
|
||||
[SerializeField] private Text enemyStepIconText;
|
||||
|
||||
[SerializeField] private List<Sprite> allStepImageIcons = new List<Sprite>();
|
||||
|
||||
[SerializeField] private Text enemyName;
|
||||
[SerializeField] private Text enemyMaxHp;
|
||||
|
|
@ -22,7 +25,10 @@ public class Enemy : MonoBehaviour
|
|||
[SerializeField] int phaseAttack = 0;
|
||||
public List<UnityEvent> attackLoop = new List<UnityEvent>();
|
||||
|
||||
|
||||
private void Start()
|
||||
{
|
||||
UpdateNextStepIconAndText();
|
||||
}
|
||||
|
||||
public void onClick()
|
||||
{
|
||||
|
|
@ -68,10 +74,29 @@ public class Enemy : MonoBehaviour
|
|||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
public void UpdateNextStepIconAndText()
|
||||
{
|
||||
BaseEnemyTurn.basic.FindLoopForLocal(gameObject, phaseAttack);
|
||||
int _phase = BaseEnemyTurn.basic.phase;
|
||||
//Пока всего две фазы атаки пойдет, но надо переписать
|
||||
enemyStepIcon.sprite = allStepImageIcons[_phase];
|
||||
//А вот это тем более
|
||||
if (_phase == 0)
|
||||
{
|
||||
enemyStepIconText.text = enemyConfig.enemyCharacteristics.damage.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
enemyStepIconText.text = enemyConfig.enemyCharacteristics.selfHealing.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
public void Turn()
|
||||
{
|
||||
BaseEnemyTurn.basic.FindLoopTurn(this.gameObject, phaseAttack);
|
||||
phaseAttack++;
|
||||
print(gameObject.name + " Next step " + BaseEnemyTurn.basic.phase.ToString());
|
||||
UpdateNextStepIconAndText();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -15,13 +15,19 @@ MonoBehaviour:
|
|||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 43.2
|
||||
width: 1536
|
||||
height: 780.8
|
||||
y: 43
|
||||
width: 1920
|
||||
height: 997
|
||||
m_ShowMode: 4
|
||||
<<<<<<< HEAD
|
||||
m_Title: Hierarchy
|
||||
m_RootView: {fileID: 6}
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
=======
|
||||
m_Title: Project
|
||||
m_RootView: {fileID: 6}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
--- !u!114 &2
|
||||
|
|
@ -43,12 +49,21 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 30
|
||||
<<<<<<< HEAD
|
||||
width: 1536
|
||||
height: 730.8
|
||||
m_MinSize: {x: 679, y: 492}
|
||||
m_MaxSize: {x: 14002, y: 14042}
|
||||
vertical: 0
|
||||
controlID: 352
|
||||
=======
|
||||
width: 1920
|
||||
height: 947
|
||||
m_MinSize: {x: 679, y: 492}
|
||||
m_MaxSize: {x: 14002, y: 14042}
|
||||
vertical: 0
|
||||
controlID: 59
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -64,6 +79,7 @@ MonoBehaviour:
|
|||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 1172.8
|
||||
y: 0
|
||||
width: 363.19995
|
||||
|
|
@ -73,6 +89,17 @@ MonoBehaviour:
|
|||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
=======
|
||||
x: 1531
|
||||
y: 0
|
||||
width: 389
|
||||
height: 947
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &4
|
||||
|
|
@ -92,6 +119,7 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 290.4
|
||||
height: 432.8
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
|
|
@ -99,6 +127,15 @@ MonoBehaviour:
|
|||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
=======
|
||||
width: 379
|
||||
height: 573
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 15}
|
||||
m_Panes:
|
||||
- {fileID: 15}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &5
|
||||
|
|
@ -111,12 +148,17 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
<<<<<<< HEAD
|
||||
m_Name: ProjectBrowser
|
||||
=======
|
||||
m_Name:
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< HEAD
|
||||
y: 432.8
|
||||
width: 1172.8
|
||||
height: 298
|
||||
|
|
@ -128,6 +170,19 @@ MonoBehaviour:
|
|||
- {fileID: 17}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
=======
|
||||
y: 573
|
||||
width: 1531
|
||||
height: 374
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
- {fileID: 18}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -148,9 +203,15 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1536
|
||||
height: 780.8
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
=======
|
||||
width: 1920
|
||||
height: 997
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_UseTopView: 1
|
||||
m_TopViewHeight: 30
|
||||
|
|
@ -173,6 +234,7 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1536
|
||||
height: 30
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
|
|
@ -180,6 +242,16 @@ MonoBehaviour:
|
|||
m_LoadedToolbars: []
|
||||
m_MainToolbar: {fileID: 18}
|
||||
m_LastLoadedLayoutName: Default
|
||||
=======
|
||||
width: 1920
|
||||
height: 30
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
m_LoadedToolbars:
|
||||
- {fileID: 19}
|
||||
m_MainToolbar: {fileID: 19}
|
||||
m_LastLoadedLayoutName:
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -196,8 +268,13 @@ MonoBehaviour:
|
|||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< HEAD
|
||||
y: 760.8
|
||||
width: 1536
|
||||
=======
|
||||
y: 977
|
||||
width: 1920
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
|
|
@ -220,12 +297,21 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1172.8
|
||||
height: 730.8
|
||||
m_MinSize: {x: 403, y: 492}
|
||||
m_MaxSize: {x: 10001, y: 14042}
|
||||
vertical: 1
|
||||
controlID: 400
|
||||
=======
|
||||
width: 1531
|
||||
height: 947
|
||||
m_MinSize: {x: 403, y: 492}
|
||||
m_MaxSize: {x: 10001, y: 14042}
|
||||
vertical: 1
|
||||
controlID: 64
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &10
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -245,12 +331,21 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1172.8
|
||||
height: 432.8
|
||||
m_MinSize: {x: 403, y: 221}
|
||||
m_MaxSize: {x: 8003, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 401
|
||||
=======
|
||||
width: 1531
|
||||
height: 573
|
||||
m_MinSize: {x: 403, y: 221}
|
||||
m_MaxSize: {x: 8003, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 65
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -266,6 +361,7 @@ MonoBehaviour:
|
|||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 290.4
|
||||
y: 0
|
||||
width: 882.4
|
||||
|
|
@ -273,9 +369,20 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 15}
|
||||
=======
|
||||
x: 379
|
||||
y: 0
|
||||
width: 1152
|
||||
height: 573
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 16}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Panes:
|
||||
- {fileID: 15}
|
||||
- {fileID: 16}
|
||||
- {fileID: 17}
|
||||
- {fileID: 12}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &12
|
||||
|
|
@ -287,6 +394,34 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 400, y: 100}
|
||||
m_MaxSize: {x: 2048, y: 2048}
|
||||
m_TitleContent:
|
||||
m_Text: Asset Store
|
||||
m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 468
|
||||
y: 181
|
||||
width: 973
|
||||
height: 501
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
--- !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
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
|
|
@ -294,14 +429,24 @@ MonoBehaviour:
|
|||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_TitleContent:
|
||||
m_Text: Project
|
||||
<<<<<<< HEAD
|
||||
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
|
||||
=======
|
||||
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< HEAD
|
||||
y: 506.4
|
||||
width: 1171.8
|
||||
height: 277
|
||||
=======
|
||||
y: 646
|
||||
width: 1530
|
||||
height: 353
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_SearchFilter:
|
||||
m_NameFilter:
|
||||
|
|
@ -322,6 +467,7 @@ MonoBehaviour:
|
|||
m_ViewMode: 1
|
||||
m_StartGridSize: 64
|
||||
m_LastFolders:
|
||||
<<<<<<< HEAD
|
||||
- Assets/Prefabs/Cards
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: C:\Users\Dara\Documents\1\PO
|
||||
|
|
@ -332,6 +478,18 @@ MonoBehaviour:
|
|||
m_SelectedIDs: 2e460000
|
||||
m_LastClickedID: 17966
|
||||
m_ExpandedIDs: 00000000c6450000ce450000d0450000d4450000da4500002e46000000ca9a3b
|
||||
=======
|
||||
- Assets/Scripts/Configs/EnemyConfigs
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 704a0000
|
||||
m_LastClickedID: 19056
|
||||
m_ExpandedIDs: 00000000e6450000f0450000f64500005e4e000000ca9a3b
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
@ -359,7 +517,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000c645000000ca9a3b
|
||||
m_ExpandedIDs: 00000000e6450000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
@ -403,7 +561,11 @@ MonoBehaviour:
|
|||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
<<<<<<< HEAD
|
||||
m_ClientGUIView: {fileID: 5}
|
||||
=======
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
|
|
@ -414,8 +576,13 @@ MonoBehaviour:
|
|||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
<<<<<<< HEAD
|
||||
m_DirectoriesAreaWidth: 207
|
||||
--- !u!114 &13
|
||||
=======
|
||||
m_DirectoriesAreaWidth: 115
|
||||
--- !u!114 &14
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -431,14 +598,21 @@ MonoBehaviour:
|
|||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Inspector
|
||||
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 1172.8
|
||||
y: 73.6
|
||||
width: 362.19995
|
||||
height: 709.8
|
||||
=======
|
||||
x: 1531
|
||||
y: 73
|
||||
width: 388
|
||||
height: 926
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_ObjectsLockedBeforeSerialization: []
|
||||
m_InstanceIDsLockedBeforeSerialization:
|
||||
|
|
@ -452,7 +626,11 @@ MonoBehaviour:
|
|||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_PreviewWindow: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &14
|
||||
=======
|
||||
--- !u!114 &15
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -468,18 +646,29 @@ MonoBehaviour:
|
|||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Hierarchy
|
||||
<<<<<<< HEAD
|
||||
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
|
||||
=======
|
||||
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< HEAD
|
||||
y: 73.6
|
||||
width: 289.4
|
||||
height: 411.8
|
||||
=======
|
||||
y: 73
|
||||
width: 378
|
||||
height: 552
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SelectedIDs: 72420000
|
||||
m_LastClickedID: 17010
|
||||
m_ExpandedIDs: 40fbffff42fbffffe4420000
|
||||
|
|
@ -487,16 +676,32 @@ MonoBehaviour:
|
|||
m_UserAcceptedRename: 0
|
||||
m_Name: Card
|
||||
m_OriginalName: Card
|
||||
=======
|
||||
m_SelectedIDs: 62430000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 40fbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
<<<<<<< HEAD
|
||||
m_UserData: -2378
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 0
|
||||
=======
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 4}
|
||||
m_SearchString:
|
||||
|
|
@ -505,8 +710,13 @@ MonoBehaviour:
|
|||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
<<<<<<< HEAD
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
--- !u!114 &15
|
||||
=======
|
||||
m_WindowGUID: dd240c92f829f1642a63700438d5cc00
|
||||
--- !u!114 &16
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -522,6 +732,7 @@ MonoBehaviour:
|
|||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Scene
|
||||
<<<<<<< HEAD
|
||||
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
|
|
@ -533,6 +744,19 @@ MonoBehaviour:
|
|||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_ShowContextualTools: 0
|
||||
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
|
||||
=======
|
||||
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 379
|
||||
y: 73
|
||||
width: 1150
|
||||
height: 552
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_ShowContextualTools: 0
|
||||
m_WindowGUID: 3e104549e8e55f344bde6b644abcb8fe
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Gizmos: 1
|
||||
m_OverrideSceneCullingMask: 6917529027641081856
|
||||
m_SceneIsLit: 1
|
||||
|
|
@ -542,9 +766,15 @@ MonoBehaviour:
|
|||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
<<<<<<< HEAD
|
||||
m_Target: {x: 511.53592, y: 34.119125, z: -1.415598}
|
||||
speed: 2
|
||||
m_Value: {x: 516.54706, y: 33.124474, z: -0.9228163}
|
||||
=======
|
||||
m_Target: {x: -0.24857199, y: 0.7709808, z: -0.791597}
|
||||
speed: 2
|
||||
m_Value: {x: -0.30230597, y: 0.94095564, z: -0.74518836}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
|
|
@ -578,7 +808,11 @@ MonoBehaviour:
|
|||
m_Value: 0
|
||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||
m_Pivot: {x: 0, y: 0, z: 0}
|
||||
<<<<<<< HEAD
|
||||
m_Size: {x: 1, y: 1}
|
||||
=======
|
||||
m_Size: {x: 0, y: 0}
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
zGrid:
|
||||
m_Fade:
|
||||
m_Target: 1
|
||||
|
|
@ -595,9 +829,15 @@ MonoBehaviour:
|
|||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
<<<<<<< HEAD
|
||||
m_Target: 114.43494
|
||||
speed: 2
|
||||
m_Value: 109.50712
|
||||
=======
|
||||
m_Target: 12.311171
|
||||
speed: 2
|
||||
m_Value: 12.891278
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
|
|
@ -622,6 +862,7 @@ MonoBehaviour:
|
|||
m_SceneVisActive: 1
|
||||
m_LastLockedObject: {fileID: 0}
|
||||
m_ViewIsLockedToObject: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &16
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -711,6 +952,8 @@ MonoBehaviour:
|
|||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
=======
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
--- !u!114 &17
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -720,6 +963,98 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
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: 552
|
||||
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: 1920, y: 1080}
|
||||
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: -960
|
||||
m_HBaseRangeMax: 960
|
||||
m_VBaseRangeMin: -540
|
||||
m_VBaseRangeMax: 540
|
||||
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: 531
|
||||
m_Scale: {x: 0.4916667, y: 0.49166667}
|
||||
m_Translation: {x: 575, y: 265.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -1169.4915
|
||||
y: -540
|
||||
width: 2338.983
|
||||
height: 1080
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.49166667
|
||||
m_LastWindowPixelSize: {x: 1150, y: 552}
|
||||
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
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
|
|
@ -727,6 +1062,7 @@ MonoBehaviour:
|
|||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Console
|
||||
<<<<<<< HEAD
|
||||
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
|
|
@ -737,6 +1073,18 @@ MonoBehaviour:
|
|||
height: 250
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
--- !u!114 &18
|
||||
=======
|
||||
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 8
|
||||
y: 718
|
||||
width: 1366
|
||||
height: 308
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
--- !u!114 &19
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
m_ProjectFiles:
|
||||
m_ManifestFileStatus:
|
||||
m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/manifest.json
|
||||
m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/manifest.json"
|
||||
m_PathExists: 1
|
||||
m_ContentTrackingEnabled: 1
|
||||
m_ModificationDate:
|
||||
serializedVersion: 2
|
||||
ticks: 637775701382787131
|
||||
m_Hash: 1047088217
|
||||
ticks: 637777933765572559
|
||||
m_Hash: 3969132510
|
||||
m_LockFileStatus:
|
||||
m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/packages-lock.json
|
||||
m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/packages-lock.json"
|
||||
m_PathExists: 1
|
||||
m_ContentTrackingEnabled: 1
|
||||
m_ModificationDate:
|
||||
serializedVersion: 2
|
||||
ticks: 637775804813421276
|
||||
m_Hash: 1522590259
|
||||
ticks: 637777933765582533
|
||||
m_Hash: 397170090
|
||||
m_EmbeddedPackageManifests:
|
||||
m_ManifestsStatus: {}
|
||||
m_PackageAssets:
|
||||
|
|
@ -25,7 +25,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 5.0.7
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.animation@5.0.7
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.animation@5.0.7"
|
||||
assetPath: Packages/com.unity.2d.animation
|
||||
name: com.unity.2d.animation
|
||||
displayName: 2D Animation
|
||||
|
|
@ -184,7 +184,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 4.0.1
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.pixel-perfect@4.0.1
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.pixel-perfect@4.0.1"
|
||||
assetPath: Packages/com.unity.2d.pixel-perfect
|
||||
name: com.unity.2d.pixel-perfect
|
||||
displayName: 2D Pixel Perfect
|
||||
|
|
@ -259,7 +259,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 4.1.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.psdimporter@4.1.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.psdimporter@4.1.0"
|
||||
assetPath: Packages/com.unity.2d.psdimporter
|
||||
name: com.unity.2d.psdimporter
|
||||
displayName: 2D PSD Importer
|
||||
|
|
@ -390,7 +390,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.sprite@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.sprite@1.0.0"
|
||||
assetPath: Packages/com.unity.2d.sprite
|
||||
name: com.unity.2d.sprite
|
||||
displayName: 2D Sprite
|
||||
|
|
@ -441,7 +441,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 5.1.4
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.spriteshape@5.1.4
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.spriteshape@5.1.4"
|
||||
assetPath: Packages/com.unity.2d.spriteshape
|
||||
name: com.unity.2d.spriteshape
|
||||
displayName: 2D SpriteShape
|
||||
|
|
@ -592,7 +592,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.tilemap@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.tilemap@1.0.0"
|
||||
assetPath: Packages/com.unity.2d.tilemap
|
||||
name: com.unity.2d.tilemap
|
||||
displayName: 2D Tilemap Editor
|
||||
|
|
@ -642,7 +642,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.9.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.collab-proxy@1.9.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.collab-proxy@1.9.0"
|
||||
assetPath: Packages/com.unity.collab-proxy
|
||||
name: com.unity.collab-proxy
|
||||
displayName: Version Control
|
||||
|
|
@ -767,7 +767,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 2.0.7
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.rider@2.0.7
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.rider@2.0.7"
|
||||
assetPath: Packages/com.unity.ide.rider
|
||||
name: com.unity.ide.rider
|
||||
displayName: JetBrains Rider Editor
|
||||
|
|
@ -810,6 +810,7 @@ m_PackageAssets:
|
|||
- 3.0.6
|
||||
- 3.0.7
|
||||
- 3.0.9
|
||||
- 3.0.10
|
||||
compatible:
|
||||
- 1.0.2
|
||||
- 1.0.6
|
||||
|
|
@ -837,6 +838,7 @@ m_PackageAssets:
|
|||
- 3.0.6
|
||||
- 3.0.7
|
||||
- 3.0.9
|
||||
- 3.0.10
|
||||
verified: 2.0.7
|
||||
dependencies:
|
||||
- name: com.unity.test-framework
|
||||
|
|
@ -876,7 +878,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 2.0.11
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.visualstudio@2.0.11
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.visualstudio@2.0.11"
|
||||
assetPath: Packages/com.unity.ide.visualstudio
|
||||
name: com.unity.ide.visualstudio
|
||||
displayName: Visual Studio Editor
|
||||
|
|
@ -965,7 +967,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.2.4
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.vscode@1.2.4
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.vscode@1.2.4"
|
||||
assetPath: Packages/com.unity.ide.vscode
|
||||
name: com.unity.ide.vscode
|
||||
displayName: Visual Studio Code Editor
|
||||
|
|
@ -1036,7 +1038,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.1.29
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.test-framework@1.1.29
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.test-framework@1.1.29"
|
||||
assetPath: Packages/com.unity.test-framework
|
||||
name: com.unity.test-framework
|
||||
displayName: Test Framework
|
||||
|
|
@ -1129,7 +1131,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 3.0.6
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.textmeshpro@3.0.6
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.textmeshpro@3.0.6"
|
||||
assetPath: Packages/com.unity.textmeshpro
|
||||
name: com.unity.textmeshpro
|
||||
displayName: TextMeshPro
|
||||
|
|
@ -1292,7 +1294,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.4.8
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.timeline@1.4.8
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.timeline@1.4.8"
|
||||
assetPath: Packages/com.unity.timeline
|
||||
name: com.unity.timeline
|
||||
displayName: Timeline
|
||||
|
|
@ -1450,7 +1452,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.toolchain.win-x86_64-linux-x86_64@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\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
|
||||
name: com.unity.toolchain.win-x86_64-linux-x86_64
|
||||
displayName: Toolchain Win Linux x64
|
||||
|
|
@ -1544,7 +1546,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ugui@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ugui@1.0.0"
|
||||
assetPath: Packages/com.unity.ugui
|
||||
name: com.unity.ugui
|
||||
displayName: Unity UI
|
||||
|
|
@ -1607,7 +1609,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ai@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ai@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.ai
|
||||
name: com.unity.modules.ai
|
||||
displayName: AI
|
||||
|
|
@ -1655,7 +1657,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.androidjni@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.androidjni@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.androidjni
|
||||
name: com.unity.modules.androidjni
|
||||
displayName: Android JNI
|
||||
|
|
@ -1703,7 +1705,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.animation@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.animation@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.animation
|
||||
name: com.unity.modules.animation
|
||||
displayName: Animation
|
||||
|
|
@ -1751,7 +1753,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.assetbundle@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.assetbundle@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.assetbundle
|
||||
name: com.unity.modules.assetbundle
|
||||
displayName: Asset Bundle
|
||||
|
|
@ -1799,7 +1801,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.audio@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.audio@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.audio
|
||||
name: com.unity.modules.audio
|
||||
displayName: Audio
|
||||
|
|
@ -1847,7 +1849,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.cloth@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.cloth@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.cloth
|
||||
name: com.unity.modules.cloth
|
||||
displayName: Cloth
|
||||
|
|
@ -1899,7 +1901,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.director@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.director@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.director
|
||||
name: com.unity.modules.director
|
||||
displayName: Director
|
||||
|
|
@ -1955,7 +1957,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imageconversion@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imageconversion@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.imageconversion
|
||||
name: com.unity.modules.imageconversion
|
||||
displayName: Image Conversion
|
||||
|
|
@ -2004,7 +2006,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imgui@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imgui@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.imgui
|
||||
name: com.unity.modules.imgui
|
||||
displayName: IMGUI
|
||||
|
|
@ -2052,7 +2054,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.jsonserialize@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.jsonserialize@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.jsonserialize
|
||||
name: com.unity.modules.jsonserialize
|
||||
displayName: JSONSerialize
|
||||
|
|
@ -2100,7 +2102,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.particlesystem@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.particlesystem@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.particlesystem
|
||||
name: com.unity.modules.particlesystem
|
||||
displayName: Particle System
|
||||
|
|
@ -2148,7 +2150,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.physics
|
||||
name: com.unity.modules.physics
|
||||
displayName: Physics
|
||||
|
|
@ -2196,7 +2198,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics2d@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics2d@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.physics2d
|
||||
name: com.unity.modules.physics2d
|
||||
displayName: Physics 2D
|
||||
|
|
@ -2244,7 +2246,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.screencapture@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.screencapture@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.screencapture
|
||||
name: com.unity.modules.screencapture
|
||||
displayName: Screen Capture
|
||||
|
|
@ -2296,7 +2298,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrain@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrain@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.terrain
|
||||
name: com.unity.modules.terrain
|
||||
displayName: Terrain
|
||||
|
|
@ -2344,7 +2346,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrainphysics@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrainphysics@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.terrainphysics
|
||||
name: com.unity.modules.terrainphysics
|
||||
displayName: Terrain Physics
|
||||
|
|
@ -2400,7 +2402,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.tilemap@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.tilemap@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.tilemap
|
||||
name: com.unity.modules.tilemap
|
||||
displayName: Tilemap
|
||||
|
|
@ -2452,7 +2454,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ui@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ui@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.ui
|
||||
name: com.unity.modules.ui
|
||||
displayName: UI
|
||||
|
|
@ -2500,7 +2502,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielements@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielements@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.uielements
|
||||
name: com.unity.modules.uielements
|
||||
displayName: UIElements
|
||||
|
|
@ -2564,7 +2566,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.umbra@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.umbra@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.umbra
|
||||
name: com.unity.modules.umbra
|
||||
displayName: Umbra
|
||||
|
|
@ -2612,7 +2614,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unityanalytics@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unityanalytics@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unityanalytics
|
||||
name: com.unity.modules.unityanalytics
|
||||
displayName: Unity Analytics
|
||||
|
|
@ -2668,7 +2670,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequest@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequest@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unitywebrequest
|
||||
name: com.unity.modules.unitywebrequest
|
||||
displayName: Unity Web Request
|
||||
|
|
@ -2716,7 +2718,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestassetbundle@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestassetbundle@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unitywebrequestassetbundle
|
||||
name: com.unity.modules.unitywebrequestassetbundle
|
||||
displayName: Unity Web Request Asset Bundle
|
||||
|
|
@ -2772,7 +2774,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestaudio@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestaudio@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unitywebrequestaudio
|
||||
name: com.unity.modules.unitywebrequestaudio
|
||||
displayName: Unity Web Request Audio
|
||||
|
|
@ -2828,7 +2830,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequesttexture@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequesttexture@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unitywebrequesttexture
|
||||
name: com.unity.modules.unitywebrequesttexture
|
||||
displayName: Unity Web Request Texture
|
||||
|
|
@ -2884,7 +2886,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestwww@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestwww@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.unitywebrequestwww
|
||||
name: com.unity.modules.unitywebrequestwww
|
||||
displayName: Unity Web Request WWW
|
||||
|
|
@ -2956,7 +2958,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vehicles@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vehicles@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.vehicles
|
||||
name: com.unity.modules.vehicles
|
||||
displayName: Vehicles
|
||||
|
|
@ -3008,7 +3010,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.video@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.video@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.video
|
||||
name: com.unity.modules.video
|
||||
displayName: Video
|
||||
|
|
@ -3068,7 +3070,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vr@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vr@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.vr
|
||||
name: com.unity.modules.vr
|
||||
displayName: VR
|
||||
|
|
@ -3130,7 +3132,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.wind@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.wind@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.wind
|
||||
name: com.unity.modules.wind
|
||||
displayName: Wind
|
||||
|
|
@ -3178,7 +3180,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 1
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.xr@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.xr@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.xr
|
||||
name: com.unity.modules.xr
|
||||
displayName: XR
|
||||
|
|
@ -3238,7 +3240,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.subsystems@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.subsystems@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.subsystems
|
||||
name: com.unity.modules.subsystems
|
||||
displayName: Subsystems
|
||||
|
|
@ -3290,7 +3292,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.0.0
|
||||
source: 2
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielementsnative@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielementsnative@1.0.0"
|
||||
assetPath: Packages/com.unity.modules.uielementsnative
|
||||
name: com.unity.modules.uielementsnative
|
||||
displayName: UIElements Native
|
||||
|
|
@ -3349,7 +3351,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.0.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot@1.0.0"
|
||||
assetPath: Packages/com.unity.sysroot
|
||||
name: com.unity.sysroot
|
||||
displayName: Sysroot Base
|
||||
|
|
@ -3424,7 +3426,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.0.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot.linux-x86_64@1.0.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot.linux-x86_64@1.0.0"
|
||||
assetPath: Packages/com.unity.sysroot.linux-x86_64
|
||||
name: com.unity.sysroot.linux-x86_64
|
||||
displayName: Sysroot Linux x64
|
||||
|
|
@ -3498,7 +3500,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.0.6
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ext.nunit@1.0.6
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ext.nunit@1.0.6"
|
||||
assetPath: Packages/com.unity.ext.nunit
|
||||
name: com.unity.ext.nunit
|
||||
displayName: Custom NUnit
|
||||
|
|
@ -3514,18 +3516,8 @@ m_PackageAssets:
|
|||
errors: []
|
||||
versions:
|
||||
all:
|
||||
- 0.1.5-preview
|
||||
- 0.1.6-preview
|
||||
- 0.1.9-preview
|
||||
- 1.0.0
|
||||
- 1.0.5
|
||||
- 1.0.6
|
||||
compatible:
|
||||
- 0.1.5-preview
|
||||
- 0.1.6-preview
|
||||
- 0.1.9-preview
|
||||
- 1.0.0
|
||||
- 1.0.5
|
||||
- 1.0.6
|
||||
verified: 1.0.6
|
||||
dependencies: []
|
||||
|
|
@ -3546,7 +3538,7 @@ m_PackageAssets:
|
|||
entitlements:
|
||||
isAllowed: 1
|
||||
isAssetStorePackage: 0
|
||||
datePublishedTicks: 637429759280000000
|
||||
datePublishedTicks: 0
|
||||
documentationUrl:
|
||||
hasRepository: 1
|
||||
repository:
|
||||
|
|
@ -3559,7 +3551,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 1.1.0
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.mathematics@1.1.0
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.mathematics@1.1.0"
|
||||
assetPath: Packages/com.unity.mathematics
|
||||
name: com.unity.mathematics
|
||||
displayName: Mathematics
|
||||
|
|
@ -3575,40 +3567,12 @@ m_PackageAssets:
|
|||
errors: []
|
||||
versions:
|
||||
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.2.1
|
||||
- 1.2.4
|
||||
- 1.2.5
|
||||
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.2.1
|
||||
- 1.2.4
|
||||
- 1.2.5
|
||||
verified: 1.2.5
|
||||
verified: 1.2.1
|
||||
dependencies: []
|
||||
resolvedDependencies: []
|
||||
keywords:
|
||||
|
|
@ -3625,7 +3589,7 @@ m_PackageAssets:
|
|||
entitlements:
|
||||
isAllowed: 1
|
||||
isAssetStorePackage: 0
|
||||
datePublishedTicks: 636984649280000000
|
||||
datePublishedTicks: 0
|
||||
documentationUrl:
|
||||
hasRepository: 1
|
||||
repository:
|
||||
|
|
@ -3638,7 +3602,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 4.0.3
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.common@4.0.3
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.common@4.0.3"
|
||||
assetPath: Packages/com.unity.2d.common
|
||||
name: com.unity.2d.common
|
||||
displayName: 2D Common
|
||||
|
|
@ -3670,6 +3634,7 @@ m_PackageAssets:
|
|||
- 4.0.1
|
||||
- 4.0.2
|
||||
- 4.0.3
|
||||
- 4.0.4
|
||||
- 5.0.0-pre.1
|
||||
- 5.0.0-pre.2
|
||||
- 5.0.0
|
||||
|
|
@ -3678,10 +3643,13 @@ m_PackageAssets:
|
|||
- 6.0.0-pre.4
|
||||
- 6.0.0
|
||||
- 6.0.1
|
||||
- 6.0.2
|
||||
- 7.0.0-pre.3
|
||||
- 7.0.0-pre.4
|
||||
compatible:
|
||||
- 4.0.3
|
||||
verified: 4.0.3
|
||||
- 4.0.4
|
||||
verified: 4.0.4
|
||||
dependencies:
|
||||
- name: com.unity.2d.sprite
|
||||
version: 1.0.0
|
||||
|
|
@ -3727,7 +3695,7 @@ m_PackageAssets:
|
|||
isDirectDependency: 0
|
||||
version: 4.0.2
|
||||
source: 1
|
||||
resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.path@4.0.2
|
||||
resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.path@4.0.2"
|
||||
assetPath: Packages/com.unity.2d.path
|
||||
name: com.unity.2d.path
|
||||
displayName: 2D Path
|
||||
|
|
@ -3793,5 +3761,5 @@ m_PackageAssets:
|
|||
path:
|
||||
m_LocalPackages:
|
||||
m_LocalFileStatus: []
|
||||
m_ProjectPath: C:/Users/Dara/Documents/1/PO/Packages
|
||||
m_ProjectPath: "E:/Projects \u0441#/Unity/omega/Packages"
|
||||
m_EditorVersion: 2020.3.19f1 (68f137dc9bbe)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b4db11b227f21399b8c465ccc9c9db12
|
||||
f5e98bd93cbb082bc13febd9deb805dc
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
|||
Using pre-set license
|
||||
Built from '2020.3/staging' branch; Version is '2020.3.19f1 (68f137dc9bbe) revision 6877495'; Using compiler version '192528614'; Build Type 'Release'
|
||||
OS: 'Windows 10 Home; OS build 19043.1466; Version 2009; 64bit' Language: 'ru' Physical Memory: 8029 MB
|
||||
OS: 'Windows 10 Pro; OS build 19043.1415; Version 2009; 64bit' Language: 'ru' Physical Memory: 32637 MB
|
||||
BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
|
||||
|
||||
COMMAND LINE ARGUMENTS:
|
||||
|
|
@ -11,36 +11,47 @@ C:\Program Files\Unity\Hub\Editor\2020.3.19f1\Editor\Unity.exe
|
|||
-name
|
||||
AssetImportWorker0
|
||||
-projectPath
|
||||
C:/Users/Dara/Documents/1/PO
|
||||
E:/Projects с#/Unity/omega
|
||||
-logFile
|
||||
Logs/AssetImportWorker0.log
|
||||
-srvPort
|
||||
<<<<<<< HEAD
|
||||
64513
|
||||
Successfully changed project path to: C:/Users/Dara/Documents/1/PO
|
||||
C:/Users/Dara/Documents/1/PO
|
||||
Using Asset Import Pipeline V2.
|
||||
Refreshing native plugins compatible for Editor in 49.81 ms, found 3 plugins.
|
||||
=======
|
||||
53403
|
||||
Successfully changed project path to: E:/Projects с#/Unity/omega
|
||||
E:/Projects с#/Unity/omega
|
||||
Using Asset Import Pipeline V2.
|
||||
Refreshing native plugins compatible for Editor in 33.48 ms, found 3 plugins.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Initialize engine version: 2020.3.19f1 (68f137dc9bbe)
|
||||
[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Resources/UnitySubsystems
|
||||
[Subsystems] Discovering subsystems at path C:/Users/Dara/Documents/1/PO/Assets
|
||||
[Subsystems] Discovering subsystems at path E:/Projects с#/Unity/omega/Assets
|
||||
GfxDevice: creating device client; threaded=0
|
||||
Direct3D:
|
||||
Version: Direct3D 11.0 [level 11.1]
|
||||
Renderer: NVIDIA GeForce GTX 1650 (ID=0x1f99)
|
||||
Version: Direct3D 11.0 [level 11.0]
|
||||
Renderer: NVIDIA GeForce GT 730 (ID=0x1287)
|
||||
Vendor:
|
||||
VRAM: 3962 MB
|
||||
Driver: 30.0.14.9709
|
||||
VRAM: 984 MB
|
||||
Driver: 30.0.14.7212
|
||||
Initialize mono
|
||||
Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Managed'
|
||||
Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
|
||||
Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/etc'
|
||||
<<<<<<< HEAD
|
||||
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56000
|
||||
=======
|
||||
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56912
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Begin MonoManager ReloadAssembly
|
||||
Registering precompiled unity dll's ...
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
|
||||
<<<<<<< HEAD
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
|
||||
Registered in 0.006394 seconds.
|
||||
Native extension for LinuxStandalone target not found
|
||||
|
|
@ -54,11 +65,23 @@ Mono: successfully reloaded assembly
|
|||
Domain Reload Profiling:
|
||||
ReloadAssembly (4169ms)
|
||||
BeginReloadAssembly (52ms)
|
||||
=======
|
||||
Registered in 0.001142 seconds.
|
||||
Native extension for WindowsStandalone target not found
|
||||
Refreshing native plugins compatible for Editor in 31.77 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 1.235 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (1235ms)
|
||||
BeginReloadAssembly (35ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (0ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
CreateAndSetChildDomain (1ms)
|
||||
<<<<<<< HEAD
|
||||
EndReloadAssembly (448ms)
|
||||
LoadAssemblies (51ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
|
|
@ -73,16 +96,36 @@ Domain Reload Profiling:
|
|||
BeforeProcessingInitializeOnLoad (18ms)
|
||||
ProcessInitializeOnLoadAttributes (79ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (27ms)
|
||||
=======
|
||||
EndReloadAssembly (290ms)
|
||||
LoadAssemblies (34ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (96ms)
|
||||
ReleaseScriptCaches (0ms)
|
||||
RebuildScriptCaches (20ms)
|
||||
SetupLoadedEditorAssemblies (122ms)
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
RefreshPlugins (32ms)
|
||||
BeforeProcessingInitializeOnLoad (12ms)
|
||||
ProcessInitializeOnLoadAttributes (55ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (19ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
AfterProcessingInitializeOnLoad (0ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (0ms)
|
||||
Platform modules already initialized, skipping
|
||||
Registering precompiled user dll's ...
|
||||
<<<<<<< HEAD
|
||||
Registered in 0.002502 seconds.
|
||||
=======
|
||||
Registered in 0.001259 seconds.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Begin MonoManager ReloadAssembly
|
||||
Native extension for LinuxStandalone target not found
|
||||
Native extension for WindowsStandalone target not found
|
||||
<<<<<<< HEAD
|
||||
Native extension for OSXStandalone target not found
|
||||
Native extension for WebGL target not found
|
||||
Refreshing native plugins compatible for Editor in 38.82 ms, found 3 plugins.
|
||||
|
|
@ -120,13 +163,53 @@ Platform modules already initialized, skipping
|
|||
Worker process is ready to serve import requests
|
||||
Launched and connected shader compiler UnityShaderCompiler.exe after 0.07 seconds
|
||||
Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins.
|
||||
=======
|
||||
Refreshing native plugins compatible for Editor in 30.53 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 0.736 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (737ms)
|
||||
BeginReloadAssembly (96ms)
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (3ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
CreateAndSetChildDomain (13ms)
|
||||
EndReloadAssembly (599ms)
|
||||
LoadAssemblies (60ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (185ms)
|
||||
ReleaseScriptCaches (0ms)
|
||||
RebuildScriptCaches (31ms)
|
||||
SetupLoadedEditorAssemblies (244ms)
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
RefreshPlugins (31ms)
|
||||
BeforeProcessingInitializeOnLoad (55ms)
|
||||
ProcessInitializeOnLoadAttributes (141ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (10ms)
|
||||
AfterProcessingInitializeOnLoad (4ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (5ms)
|
||||
Platform modules already initialized, skipping
|
||||
========================================================================
|
||||
Worker process is ready to serve import requests
|
||||
Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds
|
||||
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 2124 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 95.8 MB.
|
||||
System memory in use after: 95.9 MB.
|
||||
|
||||
Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2564.
|
||||
<<<<<<< HEAD
|
||||
Total: 3.317000 ms (FindLiveObjects: 0.362200 ms CreateObjectMapping: 0.266900 ms MarkObjects: 2.587900 ms DeleteObjects: 0.098600 ms)
|
||||
=======
|
||||
Total: 1.983400 ms (FindLiveObjects: 0.119500 ms CreateObjectMapping: 0.040700 ms MarkObjects: 1.760100 ms DeleteObjects: 0.062300 ms)
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
|
|
@ -139,6 +222,181 @@ AssetImportParameters requested are different than current active one (requested
|
|||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
path: Assets/Scripts
|
||||
artifactKey: Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts using Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c25a1d281167645a33bf722f65337e25') in 0.002948 seconds
|
||||
Import took 0.005165 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.230927 seconds.
|
||||
path: Assets/Scripts/Enemy
|
||||
artifactKey: Guid(f1dc807a1231259428b7050d80cd4621) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy using Guid(f1dc807a1231259428b7050d80cd4621) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c8937e923d858b0c0af47257ef06a91b') in 0.000928 seconds
|
||||
Import took 0.003359 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 1.359162 seconds.
|
||||
path: Assets/Scripts/Enemy/Enemy.cs
|
||||
artifactKey: Guid(2b59d706054351043a791f29cd4400e1) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy/Enemy.cs using Guid(2b59d706054351043a791f29cd4400e1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '0e74811923e2b7b55dd1c605ea446500') in 0.013118 seconds
|
||||
Import took 0.015485 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Prepare
|
||||
Refreshing native plugins compatible for Editor in 1.75 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 13 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 52.7 MB.
|
||||
System memory in use after: 52.8 MB.
|
||||
|
||||
Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2564.
|
||||
Total: 2.109900 ms (FindLiveObjects: 0.128200 ms CreateObjectMapping: 0.041200 ms MarkObjects: 1.929900 ms DeleteObjects: 0.010100 ms)
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 71.508425 seconds.
|
||||
path: Assets/Scripts/DeckManager.cs
|
||||
artifactKey: Guid(dee7bf68184e7d345b01f75f8ee9197b) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/DeckManager.cs using Guid(dee7bf68184e7d345b01f75f8ee9197b) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '20576dacfca5829fc30fed080bee0948') in 0.001032 seconds
|
||||
Import took 0.003535 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 5.635163 seconds.
|
||||
path: Assets/Scripts/Configs
|
||||
artifactKey: Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs using Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ee0ede7d3d1e8288bf6e1c9db58df68f') in 0.001047 seconds
|
||||
Import took 0.003620 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 1.679315 seconds.
|
||||
path: Assets/Scripts/Configs/BattleConfig.cs
|
||||
artifactKey: Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/BattleConfig.cs using Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '413ed641904f78eca62b0c9b32930bda') in 0.000917 seconds
|
||||
Import took 0.003342 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 3.671034 seconds.
|
||||
path: Assets/Scripts/Configs/CardConfig.cs
|
||||
artifactKey: Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/CardConfig.cs using Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9b9176fbb5fdef0a02bd515ca1c321da') in 0.001314 seconds
|
||||
Import took 0.003746 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 6.424093 seconds.
|
||||
path: Assets/Scripts/Session.cs
|
||||
artifactKey: Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Session.cs using Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'b793d683ade2038d4583a85195530274') in 0.001188 seconds
|
||||
Import took 0.003668 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 9.560496 seconds.
|
||||
path: Assets/Scripts/Enemy/LibraryTurnMethods.cs
|
||||
artifactKey: Guid(b3ffd201925e0e64b9acf27bad35844d) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy/LibraryTurnMethods.cs using Guid(b3ffd201925e0e64b9acf27bad35844d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '1ff2ce029f8b958a86d696c00c92e13c') in 0.001274 seconds
|
||||
Import took 0.003723 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 4.292317 seconds.
|
||||
path: Assets/Scripts/Enemy/BaseEnemyTurn.cs
|
||||
artifactKey: Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy/BaseEnemyTurn.cs using Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '82e800281ce1c91a92eb560a44ec1035') in 0.001122 seconds
|
||||
Import took 0.003612 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 4.896072 seconds.
|
||||
path: Assets/Scripts/Enemy/BaseEnemyTurn.cs
|
||||
artifactKey: Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy/BaseEnemyTurn.cs using Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '257a6f2b4002722f878fd77fe453a4b2') in 0.001299 seconds
|
||||
Import took 0.004134 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 13.197665 seconds.
|
||||
path: Assets/Scripts/Enemy/BaseEnemyTurn.cs
|
||||
artifactKey: Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Enemy/BaseEnemyTurn.cs using Guid(047bd205dd84f1549a382c7169ea0369) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'df338014a70ca539e495920153a67400') in 0.001054 seconds
|
||||
Import took 0.003547 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Prepare
|
||||
Registering precompiled user dll's ...
|
||||
Registered in 0.001156 seconds.
|
||||
Begin MonoManager ReloadAssembly
|
||||
Native extension for WindowsStandalone target not found
|
||||
Refreshing native plugins compatible for Editor in 0.33 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 0.689 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (689ms)
|
||||
BeginReloadAssembly (94ms)
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (4ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
CreateAndSetChildDomain (25ms)
|
||||
EndReloadAssembly (552ms)
|
||||
LoadAssemblies (60ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (177ms)
|
||||
ReleaseScriptCaches (1ms)
|
||||
RebuildScriptCaches (33ms)
|
||||
SetupLoadedEditorAssemblies (211ms)
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
RefreshPlugins (0ms)
|
||||
BeforeProcessingInitializeOnLoad (58ms)
|
||||
ProcessInitializeOnLoadAttributes (141ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (4ms)
|
||||
AfterProcessingInitializeOnLoad (4ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (8ms)
|
||||
Platform modules already initialized, skipping
|
||||
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
|
||||
Refreshing native plugins compatible for Editor in 0.38 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 94.0 MB.
|
||||
System memory in use after: 94.1 MB.
|
||||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2566.
|
||||
Total: 1.941300 ms (FindLiveObjects: 0.127700 ms CreateObjectMapping: 0.071100 ms MarkObjects: 1.726800 ms DeleteObjects: 0.014300 ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
<<<<<<< HEAD
|
||||
Received Prepare
|
||||
Refreshing native plugins compatible for Editor in 3.44 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
|
|
@ -215,19 +473,49 @@ System memory in use after: 94.1 MB.
|
|||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2566.
|
||||
Total: 3.962500 ms (FindLiveObjects: 0.204100 ms CreateObjectMapping: 0.091200 ms MarkObjects: 3.640100 ms DeleteObjects: 0.025400 ms)
|
||||
=======
|
||||
Received Import Request.
|
||||
Time since last request: 122.475184 seconds.
|
||||
path: Assets/Prefabs
|
||||
artifactKey: Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Prefabs using Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4722b95463dd97ba4aa8d14403194875') in 0.003461 seconds
|
||||
Import took 0.006144 seconds .
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 3.044090 seconds.
|
||||
path: Assets/Prefabs/Enemy
|
||||
artifactKey: Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Prefabs/Enemy using Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7fce1d80a97414ba1c8e8727fb455b85') in 0.001073 seconds
|
||||
Import took 0.003486 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.058549 seconds.
|
||||
path: Assets/Prefabs/Enemy/Enemy_1.prefab
|
||||
artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '55406cda914129a42c15635cae5953f5') in 0.032889 seconds
|
||||
Import took 0.035434 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 8.903016 seconds.
|
||||
path: Assets/Prefabs/Enemy/Enemy_1.prefab
|
||||
artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'cf2951ccbd576c98c286e4ff8b7ee98c') in 0.006161 seconds
|
||||
Import took 0.008787 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 1.649861 seconds.
|
||||
path: Assets/Graphics
|
||||
artifactKey: Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics using Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '2c78f3d8ddeda74415dd6ce63d344cd1') in 0.001035 seconds
|
||||
Import took 0.003446 seconds .
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
========================================================================
|
||||
<<<<<<< HEAD
|
||||
Received Prepare
|
||||
Registering precompiled user dll's ...
|
||||
Registered in 0.002304 seconds.
|
||||
|
|
@ -276,19 +564,17 @@ System memory in use after: 94.1 MB.
|
|||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2568.
|
||||
Total: 2.848100 ms (FindLiveObjects: 0.208300 ms CreateObjectMapping: 0.084300 ms MarkObjects: 2.536100 ms DeleteObjects: 0.017900 ms)
|
||||
=======
|
||||
Received Import Request.
|
||||
Time since last request: 1.505705 seconds.
|
||||
path: Assets/Graphics/Other
|
||||
artifactKey: Guid(963406e10cb08d748b2edcc8f65018d8) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics/Other using Guid(963406e10cb08d748b2edcc8f65018d8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e3ce051457e668ed83d182fc92361481') in 0.001245 seconds
|
||||
Import took 0.003731 seconds .
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
<<<<<<< HEAD
|
||||
Received Prepare
|
||||
Registering precompiled user dll's ...
|
||||
Registered in 0.002753 seconds.
|
||||
|
|
@ -337,20 +623,18 @@ System memory in use after: 94.2 MB.
|
|||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2570.
|
||||
Total: 2.908900 ms (FindLiveObjects: 0.198500 ms CreateObjectMapping: 0.079600 ms MarkObjects: 2.605700 ms DeleteObjects: 0.023400 ms)
|
||||
=======
|
||||
Received Import Request.
|
||||
Time since last request: 0.036713 seconds.
|
||||
path: Assets/Graphics/Other/Markers.png
|
||||
artifactKey: Guid(5f2cb20f1f8274c42a5d23c6d6237680) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics/Other/Markers.png using Guid(5f2cb20f1f8274c42a5d23c6d6237680) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '8fcdd2d9a899710f3655ff4c8313240e') in 0.061323 seconds
|
||||
Import took 0.063922 seconds .
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
<<<<<<< HEAD
|
||||
Time since last request: 140.621317 seconds.
|
||||
path: Assets/Scripts/Configs/EnemyConfigs/Zombie.asset
|
||||
artifactKey: Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
|
|
@ -406,19 +690,16 @@ System memory in use after: 94.2 MB.
|
|||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2572.
|
||||
Total: 3.777300 ms (FindLiveObjects: 0.242600 ms CreateObjectMapping: 0.093000 ms MarkObjects: 3.413600 ms DeleteObjects: 0.027100 ms)
|
||||
=======
|
||||
Time since last request: 0.000157 seconds.
|
||||
path: Assets/Graphics/Other/output-onlinepngtools (4).png
|
||||
artifactKey: Guid(baeea79bd8960b44c8a956ac6aef5e68) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics/Other/output-onlinepngtools (4).png using Guid(baeea79bd8960b44c8a956ac6aef5e68) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '67d94e642ff57fb3a0bbf6f172f669fe') in 0.027304 seconds
|
||||
Import took 0.029645 seconds .
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
========================================================================
|
||||
<<<<<<< HEAD
|
||||
Received Prepare
|
||||
Registering precompiled user dll's ...
|
||||
Registered in 0.003552 seconds.
|
||||
|
|
@ -467,6 +748,69 @@ System memory in use after: 94.2 MB.
|
|||
|
||||
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2574.
|
||||
Total: 4.052000 ms (FindLiveObjects: 0.201000 ms CreateObjectMapping: 0.073100 ms MarkObjects: 3.754200 ms DeleteObjects: 0.022500 ms)
|
||||
=======
|
||||
Received Import Request.
|
||||
Time since last request: 12.638414 seconds.
|
||||
path: Assets/Graphics/Other/kisspng-devops-business-bob-s-auto-body-information-mclemo-bandaid-5b20dcaeb2d376.9603632615288803027325.png
|
||||
artifactKey: Guid(e358c2b81c85b9e46a554b5c06625c27) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics/Other/kisspng-devops-business-bob-s-auto-body-information-mclemo-bandaid-5b20dcaeb2d376.9603632615288803027325.png using Guid(e358c2b81c85b9e46a554b5c06625c27) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '394ffee5c00117c73bcd8eeb4a4d210b') in 0.022263 seconds
|
||||
Import took 0.024990 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.000142 seconds.
|
||||
path: Assets/Graphics/Other/transparent-sword-icon-rpg-game-icon-linear-game-design-elemen-5ff40d98792267.2695604616098297844962.png
|
||||
artifactKey: Guid(dd98efe28d8ec124aa1125cdd7974e8f) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Graphics/Other/transparent-sword-icon-rpg-game-icon-linear-game-design-elemen-5ff40d98792267.2695604616098297844962.png using Guid(dd98efe28d8ec124aa1125cdd7974e8f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5a6d84669d621dd88a2e06f683098324') in 0.014967 seconds
|
||||
Import took 0.017405 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Prepare
|
||||
Registering precompiled user dll's ...
|
||||
Registered in 0.001111 seconds.
|
||||
Begin MonoManager ReloadAssembly
|
||||
Native extension for WindowsStandalone target not found
|
||||
Refreshing native plugins compatible for Editor in 0.31 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 0.670 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (670ms)
|
||||
BeginReloadAssembly (91ms)
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (4ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
CreateAndSetChildDomain (25ms)
|
||||
EndReloadAssembly (538ms)
|
||||
LoadAssemblies (58ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (173ms)
|
||||
ReleaseScriptCaches (1ms)
|
||||
RebuildScriptCaches (31ms)
|
||||
SetupLoadedEditorAssemblies (201ms)
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
RefreshPlugins (0ms)
|
||||
BeforeProcessingInitializeOnLoad (56ms)
|
||||
ProcessInitializeOnLoadAttributes (134ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (4ms)
|
||||
AfterProcessingInitializeOnLoad (3ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (8ms)
|
||||
Platform modules already initialized, skipping
|
||||
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
|
||||
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 97.0 MB.
|
||||
System memory in use after: 97.1 MB.
|
||||
|
||||
Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2579.
|
||||
Total: 2.031800 ms (FindLiveObjects: 0.118700 ms CreateObjectMapping: 0.042800 ms MarkObjects: 1.838900 ms DeleteObjects: 0.030800 ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Using pre-set license
|
||||
Built from '2020.3/staging' branch; Version is '2020.3.19f1 (68f137dc9bbe) revision 6877495'; Using compiler version '192528614'; Build Type 'Release'
|
||||
OS: 'Windows 10 Home; OS build 19043.1466; Version 2009; 64bit' Language: 'ru' Physical Memory: 8029 MB
|
||||
OS: 'Windows 10 Pro; OS build 19043.1415; Version 2009; 64bit' Language: 'ru' Physical Memory: 32637 MB
|
||||
BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
|
||||
|
||||
COMMAND LINE ARGUMENTS:
|
||||
|
|
@ -11,36 +11,47 @@ C:\Program Files\Unity\Hub\Editor\2020.3.19f1\Editor\Unity.exe
|
|||
-name
|
||||
AssetImportWorker0
|
||||
-projectPath
|
||||
C:/Users/Dara/Documents/1/PO
|
||||
E:/Projects с#/Unity/omega
|
||||
-logFile
|
||||
Logs/AssetImportWorker0.log
|
||||
-srvPort
|
||||
<<<<<<< HEAD
|
||||
64717
|
||||
Successfully changed project path to: C:/Users/Dara/Documents/1/PO
|
||||
C:/Users/Dara/Documents/1/PO
|
||||
Using Asset Import Pipeline V2.
|
||||
Refreshing native plugins compatible for Editor in 38.30 ms, found 3 plugins.
|
||||
=======
|
||||
63632
|
||||
Successfully changed project path to: E:/Projects с#/Unity/omega
|
||||
E:/Projects с#/Unity/omega
|
||||
Using Asset Import Pipeline V2.
|
||||
Refreshing native plugins compatible for Editor in 27.82 ms, found 3 plugins.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Initialize engine version: 2020.3.19f1 (68f137dc9bbe)
|
||||
[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Resources/UnitySubsystems
|
||||
[Subsystems] Discovering subsystems at path C:/Users/Dara/Documents/1/PO/Assets
|
||||
[Subsystems] Discovering subsystems at path E:/Projects с#/Unity/omega/Assets
|
||||
GfxDevice: creating device client; threaded=0
|
||||
Direct3D:
|
||||
Version: Direct3D 11.0 [level 11.1]
|
||||
Renderer: NVIDIA GeForce GTX 1650 (ID=0x1f99)
|
||||
Version: Direct3D 11.0 [level 11.0]
|
||||
Renderer: NVIDIA GeForce GT 730 (ID=0x1287)
|
||||
Vendor:
|
||||
VRAM: 3962 MB
|
||||
Driver: 30.0.14.9709
|
||||
VRAM: 984 MB
|
||||
Driver: 30.0.14.7212
|
||||
Initialize mono
|
||||
Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Managed'
|
||||
Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
|
||||
Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/etc'
|
||||
<<<<<<< HEAD
|
||||
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56868
|
||||
=======
|
||||
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56056
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Begin MonoManager ReloadAssembly
|
||||
Registering precompiled unity dll's ...
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
|
||||
<<<<<<< HEAD
|
||||
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
|
||||
Registered in 0.004521 seconds.
|
||||
Native extension for LinuxStandalone target not found
|
||||
|
|
@ -54,11 +65,23 @@ Mono: successfully reloaded assembly
|
|||
Domain Reload Profiling:
|
||||
ReloadAssembly (2864ms)
|
||||
BeginReloadAssembly (44ms)
|
||||
=======
|
||||
Registered in 0.001219 seconds.
|
||||
Native extension for WindowsStandalone target not found
|
||||
Refreshing native plugins compatible for Editor in 28.63 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 1.265 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (1266ms)
|
||||
BeginReloadAssembly (35ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (0ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
CreateAndSetChildDomain (1ms)
|
||||
<<<<<<< HEAD
|
||||
EndReloadAssembly (374ms)
|
||||
LoadAssemblies (44ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
|
|
@ -66,23 +89,43 @@ Domain Reload Profiling:
|
|||
ReleaseScriptCaches (0ms)
|
||||
RebuildScriptCaches (25ms)
|
||||
SetupLoadedEditorAssemblies (146ms)
|
||||
=======
|
||||
EndReloadAssembly (274ms)
|
||||
LoadAssemblies (34ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (92ms)
|
||||
ReleaseScriptCaches (0ms)
|
||||
RebuildScriptCaches (19ms)
|
||||
SetupLoadedEditorAssemblies (114ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (6ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
<<<<<<< HEAD
|
||||
RefreshPlugins (36ms)
|
||||
BeforeProcessingInitializeOnLoad (15ms)
|
||||
ProcessInitializeOnLoadAttributes (65ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (24ms)
|
||||
=======
|
||||
RefreshPlugins (29ms)
|
||||
BeforeProcessingInitializeOnLoad (12ms)
|
||||
ProcessInitializeOnLoadAttributes (53ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (18ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
AfterProcessingInitializeOnLoad (0ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (0ms)
|
||||
Platform modules already initialized, skipping
|
||||
Registering precompiled user dll's ...
|
||||
<<<<<<< HEAD
|
||||
Registered in 0.007740 seconds.
|
||||
=======
|
||||
Registered in 0.001129 seconds.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Begin MonoManager ReloadAssembly
|
||||
Native extension for LinuxStandalone target not found
|
||||
Native extension for WindowsStandalone target not found
|
||||
<<<<<<< HEAD
|
||||
Native extension for OSXStandalone target not found
|
||||
Native extension for WebGL target not found
|
||||
Refreshing native plugins compatible for Editor in 38.25 ms, found 3 plugins.
|
||||
|
|
@ -92,10 +135,20 @@ Mono: successfully reloaded assembly
|
|||
Domain Reload Profiling:
|
||||
ReloadAssembly (997ms)
|
||||
BeginReloadAssembly (124ms)
|
||||
=======
|
||||
Refreshing native plugins compatible for Editor in 28.59 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Mono: successfully reloaded assembly
|
||||
- Completed reload, in 0.691 seconds
|
||||
Domain Reload Profiling:
|
||||
ReloadAssembly (692ms)
|
||||
BeginReloadAssembly (89ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
ExecutionOrderSort (0ms)
|
||||
DisableScriptedObjects (4ms)
|
||||
DisableScriptedObjects (3ms)
|
||||
BackupInstance (0ms)
|
||||
ReleaseScriptingObjects (0ms)
|
||||
<<<<<<< HEAD
|
||||
CreateAndSetChildDomain (15ms)
|
||||
EndReloadAssembly (821ms)
|
||||
LoadAssemblies (111ms)
|
||||
|
|
@ -120,12 +173,39 @@ Platform modules already initialized, skipping
|
|||
Worker process is ready to serve import requests
|
||||
Launched and connected shader compiler UnityShaderCompiler.exe after 0.07 seconds
|
||||
Refreshing native plugins compatible for Editor in 0.39 ms, found 3 plugins.
|
||||
=======
|
||||
CreateAndSetChildDomain (13ms)
|
||||
EndReloadAssembly (564ms)
|
||||
LoadAssemblies (56ms)
|
||||
RebuildTransferFunctionScriptingTraits (0ms)
|
||||
SetupTypeCache (176ms)
|
||||
ReleaseScriptCaches (0ms)
|
||||
RebuildScriptCaches (29ms)
|
||||
SetupLoadedEditorAssemblies (226ms)
|
||||
LogAssemblyErrors (0ms)
|
||||
InitializePlatformSupportModulesInManaged (3ms)
|
||||
SetLoadedEditorAssemblies (0ms)
|
||||
RefreshPlugins (29ms)
|
||||
BeforeProcessingInitializeOnLoad (51ms)
|
||||
ProcessInitializeOnLoadAttributes (131ms)
|
||||
ProcessInitializeOnLoadMethodAttributes (10ms)
|
||||
AfterProcessingInitializeOnLoad (3ms)
|
||||
EditorAssembliesLoaded (0ms)
|
||||
ExecutionOrderSort2 (0ms)
|
||||
AwakeInstancesAfterBackupRestoration (5ms)
|
||||
Platform modules already initialized, skipping
|
||||
========================================================================
|
||||
Worker process is ready to serve import requests
|
||||
Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds
|
||||
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 2124 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 95.8 MB.
|
||||
System memory in use after: 95.9 MB.
|
||||
|
||||
Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2564.
|
||||
<<<<<<< HEAD
|
||||
Total: 2.580700 ms (FindLiveObjects: 0.184700 ms CreateObjectMapping: 0.079100 ms MarkObjects: 2.262600 ms DeleteObjects: 0.053400 ms)
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
|
|
@ -152,9 +232,13 @@ Received Import Request.
|
|||
artifactKey: Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Prefabs using Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ab464ff287aed2b45edc76128fbfdea8') in 0.008233 seconds
|
||||
Import took 0.012863 seconds .
|
||||
=======
|
||||
Total: 2.006200 ms (FindLiveObjects: 0.119000 ms CreateObjectMapping: 0.042000 ms MarkObjects: 1.789700 ms DeleteObjects: 0.054600 ms)
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
<<<<<<< HEAD
|
||||
Time since last request: 0.000183 seconds.
|
||||
path: Assets/Scenes
|
||||
artifactKey: Guid(fb67c500aacab5e4e9d173bfe45e441f) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
|
|
@ -257,4 +341,56 @@ Received Import Request.
|
|||
Start importing Assets/Scripts/Enemy using Guid(f1dc807a1231259428b7050d80cd4621) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9f4194e34a06c4fd5b6d162c5bf29215') in 0.014903 seconds
|
||||
Import took 0.149515 seconds .
|
||||
|
||||
=======
|
||||
path: Assets/Scripts/Configs/EnemyConfigs
|
||||
artifactKey: Guid(44990bee8511b1b45bdc0b0e8d1b6843) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/EnemyConfigs using Guid(44990bee8511b1b45bdc0b0e8d1b6843) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '46dcc98837762263e2e9090c0b6f3632') in 0.003072 seconds
|
||||
Import took 0.005354 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.000187 seconds.
|
||||
path: Assets/Scripts/Configs/EnemyConfigs/Shaman.asset
|
||||
artifactKey: Guid(4f3f54f77793e6742beb0119340b03f5) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/EnemyConfigs/Shaman.asset using Guid(4f3f54f77793e6742beb0119340b03f5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '17bd83a0220f4e79a46c59d0978a36b8') in 0.019620 seconds
|
||||
Import took 0.021795 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.000207 seconds.
|
||||
path: Assets/Scripts/Configs/EnemyConfigs/Snake.asset
|
||||
artifactKey: Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/EnemyConfigs/Snake.asset using Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '46001076841c0f58d0d02b36f5f35824') in 0.001211 seconds
|
||||
Import took 0.003265 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Import Request.
|
||||
Time since last request: 0.000351 seconds.
|
||||
path: Assets/Scripts/Configs/EnemyConfigs/Zombie.asset
|
||||
artifactKey: Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
|
||||
Start importing Assets/Scripts/Configs/EnemyConfigs/Zombie.asset using Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'a2d5eae1d223bbdfb8bdcf55bbc8e4e0') in 0.001441 seconds
|
||||
Import took 0.004000 seconds .
|
||||
|
||||
========================================================================
|
||||
Received Prepare
|
||||
Refreshing native plugins compatible for Editor in 1.84 ms, found 3 plugins.
|
||||
Preloading 0 native plugins for Editor in 0.00 ms.
|
||||
Unloading 13 Unused Serialized files (Serialized files now loaded: 0)
|
||||
System memory in use before: 52.7 MB.
|
||||
System memory in use after: 52.8 MB.
|
||||
|
||||
Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2564.
|
||||
Total: 2.615800 ms (FindLiveObjects: 0.167800 ms CreateObjectMapping: 0.061200 ms MarkObjects: 2.354700 ms DeleteObjects: 0.031000 ms)
|
||||
|
||||
AssetImportParameters requested are different than current active one (requested -> active):
|
||||
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
|
||||
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
|
||||
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
|
||||
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
|
||||
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
|
||||
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
|
||||
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
|
||||
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
AssetImportWorkerClient::OnTransportError - code=2 error=End of file
|
||||
|
|
|
|||
|
|
@ -1,3 +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'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Cmd: shutdown
|
||||
|
|
|
|||
|
|
@ -1,3 +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'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Cmd: shutdown
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
@ -1,3 +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'
|
||||
Cmd: initializeCompiler
|
||||
|
||||
Cmd: shutdown
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
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
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
Cmd: shutdown
|
||||
|
||||
Quitting shader compiler process
|
||||
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
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
|
||||
|
||||
Quitting shader compiler process
|
||||
Binary file not shown.
Loading…
Reference in New Issue